[Csp-commits] svn:csp r2005 - trunk/csp/cspsim

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

Author: stormbringer
Date: 2006-11-14 14:48:32 -0800 (Tue, 14 Nov 2006)
New Revision: 2005

Modified:
   trunk/csp/cspsim/Engine.cpp
   trunk/csp/cspsim/GameScreen.cpp
   trunk/csp/cspsim/HID.cpp
   trunk/csp/cspsim/SConscript
Log:
Update to GUI code

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

Modified: trunk/csp/cspsim/Engine.cpp
===================================================================
--- trunk/csp/cspsim/Engine.cpp	2006-11-01 21:07:56 UTC (rev 2004)
+++ trunk/csp/cspsim/Engine.cpp	2006-11-14 22:48:32 UTC (rev 2005)
@@ -237,14 +237,14 @@
 					fPitch = 1.999;
 				}
 				(*i)->m_EngineSound->state()->setPitch(fPitch);
-				(*i)->m_EngineSound->state()->setGain(fBlend);
-				(*i)->m_EngineSound->state()->apply();
+				(*i)->m_EngineSound->state()->setGain(fBlend / 3);
+//				(*i)->m_EngineSound->state()->apply();
 			}
 
 			// the afterburner sound is played when fBlend is between 2 and 3
 			// ToDo: check whether this is the right parameter to determine if burner is running
 			if((*i)->m_AfterburnerSound.valid()) {
-				(*i)->m_AfterburnerSound->state()->setGain(fBlend);
+				(*i)->m_AfterburnerSound->state()->setGain(fBlend / 3);
 				isPlaying = (*i)->m_AfterburnerSound->state()->getPlay();
 				if (fBlend > 2.0 && !isPlaying) {
 					(*i)->m_AfterburnerSound->play();

Modified: trunk/csp/cspsim/GameScreen.cpp
===================================================================
--- trunk/csp/cspsim/GameScreen.cpp	2006-11-01 21:07:56 UTC (rev 2004)
+++ trunk/csp/cspsim/GameScreen.cpp	2006-11-14 22:48:32 UTC (rev 2005)
@@ -291,7 +291,7 @@
 void GameScreen::on_Quit() {
 	wf::WindowManager* manager = CSPSim::theSim->getScene()->getWindowManager();
 	if(!manager->windowIsOpen<windows::QuitResume>()) {
-		Ref<wf::Window> quitResumeWindow = new windows::QuitResume;
+		Ref<wf::Window> quitResumeWindow = new windows::QuitResume(manager->getTheme());
 		manager->show(quitResumeWindow.get());
 	}
 }

Modified: trunk/csp/cspsim/HID.cpp
===================================================================
--- trunk/csp/cspsim/HID.cpp	2006-11-01 21:07:56 UTC (rev 2004)
+++ trunk/csp/cspsim/HID.cpp	2006-11-14 22:48:32 UTC (rev 2005)
@@ -108,6 +108,7 @@
 	m_Map = 0;
 	m_VirtualMode = 0;
 	m_JoystickModifier = 0;
+	m_Object = 0;
 	m_ActiveScript = 0;
 }
 

Modified: trunk/csp/cspsim/SConscript
===================================================================
--- trunk/csp/cspsim/SConscript	2006-11-01 21:07:56 UTC (rev 2004)
+++ trunk/csp/cspsim/SConscript	2006-11-14 22:48:32 UTC (rev 2005)
@@ -374,8 +374,22 @@
 		
 		'wf/Button.cpp',
 		'wf/Button.h',
+		'wf/Container.cpp',
+		'wf/Container.h',
 		'wf/Control.cpp',
 		'wf/Control.h',
+		'wf/Label.cpp',
+		'wf/Label.h',
+		'wf/MultiControlContainer.cpp',
+		'wf/MultiControlContainer.h',
+		'wf/SingleControlContainer.cpp',
+		'wf/SingleControlContainer.h',
+		'wf/Tab.cpp',
+		'wf/Tab.h',
+		'wf/TableControlContainer.cpp',
+		'wf/TableControlContainer.h',
+		'wf/TabPage.cpp',
+		'wf/TabPage.h',
 		'wf/Window.cpp',
 		'wf/Window.h',
 		'wf/WindowManager.cpp',
@@ -384,8 +398,14 @@
 		'wf/themes/Default.cpp',
 		'wf/themes/Default.h',
 
+		'windows/DisplayOptions.cpp',
+		'windows/DisplayOptions.h',
 		'windows/QuitResume.cpp',
 		'windows/QuitResume.h',
+		'windows/Options.cpp',
+		'windows/Options.h',
+		'windows/SoundOptions.cpp',
+		'windows/SoundOptions.h',
 	],
 	deps = ['csplib', 'opengl', 'osg', 'sdl', 'sound'])