[Csp-commits] svn:csp r1981 - in trunk/csp: . cspsim

[<sv...@ww...>]

Author: mkrose
Date: 2006-09-03 01:21:25 -0700 (Sun, 03 Sep 2006)
New Revision: 1981

Modified:
   trunk/csp/SConstruct
   trunk/csp/cspsim/CSPSim.cpp
Log:
Upgrade OSG dependency to 0.9.9 for shader support.

Change vorbis pkg-config to vorbisfile, which is needed by newer
versions of openalpp.

Add a comment regarding possible deadlocks on shutdown with older
versions of openal.

Decrease the maximum simulation time between frames to reduce fcs
instability when the frame rate drops.  The minimum update rate is
now 10 Hz (instead of 5 Hz).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1981

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-09-03 07:14:07 UTC (rev 1980)
+++ trunk/csp/SConstruct	2006-09-03 08:21:25 UTC (rev 1981)
@@ -18,7 +18,7 @@
 
 print 'COMBAT SIMULATOR PROJECT - Build System'
 
-
+import sys
 from tools import build
 
 build.CheckSConsVersion('0.96.1')
@@ -59,7 +59,7 @@
 	name = 'sound',
 	config = [
 		build.PkgConfig(package='openalpp', version='0.2'),
-		build.PkgConfig(package='vorbis', version='1.1.0'),
+		build.PkgConfig(package='vorbisfile', version='1.1.0'),
 		build.DevpackConfig(dlls='openalpp', headers=[('openalpp', 'sounddata.h')]),
 		build.DevpackConfig(dlls=['libvorbis', 'libvorbisfile'], headers=[('vorbis', 'vorbisfile.h')]),
 		build.DevpackConfig(dlls='libogg', headers=[('ogg', 'ogg.h')]),
@@ -82,9 +82,9 @@
 build.ExternalLibrary(
 	name = 'osg',
 	config = [
-		build.PkgConfig(package='openscenegraph', version='0.9.8'),
-		build.PkgConfig(package='openthreads', version='0.9.8'),
-		build.PkgConfig(package='producer', version='0.9.8'),
+		build.PkgConfig(package='openscenegraph', version='0.9.9'),
+		build.PkgConfig(package='openthreads', version='0.9.9'),
+		build.PkgConfig(package='producer', version='0.9.9'),
 		build.PkgConfig(package='osgal', version='0.3'),
 		build.DevpackConfig(dlls='osgal', headers=[('osgAL', 'SoundNode')]),
 		build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32', 'Producer'], headers=[('osg', 'Depth'), ('osgText', 'Font')]),
@@ -98,7 +98,13 @@
 		build.DevpackConfig(dlls=['SDL', 'SDL_image'], headers=[('SDL', 'SDL_mouse.h'), ('SDL', 'SDL_image.h')]),
 	])
 
+build.ExternalLibrary(
+	name = 'python',
+	config = [
+		build.UnixLibConfig(lib='python%d.%d' % tuple(sys.version_info[:2]), symbol='PyEval_SaveThread', label='python library'),
+	])
 
+
 class Environment(build.Environment):
 	"""
 	COMMON TARGETS:

Modified: trunk/csp/cspsim/CSPSim.cpp
===================================================================
--- trunk/csp/cspsim/CSPSim.cpp	2006-09-03 07:14:07 UTC (rev 1980)
+++ trunk/csp/cspsim/CSPSim.cpp	2006-09-03 08:21:25 UTC (rev 1981)
@@ -432,8 +432,12 @@
 	// release cached objects.  this must be done before the sound engine is shut
 	// down to prevent errors when deleting cached sound samples.
 	m_DataManager = 0;
+	
+	// note: shutdown hangs under some conditions when using openal 0.0.7 (due to
+	// a race condition in _alLockMixerPause when calling alcMakeContextCurrent(NULL)).
+	// if you experience problems here, try upgrading openal.
+	SoundEngine::getInstance().shutdown();
 
-	SoundEngine::getInstance().shutdown();
 	SDL_Quit();
 	m_Clean = true;
 }
@@ -607,9 +611,9 @@
 	m_ElapsedTime += m_FrameTime;
 	m_FrameTime += m_TimeLag;
 	assert(m_FrameTime > 0.0);
-	if (m_FrameTime > 0.2) {
-		m_TimeLag = m_FrameTime - 0.2;
-		m_FrameTime = 0.2;
+	if (m_FrameTime > 0.1) {
+		m_TimeLag = m_FrameTime - 0.1;
+		m_FrameTime = 0.1;
 	} else {
 		m_TimeLag = 0.0;
 	}