fly/flightgear
1
0
Fork 0
Code Activity

Refined conditional audio support compilation.

Browse source 
Moved texture parameter setup calls to ../Scenery/materials.cxx
#include <string.h> before various STL includes.
Make HUD default state be enabled.
This commit is contained in:
curt 1998-06-17 21:35:10 +00:00
parent 1e4a06098f
commit e461053c78
5 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Main/GLUTmain.cxx
View file

@ -52,9 +52,9 @@
#include <Astro/stars.hxx>
#include <Astro/sun.hxx>
#ifdef HAVE_OSS_AUDIO
# include <Audio/sl.h>
# include <Audio/sm.h>
#ifdef HAVE_AUDIO_SUPPORT
# include <Audio/src/sl.h>
# include <Audio/src/sm.h>
#endif
#include <Cockpit/cockpit.hxx>
@ -89,7 +89,7 @@ int use_signals = 0;
int displayInstruments;
// Global structures for the Audio library
#ifdef HAVE_OSS_AUDIO
#ifdef HAVE_AUDIO_SUPPORT
slScheduler audio_sched ( 8000 ) ;
smMixer audio_mixer ;
slSample *s1;
@ -365,13 +365,6 @@ static void fgRenderFrame( void ) {
if ( o->textures ) {
// texture parameters
xglEnable( GL_TEXTURE_2D );
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ) ;
xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_LINEAR /* GL_LINEAR_MIPMAP_LINEAR */ ) ;
xglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
xglHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
// set base color (I don't think this is doing anything here)
xglMaterialfv (GL_FRONT, GL_AMBIENT, white);
xglMaterialfv (GL_FRONT, GL_DIFFUSE, white);
@ -562,7 +555,7 @@ static void fgMainLoop( void ) {
global_events.Process();
// Run audio scheduler
#ifdef HAVE_OSS_AUDIO
#ifdef HAVE_AUDIO_SUPPORT
audio_sched.update();
#endif
@ -722,7 +715,7 @@ int main( int argc, char **argv ) {
guiInit();
// Initialize audio support
#ifdef HAVE_OSS_AUDIO
#ifdef HAVE_AUDIO_SUPPORT
audio_mixer . setMasterVolume ( 30 ) ; /* 50% of max volume. */
audio_sched . setSafetyMargin ( 1.0 ) ;
strcpy(path, o->fg_root);
@ -752,6 +745,12 @@ int main( int argc, char **argv ) {
// $Log$
// Revision 1.27 1998/06/17 21:35:10 curt
// Refined conditional audio support compilation.
// Moved texture parameter setup calls to ../Scenery/materials.cxx
// #include <string.h> before various STL includes.
// Make HUD default state be enabled.
//
// Revision 1.26 1998/06/13 00:40:32 curt
// Tweaked fog command line options.
//

12
Main/Makefile.am
View file

@ -1,6 +1,12 @@
if HAVE_OSS_AUDIO
DEFS += -DHAVE_OSS_AUDIO
AUDIO_LIBS = $(top_builddir)/Lib/Audio/libAudio.la
if HAVE_AUDIO_SUPPORT
DEFS += -DHAVE_AUDIO_SUPPORT
AUDIO_LIBS = \
$(top_builddir)/Lib/Audio/src/libsl.la \
$(top_builddir)/Lib/Audio/src/libsm.la
endif
if HAVE_WIN32_AUDIO
LIBS += -lwinmm
endif
EXTRA_DIST = runfg.in runfg.bat.in

8
Main/airports.hxx
View file

@ -34,8 +34,8 @@
#endif
#include <map> // STL associative "array"
#include <string> // Standard C++ string library
#include <map> // STL associative "array"
typedef struct {
@ -70,6 +70,12 @@ public:
// $Log$
// Revision 1.5 1998/06/17 21:35:11 curt
// Refined conditional audio support compilation.
// Moved texture parameter setup calls to ../Scenery/materials.cxx
// #include <string.h> before various STL includes.
// Make HUD default state be enabled.
//
// Revision 1.4 1998/06/03 00:47:14 curt
// Updated to compile in audio support if OSS available.
// Updated for new version of Steve's audio library.

7
Main/fg_init.cxx
View file

@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <Include/fg_constants.h>
#include <Include/general.h>
@ -386,6 +387,12 @@ int fgInitSubsystems( void ) {
// $Log$
// Revision 1.20 1998/06/17 21:35:12 curt
// Refined conditional audio support compilation.
// Moved texture parameter setup calls to ../Scenery/materials.cxx
// #include <string.h> before various STL includes.
// Make HUD default state be enabled.
//
// Revision 1.19 1998/06/08 17:57:05 curt
// Minor sound/startup position tweaks.
//

8
Main/options.cxx
View file

@ -68,7 +68,7 @@ fgOPTIONS::fgOPTIONS( void ) {
strcpy(airport_id, "");
// Features
hud_status = 0;
hud_status = 1;
// Rendering options
fog = 2; // nicest
@ -433,6 +433,12 @@ fgOPTIONS::~fgOPTIONS( void ) {
// $Log$
// Revision 1.12 1998/06/17 21:35:13 curt
// Refined conditional audio support compilation.
// Moved texture parameter setup calls to ../Scenery/materials.cxx
// #include <string.h> before various STL includes.
// Make HUD default state be enabled.
//
// Revision 1.11 1998/06/13 00:40:33 curt
// Tweaked fog command line options.
//