Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv28509/CSPFlightSim/Source
Modified Files:
BaseObject.cpp CSPFlightSim.cpp HudTextElement.cpp Makefile
VirtualBattlefield.cpp
Log Message:
fixed a couple build dependencies, related to osg cvs (should still work with osg 0.9.2)
flight model parameters for M2k updated from delta
Index: BaseObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/BaseObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BaseObject.cpp 12 Dec 2002 21:13:45 -0000 1.3
--- BaseObject.cpp 13 Dec 2002 01:20:58 -0000 1.4
***************
*** 342,347 ****
m_rpSwitch = osgNew osg::Switch;
m_rpSwitch->setName("Model switch");
! m_rpSwitch->addChild(m_rpNode.get());
! m_rpSwitch->setAllChildrenOn();
}
--- 342,347 ----
m_rpSwitch = osgNew osg::Switch;
m_rpSwitch->setName("Model switch");
! m_rpSwitch->addChild(m_rpNode.get());
! //m_rpSwitch->setAllChildrenOn();
}
***************
*** 398,402 ****
if (m_sObjectName == "PLAYER" )
{
! AddSmoke();
}
--- 398,402 ----
if (m_sObjectName == "PLAYER" )
{
! //AddSmoke();
}
Index: CSPFlightSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/CSPFlightSim.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CSPFlightSim.cpp 12 Dec 2002 21:13:45 -0000 1.3
--- CSPFlightSim.cpp 13 Dec 2002 01:20:58 -0000 1.4
***************
*** 8,11 ****
--- 8,13 ----
#include <osg/Timer>
+
+ #include "SDL.h"
#include "CON_console.h" // console is using SDL_OPENGLBLIT :-( switch to osgConsole?
#include "CON_consolecommands.h"
***************
*** 582,585 ****
--- 584,594 ----
DT_DrawText(buffer, m_SDLScreen, ConsoleFont, 1, m_SDLScreen->h - 80);
+ /* frame rate logging versus position -- temporary hack */
+ static float next_dump = 0.0;
+ float simtime = g_pSimTime->getSimTime();
+ if (simtime > next_dump) {
+ next_dump = simtime + 10.0;
+ CSP_LOG( CSP_APP , CSP_WARN, framerate << endl << buffer );
+ }
pos = g_pPlayerObject->getGlobalPosition();
***************
*** 598,601 ****
--- 607,611 ----
DT_DrawText(buffer, m_SDLScreen, ConsoleFont, 1, m_SDLScreen->h - 20);
+
}
Index: HudTextElement.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/HudTextElement.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HudTextElement.cpp 12 Dec 2002 21:13:45 -0000 1.2
--- HudTextElement.cpp 13 Dec 2002 01:20:58 -0000 1.3
***************
*** 75,79 ****
setDrawMode( osgText::Text::TEXT );
setAlignment(osgText::Text::LEFT_BOTTOM);
! setAxisAlignment(XZ_PLANE);
setColor(fontColor);
setPosition(p_position);
--- 75,79 ----
setDrawMode( osgText::Text::TEXT );
setAlignment(osgText::Text::LEFT_BOTTOM);
! //setAxisAlignment(XZ_PLANE);
setColor(fontColor);
setPosition(p_position);
Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 5 Dec 2002 03:35:32 -0000 1.2
--- Makefile 13 Dec 2002 01:20:58 -0000 1.3
***************
*** 4,8 ****
# Edit these lines to match your system configuration
! CC=g++ #-3.0
OSG_PREFIX=/usr/local
--- 4,8 ----
# Edit these lines to match your system configuration
! CC=g++
OSG_PREFIX=/usr/local
Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VirtualBattlefield.cpp 12 Dec 2002 21:11:40 -0000 1.3
--- VirtualBattlefield.cpp 13 Dec 2002 01:20:58 -0000 1.4
***************
*** 154,158 ****
osg::ClearNode* earthSky = osgNew osg::ClearNode;
! earthSky->setRequiresClear(false); // we've got base and sky to do it.
// use a transform to make the sky and base around with the eye point.
--- 154,159 ----
osg::ClearNode* earthSky = osgNew osg::ClearNode;
! //earthSky->setRequiresClear(false); // we've got base and sky to do it.
! earthSky->setRequiresClear(true); // we've got base and sky to do it.
// use a transform to make the sky and base around with the eye point.
|
