Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2003-02-19 23:14:12
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv25705 Modified Files: CSPSimDLL.dsp Log Message: no message Index: CSPSimDLL.dsp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CSPSimDLL.dsp 3 Feb 2003 19:24:44 -0000 1.2 --- CSPSimDLL.dsp 19 Feb 2003 23:14:05 -0000 1.3 *************** *** 55,60 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 DemeterVisualC6.lib opengl32.lib SDLmain.lib SDL.lib SDL_Console.lib gdal_i.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:"../../Bin/CSP.pdb" /debug /machine:I386 /out:"../../Bin/_CSP.dll" /pdbtype:sept /libpath:"../../../../THIRDPARTYLIBS/lib" /libpath:"C:/Python22/libs" ! # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "CSPSimDLL - Win32 Debug" --- 55,60 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../Bin/_CSP.dll" /libpath:"../../../../THIRDPARTYLIBS/lib" /libpath:"C:/Python22/libs" ! # SUBTRACT LINK32 /debug !ELSEIF "$(CFG)" == "CSPSimDLL - Win32 Debug" *************** *** 128,133 **** !IF "$(CFG)" == "CSPSimDLL - Win32 Release" - # PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "CSPSimDLL - Win32 Debug" --- 128,131 ---- *************** *** 141,148 **** # Begin Source File - SOURCE=..\..\Source\ConsoleCommands.cpp - # End Source File - # Begin Source File - SOURCE=..\..\Source\CSP_wrap.cpp # End Source File --- 139,142 ---- *************** *** 209,212 **** --- 203,214 ---- # Begin Source File + SOURCE=..\..\Source\ScreenInfo.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\Source\ScreenInfoManager.cpp + # End Source File + # Begin Source File + SOURCE=..\..\Source\SimObject.cpp # End Source File *************** *** 281,296 **** # Begin Source File - SOURCE=..\..\Include\CON_consolecommands.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\Config.h # End Source File # Begin Source File - SOURCE=..\..\Include\ConsoleCommands.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\CSPSim.h # End Source File --- 283,290 ---- *************** *** 301,308 **** # Begin Source File - SOURCE=..\..\Include\DirVectorDrawable.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\DynamicObject.h # End Source File --- 295,298 ---- *************** *** 369,372 **** --- 359,370 ---- # Begin Source File + SOURCE=..\..\Include\ScreenInfo.h + # End Source File + # Begin Source File + + SOURCE=..\..\Include\ScreenInfoManager.h + # End Source File + # Begin Source File + SOURCE=..\..\Include\SimObject.h # End Source File *************** *** 394,401 **** SOURCE=..\..\Include\TerrainObject.h - # End Source File - # Begin Source File - - SOURCE=..\..\Include\TerrainSymbol.h # End Source File # Begin Source File --- 392,395 ---- |
|
From: <de...@us...> - 2003-02-19 23:13:57
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv25564 Modified Files: CSPSimAppli.dsp Log Message: no message Index: CSPSimAppli.dsp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CSPSimAppli.dsp 3 Feb 2003 19:24:10 -0000 1.2 --- CSPSimAppli.dsp 19 Feb 2003 23:13:52 -0000 1.3 *************** *** 55,60 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 DemeterVisualC6.lib opengl32.lib SDLmain.lib SDL.lib SDL_Console.lib gdal_i.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"../../Bin/CSPSim.exe" /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib" ! # SUBTRACT LINK32 /debug !ELSEIF "$(CFG)" == "CSPSimAppli - Win32 Debug" --- 55,59 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../Bin/CSPSim.exe" /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib" !ELSEIF "$(CFG)" == "CSPSimAppli - Win32 Debug" *************** *** 83,88 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib SDL_Console.lib gdal_i.lib _cSimDatad.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"../../Bin/CSPSimd.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Bin/CSPSimd.exe" /pdbtype:sept /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib" ! # SUBTRACT LINK32 /pdb:none /map !ENDIF --- 82,87 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib SDL_Console.lib gdal_i.lib _cSimDatad.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"../../Bin/CSPSimd.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Bin/CSPSimd.exe" /pdbtype:sept /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib" ! # SUBTRACT LINK32 /pdb:none !ENDIF *************** *** 130,135 **** !IF "$(CFG)" == "CSPSimAppli - Win32 Release" - # PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "CSPSimAppli - Win32 Debug" --- 129,132 ---- *************** *** 143,150 **** # Begin Source File - SOURCE=..\..\Source\ConsoleCommands.cpp - # End Source File - # Begin Source File - SOURCE=..\..\Source\CSP_wrap.cpp # End Source File --- 140,143 ---- *************** *** 203,210 **** # Begin Source File - SOURCE=..\..\Source\mmgr.cpp - # End Source File - # Begin Source File - SOURCE=..\..\Source\ObjectModel.cpp # End Source File --- 196,199 ---- *************** *** 219,222 **** --- 208,219 ---- # Begin Source File + SOURCE=..\..\Source\ScreenInfo.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\Source\ScreenInfoManager.cpp + # End Source File + # Begin Source File + SOURCE=..\..\Source\SimObject.cpp # End Source File *************** *** 291,306 **** # Begin Source File - SOURCE=..\..\Include\CON_consolecommands.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\Config.h # End Source File # Begin Source File - SOURCE=..\..\Include\ConsoleCommands.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\CSPSim.h # End Source File --- 288,295 ---- *************** *** 327,338 **** # Begin Source File - SOURCE=..\..\Include\FLCS.h - # End Source File - # Begin Source File - - SOURCE=..\..\Include\GameScreen.h - # End Source File - # Begin Source File - SOURCE=..\..\Include\GlibCsp.h # End Source File --- 316,319 ---- *************** *** 363,387 **** # Begin Source File ! SOURCE=..\..\Include\mmgr.h ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\Include\nommgr.h # End Source File # Begin Source File ! SOURCE=..\..\Include\ObjectModel.h # End Source File # Begin Source File ! SOURCE=..\..\Include\ObjectRangeInfo.h # End Source File # Begin Source File ! SOURCE=..\..\Include\OGLText.h # End Source File # Begin Source File ! SOURCE=..\..\Include\Platform.h # End Source File # Begin Source File --- 344,364 ---- # Begin Source File ! SOURCE=..\..\Include\ObjectModel.h # End Source File # Begin Source File ! SOURCE=..\..\Include\ObjectRangeInfo.h # End Source File # Begin Source File ! SOURCE=..\..\Include\Platform.h # End Source File # Begin Source File ! SOURCE=..\..\Include\ScreenInfo.h # End Source File # Begin Source File ! SOURCE=..\..\Include\ScreenInfoManager.h # End Source File # Begin Source File *************** *** 395,407 **** # Begin Source File ! SOURCE=..\..\Include\SmokeEffects.h # End Source File # Begin Source File ! SOURCE=..\..\Include\StaticObject.h # End Source File # Begin Source File ! SOURCE=..\..\Include\stdinc.h # End Source File # Begin Source File --- 372,384 ---- # Begin Source File ! SOURCE=..\..\Include\Sky.h # End Source File # Begin Source File ! SOURCE=..\..\Include\SmokeEffects.h # End Source File # Begin Source File ! SOURCE=..\..\Include\StaticObject.h # End Source File # Begin Source File |
|
From: <de...@us...> - 2003-02-19 23:04:03
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID In directory sc8-pr-cvs1:/tmp/cvs-serv18703 Modified Files: GameScreen.map GameScreen.hid Log Message: F12 toggle stats Index: GameScreen.map =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/GameScreen.map,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameScreen.map 19 Feb 2003 11:41:58 -0000 1.3 --- GameScreen.map 19 Feb 2003 23:03:56 -0000 1.4 *************** *** 1,8 **** include mouse.map include keys.map ! include x36.map device keyboard 0 key US_keyboard ! device joystick 0 x36 Saitek_X36 device mouse 0 mouse standard_mouse --- 1,8 ---- include mouse.map include keys.map ! include F16CS.map device keyboard 0 key US_keyboard ! device joystick 0 F16CS CH_F16CS device mouse 0 mouse standard_mouse *************** *** 32,35 **** --- 32,36 ---- map key:ESCAPE press QUIT map key:p press PAUSE + map key:F12 press STATS map key:SPACE press CHANGE_VEHICLE map key:KP_MINUS press CAMERA_ZOOM_OUT Index: GameScreen.hid =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/GameScreen.hid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameScreen.hid 26 Jan 2003 23:35:01 -0000 1.2 --- GameScreen.hid 19 Feb 2003 23:03:57 -0000 1.3 *************** *** 33,49 **** +K 0 R 0000 0000 0000 0258 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_IN ! +K 0 P 0000 0000 0000 0043 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP ! +K 0 R 0000 0000 0000 0043 00 @00.00 -01 -0001 +00 -01 QUIT +K 0 P 0000 0000 0000 0027 00 @00.00 -01 -0001 +00 -01 PAUSE +K 0 P 0000 0000 0000 0112 00 @00.00 -01 -0001 +00 -01 CHANGE_VEHICLE +K 0 P 0000 0000 0000 0032 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_OUT ! +K 0 P 0000 0000 0000 0045 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP ! +K 0 R 0000 0000 0000 0045 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STEP_IN +M 0 P 0000 0000 0000 0004 00 --- 33,56 ---- +K 0 R 0000 0000 0000 0258 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_IN ! +K 0 P 0000 0000 0000 0270 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP ! +K 0 R 0000 0000 0000 0270 00 @00.00 -01 -0001 +00 -01 QUIT +K 0 P 0000 0000 0000 0027 00 @00.00 -01 -0001 +00 -01 PAUSE +K 0 P 0000 0000 0000 0112 00 + @00.00 -01 -0001 +00 -01 STATS + +K 0 P 0000 0000 0000 0293 00 @00.00 -01 -0001 +00 -01 CHANGE_VEHICLE +K 0 P 0000 0000 0000 0032 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_OUT ! +K 0 P 0000 0000 0000 0269 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP ! +K 0 R 0000 0000 0000 0269 00 ! @00.00 -01 -0001 +01 -01 SPIN_THE_WORLD ! @00.00 -01 -0001 +01 -01 SPIN_THE_WORLD_STOP ! +K 0 P 0000 0000 0000 0282 00 ! @00.00 -01 -0001 +00 -01 RESET_SPIN ! +K 0 P 0000 0000 0000 0283 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STEP_IN +M 0 P 0000 0000 0000 0004 00 |
|
From: <de...@us...> - 2003-02-19 23:03:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv18243 Added Files: ScreenInfoManager.cpp ScreenInfo.cpp Log Message: New display code --- NEW FILE: ScreenInfoManager.cpp --- // Combat Simulator Project - FlightSim Demo // Copyright (C) 2002 The Combat Simulator Project // http://csp.sourceforge.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** * @file ScreenInfoManager.cpp * **/ #include <osg/Depth> #include <osg/MatrixTransform> #include "ScreenInfoManager.h" ScreenInfoManager::ScreenInfoManager(int ScreenWidth, int ScreenHeight) { setMatrix(osg::Matrix::ortho2D(0,ScreenWidth,0,ScreenHeight)); m_modelview_abs = new osg::MatrixTransform; m_modelview_abs->setReferenceFrame(osg::Transform::RELATIVE_TO_ABSOLUTE); m_modelview_abs->setMatrix(osg::Matrix::identity()); set2dScene(m_modelview_abs,ScreenWidth,ScreenHeight); addChild(m_modelview_abs); setCullingActive(true); } void ScreenInfoManager::set2dScene(osg::Group* rootNode, int ScreenWidth, int ScreenHeight) { osg::ref_ptr<Framerate> framerate = new Framerate(0,ScreenHeight); //float textWidth = bitmapFont->getWidth(pause->getEncodedText()); osg::ref_ptr<ScreenInfo> pause = new ScreenInfo(ScreenWidth - 5 * 8, ScreenHeight,"PAUSE", "PAUSE"); pause->setStatus(false); osg::ref_ptr<GeneralStats> generalStats = new GeneralStats(0, ScreenHeight / 3); osg::ref_ptr<ObjectStats> objectStats = new ObjectStats(0, 2 * ScreenHeight / 3); rootNode->addChild(framerate.get()); rootNode->addChild(pause.get()); rootNode->addChild(generalStats.get()); rootNode->addChild(objectStats.get()); // now add a depth attribute to the scene to force it to draw on top. osg::Depth* depth = new osg::Depth; depth->setRange(0.0,0.0); osg::StateSet* rootState = new osg::StateSet(); rootState->setAttribute(depth); rootState->setMode(GL_LIGHTING,osg::StateAttribute::OFF); rootNode->setStateSet(rootState); } class FindNamedNodeVisitor : public osg::NodeVisitor { public : FindNamedNodeVisitor() : osg::NodeVisitor( TRAVERSE_ALL_CHILDREN ) { setNodeMaskOverride(1); _found_node = 0L; } virtual void apply( osg::Node &node ) { if( node.getName() == _name_to_find ) _found_node = &node; traverse(node); } void setNameToFind( std::string const & name ) { _name_to_find = name; } osg::Node *foundNode() { return _found_node; } private : std::string _name_to_find; osg::Node *_found_node; }; ScreenInfo * ScreenInfoManager::getScreenInfo(std::string const & name) { FindNamedNodeVisitor nv; nv.setNameToFind(name); nv.apply( *m_modelview_abs ); return dynamic_cast<ScreenInfo *>(nv.foundNode()); } void ScreenInfoManager::setStatus(std::string const & name, bool bvisible) { ScreenInfo * sci = getScreenInfo(name); if (sci) sci->setStatus(bvisible); } bool ScreenInfoManager::getStatus(std::string const & name) { ScreenInfo * sci = getScreenInfo(name); if (sci) return sci->getStatus(); else return false; } --- NEW FILE: ScreenInfo.cpp --- // Combat Simulator Project - FlightSim Demo // Copyright (C) 2002 The Combat Simulator Project // http://csp.sourceforge.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** * @file ScreenInfo.cpp * **/ #include <iomanip> #include <sstream> #include "CSPSim.h" #include "ScreenInfo.h" #include "VirtualBattlefield.h" class UpdateCallback : public osg::NodeCallback { virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) { ScreenInfo * aScreenInfo = dynamic_cast<ScreenInfo*>(node); if (aScreenInfo && aScreenInfo->getStatus()) aScreenInfo->update(); traverse(node,nv); } }; ScreenInfo::ScreenInfo(int posx,int posy, std::string const & name, std::string const & text): m_TTFPath("../Data/Fonts/ltype.ttf"),m_FontSize(11), m_BitmapFont(new osgText::BitmapFont(m_TTFPath,m_FontSize)), m_Text(new osgText::Text(m_BitmapFont)) { int heightFont = m_BitmapFont->getHeight(); //uh, an osg fix is needed here heightFont = m_FontSize; setName(name); m_Text->setPosition(osg::Vec3(posx,posy - heightFont,0)); setUpdateCallback(new UpdateCallback()); m_Text->setText(text); addDrawable( m_Text ); } Framerate::Framerate(int posx, int posy):ScreenInfo(posx,posy,"FRAMERATE"),m_minFps(60),m_maxFps(25) { int heightFont = m_BitmapFont->getHeight(); //uh, an osg fix is needed here m_Date = new osgText::Text(m_BitmapFont); m_Date->setPosition(osg::Vec3(posx,posy - 2 * m_FontSize,0)); addDrawable( m_Date ); } void Framerate::update() { float fps = CSPSim::theSim->getFrameRate(); m_minFps = min(m_minFps,fps); m_maxFps = max(m_maxFps,fps); std::ostringstream osstr; osstr << setprecision(1) << fixed << fps << " FPS min: " << m_minFps << " max: " << m_maxFps; m_Text->setText(osstr.str()); simdata::SimDate artificial_time = CSPSim::theSim->getCurrentTime(); artificial_time.addTime(CSPSim::theSim->getBattlefield()->getSpin()); m_Date->setText("Date: " + artificial_time.asString()); } GeneralStats::GeneralStats(int posx,int posy):ScreenInfo(posx,posy,"GENERAL STATS") { unsigned int yOffset; yOffset = 50 - m_FontSize; m_LocalPosition = new osgText::Text(m_BitmapFont); m_LocalPosition->setPosition(osg::Vec3(posx,yOffset,0)); addDrawable( m_LocalPosition ); yOffset -= m_FontSize; m_GlobalPosition = new osgText::Text(m_BitmapFont); m_GlobalPosition->setPosition(osg::Vec3(posx,yOffset,0)); addDrawable( m_GlobalPosition ); yOffset -= m_FontSize; m_Velocity = new osgText::Text(m_BitmapFont); m_Velocity->setPosition(osg::Vec3(posx,yOffset,0)); addDrawable( m_Velocity ); } void GeneralStats::update() { unsigned short const precision = 2; std::ostringstream osstr; osstr << "Terrain Polygons: " << CSPSim::theSim->getBattlefield()->getTerrainPolygonsRendered(); m_Text->setText(osstr.str()); simdata::Pointer<DynamicObject> activeObject = CSPSim::theSim->getActiveObject(); if (!activeObject.isNull()) { simdata::Vector3 pos = activeObject->getLocalPosition(); osstr.str(""); osstr << "LocalPosition: (" << setprecision(precision) << fixed << setw(6 + precision) << setfill('0') << pos.x << ", "; osstr << setw(6 + precision) << setfill('0') << pos.y << ", "; osstr << setw(6 + precision) << setfill('0') << pos.z << ")"; m_LocalPosition->setText(osstr.str()); pos = activeObject->getGlobalPosition(); osstr.str(""); osstr << "GlobalPosition: (" << setprecision(precision) << fixed << setw(7 + precision) << setfill('0') << pos.x << ", "; osstr << setw(7 + precision) << setfill('0') << pos.y << ", "; osstr << setw(7 + precision) << setfill('0') << pos.z << ")"; m_GlobalPosition->setText(osstr.str()); simdata::Vector3 vel = activeObject->getVelocity(); osstr.str(""); osstr << "Velocity: (" << setprecision(2) << fixed << vel.x << ", " << vel.y << ", " << vel.z << ")"; m_Velocity->setText(osstr.str()); } } ObjectStats::ObjectStats(int posx,int posy):ScreenInfo(posx,posy,"OBJECT STATS") { simdata::Pointer<DynamicObject> activeObject = CSPSim::theSim->getActiveObject(); if (!activeObject.isNull()) { std::vector<std::string> stringStats; activeObject->getStats(stringStats); for (unsigned short i = 0; i < stringStats.size(); ++i) { posy -= m_FontSize; osgText::Text* aStat = new osgText::Text(m_BitmapFont); aStat->setPosition(osg::Vec3(posx,posy,0)); m_ObjectStats.push_back(aStat); addDrawable( aStat ); } removeDrawable(m_Text); } }; void ObjectStats::update() { simdata::Pointer<DynamicObject> activeObject = CSPSim::theSim->getActiveObject(); if (!activeObject.isNull()) { std::vector<std::string> stringStats; activeObject->getStats(stringStats); for (unsigned short i = 0; i < m_ObjectStats.size(); ++i) m_ObjectStats[i]->setText(stringStats[i]); } } |
|
From: <de...@us...> - 2003-02-19 23:02:30
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv17950 Added Files: ScreenInfoManager.h ScreenInfo.h Log Message: New display code --- NEW FILE: ScreenInfoManager.h --- // Combat Simulator Project - FlightSim Demo // Copyright (C) 2002 The Combat Simulator Project // http://csp.sourceforge.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** * @file ScreenInfoManager.h * **/ #ifndef __SCREENINFOMANAGER_H__ #define __SCREENINFOMANAGER_H__ #include <osg/NodeVisitor> #include <osg/Projection> #include "ScreenInfo.h" class ScreenInfoManager:public osg::Projection { public: ScreenInfoManager(int ScreenWidth, int ScreenHeight); virtual ~ScreenInfoManager(){;}; void setStatus(std::string const & name, bool bvisible); bool ScreenInfoManager::getStatus(std::string const & name); private: osg::MatrixTransform* m_modelview_abs; ScreenInfo * getScreenInfo(std::string const & name); void set2dScene(osg::Group* rootNode, int ScreenWidth, int ScreenHeight); }; #endif // __SCREENINFOMANAGER_H__ --- NEW FILE: ScreenInfo.h --- // Combat Simulator Project - FlightSim Demo // Copyright (C) 2002 The Combat Simulator Project // http://csp.sourceforge.net // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** * @file ScreenInfo.h * **/ #ifndef __SCREENINFO_H__ #define __SCREENINFO_H__ #include <osg/Geode> #include <osgText/Text> class ScreenInfo:public osg::Geode { protected: std::string m_TTFPath; int m_FontSize; osgText::BitmapFont * m_BitmapFont; osgText::Text * m_Text; public: ScreenInfo(int posx,int posy, std::string const & name, std::string const & text = ""); virtual ~ScreenInfo() {;}; virtual void update(){;}; void setStatus(bool const bvisible) {if (bvisible) setNodeMask(1); else setNodeMask(0);}; bool getStatus() const {return getNodeMask() != 0;}; }; class Framerate:public ScreenInfo { float m_minFps, m_maxFps; osgText::Text * m_Date; public: Framerate(int posx,int posy); virtual void update(); }; class GeneralStats: public ScreenInfo { osgText::Text * m_LocalPosition; osgText::Text * m_GlobalPosition; osgText::Text * m_Velocity; public: GeneralStats(int posx,int posy); virtual void update(); virtual ~GeneralStats() {;}; }; class ObjectStats: public ScreenInfo { // input device informations std::vector<osgText::Text *> m_ObjectStats; public: ObjectStats(int posx,int posy); virtual void update(); virtual ~ObjectStats() {;}; }; #endif // __SCREENINFO_H__ |
|
From: <de...@us...> - 2003-02-19 23:01:56
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv17620 Modified Files: GameScreen.h Log Message: New display code Index: GameScreen.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/GameScreen.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GameScreen.h 19 Feb 2003 11:41:56 -0000 1.4 --- GameScreen.h 19 Feb 2003 23:01:52 -0000 1.5 *************** *** 26,29 **** --- 26,31 ---- #define __GAMESCREEN_H__ + #include <osgUtil/SceneView> + #include <SimData/Math.h> #include <SimData/Vector3.h> *************** *** 32,35 **** --- 34,38 ---- #include "DynamicObject.h" #include "HID.h" + #include "ScreenInfoManager.h" *************** *** 61,66 **** virtual void OnExit(); ! virtual void OnRender(); ! virtual void OnUpdateObjects(double dt); virtual void setActiveObject(simdata::PointerBase &); --- 64,69 ---- virtual void OnExit(); ! virtual void onRender(); ! virtual void onUpdate(double dt); virtual void setActiveObject(simdata::PointerBase &); *************** *** 68,71 **** --- 71,75 ---- ACTION_INTERFACE(GameScreen, on_Quit); ACTION_INTERFACE(GameScreen, on_Pause); + ACTION_INTERFACE(GameScreen, on_Stats); ACTION_INTERFACE(GameScreen, on_ChangeVehicle); ACTION_INTERFACE(GameScreen, on_View0); *************** *** 104,111 **** protected: ! static double const angleOffset; int m_iViewMode; ! float m_fangleRotX, m_fangleRotZ, m_fdisToObject, m_fangleOffsetX, m_fangleOffsetZ; ! float m_fscaleFactor; simdata::Vector3 m_fixedCamPos; --- 108,114 ---- protected: ! static double const OffsetRate; int m_iViewMode; ! float m_fangleRotX, m_fangleRotZ, m_fdisToObject, m_PanRateX, m_PanRateZ, m_ZoomRate; simdata::Vector3 m_fixedCamPos; *************** *** 114,122 **** void NormalView(); ! void TurnViewAboutX(double fangleMax = G_PI / 2); ! void TurnViewAboutZ(double fangleMax = G_PI); ! void ScaleView(); simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const; ! void SetCamera(); simdata::Pointer<DynamicObject> m_ActiveObject; --- 117,131 ---- void NormalView(); ! void TurnViewAboutX(double dt, double fangleMax = G_PI / 2); ! void TurnViewAboutZ(double dt, double fangleMax = G_PI); ! void ScaleView(double dt); simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const; ! void SetCamera(double dt); ! ! /** ! * Text informations ! */ ! osg::ref_ptr<ScreenInfoManager> m_ScreenInfoManager; ! osg::ref_ptr<osgUtil::SceneView> m_rpInfosView; simdata::Pointer<DynamicObject> m_ActiveObject; |
|
From: <de...@us...> - 2003-02-19 23:01:34
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv17321
Modified Files:
GameScreen.cpp CSPSim.cpp
Log Message:
New display code
Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GameScreen.cpp 19 Feb 2003 11:41:58 -0000 1.4
--- GameScreen.cpp 19 Feb 2003 23:01:25 -0000 1.5
***************
*** 23,30 ****
**/
-
#include "stdinc.h"
#include <SimData/Types.h>
#include "GameScreen.h"
#include "EventMapIndex.h"
--- 23,33 ----
**/
#include "stdinc.h"
+ #include <osg/Depth>
+ #include <osg/State>
+
#include <SimData/Types.h>
+
#include "GameScreen.h"
#include "EventMapIndex.h"
***************
*** 33,51 ****
!
! double const GameScreen::angleOffset = 0.02;
simdata::Vector3 m_normalDirection;
-
-
void GameScreen::NormalView()
{
m_fangleRotX = 0.0;
m_fangleRotZ = 0.0;
! m_fangleOffsetX = 0.0;
! m_fangleOffsetZ = 0.0;
m_fdisToObject = 30.0;
- m_fscaleFactor = 1.0;
}
--- 36,51 ----
! double const GameScreen::OffsetRate = 30.0 * (G_PI / 180.0); // x deg / s, even if it is used for Zoom also ...
simdata::Vector3 m_normalDirection;
void GameScreen::NormalView()
{
m_fangleRotX = 0.0;
m_fangleRotZ = 0.0;
! m_PanRateX = 0.0;
! m_PanRateZ = 0.0;
! m_ZoomRate = 0.0;
m_fdisToObject = 30.0;
}
***************
*** 58,61 ****
--- 58,62 ----
BIND_ACTION("QUIT", on_Quit);
BIND_ACTION("PAUSE", on_Pause);
+ BIND_ACTION("STATS", on_Stats);
BIND_ACTION("CHANGE_VEHICLE", on_ChangeVehicle);
BIND_ACTION("CAMERA_VIEW_0", on_View0);
***************
*** 99,102 ****
--- 100,125 ----
CSP_LOG( CSP_APP , CSP_ERROR, "No HID interface maps defined, '__gamescreen__' not found.");
}
+
+ // add a layer for texts on screen
+ m_rpInfosView = new osgUtil::SceneView();
+ m_rpInfosView->setDefaults();
+
+ int ScreenWidth = CSPSim::theSim->GetSDLScreen()->w;
+ int ScreenHeight = CSPSim::theSim->GetSDLScreen()->h;
+
+ m_rpInfosView->setViewport(0,0,ScreenWidth,ScreenHeight);
+
+ osg::Depth* depth = new osg::Depth;
+ depth->setRange(0.0,0.0);
+ osg::StateSet* State = new osg::StateSet();
+ State->setAttribute(depth);
+
+ m_rpInfosView->getRenderStage()->setClearMask(0x0);
+
+ m_ScreenInfoManager = new ScreenInfoManager(ScreenWidth,ScreenHeight);
+ m_ScreenInfoManager->setName("ScreenInfoManager");
+ m_ScreenInfoManager->setStateSet(State);
+
+ m_rpInfosView->setSceneData(m_ScreenInfoManager.get() );
}
***************
*** 107,116 ****
}
! void GameScreen::TurnViewAboutZ(double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutZ: m_fangleViewZ = " << m_fangleRotZ
! << "; m_fangleOffsetZ = " << m_fangleOffsetZ);
! m_fangleRotZ += m_fangleOffsetZ;
/*if ( m_fangleRotZ > fangleMax )
if ( fangleMax == pi )
--- 130,139 ----
}
! void GameScreen::TurnViewAboutZ(double dt, double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutZ: m_fangleViewZ = " << m_fangleRotZ
! << "; m_PanRateZ = " << m_PanRateZ);
! m_fangleRotZ += m_PanRateZ * dt;
/*if ( m_fangleRotZ > fangleMax )
if ( fangleMax == pi )
***************
*** 125,134 ****
}
! void GameScreen::TurnViewAboutX(double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutX: m_fangleViewX = " << m_fangleRotX
! << "; m_fangleOffsetX = " << m_fangleOffsetX);
! m_fangleRotX += m_fangleOffsetX;
/*if ( m_fangleRotX > fangleMax )
m_fangleRotX = fangleMax;
--- 148,157 ----
}
! void GameScreen::TurnViewAboutX(double dt, double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutX: m_fangleViewX = " << m_fangleRotX
! << "; m_PanRateX = " << m_PanRateX);
! m_fangleRotX += m_PanRateX * dt;
/*if ( m_fangleRotX > fangleMax )
m_fangleRotX = fangleMax;
***************
*** 137,145 ****
}
! void GameScreen::ScaleView()
{
! if ( (m_fdisToObject > 2.0 && m_fscaleFactor < 1.0) ||
! (m_fdisToObject < 2000.0 && m_fscaleFactor > 1.0) ) {
! m_fdisToObject *= m_fscaleFactor;
}
if (m_fdisToObject < 2.0) {
--- 160,169 ----
}
! void GameScreen::ScaleView(double dt)
{
! double ScaleFactor = 1.0 + m_ZoomRate * dt;
! if ( (m_fdisToObject > 2.0 && ScaleFactor < 1.0) ||
! (m_fdisToObject < 2000.0 && ScaleFactor > 1.0) ) {
! m_fdisToObject *= ScaleFactor;
}
if (m_fdisToObject < 2.0) {
***************
*** 187,194 ****
}
! void GameScreen::OnRender()
{
- SetCamera();
-
if (m_ActiveObject.valid()) {
if (m_bPreviousState^m_bInternalView)
--- 211,216 ----
}
! void GameScreen::onRender()
{
if (m_ActiveObject.valid()) {
if (m_bPreviousState^m_bInternalView)
***************
*** 207,219 ****
}
}
-
// Draw the whole scene
if (m_Battlefield) {
m_Battlefield->drawScene();
}
}
! void GameScreen::OnUpdateObjects(double dt)
{
}
--- 229,244 ----
}
}
// Draw the whole scene
if (m_Battlefield) {
m_Battlefield->drawScene();
}
+ m_rpInfosView->cull();
+ m_rpInfosView->draw();
}
! void GameScreen::onUpdate(double dt)
{
+ SetCamera(dt);
+ m_rpInfosView->update();
}
***************
*** 233,237 ****
float h = 0;
if (m_Battlefield) {
! m_Battlefield->getElevation(objectPos.x, objectPos.y);
}
if ( camPos.z < h ) camPos.z = h;
--- 258,262 ----
float h = 0;
if (m_Battlefield) {
! h = m_Battlefield->getElevation(objectPos.x, objectPos.y);
}
if ( camPos.z < h ) camPos.z = h;
***************
*** 313,316 ****
--- 338,348 ----
{
CSPSim::theSim->togglePause();
+ m_ScreenInfoManager->setStatus("PAUSE", !m_ScreenInfoManager->getStatus("PAUSE"));
+ }
+
+ void GameScreen::on_Stats()
+ {
+ m_ScreenInfoManager->setStatus("GENERAL STATS", !m_ScreenInfoManager->getStatus("GENERAL STATS"));
+ m_ScreenInfoManager->setStatus("OBJECT STATS", !m_ScreenInfoManager->getStatus("OBJECT STATS"));
}
***************
*** 325,329 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetZ = - angleOffset;
}
--- 357,361 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateZ = - OffsetRate;
}
***************
*** 331,335 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetZ = + angleOffset;
}
--- 363,367 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateZ = + OffsetRate;
}
***************
*** 337,341 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetZ < 0.0) m_fangleOffsetZ = 0.0;
}
--- 369,373 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateZ < 0.0) m_PanRateZ = 0.0;
}
***************
*** 343,347 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetZ > 0.0) m_fangleOffsetZ = 0.0;
}
--- 375,379 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateZ > 0.0) m_PanRateZ = 0.0;
}
***************
*** 349,353 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetX < 0.0) m_fangleOffsetX = 0.0;
}
--- 381,385 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateX < 0.0) m_PanRateX = 0.0;
}
***************
*** 355,359 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetX > 0.0) m_fangleOffsetX = 0.0;
}
--- 387,391 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateX > 0.0) m_PanRateX = 0.0;
}
***************
*** 361,365 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = 1.0;
}
--- 393,397 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = 0.0;
}
***************
*** 367,371 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetX = - angleOffset;
}
--- 399,403 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateX = - OffsetRate;
}
***************
*** 373,377 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetX = angleOffset;
}
--- 405,409 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateX = OffsetRate;
}
***************
*** 379,383 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = (1.00 / 1.05);
}
--- 411,415 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = - OffsetRate;
}
***************
*** 385,389 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = 1.05;
}
--- 417,421 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = OffsetRate;
}
***************
*** 391,395 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 0.75;
}
--- 423,427 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 0.8 ;
}
***************
*** 397,406 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 1.25;
}
void GameScreen::on_ViewFovStepDec()
{
! float fov = m_Battlefield->getViewAngle() * 0.80;
if (fov > 10.0) {
m_Battlefield->setViewAngle(fov);
--- 429,438 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 1.20;
}
void GameScreen::on_ViewFovStepDec()
{
! float fov = m_Battlefield->getViewAngle() * 0.8;
if (fov > 10.0) {
m_Battlefield->setViewAngle(fov);
***************
*** 433,438 ****
void GameScreen::on_MouseView(int x, int y, int dx, int dy)
{
! m_fangleOffsetX = 0.0;
! m_fangleOffsetZ = 0.0;
m_fangleRotZ += dx * 0.001;
m_fangleRotX += dy * 0.001;
--- 465,470 ----
void GameScreen::on_MouseView(int x, int y, int dx, int dy)
{
! m_PanRateX = 0.0;
! m_PanRateZ = 0.0;
m_fangleRotZ += dx * 0.001;
m_fangleRotX += dy * 0.001;
***************
*** 558,562 ****
// TODO All references to planes should be made generic!
! void GameScreen::SetCamera()
{
simdata::Vector3 eyePos;
--- 590,594 ----
// TODO All references to planes should be made generic!
! void GameScreen::SetCamera(double dt)
{
simdata::Vector3 eyePos;
***************
*** 567,572 ****
// temporary view if there are no active objects... probably
// should switch to an "action" view mode in this case.
! TurnViewAboutX();
! TurnViewAboutZ();
eyePos = simdata::Vector3(483000.0, 499000.0, 2000.0);
//lookPos = simdata::Vector3(483000.0, 499005.0, 2000.0);
--- 599,604 ----
// temporary view if there are no active objects... probably
// should switch to an "action" view mode in this case.
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
eyePos = simdata::Vector3(483000.0, 499000.0, 2000.0);
//lookPos = simdata::Vector3(483000.0, 499005.0, 2000.0);
***************
*** 584,589 ****
case 1: // view_mode one is normal inside the cockpit view
{
! TurnViewAboutX(M_PI / 3);
! TurnViewAboutZ(M_PI / 3);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
--- 616,621 ----
case 1: // view_mode one is normal inside the cockpit view
{
! TurnViewAboutX(dt,M_PI / 3);
! TurnViewAboutZ(dt,M_PI / 3);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
***************
*** 600,606 ****
case 2: // view mode two is external view; normal view is behind the plane
{
! TurnViewAboutX();
! TurnViewAboutZ();
! ScaleView();
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
--- 632,638 ----
case 2: // view mode two is external view; normal view is behind the plane
{
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
! ScaleView(dt);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
***************
*** 619,625 ****
case 3: // view mode three is external fixed view around the plane
{
! TurnViewAboutX();
! TurnViewAboutZ();
! ScaleView();
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Matrix3 RotZ, RotX;
--- 651,657 ----
case 3: // view mode three is external fixed view around the plane
{
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
! ScaleView(dt);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Matrix3 RotZ, RotX;
Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CSPSim.cpp 19 Feb 2003 11:41:57 -0000 1.5
--- CSPSim.cpp 19 Feb 2003 23:01:27 -0000 1.6
***************
*** 32,45 ****
#include <osg/Timer>
-
#include <SDL/SDL.h>
- #include <SDL/CON_console.h> // console is using SDL_OPENGLBLIT :-( switch to osgConsole?
- #include <SDL/DT_drawtext.h>
- #include "CON_consolecommands.h"
#include "DemeterException.h"
! #include "Config.h"
! #include "ConsoleCommands.h"
#include "CSPSim.h"
#include "EventMapIndex.h"
--- 32,40 ----
#include <osg/Timer>
#include <SDL/SDL.h>
#include "DemeterException.h"
! #include "Config.h"
#include "CSPSim.h"
#include "EventMapIndex.h"
***************
*** 93,97 ****
CSPSim *CSPSim::theSim = 0;
-
CSPSim::CSPSim()
{
--- 88,91 ----
***************
*** 108,116 ****
m_MainMenuScreen = NULL;
- m_pConsole = NULL;
-
- m_bConsoleDisplay = false;
m_bFreezeSim = true;
- m_bShowStats = true;
m_Interface = NULL;
--- 102,106 ----
***************
*** 155,170 ****
}
!
! void CSPSim::unpause() {
! m_bFreezeSim = false;
}
! void CSPSim::pause() {
! m_bFreezeSim = true;
}
void CSPSim::togglePause() {
m_bFreezeSim = !m_bFreezeSim;
! }
void CSPSim::Init()
--- 145,160 ----
}
! simdata::Pointer<DynamicObject> const CSPSim::getActiveObject() const {
! return m_ActiveObject;
}
! VirtualBattlefield * const CSPSim::getBattlefield() const
! {
! return m_Battlefield;
}
void CSPSim::togglePause() {
m_bFreezeSim = !m_bFreezeSim;
! }
void CSPSim::Init()
***************
*** 197,206 ****
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
! logoScreen.OnRender();
SDL_GL_SwapBuffers();
// do rest of initialization
! InitConsole();
// load all interface maps and create a virtual hid for the active object
--- 187,196 ----
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
! logoScreen.onRender();
SDL_GL_SwapBuffers();
// do rest of initialization
! //InitConsole(); // should be replaced by osgConsole if necessary
// load all interface maps and create a virtual hid for the active object
***************
*** 233,237 ****
// create a couple test objects
-
simdata::Pointer<AircraftObject> ao = m_DataArchive->getObject("vehicles.aircraft.m2k");
assert(ao.valid());
--- 223,226 ----
***************
*** 265,269 ****
ChangeScreen(m_GameScreen);
!
logoScreen.OnExit();
}
--- 254,258 ----
ChangeScreen(m_GameScreen);
!
logoScreen.OnExit();
}
***************
*** 320,324 ****
CSP_LOG(CSP_APP, CSP_DEBUG, "CSPSim::Run...");
! m_bShowStats = false;
m_bFreezeSim = false;
--- 309,313 ----
CSP_LOG(CSP_APP, CSP_DEBUG, "CSPSim::Run...");
! //m_bShowStats = true;
m_bFreezeSim = false;
***************
*** 354,374 ****
UpdateObjects(dt);
}
!
// Display (render) current Screen
! if (m_CurrentScreen)
! m_CurrentScreen->OnRender();
!
// Do Console
! if (m_bConsoleDisplay)
! CON_DrawConsole(m_pConsole);
!
! if (m_bFreezeSim)
! ShowPaused();
- // Do fps and other stuff.
- if (m_bShowStats) {
- ShowStats(m_FrameRate);
- // ShowPlaneInfo();
- }
// Swap OpenGL buffers
SDL_GL_SwapBuffers();
--- 343,359 ----
UpdateObjects(dt);
}
!
!
!
// Display (render) current Screen
! if (m_CurrentScreen) {
! m_CurrentScreen->onUpdate(dt);
! m_CurrentScreen->onRender();
! }
!
// Do Console
! //if (m_bConsoleDisplay)
! // CON_DrawConsole(m_pConsole);
// Swap OpenGL buffers
SDL_GL_SwapBuffers();
***************
*** 376,385 ****
// remove marked objects, this should be done at the end of the main loop.
m_Battlefield->removeObjectsMarkedForDelete();
-
- m_bShowStats = true;
}
m_Battlefield->dumpObjectHistory();
}
!
catch(DemeterException * pEx) {
CSP_LOG(CSP_APP, CSP_ERROR, "Caught Demeter Exception: " << pEx->GetErrorMessage());
--- 361,368 ----
// remove marked objects, this should be done at the end of the main loop.
m_Battlefield->removeObjectsMarkedForDelete();
}
m_Battlefield->dumpObjectHistory();
}
!
catch(DemeterException * pEx) {
CSP_LOG(CSP_APP, CSP_ERROR, "Caught Demeter Exception: " << pEx->GetErrorMessage());
***************
*** 452,462 ****
return;
}
! if (m_bConsoleDisplay) {
! // handle console key events
! // if (event.type == SDL_KEYUP || event.type == SDL_KEYDN) {
! // char *key = SDL_GetKeyName(event.key.keysym.sym);
! // ...
! // }
! }
if (m_CurrentScreen) {
VirtualHID *i = m_CurrentScreen->getInterface();
--- 435,439 ----
return;
}
!
if (m_CurrentScreen) {
VirtualHID *i = m_CurrentScreen->getInterface();
***************
*** 468,473 ****
handled = m_Interface->OnEvent(event);
}
}
-
}
--- 445,497 ----
handled = m_Interface->OnEvent(event);
}
+ #if 0
+ switch (event.key.keysym.sym) {
+ case SDLK_ESCAPE:
+ {
+ m_bFinished = TRUE;
+ break;
+ }
+ case SDLK_F9:
+ {
+ m_bConsoleDisplay = !m_bConsoleDisplay;
+ if (m_bConsoleDisplay) {
+ m_bFreezeSim = true;
+ CON_Topmost(m_pConsole);
+ SDL_EnableUNICODE(1);
+ } else {
+ m_bFreezeSim = false;
+ CON_Topmost(NULL);
+ SDL_EnableUNICODE(0);
+ }
+ break;
+ }
+ case SDLK_F10:
+ {
+ m_bShowStats = !m_bShowStats;
+ break;
+ }
+ case SDLK_p:
+ {
+ // don't do pause while in console mode.
+ if (!m_bConsoleDisplay) {
+ // todo: call m_CurrentTime.pause/unpause()
+ if (!m_bFreezeSim)
+ m_bFreezeSim = true;
+ else
+ m_bFreezeSim = false;
+ }
+ }
+ default:
+ {
+ // Send the event to the console
+ if (m_bConsoleDisplay)
+ CON_Events(&event);
+ break;
+ }
+ }
+ }
+ #endif
+ // break;
}
}
***************
*** 513,518 ****
CSP_LOG(CSP_APP, CSP_ERROR, "Initializing video at " << bpp << " BitsPerPixel.");
! Uint32 flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_OPENGLBLIT;
! //Uint32 flags = SDL_OPENGL | SDL_HWSURFACE;
if (fullscreen) {
--- 537,541 ----
CSP_LOG(CSP_APP, CSP_ERROR, "Initializing video at " << bpp << " BitsPerPixel.");
! Uint32 flags = SDL_OPENGL | SDL_HWSURFACE | SDL_DOUBLEBUF;
if (fullscreen) {
***************
*** 521,524 ****
--- 544,550 ----
m_SDLScreen = SDL_SetVideoMode(width, height, bpp, flags);
+ SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 32 );
+ SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
if (m_SDLScreen == NULL) {
printf("Unable to set video mode: %s\n", SDL_GetError());
***************
*** 532,536 ****
CSP_LOG(CSP_APP, CSP_ERROR, SDL_GetError());
}
!
SDL_EnableUNICODE(1);
--- 558,562 ----
CSP_LOG(CSP_APP, CSP_ERROR, SDL_GetError());
}
!
SDL_EnableUNICODE(1);
***************
*** 538,541 ****
--- 564,568 ----
}
+ /*
int CSPSim::InitConsole()
{
***************
*** 655,656 ****
--- 682,684 ----
+ */
|
|
From: <de...@us...> - 2003-02-19 23:00:49
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv16686
Modified Files:
VirtualBattlefield.cpp SmokeEffects.cpp Sky.cpp SimObject.cpp
MenuScreen.cpp main.cpp LogoScreen.cpp DynamicObject.cpp
Colorspace.cpp AeroDynamics.cpp
Log Message:
Fixes under windows
Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VirtualBattlefield.cpp 19 Feb 2003 12:25:23 -0000 1.6
--- VirtualBattlefield.cpp 19 Feb 2003 23:00:32 -0000 1.7
***************
*** 35,38 ****
--- 35,40 ----
#include <osgUtil/CullVisitor>
+ #include "Config.h"
+ #include "CSPSim.h"
#include "LogStream.h"
#include "VirtualBattlefield.h"
***************
*** 77,80 ****
--- 79,83 ----
float intensity_test = 0.0;
+
void setCM(osg::ColorMatrix* cm, float intensity) {
assert(cm);
***************
*** 226,229 ****
--- 229,233 ----
// use a transform to make the sky and base around with the eye point.
+
m_EyeTransform = new osg::Transform;
***************
*** 335,339 ****
(*i)->updateScene();
}
!
osgUtil::CullVisitor * pCullVisitor = m_pView->getCullVisitor();
pCullVisitor->setComputeNearFarMode(osgUtil::CullVisitor::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
--- 339,343 ----
(*i)->updateScene();
}
!
osgUtil::CullVisitor * pCullVisitor = m_pView->getCullVisitor();
pCullVisitor->setComputeNearFarMode(osgUtil::CullVisitor::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES);
***************
*** 386,392 ****
}
if (m_SpinTheWorld) m_Sky->spinTheWorld();
! m_Sky->update(lat, lon, CSPSim::theSim->getCurrentTime());
// greenwich, england (for testing)
! //m_Sky->update(0.8985, 0.0, CSPSim::theSim->getCurrentTime());
t+=1.0;
} else {
--- 390,396 ----
}
if (m_SpinTheWorld) m_Sky->spinTheWorld();
! //m_Sky->update(lat, lon, CSPSim::theSim->getCurrentTime());
// greenwich, england (for testing)
! m_Sky->update(0.8985, 0.0, CSPSim::theSim->getCurrentTime());
t+=1.0;
} else {
***************
*** 421,438 ****
osg::Camera * pCamera = m_pView->getCamera();
!
int XLatticePos = (int) (eyePos.x / g_LatticeXDist);
int YLatticePos = (int) (eyePos.y / g_LatticeYDist);
! float localEyePosition_x = eyePos.x - g_LatticeXDist*XLatticePos;
! float localEyePosition_y = eyePos.y - g_LatticeYDist*YLatticePos;
!
! float localLookPosition_x = lookPos.x - g_LatticeXDist*XLatticePos;
! float localLookPosition_y = lookPos.y - g_LatticeYDist*YLatticePos;
osg::Vec3 _localEye( localEyePosition_x, localEyePosition_y, eyePos.z) ;
osg::Vec3 _localLook(localLookPosition_x, localLookPosition_y, lookPos.z ) ;
osg::Vec3 _up (upVec.x, upVec.y, upVec.z );
!
pCamera->setLookAt(_localEye, _localLook, _up);
pCamera->ensureOrthogonalUpVector();
--- 425,442 ----
osg::Camera * pCamera = m_pView->getCamera();
!
int XLatticePos = (int) (eyePos.x / g_LatticeXDist);
int YLatticePos = (int) (eyePos.y / g_LatticeYDist);
! double localEyePosition_x = eyePos.x - g_LatticeXDist*XLatticePos;
! double localEyePosition_y = eyePos.y - g_LatticeYDist*YLatticePos;
+ double localLookPosition_x = lookPos.x - g_LatticeXDist*XLatticePos;
+ double localLookPosition_y = lookPos.y - g_LatticeYDist*YLatticePos;
+
osg::Vec3 _localEye( localEyePosition_x, localEyePosition_y, eyePos.z) ;
osg::Vec3 _localLook(localLookPosition_x, localLookPosition_y, lookPos.z ) ;
osg::Vec3 _up (upVec.x, upVec.y, upVec.z );
!
pCamera->setLookAt(_localEye, _localLook, _up);
pCamera->ensureOrthogonalUpVector();
Index: SmokeEffects.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SmokeEffects.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SmokeEffects.cpp 19 Feb 2003 11:41:58 -0000 1.3
--- SmokeEffects.cpp 19 Feb 2003 23:00:33 -0000 1.4
***************
*** 71,74 ****
--- 71,75 ----
namespace smoke {
+
int SmokeSegments::addSource(simdata::Vector3 const &v) {
m_Sources.push_back(v);
***************
*** 90,100 ****
std::vector<simdata::Vector3>::iterator lastplace = m_LastPlace.begin();
! for (i = 0; i < n; i++) {
simdata::Vector3 lastbody = to_body * (*lastplace - motion);
m_Placers[i]->setVertexA(toVec3(*source));
m_Placers[i]->setVertexB(toVec3(lastbody));
*lastplace = to_scene * *source;
! lastplace++;
! source++;
}
}
--- 91,101 ----
std::vector<simdata::Vector3>::iterator lastplace = m_LastPlace.begin();
! for (i = 0; i < n; ++i) {
simdata::Vector3 lastbody = to_body * (*lastplace - motion);
m_Placers[i]->setVertexA(toVec3(*source));
m_Placers[i]->setVertexB(toVec3(lastbody));
*lastplace = to_scene * *source;
! ++lastplace;
! ++source;
}
}
***************
*** 131,137 ****
m_Prototype.setLifeTime(1.0);
m_Prototype.setAlphaRange(osgParticle::rangef(1,0));
! m_Prototype.setSizeRange(osgParticle::rangef(0.2, 0.2));
! m_Prototype.setPosition(osg::Vec3(0,0,0));
! m_Prototype.setVelocity(osg::Vec3(0,0,0));
m_Prototype.setColorRange(osgParticle::rangev4(osg::Vec4(1,1,1,1), osg::Vec4(1,1,1,1)));
m_Prototype.setRadius(10000.0);
--- 132,138 ----
m_Prototype.setLifeTime(1.0);
m_Prototype.setAlphaRange(osgParticle::rangef(1,0));
! m_Prototype.setSizeRange(osgParticle::rangef(0.2f, 0.2f));
! m_Prototype.setPosition(osg::Vec3(0.0f,0.0f,0.0f));
! m_Prototype.setVelocity(osg::Vec3(0.0,0.0,0.0));
m_Prototype.setColorRange(osgParticle::rangev4(osg::Vec4(1,1,1,1), osg::Vec4(1,1,1,1)));
m_Prototype.setRadius(10000.0);
***************
*** 253,257 ****
// rescale the size range to match the new lifetime
float scale = 1.0;
! if (old_lifetime > 0.0) scale = lifetime / old_lifetime;
osgParticle::rangef const &r = p->getSizeRange();
p->setSizeRange(osgParticle::rangef(r.minimum, r.maximum * scale));
--- 254,258 ----
// rescale the size range to match the new lifetime
float scale = 1.0;
! if (old_lifetime > 0.0) scale = lifetime / (1.0 + old_lifetime); // can old_lifetime be < 1.0?
osgParticle::rangef const &r = p->getSizeRange();
p->setSizeRange(osgParticle::rangef(r.minimum, r.maximum * scale));
***************
*** 262,268 ****
osgParticle::Shooter *user = BaseSystem::getShooter();
if (user) return user;
osgParticle::RadialShooter *rs = new osgParticle::RadialShooter;
! rs->setPhiRange(-0.21, 1.78);
! rs->setThetaRange(0.0, 1.57);
rs->setInitialSpeedRange(0, m_Speed);
return rs;
--- 263,270 ----
osgParticle::Shooter *user = BaseSystem::getShooter();
if (user) return user;
+
osgParticle::RadialShooter *rs = new osgParticle::RadialShooter;
! rs->setPhiRange(-0.21f, 1.78f);
! rs->setThetaRange(0.0f, 1.57f);
rs->setInitialSpeedRange(0, m_Speed);
return rs;
Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sky.cpp 19 Feb 2003 21:24:16 -0000 1.2
--- Sky.cpp 19 Feb 2003 23:00:33 -0000 1.3
***************
*** 138,142 ****
virtual void pack(simdata::Packer &p) const {
! simdata::Object::pack(p);
p.pack(m_Source);
p.pack(m_MagnitudeCutoff);
--- 138,142 ----
virtual void pack(simdata::Packer &p) const {
! Object::pack(p);
p.pack(m_Source);
p.pack(m_MagnitudeCutoff);
***************
*** 148,152 ****
}
virtual void unpack(simdata::UnPacker &p) {
! simdata::Object::unpack(p);
p.unpack(m_Source);
p.unpack(m_MagnitudeCutoff);
--- 148,152 ----
}
virtual void unpack(simdata::UnPacker &p) {
! Object::unpack(p);
p.unpack(m_Source);
p.unpack(m_MagnitudeCutoff);
***************
*** 660,663 ****
--- 660,664 ----
m_Transform->setMatrix(S*T);
_updateLighting(x, y, z, h, intensity);
+
}
***************
*** 1228,1231 ****
--- 1229,1233 ----
}
_updateStars();
+
}
Index: SimObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SimObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimObject.cpp 19 Feb 2003 11:41:58 -0000 1.4
--- SimObject.cpp 19 Feb 2003 23:00:34 -0000 1.5
***************
*** 25,32 ****
#include "SimObject.h"
-
#include "LogStream.h"
- #include "VirtualBattlefield.h"
#include "SmokeEffects.h"
#include <osg/NodeVisitor>
--- 25,31 ----
#include "SimObject.h"
#include "LogStream.h"
#include "SmokeEffects.h"
+ #include "VirtualBattlefield.h"
#include <osg/NodeVisitor>
***************
*** 60,64 ****
using std::string;
-
SIMDATA_REGISTER_INTERFACE(SimObject)
--- 59,62 ----
***************
*** 233,238 ****
void SimObject::ShowRepresentant(unsigned short const p_usflag)
{
! //m_rpSwitch->setAllChildrenOff();
! m_rpSwitch->setValue(1-p_usflag, false);
m_rpSwitch->setValue(p_usflag, true);
}
--- 231,235 ----
void SimObject::ShowRepresentant(unsigned short const p_usflag)
{
! m_rpSwitch->setAllChildrenOff();
m_rpSwitch->setValue(p_usflag, true);
}
***************
*** 372,376 ****
// this needs 2 upgrades;
// first one is: working with quat and only quat;
! // second is: make an osg upgrade()/draw() callback
CSP_LOG(CSP_APP, CSP_DEBUG, "SimObject::updateScene() ID:" << m_iObjectID );
--- 369,373 ----
// this needs 2 upgrades;
// first one is: working with quat and only quat;
! // second is: make an osg update()/draw() callback
CSP_LOG(CSP_APP, CSP_DEBUG, "SimObject::updateScene() ID:" << m_iObjectID );
Index: MenuScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/MenuScreen.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MenuScreen.cpp 2 Feb 2003 20:53:28 -0000 1.3
--- MenuScreen.cpp 19 Feb 2003 23:00:35 -0000 1.4
***************
*** 106,110 ****
}
! void MenuScreen::OnRender()
{
--- 106,110 ----
}
! void MenuScreen::onRender()
{
Index: main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.cpp 16 Feb 2003 09:48:59 -0000 1.4
--- main.cpp 19 Feb 2003 23:00:35 -0000 1.5
***************
*** 5,9 ****
int main(int argc, char *argv[])
{
! if (!openConfig("CSPSim.ini")) return 0;
CSPSim app;
--- 5,9 ----
int main(int argc, char *argv[])
{
! if (!openConfig("../Data/CSPSim.ini")) return 0;
CSPSim app;
Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogoScreen.cpp 19 Feb 2003 12:25:23 -0000 1.5
--- LogoScreen.cpp 19 Feb 2003 23:00:35 -0000 1.6
***************
*** 37,40 ****
--- 37,41 ----
#include <GL/glu.h> // Header File For The GLu32 Library
+ #include "Config.h"
#include "LogoScreen.h"
#include "Platform.h"
***************
*** 69,73 ****
}
! void LogoScreen::OnRender()
{
if (!m_image)
--- 70,74 ----
}
! void LogoScreen::onRender()
{
if (!m_image)
Index: DynamicObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/DynamicObject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DynamicObject.cpp 19 Feb 2003 11:41:58 -0000 1.6
--- DynamicObject.cpp 19 Feb 2003 23:00:35 -0000 1.7
***************
*** 211,216 ****
--- 211,218 ----
trail.setSizeRange(0.2, 4.0);
trail.setPlacer(m_SmokeSegments->getSegment(0));
+
trail.setOperator(new fx::smoke::Thinner);
trail.setLight(true);
+
trail.setLifeTime(5.5);
trail.setExpansion(1.2);
Index: Colorspace.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Colorspace.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Colorspace.cpp 19 Feb 2003 11:41:57 -0000 1.4
--- Colorspace.cpp 19 Feb 2003 23:00:36 -0000 1.5
***************
*** 49,59 ****
*/
float whitepoint_xyz[][3] = {
! { 0.448, 0.407, 0.145 }, /* A */
! { 0.349, 0.352, 0.299 }, /* B */
! { 0.3101, 0.3162, 0.3737}, /* C */
! { 0.34570, 0.35854, 0.29576}, /* D50 */
! { 0.3324, 0.3474, 0.3202}, /* D55 */
! { 0.31271, 0.32899, 0.35830}, /* D65 */
! { 0.333333, 0.333333, 0.333334}, /* E */
};
--- 49,59 ----
*/
float whitepoint_xyz[][3] = {
! { 0.448f, 0.407f, 0.145f }, /* A */
! { 0.349f, 0.352f, 0.299f }, /* B */
! { 0.3101f, 0.3162f, 0.3737f}, /* C */
! { 0.34570f, 0.35854f, 0.29576f}, /* D50 */
! { 0.3324f, 0.3474f, 0.3202f}, /* D55 */
! { 0.31271f, 0.32899f, 0.35830f}, /* D65 */
! { 0.333333f, 0.333333f, 0.333334f}, /* E */
};
***************
*** 156,162 ****
*/
void CMY_to_RGB(float C, float M, float Y, float &R, float &G, float &B) {
! R = 1.0 - C;
! G = 1.0 - M;
! B = 1.0 - Y;
}
--- 156,162 ----
*/
void CMY_to_RGB(float C, float M, float Y, float &R, float &G, float &B) {
! R = 1.0f - C;
! G = 1.0f - M;
! B = 1.0f - Y;
}
***************
*** 175,181 ****
*/
void RGB_to_CMY(float R, float G, float B, float &C, float &M, float &Y) {
! C = 1.0 - R;
! M = 1.0 - G;
! Y = 1.0 - B;
}
--- 175,181 ----
*/
void RGB_to_CMY(float R, float G, float B, float &C, float &M, float &Y) {
! C = 1.0f - R;
! M = 1.0f - G;
! Y = 1.0f - B;
}
***************
*** 227,231 ****
m2 = L + S - L*S;
}
! m1 = 2.0 * L - m2;
if (S == 0.0) {
R = G = B = L;
--- 227,231 ----
m2 = L + S - L*S;
}
! m1 = 2.0f * L - m2;
if (S == 0.0) {
R = G = B = L;
Index: AeroDynamics.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AeroDynamics.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AeroDynamics.cpp 19 Feb 2003 11:41:57 -0000 1.4
--- AeroDynamics.cpp 19 Feb 2003 23:00:36 -0000 1.5
***************
*** 22,26 ****
*
**/
!
#include "AeroDynamics.h"
--- 22,26 ----
*
**/
! #include <algorithm>
#include "AeroDynamics.h"
***************
*** 289,295 ****
run_test(*this, m_Maxi, *m_Position, *m_Velocity, *m_AngularVelocity, *m_Orientation);
}
! */
! double qBarFactor;
!
CSP_LOG(CSP_PHYSICS, CSP_DEBUG, "AeroDynamics: DoSimStep");
--- 289,293 ----
run_test(*this, m_Maxi, *m_Position, *m_Velocity, *m_AngularVelocity, *m_Orientation);
}
! */
CSP_LOG(CSP_PHYSICS, CSP_DEBUG, "AeroDynamics: DoSimStep");
***************
*** 324,333 ****
dt /= m_Maxi;
! qBarFactor = 0.5 * CalculateAirDensity(m_PositionLocal.z) * m_WingArea;
m_Gravity = CalculateGravity(m_PositionLocal.z);
m_GravityWorld = - m_Mass * m_Gravity * simdata::Vector3::ZAXIS;
for (unsigned short modelStepNumber = 0; modelStepNumber < m_Maxi; ++modelStepNumber) {
m_VelocityBody = LocalToBody(m_VelocityLocal);
// Calculate angle of attack, rate of AOA
--- 322,337 ----
dt /= m_Maxi;
!
! double qBarFactor = 0.5 * CalculateAirDensity(m_PositionLocal.z) * m_WingArea;
!
! //qBarFactor = 0.5 * CalculateAirDensity(m_PositionLocal.z) * m_WingArea;
m_Gravity = CalculateGravity(m_PositionLocal.z);
m_GravityWorld = - m_Mass * m_Gravity * simdata::Vector3::ZAXIS;
for (unsigned short modelStepNumber = 0; modelStepNumber < m_Maxi; ++modelStepNumber) {
+
+ m_AngularAccelBody = LocalToBody(m_AngularAccelLocal);
m_VelocityBody = LocalToBody(m_VelocityLocal);
+ m_AngularVelocityBody = LocalToBody(m_AngularVelocityLocal);
// Calculate angle of attack, rate of AOA
***************
*** 346,352 ****
m_beta = atan2(m_VelocityBody.x, m_VelocityBody.y);
! simdata::Vector3 currentAngularAccel;
! simdata::Vector3 currentAngularVelocity;
! simdata::Vector3 currentLinearAccel;
unsigned short GControlNumber = 0;
--- 350,356 ----
m_beta = atan2(m_VelocityBody.x, m_VelocityBody.y);
! simdata::Vector3 angularAccelBody;
! simdata::Vector3 angularVelocityBody;
! simdata::Vector3 linearAccelBody;
unsigned short GControlNumber = 0;
***************
*** 363,379 ****
// First, calculate angular acceleration
! currentAngularAccel = m_InertiaInverse * (m_MomentsBody - (m_AngularVelocityBody^(m_Inertia * m_AngularVelocityBody)));
!
! // add a damping term
! ;//- 0.5 * m_AngularVelocityBody.Length() * m_AngularVelocityBody; //.Unitize();
// Angular acceleration mean
! currentAngularAccel += m_AngularAccelBody;
! currentAngularAccel *= 0.5;
// Integrate angular acceleration gives angular velocity
! currentAngularVelocity = dt * currentAngularAccel + m_AngularVelocityBody;
// Games gems advice
! currentAngularVelocity *= 0.999;
// Calculate force
--- 367,382 ----
// First, calculate angular acceleration
! angularAccelBody = m_InertiaInverse *
! (m_MomentsBody - (m_AngularVelocityBody^(m_Inertia * m_AngularVelocityBody)));
// Angular acceleration mean
! simdata::Vector3 angularAccelMeanBody = angularAccelBody;
! angularAccelMeanBody += m_AngularAccelBody;
! angularAccelMeanBody *= 0.5;
// Integrate angular acceleration gives angular velocity
! angularVelocityBody = dt * angularAccelMeanBody + m_AngularVelocityBody;
// Games gems advice
! angularVelocityBody *= 0.999;
// Calculate force
***************
*** 381,390 ****
// Deduce linear acceleration
! currentLinearAccel = m_MassInverse * m_ForcesBody - (currentAngularVelocity^m_VelocityBody)
! ; //- 0.05 * m_VelocityBody;
!
! // Linear acceleration mean
! currentLinearAccel += m_LinearAccelBody;
! currentLinearAccel *= 0.5;
++GControlNumber;
--- 384,388 ----
// Deduce linear acceleration
! linearAccelBody = m_MassInverse * m_ForcesBody - (angularVelocityBody^m_VelocityBody);
++GControlNumber;
***************
*** 395,418 ****
! // Update angular accel
! m_AngularAccelBody = currentAngularAccel;
!
! // Update angular velocity
! m_AngularVelocityBody = currentAngularVelocity;
! // Update linear acceleration
! m_LinearAccelBody = currentLinearAccel;
! // Integrate linear velocity
! m_VelocityBody += dt * m_LinearAccelBody;
m_Speed = m_VelocityBody.Length();
if (m_Speed < 1.0) m_Speed = 1.0;
!
// Calculate local velocity before changing coordinates
! simdata::Vector3 currentLinVelocity = BodyToLocal(m_VelocityBody);
// Integrate the rotation quaternion
! qOrientation += 0.5f * dt * ( qOrientation * m_AngularVelocityBody);
// Now normalize the orientation quaternion:
double mag = qOrientation.Magnitude();
--- 393,425 ----
! // Update angular accelerations
! m_AngularAccelBody = angularAccelBody;
! m_AngularAccelLocal = BodyToLocal(m_AngularAccelBody);
! // Update linear acceleration body
! // Linear acceleration mean
! simdata::Vector3 linearAccelMeanBody = m_LinearAccelBody;
! linearAccelMeanBody += linearAccelBody;
! linearAccelMeanBody *= 0.5;
! m_LinearAccelBody = linearAccelBody;
! // Integrate linear velocity body
! m_VelocityBody += dt * linearAccelMeanBody;
m_Speed = m_VelocityBody.Length();
if (m_Speed < 1.0) m_Speed = 1.0;
!
! // Update local linear velocity
// Calculate local velocity before changing coordinates
! simdata::Vector3 linearVelocityLocal = BodyToLocal(m_VelocityBody);
! simdata::Vector3 linearVelocityMeanLocal = m_VelocityLocal;
! linearVelocityMeanLocal += linearVelocityLocal;
! linearVelocityMeanLocal *= 0.5;
! m_VelocityLocal = linearVelocityLocal;
+ m_AngularVelocityLocal = BodyToLocal(angularVelocityBody);
+
// Integrate the rotation quaternion
! qOrientation += 0.25f * dt * ( qOrientation * (m_AngularVelocityBody + angularVelocityBody));
// Now normalize the orientation quaternion:
double mag = qOrientation.Magnitude();
***************
*** 420,431 ****
qOrientation /= mag;
}
!
! // Update local linear velocity
! // m_VelocityLocal += currentLinVelocity;
! // m_VelocityLocal *= 0.5;
! m_VelocityLocal = currentLinVelocity;
// Update position in local frame
! m_PositionLocal += dt * m_VelocityLocal;
}
--- 427,436 ----
qOrientation /= mag;
}
!
! // Update angular velocity
! m_AngularVelocityBody = angularVelocityBody;
// Update position in local frame
! m_PositionLocal += dt * linearVelocityMeanLocal;
}
***************
*** 501,505 ****
double AeroDynamics::CalculateLiftCoefficient() const
! {
double lift_coe;
double alpha = m_alpha;
--- 506,510 ----
double AeroDynamics::CalculateLiftCoefficient() const
! { // Cl should be calculated before Cd (IF it is used in Cd as induced drag)
double lift_coe;
double alpha = m_alpha;
***************
*** 558,566 ****
if (alpha < -0.8) alpha = -0.8;
! //drag_coe = m_CD0 + m_CD_a * fabs(alpha) + m_CD_de * fabs(m_Elevator);
! drag_coe = -0.0194 + 0.0214 * alpha + (- 0.29 * m_Elevator + 0.0033 + 0.206 * alpha) * m_Elevator + (-0.699 - 0.903 * alpha) * alpha * alpha;
! drag_coe = - drag_coe;
! double induced = lift_coe*lift_coe*m_WingArea / (3.14 * 0.9 * m_WingSpan*m_WingSpan);
if (induced < 0.0) induced = 0.0;
--- 563,571 ----
if (alpha < -0.8) alpha = -0.8;
! drag_coe = m_CD0 + m_CD_a * fabs(alpha) + m_CD_de * fabs(m_Elevator);
! //drag_coe = -0.0194 + 0.0214 * alpha + (- 0.29 * m_Elevator + 0.0033 + 0.206 * alpha) * m_Elevator + (-0.699 - 0.903 * alpha) * alpha * alpha;
! //drag_coe = - drag_coe;
! double induced = lift_coe*lift_coe*m_WingArea / (3.145926536 * m_WingSpan*m_WingSpan);
if (induced < 0.0) induced = 0.0;
***************
*** 765,769 ****
double AeroDynamics::CIVbasis(double p_t) const
{
! double cIV = p_t * p_t * ( 2 * p_t + 3 );
return cIV;
}
--- 770,774 ----
double AeroDynamics::CIVbasis(double p_t) const
{
! double cIV = p_t * p_t * ( 3.0 - 2.0 * p_t);
return cIV;
}
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv15241
Modified Files:
VirtualBattlefield.h SmokeEffects.h SimpleConfig.h SimObject.h
MenuScreen.h LogoScreen.h CSPSim.h BaseScreen.h
Log Message:
Fixes under windows
Index: VirtualBattlefield.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualBattlefield.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VirtualBattlefield.h 19 Feb 2003 11:41:56 -0000 1.3
--- VirtualBattlefield.h 19 Feb 2003 22:57:58 -0000 1.4
***************
*** 46,49 ****
--- 46,50 ----
const int MAX_NUM_VISIBLE_TRIANGLES = 30000; // Chosen based on the expected number of triangles that will be visible on-screen at any one time (the terrain mesh will typically have far more triangles than are seen at one time, especially with dynamic tessellation)
+ class DynamicObject;
/**
Index: SmokeEffects.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SmokeEffects.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SmokeEffects.h 19 Feb 2003 11:41:56 -0000 1.2
--- SmokeEffects.h 19 Feb 2003 22:57:59 -0000 1.3
***************
*** 38,41 ****
--- 38,43 ----
#include <string>
+ using std::string;
+
namespace osgParticle {
class ParticleSystem;
Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleConfig.h 19 Feb 2003 11:41:56 -0000 1.5
--- SimpleConfig.h 19 Feb 2003 22:57:59 -0000 1.6
***************
*** 41,46 ****
#include <iostream>
#include <fstream>
! #include <cstdio>
! #include <cstdlib>
#include <SimData/hash_map.h>
--- 41,46 ----
#include <iostream>
#include <fstream>
! //#include <cstdio>
! //#include <cstdlib>
#include <SimData/hash_map.h>
Index: SimObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimObject.h 2 Feb 2003 20:53:27 -0000 1.3
--- SimObject.h 19 Feb 2003 22:58:00 -0000 1.4
***************
*** 39,49 ****
- class VirtualBattlefield;
-
-
/**
* class SimObject - Base class for all objects in the simulation.
*
*/
class SimObject: public simdata::Object
--- 39,47 ----
/**
* class SimObject - Base class for all objects in the simulation.
*
*/
+ class VirtualBattlefield;
class SimObject: public simdata::Object
Index: MenuScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/MenuScreen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MenuScreen.h 26 Jan 2003 23:34:13 -0000 1.2
--- MenuScreen.h 19 Feb 2003 22:58:00 -0000 1.3
***************
*** 42,46 ****
virtual void OnExit();
! virtual void OnRender();
virtual bool OnKeyDown(char * key);
--- 42,46 ----
virtual void OnExit();
! virtual void onRender();
virtual bool OnKeyDown(char * key);
Index: LogoScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogoScreen.h 2 Feb 2003 20:53:27 -0000 1.3
--- LogoScreen.h 19 Feb 2003 22:58:00 -0000 1.4
***************
*** 45,50 ****
virtual void OnExit();
! virtual void OnRender();
! virtual void OnUpdateObjects(double dt) {; }
--- 45,50 ----
virtual void OnExit();
! virtual void onRender();
! virtual void onUpdate(double dt) {; }
Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CSPSim.h 19 Feb 2003 11:41:56 -0000 1.4
--- CSPSim.h 19 Feb 2003 22:58:00 -0000 1.5
***************
*** 28,41 ****
#define __CSPSIM_H__
-
- #include "TerrainObject.h"
- #include "DynamicObject.h"
-
#include <SDL/SDL.h>
#include <SDL/SDL_joystick.h>
- #include <SDL/CON_console.h>
#include <SimData/Types.h>
class VirtualBattlefield;
--- 28,39 ----
#define __CSPSIM_H__
#include <SDL/SDL.h>
#include <SDL/SDL_joystick.h>
#include <SimData/Types.h>
+ #include "DynamicObject.h"
+ #include "TerrainObject.h"
+
class VirtualBattlefield;
***************
*** 69,79 ****
simdata::SimDate & getCurrentTime() { return m_CurrentTime; }
void setActiveObject(simdata::Pointer<DynamicObject> object);
EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
- void pause();
- void unpause();
void togglePause();
--- 67,79 ----
simdata::SimDate & getCurrentTime() { return m_CurrentTime; }
+ simdata::SimTime const & getFrameRate() const{ return m_FrameRate; }
void setActiveObject(simdata::Pointer<DynamicObject> object);
+ simdata::Pointer<DynamicObject> const getActiveObject() const;
+ VirtualBattlefield * const getBattlefield() const;
+
EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
void togglePause();
***************
*** 84,91 ****
void InitSim();
int InitSDL();
- int InitConsole();
- void ShowStats(float fps);
- void ShowPlaneInfo();
- void ShowPaused();
void DoInput();
--- 84,87 ----
***************
*** 108,116 ****
int m_ScreenHeight;
- ConsoleInformation * m_pConsole;
-
- bool m_bConsoleDisplay;
bool m_bFreezeSim;
- bool m_bShowStats;
bool m_bFinished;
--- 104,108 ----
***************
*** 137,142 ****
simdata::Pointer<DynamicObject> m_ActiveObject;
- int m_ConsoleFont;
-
/**
* The virtual battlefield
--- 129,132 ----
***************
*** 148,152 ****
simdata::DataArchive *m_DataArchive;
};
-
#endif // __CSPSIM_H__
--- 138,141 ----
Index: BaseScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/BaseScreen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseScreen.h 26 Jan 2003 23:34:13 -0000 1.2
--- BaseScreen.h 19 Feb 2003 22:58:00 -0000 1.3
***************
*** 33,37 ****
// Each screen within the Game/Sim should
// Derive a class from class. Each Screen
! // class must support a OnRender() function
// that knows how to draw the screen.
--- 33,37 ----
// Each screen within the Game/Sim should
// Derive a class from class. Each Screen
! // class must support a onRender() function
// that knows how to draw the screen.
***************
*** 51,56 ****
virtual void OnExit() = 0;
! virtual void OnUpdateObjects(double dt) = 0;
! virtual void OnRender() = 0;
virtual VirtualHID *getInterface();
--- 51,56 ----
virtual void OnExit() = 0;
! virtual void onUpdate(double dt) = 0;
! virtual void onRender() = 0;
virtual VirtualHID *getInterface();
|
|
From: <mk...@us...> - 2003-02-19 22:54:35
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv13642 Added Files: README.CVS Log Message: --- NEW FILE: README.CVS --- ======================================================================= Please make notes here whenever checking changes into cvs that require additional steps to make work. Likewise, please check this file first whenever something goes wrong with a recently checked out version of the code. ======================================================================= 2002-02-18 Onsight checked in new sky code, improved virtual hid script handling, and a bunch of miscellaneous fixes. in order for it to run, you need to get the image file moon.png from http://stm.lbl.gov/~tm2/csp/moon.png. make sure it is saved as a png file, and not converted to bmp by IE. there are some new keyboard commands. take a look at aircraft.map and GameScreen.map in Tools/HID for details. the new hid files are in Data/Input, so be sure to check them out or use map2hid to regenerate them. the autoconf scripts are broken on linux, you may need to copy Makefile.in to Makefile and tweak it by hand. i'm still working on a fix. |
|
From: <mk...@us...> - 2003-02-19 21:25:01
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv32684/Include/SimData
Modified Files:
Date.h
Log Message:
fix strftime format for windows
Index: Date.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Date.h 19 Feb 2003 11:14:33 -0000 1.4
--- Date.h 19 Feb 2003 21:24:58 -0000 1.5
***************
*** 509,513 ****
virtual std::string asString() const {
! return formatString("%Tz");
}
--- 509,513 ----
virtual std::string asString() const {
! return formatString("%H:%M:%Sz");
}
***************
*** 550,554 ****
std::string formatString(const char *format, bool local=false) const;
virtual std::string asString() const {
! return formatString("%Y/%m/%d %Tz");
}
--- 550,554 ----
std::string formatString(const char *format, bool local=false) const;
virtual std::string asString() const {
! return formatString("%Y/%m/%d %H:%M:%Sz");
}
***************
*** 629,633 ****
virtual std::string asString() const {
! return formatString("%Y/%m/%d %Tz");
}
--- 629,633 ----
virtual std::string asString() const {
! return formatString("%Y/%m/%d %H:%M:%Sz");
}
|
|
From: <mk...@us...> - 2003-02-19 21:24:20
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv32220/Source
Modified Files:
Makefile.in Sky.cpp
Log Message:
fix for moon size
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in 19 Feb 2003 11:41:58 -0000 1.2
--- Makefile.in 19 Feb 2003 21:24:16 -0000 1.3
***************
*** 1,5 ****
TOPDIR = ..
! SUBDIRS = FX
DEMETER_PREFIX = $(TOPDIR)/$(DEMETER_RELATIVE)
--- 1,5 ----
TOPDIR = ..
! #SUBDIRS = FX
DEMETER_PREFIX = $(TOPDIR)/$(DEMETER_RELATIVE)
***************
*** 95,101 ****
build-subdirs:
! @for dir in $(SUBDIRS); do \
! $(MAKE) -C $${dir} all; \
! done
$(DEPDIR)/%.d : %
--- 95,101 ----
build-subdirs:
! # @for dir in $(SUBDIRS); do \
! # $(MAKE) -C $${dir} all; \
! # done
$(DEPDIR)/%.d : %
***************
*** 122,125 ****
--- 122,128 ----
$(CXX) -c $(CFLAGS) $(@:.o=.cpp)
+ AeroDynamics.o: AeroDynamics.cpp
+ $(CXX) -c $(CFLAGS) -O3 $(@:.o=.cpp)
+
Makefile: Makefile.in
cd $(TOPDIR) && ./configure
Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Sky.cpp 19 Feb 2003 11:41:58 -0000 1.1
--- Sky.cpp 19 Feb 2003 21:24:16 -0000 1.2
***************
*** 495,502 ****
Moon::Moon(): AstronomicalBody() {
_radius = 1738000.0;
m_Latitude = -100.0;
m_DirtyImage = true;
m_Phase = 0.0;
-
m_ApparentBrightness = 0.0;
m_MoonShine = 0.0;
--- 495,503 ----
Moon::Moon(): AstronomicalBody() {
_radius = 1738000.0;
+ // approximate distance for setting initial size
+ //_distance = 384400000.0 - 6370000.0;
m_Latitude = -100.0;
m_DirtyImage = true;
m_Phase = 0.0;
m_ApparentBrightness = 0.0;
m_MoonShine = 0.0;
***************
*** 504,509 ****
m_SunShine = 0.0;
! float y = 4100.0;
! float x = 4100.0;
m_Image = osgDB::readImageFile("moon.png");
assert(m_Image.valid());
--- 505,511 ----
m_SunShine = 0.0;
! m_RenderDistance = 950000.0;
! float x, y;
! x = y = 1.0; //_radius / _distance * m_RenderDistance;
m_Image = osgDB::readImageFile("moon.png");
assert(m_Image.valid());
***************
*** 634,638 ****
void Moon::updateScene(double lat, double lmst, Sun const &sun, float intensity) {
- static double R = 950000.0;
double h, A;
double x, y, z;
--- 636,639 ----
***************
*** 654,659 ****
y *= cos(A);
z = sin(h);
! osg::Matrix T = osg::Matrix::translate(x*R, y*R, z*R);
! m_Transform->setMatrix(T);
_updateLighting(x, y, z, h, intensity);
}
--- 655,662 ----
y *= cos(A);
z = sin(h);
! double scale = m_RenderDistance * _radius / _distance;
! osg::Matrix S = osg::Matrix::scale(scale, scale, scale);
! osg::Matrix T = osg::Matrix::translate(x*m_RenderDistance, y*m_RenderDistance, z*m_RenderDistance);
! m_Transform->setMatrix(S*T);
_updateLighting(x, y, z, h, intensity);
}
|
|
From: <mk...@us...> - 2003-02-19 21:24:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv32220/Include Modified Files: Sky.h Log Message: fix for moon size Index: Sky.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Sky.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sky.h 19 Feb 2003 11:41:56 -0000 1.1 --- Sky.h 19 Feb 2003 21:24:16 -0000 1.2 *************** *** 233,236 **** --- 233,237 ---- float m_SunShine; float m_ApparentBrightness; + float m_RenderDistance; }; |
|
From: <mk...@us...> - 2003-02-19 21:24:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv32220 Modified Files: Makefile.in configure.in Log Message: fix for moon size Index: Makefile.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 2 Feb 2003 21:07:31 -0000 1.1 --- Makefile.in 19 Feb 2003 21:24:15 -0000 1.2 *************** *** 5,9 **** export GDEBUGF = -g -Wall ! export GCFLAGS = -I/usr/local/include/python2.2 -I/usr/local/include -fPIC -DSWIG_GLOBAL # -O2 export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept --- 5,9 ---- export GDEBUGF = -g -Wall ! export GCFLAGS = -I/usr/local/include/python2.2 -fPIC -Wall -DSWIG_GLOBAL -O2 -march=athon-tbird export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept Index: configure.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.in 19 Feb 2003 12:36:24 -0000 1.5 --- configure.in 19 Feb 2003 21:24:15 -0000 1.6 *************** *** 52,59 **** dnl check for OpenSceneGraph CSP_OSG_CONFIG(osg, 0.9.3, [OpenSceneGraph]) ! CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library]) ! CSP_OSG_CONFIG(osgUtil, 0.9.3, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgText, 0.9.3, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) --- 52,59 ---- dnl check for OpenSceneGraph CSP_OSG_CONFIG(osg, 0.9.3, [OpenSceneGraph]) ! #CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library]) ! #CSP_OSG_CONFIG(osgUtil, 0.9.3, [OpenSceneGraph Util library]) ! #CSP_OSG_CONFIG(osgText, 0.9.3, [OpenSceneGraph Util library]) ! #CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) |
|
From: <mk...@us...> - 2003-02-19 21:24:19
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data In directory sc8-pr-cvs1:/tmp/cvs-serv32220/Data Modified Files: CSPSim.ini Log Message: fix for moon size Index: CSPSim.ini =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CSPSim.ini 19 Feb 2003 19:35:06 -0000 1.4 --- CSPSim.ini 19 Feb 2003 21:24:16 -0000 1.5 *************** *** 25,29 **** [Testing] ! Date = 2003-02-18 19:50:00.0 Latitude = 37 Longitude = -122 --- 25,30 ---- [Testing] ! ;Date = 2003-02-18 19:50:00.0 ! Date = 2000-01-01 15:00:00.0 Latitude = 37 Longitude = -122 |
|
From: <mk...@us...> - 2003-02-19 19:35:11
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data In directory sc8-pr-cvs1:/tmp/cvs-serv10260/Data Modified Files: CSPSim.ini Log Message: added default data paths Index: CSPSim.ini =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CSPSim.ini 19 Feb 2003 11:41:55 -0000 1.3 --- CSPSim.ini 19 Feb 2003 19:35:06 -0000 1.4 *************** *** 12,15 **** --- 12,19 ---- ModelPath = ../Data InputMapPath = ../Data/Input + DataPath = ../Data + ImagePath = ../Data/Images + FontPath = ../Data/Fonts + TerrainPath = ../Data/Terrain [View] *************** *** 21,28 **** [Testing] - ;Date = 2003-02-18 03:50:00.0 Date = 2003-02-18 19:50:00.0 - ;Date = 2003-02-5 03:20:00.0 Latitude = 37 Longitude = -122 SpinWorld = false --- 25,32 ---- [Testing] Date = 2003-02-18 19:50:00.0 Latitude = 37 Longitude = -122 SpinWorld = false + ;Date = 2003-02-18 03:50:00.0 + ;Date = 2003-02-5 03:20:00.0 |
|
From: <mk...@us...> - 2003-02-19 12:40:10
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv7768
Modified Files:
acinclude.m4
Log Message:
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** acinclude.m4 19 Feb 2003 11:41:55 -0000 1.3
--- acinclude.m4 19 Feb 2003 12:40:06 -0000 1.4
***************
*** 110,114 ****
[AC_MSG_RESULT(no)
AC_MSG_ERROR([
! $3 version >= $1 needs to be installed. OSG can be
downloaded from http://www.openscenegraph.org/
])
--- 110,114 ----
[AC_MSG_RESULT(no)
AC_MSG_ERROR([
! $3 version >= $2 needs to be installed. OSG can be
downloaded from http://www.openscenegraph.org/
])
|
|
From: <mk...@us...> - 2003-02-19 12:36:29
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv6128 Modified Files: configure.in Log Message: osg 0.9.3 req now Index: configure.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 19 Feb 2003 11:41:55 -0000 1.4 --- configure.in 19 Feb 2003 12:36:24 -0000 1.5 *************** *** 51,59 **** dnl check for OpenSceneGraph ! CSP_OSG_CONFIG(osg, 0.9.2, [OpenSceneGraph]) ! CSP_OSG_CONFIG(osgGLUT, 0.9.2, [OpenSceneGraph GLUT library]) ! CSP_OSG_CONFIG(osgUtil, 0.9.2, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgText, 0.9.2, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgParticle, 0.9.2, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) --- 51,59 ---- dnl check for OpenSceneGraph ! CSP_OSG_CONFIG(osg, 0.9.3, [OpenSceneGraph]) ! CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library]) ! CSP_OSG_CONFIG(osgUtil, 0.9.3, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgText, 0.9.3, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) |
|
From: <mk...@us...> - 2003-02-19 12:25:27
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv1838
Modified Files:
LogoScreen.cpp TerrainObject.cpp VirtualBattlefield.cpp
Log Message:
missed a few bugs related to the new data path config code that had been committed to cvs earlier
Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogoScreen.cpp 16 Feb 2003 09:48:59 -0000 1.4
--- LogoScreen.cpp 19 Feb 2003 12:25:23 -0000 1.5
***************
*** 39,42 ****
--- 39,43 ----
#include "LogoScreen.h"
#include "Platform.h"
+ #include "Config.h"
***************
*** 55,59 ****
{
std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! std::string path = ospath.join(image_path, "CSPLogo.bmp");
m_image = SDL_LoadBMP(path.c_str());
if (m_image == NULL)
--- 56,60 ----
{
std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! std::string path = ospath::join(image_path, "CSPLogo.bmp");
m_image = SDL_LoadBMP(path.c_str());
if (m_image == NULL)
Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TerrainObject.cpp 19 Feb 2003 11:41:58 -0000 1.5
--- TerrainObject.cpp 19 Feb 2003 12:25:23 -0000 1.6
***************
*** 3,6 ****
--- 3,7 ----
#include <osg/StateSet>
+ #include "Config.h"
#include "LogStream.h"
#include "Platform.h"
Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VirtualBattlefield.cpp 19 Feb 2003 11:41:58 -0000 1.5
--- VirtualBattlefield.cpp 19 Feb 2003 12:25:23 -0000 1.6
***************
*** 198,202 ****
ospath::addpath(search_path, model_path);
ospath::addpath(search_path, font_path);
! osgDB::setDataFilePathList(searchpath);
// we don't need this on Linux since libs are usually
--- 198,202 ----
ospath::addpath(search_path, model_path);
ospath::addpath(search_path, font_path);
! osgDB::setDataFilePathList(search_path);
// we don't need this on Linux since libs are usually
|
|
From: <mk...@us...> - 2003-02-19 11:42:29
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv19397/Data/XML/vehicles/aircraft/m2k Modified Files: fm.xml Log Message: new sky code, hid enhancement, smoke fixes, other misc Index: fm.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fm.xml 26 Jan 2003 23:15:55 -0000 1.1 --- fm.xml 19 Feb 2003 11:41:56 -0000 1.2 *************** *** 64,68 **** <!-- Pitch Moment Parameters --> ! <Real name="cm0">-0.02</Real> <Real name="cm_a">-0.02</Real> <Real name="cm_adot">-1.73</Real> --- 64,68 ---- <!-- Pitch Moment Parameters --> ! <Real name="cm0">-0.002</Real> <Real name="cm_a">-0.02</Real> <Real name="cm_adot">-1.73</Real> |
|
From: <mk...@us...> - 2003-02-19 11:42:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data In directory sc8-pr-cvs1:/tmp/cvs-serv19397/Data Modified Files: CSPSim.ini Log Message: new sky code, hid enhancement, smoke fixes, other misc Index: CSPSim.ini =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CSPSim.ini 26 Jan 2003 23:36:06 -0000 1.2 --- CSPSim.ini 19 Feb 2003 11:41:55 -0000 1.3 *************** *** 11,20 **** [Paths] ModelPath = ../Data ! InputMapPath = ../Tools/HID [View] Wireframe = false ! ViewDistance = 35000 Fog = true FogStart = 20000 FogEnd = 35000 --- 11,28 ---- [Paths] ModelPath = ../Data ! InputMapPath = ../Data/Input [View] Wireframe = false ! ViewDistance = 40000 Fog = true FogStart = 20000 FogEnd = 35000 + + [Testing] + ;Date = 2003-02-18 03:50:00.0 + Date = 2003-02-18 19:50:00.0 + ;Date = 2003-02-5 03:20:00.0 + Latitude = 37 + Longitude = -122 + SpinWorld = false |
|
From: <mk...@us...> - 2003-02-19 11:42:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv19397 Modified Files: acinclude.m4 configure.in Log Message: new sky code, hid enhancement, smoke fixes, other misc Index: acinclude.m4 =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acinclude.m4 26 Jan 2003 23:30:59 -0000 1.2 --- acinclude.m4 19 Feb 2003 11:41:55 -0000 1.3 *************** *** 117,118 **** --- 117,150 ---- ]) + dnl check for python + AC_DEFUN(CSP_PYTHON, [ + min_version=$1 + python=no + AC_MSG_CHECKING(for python >= $min_version) + version=`python -V 2>&1` + major=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + minor=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + micro=`echo $version | sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + major_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + minor_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + micro_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + version_proper=`expr \ + $major \> $major_min \| \ + $major \= $major_min \& \ + $minor \> $minor_min \| \ + $major \= $major_min \& \ + $minor \= $minor_min \& \ + $micro \>= $micro_min ` + if test "$version_proper" = "1" ; then + AC_MSG_RESULT(yes) + python=yes + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([ + Python version >= $min_version must be installed. Python is + avalable in prepackaged binary and source distributions from + http://www.python.org. + ]) + fi + ]) + Index: configure.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 2 Feb 2003 21:06:42 -0000 1.3 --- configure.in 19 Feb 2003 11:41:55 -0000 1.4 *************** *** 57,60 **** --- 57,62 ---- CSP_OSG_CONFIG(osgParticle, 0.9.2, [OpenSceneGraph Particle library]) + CSP_PYTHON(2.2.0) + #AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, , # [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],) *************** *** 67,70 **** ! AC_OUTPUT([Makefile Source/Makefile], []) --- 69,72 ---- ! AC_OUTPUT([Makefile Source/Makefile Source/FX/Makefile], []) |
|
From: <mk...@us...> - 2003-02-19 11:42:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID In directory sc8-pr-cvs1:/tmp/cvs-serv19397/Tools/HID Modified Files: GameScreen.map aircraft.map Log Message: new sky code, hid enhancement, smoke fixes, other misc Index: GameScreen.map =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/GameScreen.map,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameScreen.map 26 Jan 2003 23:35:01 -0000 1.2 --- GameScreen.map 19 Feb 2003 11:41:58 -0000 1.3 *************** *** 28,38 **** map key:KP2 release CAMERA_PAN_DOWN_STOP ! map key:PLUS press CAMERA_ZOOM_IN ! map key:PLUS release CAMERA_ZOOM_STOP map key:ESCAPE press QUIT map key:p press PAUSE map key:SPACE press CHANGE_VEHICLE ! map key:MINUS press CAMERA_ZOOM_OUT ! map key:MINUS release CAMERA_ZOOM_STOP map mouse:WHEELUP press CAMERA_ZOOM_STEP_IN --- 28,41 ---- map key:KP2 release CAMERA_PAN_DOWN_STOP ! map key:KP_PLUS press CAMERA_ZOOM_IN ! map key:KP_PLUS release CAMERA_ZOOM_STOP map key:ESCAPE press QUIT map key:p press PAUSE map key:SPACE press CHANGE_VEHICLE ! map key:KP_MINUS press CAMERA_ZOOM_OUT ! map key:KP_MINUS release CAMERA_ZOOM_STOP ! ! map key:F1 press SPIN_THE_WORLD/B|SPIN_THE_WORLD_STOP/B ! map key:F2 press RESET_SPIN map mouse:WHEELUP press CAMERA_ZOOM_STEP_IN Index: aircraft.map =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/aircraft.map,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aircraft.map 26 Jan 2003 23:35:01 -0000 1.2 --- aircraft.map 19 Feb 2003 11:41:58 -0000 1.3 *************** *** 29,31 **** --- 29,33 ---- map key:MINUS press DEC_THROTTLE map key:MINUS release STOP_DEC_THROTTLE + map key:s press SMOKE_ON/B|SMOKE_OFF/B + #map key:SHIFT-s press SMOKE_OFF |
|
From: <mk...@us...> - 2003-02-19 11:41:59
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/environment In directory sc8-pr-cvs1:/tmp/cvs-serv19397/Data/XML/environment Added Files: stars.xml Log Message: new sky code, hid enhancement, smoke fixes, other misc --- NEW FILE: stars.xml --- <?xml version="1.0" standalone="no"?> <Object class="StarCatalog" static="1"> <String name="source">Yale Bright Star Catalog</String> <Real name="magnitude_cutoff">5.8</Real> 0.0232783288985 -0.0996146670576 0.391358773231 1.0 0.7188 0.44945 0.0366010088554 0.507725975679 0.890511233846 0.466266666667 0.575033333333 1.0 0.0400480341281 1.03235740442 0.832212251167 0.814366666667 0.837011111111 1.0 0.0407970712654 -0.488478872539 0.301407906329 0.908371428571 0.898785714286 1.0 0.0410661428584 -0.798444499556 0.4952146564 1.0 0.722644654088 0.456221383648 0.0450367669067 0.804111971488 0.341794034678 0.883658333333 0.882783333333 1.0 0.0437859476094 -1.43507758491 0.315324831266 1.0 0.714995652174 0.442765217391 0.0491528350593 -0.269968498326 0.357575710689 0.9958 0.952166666667 0.9948 0.0504981930244 -0.485196683918 0.302381274023 1.0 0.612615789474 0.284531578947 0.0511963247252 -0.613187495731 0.318389640672 0.9337 0.915 1.0 0.0530870980815 -0.313082978987 0.318389640672 1.0 0.568615686275 0.228407843137 0.0577558538306 0.265004006231 0.694736278295 0.411227272727 0.526327272727 1.0 [...2634 lines suppressed...] 6.25040947827 0.333711801118 0.336328149191 1.0 0.533559259259 0.188351851852 6.25097671028 0.191069919862 0.313298032452 0.659516216216 0.728245945946 1.0 6.2586779756 1.00355462362 0.400291934782 1.0 0.653083146067 0.34232247191 6.27265515403 -1.12221762021 0.345116112322 0.567667741935 0.658390322581 1.0 6.27340419116 0.438800014635 0.385100260729 1.0 0.536393023256 0.191441860465 6.27626216781 0.896900461916 0.368103783159 1.0 0.472631799163 0.128154393305 6.27739663183 -0.0620658474556 0.361051178818 1.0 0.762040268456 0.529400671141 6.27851655143 -0.920588458375 0.330949672789 1.0 0.685159763314 0.39250887574 6.27885834508 0.973108324449 0.358730466877 0.487471428571 0.593128571429 1.0 6.28018188643 0.119787764329 0.47488692253 0.908371428571 0.898785714286 1.0 6.28282169692 -1.14453844209 0.405487853148 0.482 0.588466666667 1.0 0.00695950039233 -1.34505253246 0.370485133292 1.0 0.635872131148 0.317081967213 0.00795579250701 -0.0528398431041 0.334166348323 0.461172727273 0.570690909091 1.0 0.00855211333477 -0.104967010097 0.417426598919 1.0 0.525198630137 0.179276712329 0.0101738150981 -0.51871670183 0.344005180847 0.44652195122 0.557868292683 1.0 0.0163188285061 -0.30257221838 0.399003391902 0.498564705882 0.602466666667 1.0 0.0196422262902 -0.183424408111 0.35185744855 1.0 0.525198630137 0.179276712329 </Object> |
|
From: <mk...@us...> - 2003-02-19 11:41:58
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/Input In directory sc8-pr-cvs1:/tmp/cvs-serv19397/Data/Input Added Files: GameScreen.hid aircraft.hid Log Message: new sky code, hid enhancement, smoke fixes, other misc --- NEW FILE: GameScreen.hid --- =__gamescreen__ @00.00 -01 -0001 +00 -01 CAMERA_VIEW_1 +K 0 P 0000 0000 0000 0049 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_2 +K 0 P 0000 0000 0000 0050 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_3 +K 0 P 0000 0000 0000 0051 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_4 +K 0 P 0000 0000 0000 0052 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_5 +K 0 P 0000 0000 0000 0053 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_6 +K 0 P 0000 0000 0000 0054 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_7 +K 0 P 0000 0000 0000 0055 00 @00.00 -01 -0001 +00 -01 CAMERA_VIEW_8 +K 0 P 0000 0000 0000 0056 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_LEFT +K 0 P 0000 0000 0000 0260 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_LEFT_STOP +K 0 R 0000 0000 0000 0260 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_RIGHT +K 0 P 0000 0000 0000 0262 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_RIGHT_STOP +K 0 R 0000 0000 0000 0262 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_UP +K 0 P 0000 0000 0000 0264 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_UP_STOP +K 0 R 0000 0000 0000 0264 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_DOWN +K 0 P 0000 0000 0000 0258 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN_DOWN_STOP +K 0 R 0000 0000 0000 0258 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_IN +K 0 P 0000 0000 0000 0270 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP +K 0 R 0000 0000 0000 0270 00 @00.00 -01 -0001 +00 -01 QUIT +K 0 P 0000 0000 0000 0027 00 @00.00 -01 -0001 +00 -01 PAUSE +K 0 P 0000 0000 0000 0112 00 @00.00 -01 -0001 +00 -01 CHANGE_VEHICLE +K 0 P 0000 0000 0000 0032 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_OUT +K 0 P 0000 0000 0000 0269 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STOP +K 0 R 0000 0000 0000 0269 00 @00.00 -01 -0001 +01 -01 SPIN_THE_WORLD @00.00 -01 -0001 +01 -01 SPIN_THE_WORLD_STOP +K 0 P 0000 0000 0000 0282 00 @00.00 -01 -0001 +00 -01 RESET_SPIN +K 0 P 0000 0000 0000 0283 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STEP_IN +M 0 P 0000 0000 0000 0004 00 @00.00 -01 -0001 +00 -01 CAMERA_ZOOM_STEP_OUT +M 0 P 0000 0000 0000 0005 00 @00.00 -01 -0001 +00 -01 CAMERA_FOV_STEP_DEC +M 0 P 0001 0000 0000 0004 00 @00.00 -01 -0001 +00 -01 CAMERA_FOV_STEP_DEC +M 0 P 0002 0000 0000 0004 00 @00.00 -01 -0001 +00 -01 CAMERA_FOV_STEP_INC +M 0 P 0001 0000 0000 0005 00 @00.00 -01 -0001 +00 -01 CAMERA_FOV_STEP_INC +M 0 P 0002 0000 0000 0005 00 @00.00 -01 -0001 +00 -01 CAMERA_PAN +M 0 M 0000 0000 0001 0001 00 --- NEW FILE: aircraft.hid --- =vehicles.aircraft.f16 =vehicles.aircraft.m2k @00.00 -01 -0001 +00 -01 AILERON +J 0 A 0000 0000 0000 0000 00 @00.00 -01 -0001 +00 -01 ELEVATOR +J 0 A 0000 0000 0000 0001 00 @00.00 -01 -0001 +00 -01 RUDDER +J 0 A 0000 0000 0000 0003 00 @00.00 -01 -0001 +00 -01 THROTTLE +J 0 A 0000 0000 0000 0004 00 @00.00 -01 -0001 +00 -01 INC_ELEVATOR +K 0 P 0000 0000 0000 0274 00 @00.00 -01 -0001 +00 -01 STOP_INC_ELEVATOR +K 0 R 0000 0000 0000 0274 00 @00.00 -01 -0001 +00 -01 DEC_ELEVATOR +K 0 P 0000 0000 0000 0273 00 @00.00 -01 -0001 +00 -01 STOP_DEC_ELEVATOR +K 0 R 0000 0000 0000 0273 00 @00.00 -01 -0001 +00 -01 INC_AILERON +K 0 P 0000 0000 0000 0275 00 @00.00 -01 -0001 +00 -01 STOP_INC_AILERON +K 0 R 0000 0000 0000 0275 00 @00.00 -01 -0001 +00 -01 DEC_AILERON +K 0 P 0000 0000 0000 0276 00 @00.00 -01 -0001 +00 -01 STOP_DEC_AILERON +K 0 R 0000 0000 0000 0276 00 @00.00 -01 -0001 +00 -01 INC_THROTTLE +K 0 P 0000 0000 0000 0061 00 @00.00 -01 -0001 +00 -01 STOP_INC_THROTTLE +K 0 R 0000 0000 0000 0061 00 @00.00 -01 -0001 +00 -01 DEC_THROTTLE +K 0 P 0000 0000 0000 0045 00 @00.00 -01 -0001 +00 -01 STOP_DEC_THROTTLE +K 0 R 0000 0000 0000 0045 00 @00.00 -01 -0001 +01 -01 SMOKE_ON @00.00 -01 -0001 +01 -01 SMOKE_OFF +K 0 P 0000 0000 0000 0115 00 |
