csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPFlightSim/Source CSPFlightSim.cpp,1.4,1.5

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7567

Modified Files:
	CSPFlightSim.cpp 
Log Message:
Adding TimeStamp (for particle) and using it instead of SDLTicks


Index: CSPFlightSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/CSPFlightSim.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CSPFlightSim.cpp	13 Dec 2002 01:20:58 -0000	1.4
--- CSPFlightSim.cpp	14 Dec 2002 18:55:07 -0000	1.5
***************
*** 54,58 ****
  
  // urgent to clarify the following or to use a real viewer!
! // it seems that this class looks more and more like an (osgSDL) viewer!
  osg::Timer _timer;
  osg::Timer_t _initialTick, _lastFrameTick, _frameTick;
--- 54,58 ----
  
  // urgent to clarify the following or to use a real viewer!
! // it seems that this class looks more and more like an osg(SDL) viewer!
  osg::Timer _timer;
  osg::Timer_t _initialTick, _lastFrameTick, _frameTick;
***************
*** 484,490 ****
  	Con_rect.w = Con_rect.h = 300;
      
! 	ConsoleFont = DT_LoadFont("Fonts/ConsoleFont.bmp", 0);
  
!     m_pConsole = CON_Init("Fonts/ConsoleFont.bmp", m_SDLScreen, 100, Con_rect);
      CON_Alpha( m_pConsole, 50 );
  
--- 484,490 ----
  	Con_rect.w = Con_rect.h = 300;
      
! 	ConsoleFont = DT_LoadFont("../Data/Fonts/ConsoleFont.bmp", 0);
  
!     m_pConsole = CON_Init("../Data/Fonts/ConsoleFont.bmp", m_SDLScreen, 100, Con_rect);
      CON_Alpha( m_pConsole, 50 );
  

[Csp-commits] APPLICATIONS/CSPFlightSim/Source BaseObject.cpp,1.4,1.5

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7340

Modified Files:
	BaseObject.cpp 
Log Message:
Adding particle test

Index: BaseObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/BaseObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseObject.cpp	13 Dec 2002 01:20:58 -0000	1.4
--- BaseObject.cpp	14 Dec 2002 18:54:13 -0000	1.5
***************
*** 271,275 ****
  }
  
! osgParticle::ParticleSystem *setupParticleSystem(osg::MatrixTransform *base, const osg::Vec4 &colorMin,
  												 const osg::Vec4 &colorMax,
  												 const osg::Vec3 &center, float lifetime)
--- 271,276 ----
  }
  
! osgParticle::ParticleSystem *setupParticleSystem(osg::MatrixTransform *base, const string & p_textureFile,
! 												 const osg::Vec4 &colorMin,
  												 const osg::Vec4 &colorMax,
  												 const osg::Vec3 &center, float lifetime)
***************
*** 279,287 ****
  	ptemp.setLifeTime(lifetime);
  	ptemp.setAlphaRange(osgParticle::rangef(1,0));
! 	ptemp.setMass(0.2);
! 	ptemp.setRadius(0.4);
  	ptemp.setPosition(osg::Vec3(0,0,0));
  	ptemp.setVelocity(osg::Vec3(0,0,0));
! 	ptemp.setSizeRange(osgParticle::rangef(0.55f, 0.3f));
  	ptemp.setColorRange(osgParticle::rangev4(colorMin, colorMax));
  
--- 280,289 ----
  	ptemp.setLifeTime(lifetime);
  	ptemp.setAlphaRange(osgParticle::rangef(1,0));
! 	ptemp.setMass(1.1);
! 	ptemp.setRadius(0.3);
  	ptemp.setPosition(osg::Vec3(0,0,0));
  	ptemp.setVelocity(osg::Vec3(0,0,0));
! 	//ptemp.setSizeRange(osgParticle::rangef(0.55f, 0.3f));
! 	ptemp.setSizeRange(osgParticle::rangef(0.5f, 0.2f));
  	ptemp.setColorRange(osgParticle::rangev4(colorMin, colorMax));
  
***************
*** 290,294 ****
  	//                     bool emissive_particles = true, bool lighting = false, int texture_unit = 0) 
  
! 	ps->setDefaultAttributes("Images/particle.rgb", false);
  	ps->setDefaultParticleTemplate(ptemp);
  	ps->setFreezeOnCull(false);
--- 292,296 ----
  	//                     bool emissive_particles = true, bool lighting = false, int texture_unit = 0) 
  
! 	ps->setDefaultAttributes(p_textureFile, true, true,0);
  	ps->setDefaultParticleTemplate(ptemp);
  	ps->setFreezeOnCull(false);
***************
*** 300,309 ****
  
  	osgParticle::RandomRateCounter *rrc = osgNew osgParticle::RandomRateCounter;
! 	rrc->setRateRange(80, 80);
  
  	osgParticle::RadialShooter *rs = osgNew osgParticle::RadialShooter;
  	rs->setPhiRange(0, 0);
  	rs->setThetaRange(0,0);
! 	rs->setInitialSpeedRange(4, 5);
  
  	osgParticle::ModularEmitter *me = osgNew osgParticle::ModularEmitter;
--- 302,311 ----
  
  	osgParticle::RandomRateCounter *rrc = osgNew osgParticle::RandomRateCounter;
! 	rrc->setRateRange(100, 100);
  
  	osgParticle::RadialShooter *rs = osgNew osgParticle::RadialShooter;
  	rs->setPhiRange(0, 0);
  	rs->setThetaRange(0,0);
! 	rs->setInitialSpeedRange(0, 0);
  
  	osgParticle::ModularEmitter *me = osgNew osgParticle::ModularEmitter;
***************
*** 357,389 ****
  	osg::Vec3 c = s.center();
  
!     osgParticle::ParticleSystem *ps1;
! 	ps1 = setupParticleSystem(m_rpTransform.get(), osg::Vec4(0.2, 0.5, 1, 0.8), osg::Vec4(0,1,0,1), 
! 		                      - osg::Vec3(0,2.0 * r/3.0,1),0.1);
! 	osg::Geode *geode1 = osgNew osg::Geode;
! 	geode1->setName("PlayerParticleSystem");
! 	geode1->addDrawable(ps1);
! 	g_pBattlefield->addNodeToScene(geode1);
! 
! 	osgParticle::ParticleSystem *ps2;
! 	ps2 = setupParticleSystem(m_rpTransform.get(), osg::Vec4(1, 0, 1, 0.8), osg::Vec4(1,1,1,1), 
! 		                      - osg::Vec3(0,3.0*r/4,1),0.1);
! 	osg::Geode *geode2 = osgNew osg::Geode;
! 	geode2->setName("PlayerParticleSystem");
! 	geode2->addDrawable(ps2);
! 	g_pBattlefield->addNodeToScene(geode2);
! 
! 	osgParticle::ParticleSystem *ps3;
! 	ps3 = setupParticleSystem(m_rpTransform.get(), osg::Vec4(1, 0, 1, 0.8), osg::Vec4(1,1,1,1), 
! 		                      - osg::Vec3(0,r,1),0.1);
! 	osg::Geode *geode3 = osgNew osg::Geode;
! 	geode3->setName("PlayerParticleSystem");
! 	geode3->addDrawable(ps3);
! 	g_pBattlefield->addNodeToScene(geode3);
  
  	osgParticle::ParticleSystemUpdater *psu = osgNew osgParticle::ParticleSystemUpdater;
! 	psu->addParticleSystem(ps1);
! 	psu->addParticleSystem(ps2);
! 	psu->addParticleSystem(ps3);
! 	g_pBattlefield->addNodeToScene(psu);
  }
  
--- 359,398 ----
  	osg::Vec3 c = s.center();
  
! 	osg::Vec3Array* pl = osgNew osg::Vec3Array;
! 	
! 	for (unsigned short i = 0; i<10; ++i)
! 	pl->push_back(osg::Vec3(0.0,-(0.8+i/20.0) * r,0.0));
!     
  
  	osgParticle::ParticleSystemUpdater *psu = osgNew osgParticle::ParticleSystemUpdater;
! 
! 	for (i = 0; i<pl->size();++i)
! 	{
! 	osgParticle::ParticleSystem *ps = setupParticleSystem(m_rpTransform.get(),"Images/particle.rgb",
! 		                                                  osg::Vec4(0.2, 0.5, 1, 0.8), 
! 														  osg::Vec4(0,0.5,1,1), 
! 														  (*pl)[i],0.05);
! 	osg::Geode *geode = osgNew osg::Geode;
! 	geode->setName("PlayerParticleSystem");
! 	geode->addDrawable(ps);
! 	g_pBattlefield->addNodeToScene(geode);
! 	psu->addParticleSystem(ps);
! 	}
!     
! 	for (i = 0; i<pl->size();++i)
! 	{
! 	osgParticle::ParticleSystem *ps = setupParticleSystem(m_rpTransform.get(),"Images/smoke.rgb",
! 		                                                  osg::Vec4(0,1,0,1), 
! 														  osg::Vec4(0.2, 0.5, 1, 0.8), 
! 														  (*pl)[i],0.01);
! 	osg::Geode *geode = osgNew osg::Geode;
! 	geode->setName("PlayerParticleSystem");
! 	geode->addDrawable(ps);
! 	g_pBattlefield->addNodeToScene(geode);
! 	psu->addParticleSystem(ps);
! 	}
!     
! 	//g_pBattlefield->addNodeToScene(psu);
!     m_rpTransform.get()->addChild(psu);
  }
  

[Csp-commits] APPLICATIONS/CSPFlightSim/Source AirplaneObject.cpp,1.3,1.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7266

Modified Files:
	AirplaneObject.cpp 
Log Message:
Changing path to Hud data file

Index: AirplaneObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/AirplaneObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AirplaneObject.cpp	12 Dec 2002 21:13:45 -0000	1.3
--- AirplaneObject.cpp	14 Dec 2002 18:53:55 -0000	1.4
***************
*** 112,116 ****
  {
    m_phud = osgNew Hud(m_InitialDirection);
!   m_phud->BuildHud("HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
  }
--- 112,116 ----
  {
    m_phud = osgNew Hud(m_InitialDirection);
!   m_phud->BuildHud("../Data/Scripts/HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
  }

[Csp-commits] APPLICATIONS/CSPFlightSim/Source Platform.cpp,1.1,1.2

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv6756

Modified Files:
	Platform.cpp 
Log Message:
Fixing path separator for windows

Index: Platform.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/Platform.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Platform.cpp	13 Dec 2002 04:36:59 -0000	1.1
--- Platform.cpp	14 Dec 2002 18:51:30 -0000	1.2
***************
*** 39,44 ****
  #include <string.h>
  #include <errno.h>
- #include <unistd.h>
- 
  
  #ifdef NATIVE_WIN32
--- 39,42 ----
***************
*** 51,58 ****
  #    include <io.h>
  #  endif /* _MSC_VER */
! #endif /* NATIVE_WIN32 */
! 
  
! std::string OSPath::basename(const string &path)
  {
  	std::string::size_type base;
--- 49,57 ----
  #    include <io.h>
  #  endif /* _MSC_VER */
! #else /* NATIVE_WIN32 */
! #  include <unistd.h>
! #endif
  
! std::string OSPath::basename(const std::string &path)
  {
  	std::string::size_type base;
***************
*** 143,147 ****
  	char *idx = str;
  	for (; *idx; idx++) {
! 		if (*idx == '\\') *idx = '/';
  	}
  	result = str;
--- 142,146 ----
  	char *idx = str;
  	for (; *idx; idx++) {
! 		if (*idx == '/') *idx = '\\';
  	}
  	result = str;

[Csp-commits] APPLICATIONS/CSPFlightSim/Source trees.cpp,1.3,1.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv6602

Modified Files:
	trees.cpp 
Log Message:
Adding more tree varieties

Index: trees.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/trees.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** trees.cpp	12 Dec 2002 21:13:45 -0000	1.3
--- trees.cpp	14 Dec 2002 18:50:41 -0000	1.4
***************
*** 1,14 ****
! #include "stdinc.h"
! 
! #include <stdlib.h>
  
  #include <osg/Billboard>
! #include <osg/Group>
! #include <osg/Geode>
  #include <osg/Geometry>
  #include <osg/Texture2D>
- #include <osg/TexEnv>
- #include <osg/BlendFunc>
- #include <osg/AlphaFunc>
  
  #include <osgDB/ReadFile>
--- 1,8 ----
! #include <sstream>
  
  #include <osg/Billboard>
! #include <osg/BlendFunc>
  #include <osg/Geometry>
  #include <osg/Texture2D>
  
  #include <osgDB/ReadFile>
***************
*** 99,104 ****
  	for (unsigned short i=0;i<p_ustypeTreeNumber;++i)
  	{
! 		aTree.h = treeHeightFactor * 10.0;
! 		aTree.w = treeWidthFactor  * 5.0;
  		treesArray.push_back(makeTree( aTree));//, osgNew StateSet(*p_pstate[i % 3]) ));
  	}
--- 93,98 ----
  	for (unsigned short i=0;i<p_ustypeTreeNumber;++i)
  	{
! 		aTree.h = treeHeightFactor * 8.0;
! 		aTree.w = treeWidthFactor  * 8.0;
  		treesArray.push_back(makeTree( aTree));//, osgNew StateSet(*p_pstate[i % 3]) ));
  	}
***************
*** 107,111 ****
  }
  
! std::vector<Geometry *> g_treesBase(1);
  
  Node *makeTreesPatch( float xoff, float yoff, float spacing, float width, 
--- 101,105 ----
  }
  
! std::vector<Geometry *> g_treesBase;
  
  Node *makeTreesPatch( float xoff, float yoff, float spacing, float width, 
***************
*** 117,126 ****
  	std::vector<std::string> treefileName;
  
! 	treefileName.push_back("Images/tree0.rgba");
!     treefileName.push_back("Images/tree1.gif");
  	treefileName.push_back("Images/tree2.gif");
  	treefileName.push_back("Images/tree3.gif");
      treefileName.push_back("Images/tree4.gif");
! 
  	unsigned short typeTreeNumber = treefileName.size();
  
--- 111,129 ----
  	std::vector<std::string> treefileName;
  
!     treefileName.push_back("Images/tree0.rgba");
! 
! 	for (i=5;i<15;++i)
! 	{
! 	 std::ostringstream osStream;
! 	 osStream << "Images/tree" << i << ".png";
! 	 string a = osStream.str();
!      treefileName.push_back(osStream.str());
! 	}
!     
! 	treefileName.push_back("Images/tree1.gif");
  	treefileName.push_back("Images/tree2.gif");
  	treefileName.push_back("Images/tree3.gif");
      treefileName.push_back("Images/tree4.gif");
!     
  	unsigned short typeTreeNumber = treefileName.size();
  
***************
*** 161,165 ****
  	jcnt = 10; //height/spacing;
  
! 	if (!g_treesBase[0]) 
  	{
  		g_treesBase = MakeBaseTreeArray(typeTreeNumber,state);
--- 164,168 ----
  	jcnt = 10; //height/spacing;
  
! 	if (g_treesBase.empty()) 
  	{
  		g_treesBase = MakeBaseTreeArray(typeTreeNumber,state);
***************
*** 169,177 ****
  	float baseRadius = 64.0 + 32.0 * RandomNumber();
  
! 	for (j=0;j<jcnt;++j)
  
  	{
  		Billboard *bb = osgNew Billboard;
- 		unsigned short indice;
  		//bb->setMode(osg::Billboard::POINT_ROT_EYE );
  		for (i=0;i<icnt;++i)
--- 172,180 ----
  	float baseRadius = 64.0 + 32.0 * RandomNumber();
  
! 	unsigned short iState = static_cast<unsigned short>(RandomNumber() * typeTreeNumber);
  
+ 	for (j=0;j<jcnt;++j)
  	{
  		Billboard *bb = osgNew Billboard;
  		//bb->setMode(osg::Billboard::POINT_ROT_EYE );
  		for (i=0;i<icnt;++i)
***************
*** 185,190 ****
  			y = fmod(y, 64000.0f);
  			Vec3 pos(x,y,z);
! 			
! 			indice = (2 * count) % typeTreeNumber;
  			Geometry * aGSet = osgNew Geometry(*g_treesBase[indice]);
              bb->addDrawable( aGSet, pos );
--- 188,192 ----
  			y = fmod(y, 64000.0f);
  			Vec3 pos(x,y,z);
! 			unsigned short indice = (2 * count) % typeTreeNumber;
  			Geometry * aGSet = osgNew Geometry(*g_treesBase[indice]);
              bb->addDrawable( aGSet, pos );
***************
*** 193,197 ****
  		group->addChild( bb );
  	}
!     group->setStateSet( state[static_cast<unsigned short>(RandomNumber() * typeTreeNumber)] );
      return group;
  }
--- 195,199 ----
  		group->addChild( bb );
  	}
! 	group->setStateSet( state[iState] );
      return group;
  }

[Csp-commits] APPLICATIONS/CSPFlightSim/Source HudTextElement.cpp,1.3,1.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv6277

Modified Files:
	HudTextElement.cpp 
Log Message:
Fixing a hud text orientation problem

Index: HudTextElement.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/HudTextElement.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HudTextElement.cpp	13 Dec 2002 01:20:58 -0000	1.3
--- HudTextElement.cpp	14 Dec 2002 18:49:07 -0000	1.4
***************
*** 75,79 ****
      setDrawMode( osgText::Text::TEXT );
      setAlignment(osgText::Text::LEFT_BOTTOM);
- 	//setAxisAlignment(XZ_PLANE);
  	setColor(fontColor);	
  	setPosition(p_position);
--- 75,78 ----

[Csp-commits] APPLICATIONS/CSPFlightSim/Include BaseObject.h,1.5,1.6

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv5993

Modified Files:
	BaseObject.h 
Log Message:
Compatiblity patch to osg 0.9.2 with respect to osg::Switch

Index: BaseObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include/BaseObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BaseObject.h	13 Dec 2002 01:20:57 -0000	1.5
--- BaseObject.h	14 Dec 2002 18:47:53 -0000	1.6
***************
*** 129,133 ****
    void ShowRepresentant(unsigned short const p_usflag)
    {
!     //m_rpSwitch->setAllChildrenOff();
      m_rpSwitch->setValue(1-p_usflag, false);
      m_rpSwitch->setValue(p_usflag, true);
--- 129,133 ----
    void ShowRepresentant(unsigned short const p_usflag)
    {
! 	//m_rpSwitch->setAllChildrenOff();
      m_rpSwitch->setValue(1-p_usflag, false);
      m_rpSwitch->setValue(p_usflag, true);

[Csp-commits] APPLICATIONS/CSPFlightSim/Include Platform.h,1.1,1.2

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv5871

Modified Files:
	Platform.h 
Log Message:
Fixing a windows separator problem

Index: Platform.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include/Platform.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Platform.h	13 Dec 2002 04:36:37 -0000	1.1
--- Platform.h	14 Dec 2002 18:47:02 -0000	1.2
***************
*** 48,52 ****
  	 * Example: basename("/usr/local/csp") returns "csp"
  	 */
! 	static std::string basename(const string &path);
  	
  	/**
--- 48,52 ----
  	 * Example: basename("/usr/local/csp") returns "csp"
  	 */
! 	static std::string basename(const std::string &path);
  	
  	/**

[Csp-commits] APPLICATIONS/CSPFlightSim/BuildMSVC CSPFlightSim.dsp,1.2,1.3

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/BuildMSVC
In directory sc8-pr-cvs1:/tmp/cvs-serv5500

Modified Files:
	CSPFlightSim.dsp 
Log Message:
add osgParticle linking
update directories configuration

Index: CSPFlightSim.dsp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/BuildMSVC/CSPFlightSim.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CSPFlightSim.dsp	5 Dec 2002 04:05:18 -0000	1.2
--- CSPFlightSim.dsp	14 Dec 2002 18:44:55 -0000	1.3
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /Od /I "../Include" /I "../../../THIRDPARTYLIBS/Include" /I "../../../THIRDPARTYLIBS/demeter" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /Od /Ob2 /I "../Include" /I "../../../THIRDPARTYLIBS/Include" /I "../../../THIRDPARTYLIBS/demeter" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 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 osgparticle.lib osgtext.lib demetervisualc6.lib osg.lib osgUtil.lib osgDb.lib SDL.lib SDLMain.lib opengl32.lib glaux.lib glu32.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 DemeterVisualC6.lib SDL_Console.lib gdal_i.lib /nologo /subsystem:windows /debug /machine:I386 /out:"../DemoPackage/CSPFlightSim_Release.exe" /pdbtype:sept /libpath:"../../../THIRDPARTYLIBS/lib"
  # SUBTRACT LINK32 /map
  
--- 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 osgparticle.lib osgtext.lib demetervisualc6.lib osg.lib osgUtil.lib osgDb.lib SDL.lib SDLMain.lib opengl32.lib glaux.lib glu32.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 DemeterVisualC6.lib SDL_Console.lib gdal_i.lib /nologo /subsystem:windows /debug /machine:I386 /out:"../Bin/CSPFlightSim_Release.exe" /pdbtype:sept /libpath:"../../../THIRDPARTYLIBS/lib"
  # SUBTRACT LINK32 /map
  
***************
*** 83,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 osgParticled.lib gdal_i.lib osgd.lib osgDBd.lib SDL_console.lib SDLd.lib opengl32.lib osgTextd.lib DemeterVisualC6d.lib osgUtild.lib SDLmaind.lib /nologo /subsystem:windows /incremental:no /pdb:"../DemoPackage/CSPFlightSim_Debug.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../DemoPackage/CSPFlightSim_Debug.exe" /pdbtype:sept /libpath:"..\..\..\THIRDPARTYLIBS\lib"
  # SUBTRACT LINK32 /pdb:none
  
--- 83,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 osgParticled.lib gdal_i.lib osgd.lib osgDBd.lib SDL_console.lib SDLd.lib opengl32.lib osgTextd.lib DemeterVisualC6d.lib osgUtild.lib SDLmaind.lib /nologo /subsystem:windows /incremental:no /pdb:"../DemoPackage/CSPFlightSim_Debug.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../Bin/CSPFlightSim_Debug.exe" /pdbtype:sept /libpath:"..\..\..\THIRDPARTYLIBS\lib"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 259,262 ****
--- 259,266 ----
  # Begin Source File
  
+ SOURCE=..\Source\Platform.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Source\ProjectileController.cpp
  # End Source File
***************
*** 404,407 ****
--- 408,415 ----
  # Begin Source File
  
+ SOURCE=..\Include\BasePhysics.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Include\BaseScreen.h
  # End Source File
***************
*** 420,423 ****
--- 428,435 ----
  # Begin Source File
  
+ SOURCE=..\..\..\THIRDPARTYLIBS\include\CON_console.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Include\Config.h
  # End Source File
***************
*** 521,524 ****
--- 533,540 ----
  
  SOURCE=..\Include\ParticleObject.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\Include\Platform.h
  # End Source File
  # Begin Source File

[Csp-commits] APPLICATIONS/CSPFlightSim/Source GlobalCommands.cpp,1.4,1.5 Makefile,1.3,1.4 TerrainObject.cpp,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv13038

Modified Files:
	GlobalCommands.cpp Makefile TerrainObject.cpp 
Log Message:
scripts now searched for in ./scripts

Index: GlobalCommands.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/GlobalCommands.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GlobalCommands.cpp	12 Dec 2002 21:13:45 -0000	1.4
--- GlobalCommands.cpp	13 Dec 2002 04:39:06 -0000	1.5
***************
*** 4,7 ****
--- 4,8 ----
  
  #include "global.h"
+ #include "Platform.h"
  #include "GlobalCommands.h"
  #include "VirtualBattlefield.h"
***************
*** 96,105 ****
  
      char buff[255];
  
      // open file
!     ifstream file(args[0].c_str());
      if (!file)
      {
!         return "Unable to find script file " + args[0];
      }
  
--- 97,115 ----
  
      char buff[255];
+     string path = args[0];
+     
+     if (!OSPath::isabs(path)) {
+     	string base;
+ 	base = OSPath::join(".", "scripts");
+ 	path = OSPath::join(base, path);
+     }
+ 
+     path = OSPath::filter(path);
  
      // open file
!     ifstream file(path.c_str());
      if (!file)
      {
!         return "Unable to find script file " + path;
      }
  

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	13 Dec 2002 01:20:58 -0000	1.3
--- Makefile	13 Dec 2002 04:39:06 -0000	1.4
***************
*** 79,82 ****
--- 79,83 ----
  	./ObjectTypeSymbol.cpp \
  	./ParticleObject.cpp \
+ 	./Platform.cpp \
  	./ProjectileController.cpp \
  	./ProjectileObject.cpp \

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/TerrainObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TerrainObject.cpp	12 Dec 2002 21:13:45 -0000	1.3
--- TerrainObject.cpp	13 Dec 2002 04:39:06 -0000	1.4
***************
*** 309,320 ****
  void TerrainObject::UpdateDemeterSettings()
  {
!     #ifdef _WIN32
!         char fileSeparator = '\\';
!     #else
!         char fileSeparator = '/';
!     #endif
!         char szMediaPath[9];
  
! 	sprintf(szMediaPath,".%cterrain%c",fileSeparator,fileSeparator);
      Demeter::Settings::GetInstance()->SetMediaPath(szMediaPath);
  
--- 309,315 ----
  void TerrainObject::UpdateDemeterSettings()
  {
!     char szMediaPath[9];
  
!     sprintf(szMediaPath,".%cterrain%c",DIR_SEPARATOR,DIR_SEPARATOR);
      Demeter::Settings::GetInstance()->SetMediaPath(szMediaPath);
  

[Csp-commits] APPLICATIONS/CSPFlightSim/Include stdinc.h,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv12782

Modified Files:
	stdinc.h 
Log Message:
include Platform.h

Index: stdinc.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include/stdinc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stdinc.h	12 Dec 2002 21:10:17 -0000	1.3
--- stdinc.h	13 Dec 2002 04:37:43 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  #include <fcntl.h>
  
+ #include "Platform.h"
  #include "Config.h"
  #include "LogStream.h"

[Csp-commits] APPLICATIONS/CSPFlightSim/Source Platform.cpp,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv12627

Added Files:
	Platform.cpp 
Log Message:
simple, platform-independent utility functions

--- NEW FILE: Platform.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 Platform.h
 * 
 * Basic definitions and classes for platform independence.
 *
 * The routines here are extracted from GLib and modified to handle
 * just a subset of typical cross-platform needs.
 *
 * Glib is Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and 
 * Josh MacDonald
 *
 */


#include "Platform.h"

#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>


#ifdef NATIVE_WIN32
#  define STRICT			/* Strict typing, please */
#  include <windows.h>
#  include <direct.h>
#  include <errno.h>
#  include <ctype.h>
#  ifdef _MSC_VER
#    include <io.h>
#  endif /* _MSC_VER */
#endif /* NATIVE_WIN32 */


std::string OSPath::basename(const string &path)
{
	std::string::size_type base;
	base = path.rfind(DIR_SEPARATOR);
	if (base != std::string::npos) {
		return path.substr(base+1);
	}
#ifdef NATIVE_WIN32
	if (path.length() > 1 && isalpha(path[0]) && path[1] == ':') {
		return path.substr(2);
	}
#endif /* NATIVE_WIN32 */
	return path;
}

bool OSPath::isabs(const std::string &path)
{
	int n = path.length();
	if (n==0) {
		return false;
	}
	if (path[0] == DIR_SEPARATOR) {
		return true;
	}
	#ifdef NATIVE_WIN32
	if (n > 2 && isalpha(path[0]) && path[1] == ':' && path[2] == DIR_SEPARATOR) {
		return TRUE;
	}
	#endif /* NATIVE_WIN32 */
	return false;
}

std::string OSPath::skiproot(const std::string &path) {
	int n = path.length();
	if (n > 0 && path[0] == DIR_SEPARATOR) {
		return path.substr(1);
	}
#ifdef NATIVE_WIN32
	if (n > 2 && isalpha(path[0]) && path[1] == ':' && path[2] == DIR_SEPARATOR) {
		return path.substr(3);
	}
#endif
	return path;
}

std::string OSPath::dirname(const std::string &path) {
	std::string::size_type base;
	base = path.rfind(DIR_SEPARATOR);
	if (base == std::string::npos) {
		return ".";
	}
	return path.substr(0, base-1);
}

std::string OSPath::currentdir() {
	std::string dir;
	dir = DIR_SEPARATOR;
	char *buffer = getcwd(0, 0);
	if (buffer) {
		dir = buffer;
		free(buffer);
	}
	return dir;
}

std::string OSPath::ext(const std::string &path) {
	std::string::size_type ext;
	ext = path.find_last_of("."+DIR_SEPARATOR);
	if (ext != std::string::npos && path[ext]=='.') {
		return path.substr(ext);
	}
	return "";
}

std::string OSPath::join(const std::string &a, const std::string &b) {
	std::string result;
	std::string::size_type idx;
	idx = a.length();
	if (idx > 0 && a[idx-1] == DIR_SEPARATOR) idx--;
	result = a.substr(0, idx);
	return result + DIR_SEPARATOR + skiproot(b);
}

std::string OSPath::stringreplace(const std::string &path, char search, char replace) {
	if (search == replace) return path;
	std::string result;
	char *str = strdup(path.c_str());
	char *idx = str;
	for (; *idx; idx++) {
		if (*idx == '\\') *idx = '/';
	}
	result = str;
	free(str);
	return result;
}
	
std::string OSPath::normalize(const std::string &path) {
	return stringreplace(path, '\\', '/');
}

std::string OSPath::denormalize(const std::string &path) {
	return stringreplace(path, '/', DIR_SEPARATOR);
}

std::string OSPath::filter(const std::string &path) {
	return denormalize(normalize(path));
}

[Csp-commits] APPLICATIONS/CSPFlightSim/Include Platform.h,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv12555

Added Files:
	Platform.h 
Log Message:
simple, platform-independent utility functions

--- NEW FILE: Platform.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 Platform.h
 * 
 * Basic definitions and classes for platform independence.
 **/

#ifndef __PLATFORM_H__
#define __PLATFORM_H__

#ifdef _WIN32
  #define NATIVE_WIN32
  #define DIR_SEPARATOR '\\'
#else
  #define DIR_SEPARATOR '/'
#endif

#include <string>

/**
 * Platform independent file path manipulation routines.
 *
 * @author Mark Rose <mr...@st...>
 */
class OSPath {
public:
	/**
	 * Return the basename of pathname path.
	 *
	 * Example: basename("/usr/local/csp") returns "csp"
	 */
	static std::string basename(const string &path);
	
	/**
	 * Returns true if path is an absolute pathname.
	 */
	static bool isabs(const std::string &path);
	
	/**
	 * Strips leading drive specifier and root directory marker.
	 *
	 * Examples: 
	 * 	skiproot("c:\\windows") == "windows"
	 * 	skiproot("/linux/csp") == "linux/csp"
	 */
	static std::string skiproot(const std::string &path);
	
	/**
	 * Returns the directory name of pathname path.
	 *
	 * Example: dirname("/usr/local/csp") returns "/usr/local"
	 */
	static std::string dirname(const std::string &path);
	
	/**
	 * Returns the current working directory.
	 */
	static std::string currentdir();
	
	/**
	 * Returns the (last) extension of pathname path.
	 *
	 * Example: ext("/usr/local/script.csp") returns ".csp"
	 */
	static std::string ext(const std::string &path);
	
	/**
	 * Intelligently joins two path components into a pathname.
	 *
	 * Examples: 
	 *     join("/usr/local", "lib") returns "/usr/local/lib"
	 *     join("c:\\windows\\", "system") returns "c:\\windows\\system"
	 */
	static std::string join(const std::string &a, const std::string &b);
	
	/**
	 * Substitute characters in a string.
	 *
	 * This routine is slightly out of place.  Can we find a substitute or better 
	 * home for it?
	 *
	 * @param search The character to replace.
	 * @param replace The replacement character.
	 */
	static std::string stringreplace(const std::string &path, char search, char replace);
	
	/**
	 * Convert a native path to a standard format (uses '/' instead of '\')
	 *
	 * Note: does *not* handle directory names under windows.
	 */
	static std::string normalize(const std::string &path);
	
	/**
	 * Convert a normalized path to the native format.
	 */
	static std::string denormalize(const std::string &path);
	
	/**
	 * Filter an input path to use the native directory separation character.
	 */
	static std::string filter(const std::string &path);

};


#endif // __PLATFORM_H__

[Csp-commits] APPLICATIONS/CSPFlightSim/Source BaseObject.cpp,1.3,1.4 CSPFlightSim.cpp,1.3,1.4 HudTextElement.cpp,1.2,1.3 Makefile,1.2,1.3 VirtualBattlefield.cpp,1.3,1.4

[<mk...@us...>]

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.

[Csp-commits] APPLICATIONS/CSPFlightSim/scripts AeroM2k.csp,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv28509/CSPFlightSim/scripts

Modified Files:
	AeroM2k.csp 
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: AeroM2k.csp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/scripts/AeroM2k.csp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AeroM2k.csp	5 Dec 2002 04:09:41 -0000	1.2
--- AeroM2k.csp	13 Dec 2002 01:20:59 -0000	1.3
***************
*** 1,81 ****
! REM Mirage 2000 aerodynamics model
! REM many parameters are estimates.
! 
! Add Aero M2K_aero
! 
! REM Wing geometry
! set M2K_aero WingSpan 9.13
! set M2K_aero WingChord 4.5
! set M2K_aero WingArea 41.0
! 
! REM Control surfaces min/max angles
! Set M2K_aero demax        25.0
! Set M2K_aero demin        -16.0
! Set M2K_aero damax        +17.5
! Set M2K_aero damin        -17.5
! Set M2K_aero drmax        +20.0
! Set M2K_aero drmin        -20.0
! 
! REM A=0.9 10^4 kg m²       A -F -E
! REM C=6.0 10^4 kg m²  I = -F  B -D
! REM B=5.4 10^4 Kg m²      -E -D  C
! REM E=1.8 10^3 kg m²
! 
! REM Mass/Inertial properties
! REM max mass
! REM Set M2K_aero Mass         17500.0
! REM interceptor mass with a central tank
! Set M2K_aero Mass         12000.0
! REM interceptor mass
! REM Set M2K_aero Mass         7500.0
! 
! Set M2K_aero I_XX        20354.0
! Set M2K_aero I_YY        135691.0
! Set M2K_aero I_ZZ        135691.0
! Set M2K_aero I_XZ         6785.0
! 
! Set M2K_aero GMIN      -3.0
! Set M2K_aero GMAX       9.0
! 
! Set M2K_aero ThrustMax 9700.0
! 
! REM Drag Parameters cx0 = 2 *  0.074 / ( rc^0.2 ) ; Cx=Cx0+KiCz² Ki(trainee induite) 1/pi*AR
! Set M2K_aero CD0          0.004
! Set M2K_aero CD_a         0.3
! Set M2K_aero CD_de        0.1
! 
! REM Lift Parameters
! Set M2K_aero StallAOA     31.0
! Set M2K_aero CL0          0.0
! Set M2K_aero CL_a         2.2
! Set M2K_aero CL_adot      0.01
! Set M2K_aero CL_q         0.1
! Set M2K_aero CL_de        0.7
! 
! REM Pitch Moment Parameters
! Set M2K_aero CM0          0.0
! Set M2K_aero CM_a         -0.38
! Set M2K_aero CM_adot      -1.1
! Set M2K_aero CM_q         -3.6
! Set M2K_aero CM_de        0.05
! 
! REM Side Force Parameters
! Set M2K_aero CY_Beta      -0.98
! Set M2K_aero CY_p          0.0
! Set M2K_aero CY_r          0.0
! Set M2K_aero CY_da         0.0
! Set M2K_aero CY_dr         0.05
! 
! REM Roll moment parameters
! Set M2K_aero CI_beta       -0.12
! Set M2K_aero CI_p          -0.26
! Set M2K_aero CI_r           0.14
! Set M2K_aero CI_da         0.02
! Set M2K_aero CI_dr         -0.001
! 
! Rem Yaw Moment Parameters
! Set M2K_aero Cn_beta       0.25
! Set M2K_aero Cn_p          0.022
! Set M2K_aero Cn_r          -0.35
! Set M2K_aero Cn_da         0.00
! Set M2K_aero Cn_dr         0.01
--- 1,81 ----
! REM Mirage 2000 aerodynamics model
! REM many parameters are estimates.
! 
! Add Aero M2K_aero
! 
! REM Wing geometry
! set M2K_aero WingSpan 9.13
! set M2K_aero WingChord 4.5
! set M2K_aero WingArea 41.0
! 
! REM Control surfaces min/max angles
! Set M2K_aero demax        25.0
! Set M2K_aero demin        -16.0
! Set M2K_aero damax        +17.5
! Set M2K_aero damin        -17.5
! Set M2K_aero drmax        +20.0
! Set M2K_aero drmin        -20.0
! 
! REM A=0.9 10^4 kg m²       A -F -E
! REM C=6.0 10^4 kg m²  I = -F  B -D
! REM B=5.4 10^4 Kg m²      -E -D  C
! REM E=1.8 10^3 kg m²
! 
! REM Mass/Inertial properties
! REM max mass
! REM Set M2K_aero Mass         17500.0
! REM interceptor mass with a central tank
! Set M2K_aero Mass         12000.0
! REM interceptor mass
! REM Set M2K_aero Mass         7500.0
! 
! Set M2K_aero I_XX        20354.0
! Set M2K_aero I_YY        135691.0
! Set M2K_aero I_ZZ        135691.0
! Set M2K_aero I_XZ         6785.0
! 
! Set M2K_aero GMIN      -3.0
! Set M2K_aero GMAX       9.0
! 
! Set M2K_aero ThrustMax 9700.0
! 
! REM Drag Parameters cx0 = 2 *  0.074 / ( rc^0.2 ) ; Cx=Cx0+KiCz² Ki(trainee induite) 1/pi*AR
! Set M2K_aero CD0          0.01
! Set M2K_aero CD_a         0.3
! Set M2K_aero CD_de        0.02
! 
! REM Lift Parameters
! Set M2K_aero StallAOA     31.0
! Set M2K_aero CL0          0.0
! Set M2K_aero CL_a         2.2
! Set M2K_aero CL_adot      1.29
! Set M2K_aero CL_q         1.5
! Set M2K_aero CL_de        0.7
! 
! REM Pitch Moment Parameters
! Set M2K_aero CM0          0.0
! Set M2K_aero CM_a         -0.38
! Set M2K_aero CM_adot      -1.73
! Set M2K_aero CM_q         -3.6
! Set M2K_aero CM_de        0.48
! 
! REM Side Force Parameters
! Set M2K_aero CY_Beta      -0.29
! Set M2K_aero CY_p          0.11
! Set M2K_aero CY_r          0.0
! Set M2K_aero CY_da         0.0
! REM Set M2K_aero CY_dr         -0.01
! 
! REM Roll moment parameters
! Set M2K_aero CI_beta       -0.17
! Set M2K_aero CI_p          -0.3
! Set M2K_aero CI_r           0.3
! Set M2K_aero CI_da          0.03
! Set M2K_aero CI_dr          0.0
! 
! Rem Yaw Moment Parameters
! Set M2K_aero Cn_beta       0.25
! Set M2K_aero Cn_p          0.0
! Set M2K_aero Cn_r          -0.99
! Set M2K_aero Cn_da         0.00
! Set M2K_aero Cn_dr         0.02

[Csp-commits] APPLICATIONS/CSPFlightSim/Include BaseObject.h,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv28509/CSPFlightSim/Include

Modified Files:
	BaseObject.h 
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.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Include/BaseObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseObject.h	12 Dec 2002 21:10:16 -0000	1.4
--- BaseObject.h	13 Dec 2002 01:20:57 -0000	1.5
***************
*** 129,133 ****
    void ShowRepresentant(unsigned short const p_usflag)
    {
! 	m_rpSwitch->setAllChildrenOff();
      m_rpSwitch->setValue(p_usflag, true);
    }
--- 129,134 ----
    void ShowRepresentant(unsigned short const p_usflag)
    {
!     //m_rpSwitch->setAllChildrenOff();
!     m_rpSwitch->setValue(1-p_usflag, false);
      m_rpSwitch->setValue(p_usflag, true);
    }

[Csp-commits] THIRDPARTYLIBS/demeter configure.in,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv15752

Modified Files:
	configure.in 
Log Message:
Another test commit to test syncmail logging to csp...@li... (no changes).

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in	9 Dec 2002 02:58:26 -0000	1.3
--- configure.in	9 Dec 2002 03:06:27 -0000	1.4
***************
*** 32,36 ****
  
  # Checks for other libraries
! # CSP_TEST_SDL(1.2.5)
  CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [CSP_SDL_ERROR])
  
--- 32,36 ----
  
  # Checks for other libraries
! #CSP_TEST_SDL(1.2.5)
  CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [CSP_SDL_ERROR])
  

[Csp-commits] THIRDPARTYLIBS/demeter configure.in,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv13665

Modified Files:
	configure.in 
Log Message:
Test commit to test syncmail logging to csp...@li... (no changes).

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	9 Dec 2002 01:33:51 -0000	1.2
--- configure.in	9 Dec 2002 02:58:26 -0000	1.3
***************
*** 32,36 ****
  
  # Checks for other libraries
! #CSP_TEST_SDL(1.2.5)
  CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [CSP_SDL_ERROR])
  
--- 32,36 ----
  
  # Checks for other libraries
! # CSP_TEST_SDL(1.2.5)
  CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [CSP_SDL_ERROR])