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: <on...@vi...> - 2004-04-17 10:45:57
|
Author: onsight Date: 2004-04-17 03:45:48 -0700 (Sat, 17 Apr 2004) New Revision: 706 Modified: trunk/CSP/Demeter/README Log: Modified: trunk/CSP/Demeter/README =================================================================== --- trunk/CSP/Demeter/README 2004-04-12 06:30:48 UTC (rev 705) +++ trunk/CSP/Demeter/README 2004-04-17 10:45:48 UTC (rev 706) @@ -1,4 +1,4 @@ -Demeter-CSP +Demeter-CSP Adapted from the Demeter Terrain Visualization Library by Clay Fowler Copyright (C) 2002 Clay Fowler <http://www.terrainengine.com/> |
|
From: <de...@us...> - 2004-04-17 08:08:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13440 Modified Files: CHANGES.current Log Message: no message Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** CHANGES.current 7 Apr 2004 12:55:06 -0000 1.87 --- CHANGES.current 17 Apr 2004 08:08:11 -0000 1.88 *************** *** 2,5 **** --- 2,18 ---- =========================== + 2004-04-17: delta + * Changes COLOR to COLOR0 to enforce arbvp1 compatibility in + nvMorph.cg. + + * Added a debug project file for heightfield_shader. + + * Removed osgProducer dependency on CSPSimDLL (not needed yet). + + * Commented out thread managing in LogoScreen.cpp. + + * Increased the number of local steps in + void AircraftPhysicsModel::doSimStep(double dt). + 2004-04-07: delta * Corrected a bug in the handling of mouse's scroll up/down. *************** *** 78,87 **** * Other minor changes. ! 2004-01-23: delta * Changed <python.h> to <Python.h> in ! APPLICATIONS/CSPSim/Source/CSPSim.cpp (suggested by Wolverine69). 2003-12-30: delta ! * Added methods in VirtualScene to access perspective matrix. 2003-12-29: delta --- 91,100 ---- * Other minor changes. ! 2004-01-23: delta (suggested by Wolverine69) * Changed <python.h> to <Python.h> in ! APPLICATIONS/CSPSim/Source/CSPSim.cpp. 2003-12-30: delta ! * Added methods in VirtualScene to access projection/mv matrix. 2003-12-29: delta *************** *** 96,101 **** 2003-12-22: delta ! * Reimplemented LogoScreen ala osg. A sequence of screens is ! loaded. ==========> All users, update APPLICATIONS/CSPSim/Data/Images. --- 109,114 ---- 2003-12-22: delta ! * Reimplemented LogoScreen a la osg. A sequence of screens is ! now loaded. ==========> All users, update APPLICATIONS/CSPSim/Data/Images. |
|
From: <de...@us...> - 2004-04-17 08:02:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12625 Modified Files: LogoScreen.h Log Message: see CHANGES.current Index: LogoScreen.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LogoScreen.h 3 Apr 2004 23:49:50 -0000 1.10 --- LogoScreen.h 17 Apr 2004 08:02:00 -0000 1.11 *************** *** 30,34 **** #include <osg/ref_ptr> ! #include <osgProducer/Viewer> namespace osg { --- 30,34 ---- #include <osg/ref_ptr> ! //#include <osgProducer/Viewer> namespace osg { |
|
From: <de...@us...> - 2004-04-17 08:01:00
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12463 Modified Files: AircraftPhysicsModel.cpp Log Message: see CHANGES.current Index: AircraftPhysicsModel.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftPhysicsModel.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AircraftPhysicsModel.cpp 7 Apr 2004 12:52:15 -0000 1.9 --- AircraftPhysicsModel.cpp 17 Apr 2004 08:00:48 -0000 1.10 *************** *** 112,116 **** if (dt == 0.0) dt = 0.017; //unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1; ! unsigned short n = std::min<unsigned short>(10,static_cast<unsigned short>(600 * dt)) + 1; double dtlocal = dt/n; std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal)); --- 112,116 ---- if (dt == 0.0) dt = 0.017; //unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1; ! unsigned short n = std::min<unsigned short>(11,static_cast<unsigned short>(850 * dt)) + 1; double dtlocal = dt/n; std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal)); |
|
From: <de...@us...> - 2004-04-17 07:58:23
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11974 Modified Files: LogoScreen.cpp Log Message: see CHANGES.current Index: LogoScreen.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** LogoScreen.cpp 3 Apr 2004 22:15:21 -0000 1.18 --- LogoScreen.cpp 17 Apr 2004 07:58:14 -0000 1.19 *************** *** 45,49 **** #include "Exception.h" ! extern OpenThreads::Barrier bar; LogoScreen::LogoScreen(int width, int height) { --- 45,49 ---- #include "Exception.h" ! //extern OpenThreads::Barrier bar; LogoScreen::LogoScreen(int width, int height) { |
|
From: <de...@us...> - 2004-04-17 07:51:52
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11084 Modified Files: CSPSimDLL.vcproj Log Message: see CHANGES.current Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CSPSimDLL.vcproj 3 Apr 2004 22:20:11 -0000 1.19 --- CSPSimDLL.vcproj 17 Apr 2004 07:51:44 -0000 1.20 *************** *** 122,126 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgProducer.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" --- 122,126 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" *************** *** 209,212 **** --- 209,222 ---- <File RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File |
|
From: <de...@us...> - 2004-04-17 07:49:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_shader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10782 Modified Files: heightfield_shader.vcproj Log Message: Added a debuug project file Index: heightfield_shader.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_shader/heightfield_shader.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** heightfield_shader.vcproj 7 Jan 2004 19:50:30 -0000 1.1 --- heightfield_shader.vcproj 17 Apr 2004 07:49:43 -0000 1.2 *************** *** 18,23 **** <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".." ! PreprocessorDefinitions="WIN32"/> <Tool Name="VCCustomBuildTool"/> --- 18,25 ---- <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories=".." ! PreprocessorDefinitions="WIN32" ! DebugInformationFormat="4"/> <Tool Name="VCCustomBuildTool"/> *************** *** 25,29 **** Name="VCLinkerTool" AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib" ! AdditionalLibraryDirectories="../lib"/> <Tool Name="VCMIDLTool"/> --- 27,36 ---- Name="VCLinkerTool" AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib" ! OutputFile="../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories="../lib" ! GenerateDebugInformation="TRUE" ! AssemblyDebug="1" ! GenerateMapFile="TRUE" ! MapLines="FALSE"/> <Tool Name="VCMIDLTool"/> |
|
From: <de...@us...> - 2004-04-17 07:48:13
|
Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10559 Modified Files: nvMorph.cg Log Message: Changed COLOR to COLOR0 to enforce arbvp1 compatibility Index: nvMorph.cg =================================================================== RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod/nvMorph.cg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nvMorph.cg 19 Jun 2003 17:42:57 -0000 1.1 --- nvMorph.cg 17 Apr 2004 07:48:02 -0000 1.2 *************** *** 1,65 **** ! // ! // nvMorph ! // ! // Copyright 2003 Mark Rose <mk...@us...> ! // ! // ! ! struct dataIn ! { ! float4 pos : POSITION; // vertex position, y delta in w ! float4 color : COLOR; ! }; ! ! struct dataOut ! { ! float4 pos : POSITION; ! float4 color : COLOR; ! float4 tex0 : TEXCOORD0; ! float4 tex1 : TEXCOORD1; ! float4 tex2 : TEXCOORD2; ! float4 tex3 : TEXCOORD3; ! float4 fogc : FOGC; }; ! ! dataOut main (dataIn IN, ! uniform float4x4 mvp, ! uniform float4x4 mv, ! uniform float4 texgen0, ! uniform float4 texgen1, ! uniform float4 texgen2, ! uniform float4 texgen3, ! uniform float3 scaleVal, // sx, vertscale, sy ! uniform float3 offsetVal, // offx, (1 - morph_factor), offy ! uniform float4 gfog) ! { ! dataOut OUT; ! ! // morph ! float4 morph = float4(0.0, 0.0, 0.0f, 1.0f); ! morph.xz = offsetVal.xz + IN.pos.xz * scaleVal.xz; morph.y = (IN.pos.y + IN.pos.w * offsetVal.y) * scaleVal.y; ! ! // texgen ! ! OUT.tex0.xy = (IN.pos.xz * texgen0.xy) + texgen0.zw; ! OUT.tex1.xy = (IN.pos.xz - texgen1.zw) * texgen1.xy; ! OUT.tex2.xy = (IN.pos.xz - texgen2.zw) * texgen2.xy; OUT.tex3.xy = (IN.pos.xz - texgen3.zw) * texgen3.xy; ! ! float4 view = mul (mv, morph); ! ! float4 place = mul (mvp, morph); ! ! float fogh = max(0.0, 1.0 - morph.y * gfog.x) * gfog.y; float fogf = length(view) + fogh; ! ! OUT.pos = place; OUT.fogc.xyzw = fogf; ! ! //OUT.color = IN.color; //float4(1.0f,1.0f,1.0f,1.0f); OUT.color = float4(1.0f,1.0f,1.0f,1.0f); ! ! return OUT; } --- 1,55 ---- ! // ! // nvMorph ! // ! // Copyright 2003 Mark Rose <mk...@us...> ! // ! // ! ! struct dataIn ! { ! float4 pos : POSITION; // vertex position, y delta in w ! float4 color : COLOR0; ! }; ! struct dataOut ! { ! float4 pos : POSITION; ! float4 color : COLOR0; ! float4 tex0 : TEXCOORD0; ! float4 tex1 : TEXCOORD1; ! float4 tex2 : TEXCOORD2; ! float4 tex3 : TEXCOORD3; ! float4 fogc : FOGC; }; ! dataOut main (dataIn IN, ! uniform float4x4 mvp, ! uniform float4x4 mv, ! uniform float4 texgen0, ! uniform float4 texgen1, ! uniform float4 texgen2, ! uniform float4 texgen3, ! uniform float3 scaleVal, // sx, vertscale, sy ! uniform float3 offsetVal, // offx, (1 - morph_factor), offy ! uniform float4 gfog) ! { ! dataOut OUT; ! ! // morph ! float4 morph = float4(0.0, 0.0, 0.0f, 1.0f); ! morph.xz = offsetVal.xz + IN.pos.xz * scaleVal.xz; morph.y = (IN.pos.y + IN.pos.w * offsetVal.y) * scaleVal.y; ! // texgen ! OUT.tex0.xy = (IN.pos.xz * texgen0.xy) + texgen0.zw; ! OUT.tex1.xy = (IN.pos.xz - texgen1.zw) * texgen1.xy; ! OUT.tex2.xy = (IN.pos.xz - texgen2.zw) * texgen2.xy; OUT.tex3.xy = (IN.pos.xz - texgen3.zw) * texgen3.xy; ! float4 view = mul (mv, morph); ! float4 place = mul (mvp, morph); ! float fogh = max(0.0, 1.0 - morph.y * gfog.x) * gfog.y; float fogf = length(view) + fogh; ! OUT.pos = place; OUT.fogc.xyzw = fogf; ! //OUT.color = IN.color; //float4(1.0f,1.0f,1.0f,1.0f); OUT.color = float4(1.0f,1.0f,1.0f,1.0f); ! return OUT; } |
|
From: /usr/local/lib/subversion/commit-email.pl: `/usr/bin/s. i. /home/svn/c. -r 7. f. w. t. output: - 2004-04-12 02:52:53
|
Author: /usr/local/lib/subversion/commit-email.pl: `/usr/bin/svnlook info /home/svn/cspsf -r 703' failed with this output: Date: svn: Berkeley DB error while opening environment for filesystem /home/svn/cspsf/db: New Revision: 703 Modified: Log: /usr/local/lib/subversion/commit-email.pl: `/usr/bin/svnlook diff /home/svn/cspsf -r 703' failed with this output: svn: Berkeley DB error while opening environment for filesystem /home/svn/cspsf/db: Permission denied |
|
From: <mk...@us...> - 2004-04-10 21:14:15
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19432/Source Modified Files: SConscript Log Message: working on scons vcproject target Index: SConscript =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SConscript 30 Mar 2004 10:13:04 -0000 1.8 --- SConscript 10 Apr 2004 21:00:42 -0000 1.9 *************** *** 220,221 **** --- 220,232 ---- #package.setTargets(package_targets) #package.unitTests('./runtests.py') + + # XXX vs project generation (under construction) + env.MSVSProject(target='SimData'+env['MSVSPROJECTSUFFIX'], + srcs=sources, + incs=headers, + buildtarget=package_targets, + variant='Release') + #localincs = barlocalincs, + #resources = barresources, + #misc = barmisc, + |
|
From: <mk...@us...> - 2004-04-10 21:14:14
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19432 Modified Files: SConstruct Log Message: working on scons vcproject target Index: SConstruct =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SConstruct 30 Mar 2004 10:10:24 -0000 1.7 --- SConstruct 10 Apr 2004 21:00:42 -0000 1.8 *************** *** 116,126 **** for subdir in SUBDIRS: SConscript(subdir+'/SConscript') - - # XXX vs project generation - #env.MSVSProject(target='SimData'+env['MSVSPROJECTSUFFIX'],srcs=['sources'],incs=['headers'],buildtarget='_cSimData.dll',variant='Release') - #localincs = barlocalincs, - #resources = barresources, - #misc = barmisc, - package.addManifest("MANIFEST.IN") --- 116,119 ---- |
|
From: <de...@us...> - 2004-04-07 13:08:05
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20995 Modified Files: CHANGES.current Log Message: no message Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** CHANGES.current 3 Apr 2004 23:49:49 -0000 1.86 --- CHANGES.current 7 Apr 2004 12:55:06 -0000 1.87 *************** *** 2,10 **** =========================== 2004-04-04: onsight * Minor fixes to get the build going under linux. 2004-04-04: delta ! * Add views classes to help in GameScreen. These files are located under Views folders. ==========> Linux users: add CSPSim/Source/Views folder to the --- 2,19 ---- =========================== + 2004-04-07: delta + * Corrected a bug in the handling of mouse's scroll up/down. + Added CameraCommands and extended CameraKinematics to achieve + it. + + * Renamed CameraAgent::notifyToObjectToView to setObject. + + * Experimenting a smaller time step in physic model. + 2004-04-04: onsight * Minor fixes to get the build going under linux. 2004-04-04: delta ! * Added views classes to help in GameScreen. These files are located under Views folders. ==========> Linux users: add CSPSim/Source/Views folder to the |
|
From: <de...@us...> - 2004-04-07 13:06:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20515 Modified Files: GameScreen.h Log Message: see CHANGES.current Index: GameScreen.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/GameScreen.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GameScreen.h 3 Apr 2004 22:17:58 -0000 1.15 --- GameScreen.h 7 Apr 2004 12:53:09 -0000 1.16 *************** *** 120,124 **** CameraCommand *m_PanLeft,*m_PanRight,*m_PanLeftRightStop; CameraCommand *m_PanUp,*m_PanDown,*m_PanUpDownStop; ! CameraCommand *m_ZoomIn,*m_ZoomOut,*m_ZoomStop; MouseCommand* m_Mouse; CameraCommand* m_CurrentCameraCommand; --- 120,124 ---- CameraCommand *m_PanLeft,*m_PanRight,*m_PanLeftRightStop; CameraCommand *m_PanUp,*m_PanDown,*m_PanUpDownStop; ! CameraCommand *m_ZoomIn,*m_ZoomOut,*m_ZoomStop,*m_ZoomStepIn,*m_ZoomStepOut; MouseCommand* m_Mouse; CameraCommand* m_CurrentCameraCommand; |
|
From: <de...@us...> - 2004-04-07 13:05:13
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20279 Modified Files: GameScreen.cpp AircraftPhysicsModel.cpp Log Message: see CHANGES.current Index: GameScreen.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** GameScreen.cpp 3 Apr 2004 22:15:21 -0000 1.32 --- GameScreen.cpp 7 Apr 2004 12:52:15 -0000 1.33 *************** *** 181,184 **** --- 181,186 ---- m_ZoomOut = new ZoomOut; m_ZoomStop = new ZoomStop; + m_ZoomStepIn = new ZoomStepIn; + m_ZoomStepOut = new ZoomStepOut; m_Mouse = new MouseCommand; } *************** *** 195,198 **** --- 197,202 ---- delete m_ZoomStop; delete m_Mouse; + delete m_ZoomStepIn; + delete m_ZoomStepOut; m_CurrentCameraCommand = 0; } *************** *** 254,258 **** } m_ActiveObject = object; ! m_CameraAgent.notifyObjectToViews(object); if (object.valid() && object->isHuman() && object->isLocal()) { on_View1(); --- 258,262 ---- } m_ActiveObject = object; ! m_CameraAgent.setObject(object); if (object.valid() && object->isHuman() && object->isLocal()) { on_View1(); *************** *** 298,304 **** void GameScreen::on_View3() { ! if (m_ActiveObject.valid()) { ! m_ViewMode = 3; ! } } --- 302,306 ---- void GameScreen::on_View3() { ! m_ViewMode = 3; } *************** *** 319,327 **** } ! void GameScreen::on_View8() ! { ! if (m_ActiveObject.valid()) { ! m_ViewMode = 8; ! } } --- 321,326 ---- } ! void GameScreen::on_View8() { ! m_ViewMode = 8; } *************** *** 436,444 **** void GameScreen::on_ViewZoomStepIn() { ! m_CurrentCameraCommand = m_ZoomIn; } void GameScreen::on_ViewZoomStepOut() { ! m_CurrentCameraCommand = m_ZoomOut; } --- 435,443 ---- void GameScreen::on_ViewZoomStepIn() { ! m_CurrentCameraCommand = m_ZoomStepIn; } void GameScreen::on_ViewZoomStepOut() { ! m_CurrentCameraCommand = m_ZoomStepOut; } Index: AircraftPhysicsModel.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftPhysicsModel.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AircraftPhysicsModel.cpp 3 Apr 2004 22:15:22 -0000 1.8 --- AircraftPhysicsModel.cpp 7 Apr 2004 12:52:15 -0000 1.9 *************** *** 111,115 **** if (dt == 0.0) dt = 0.017; ! unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1; double dtlocal = dt/n; std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal)); --- 111,116 ---- if (dt == 0.0) dt = 0.017; ! //unsigned short n = std::min<unsigned short>(6,static_cast<unsigned short>(180 * dt)) + 1; ! unsigned short n = std::min<unsigned short>(10,static_cast<unsigned short>(600 * dt)) + 1; double dtlocal = dt/n; std::for_each(m_Dynamics.begin(),m_Dynamics.end(),InitializeSimulationStep(dtlocal)); |
|
From: <de...@us...> - 2004-04-07 13:04:25
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20052 Modified Files: CameraKinematics.cpp CameraAgent.cpp Log Message: see CHANGES.current Index: CameraKinematics.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views/CameraKinematics.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CameraKinematics.cpp 3 Apr 2004 23:53:07 -0000 1.2 --- CameraKinematics.cpp 7 Apr 2004 12:51:26 -0000 1.3 *************** *** 133,136 **** --- 133,148 ---- } + void CameraKinematics::zoomStepIn() { + m_ZoomRate = -m_BaseRate; + scale(100*m_DisplacementCoefficient); + m_ZoomRate = 0.0; + } + + void CameraKinematics::zoomStepOut() { + m_ZoomRate = m_BaseRate; + scale(100*m_DisplacementCoefficient); + m_ZoomRate = 0.0; + } + void CameraKinematics::displacement(int x, int y, int dx, int dy) { m_PanRateX = 0.0; Index: CameraAgent.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views/CameraAgent.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CameraAgent.cpp 3 Apr 2004 23:53:34 -0000 1.2 --- CameraAgent.cpp 7 Apr 2004 12:51:26 -0000 1.3 *************** *** 123,127 **** }; ! void CameraAgent::notifyObjectToViews(simdata::Ref<DynamicObject> object) { std::for_each(m_ViewList.begin(),m_ViewList.end(),AcceptObject(object)); m_CameraKinematics.reset(); --- 123,127 ---- }; ! void CameraAgent::setObject(simdata::Ref<DynamicObject> object) { std::for_each(m_ViewList.begin(),m_ViewList.end(),AcceptObject(object)); m_CameraKinematics.reset(); |
|
From: <de...@us...> - 2004-04-07 13:03:40
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19872 Modified Files: CameraKinematics.h CameraCommand.h CameraAgent.h Log Message: see CHANGES.current Index: CameraKinematics.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraKinematics.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraKinematics.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraKinematics.h 7 Apr 2004 12:50:33 -0000 1.2 *************** *** 62,65 **** --- 62,67 ---- void zoomOut(); void zoomStop(); + void zoomStepIn(); + void zoomStepOut(); void displacement(int x, int y, int dx, int dy); void setAngleX(double angle_x) {m_AngleRotX = angle_x;} Index: CameraCommand.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraCommand.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraCommand.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraCommand.h 7 Apr 2004 12:50:34 -0000 1.2 *************** *** 135,138 **** --- 135,155 ---- }; + class ZoomStepIn: public CameraCommand { + public: + virtual void execute() { + m_CameraKinematics->zoomStepIn(); + } + virtual ~ZoomStepIn(){} + }; + + + class ZoomStepOut: public CameraCommand { + public: + virtual void execute() { + m_CameraKinematics->zoomStepOut(); + } + virtual ~ZoomStepOut(){} + }; + class MouseCommand: public CameraCommand { int m_x,m_y,m_dx,m_dy; Index: CameraAgent.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/CameraAgent.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraAgent.h 3 Apr 2004 22:19:01 -0000 1.1 --- CameraAgent.h 7 Apr 2004 12:50:42 -0000 1.2 *************** *** 48,52 **** void attach(size_t mode,View* vm); void set(size_t vm, CameraCommand* ck = 0); ! void notifyObjectToViews(const simdata::Ref<DynamicObject> object); void updateCamera(double dt); const simdata::Vector3& getEyePoint() const {return m_EyePoint;} --- 48,52 ---- void attach(size_t mode,View* vm); void set(size_t vm, CameraCommand* ck = 0); ! void setObject(const simdata::Ref<DynamicObject> object); void updateCamera(double dt); const simdata::Vector3& getEyePoint() const {return m_EyePoint;} |
|
From: <de...@us...> - 2004-04-04 00:05:56
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7474 Modified Files: CameraAgent.cpp Log Message: see CHANGES.current Index: CameraAgent.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views/CameraAgent.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraAgent.cpp 3 Apr 2004 22:16:33 -0000 1.1 --- CameraAgent.cpp 3 Apr 2004 23:53:34 -0000 1.2 *************** *** 48,55 **** VirtualScene* scene = CSPSim::theSim->getScene(); const simdata::Ref<TerrainObject> terrain = scene->getTerrain(); - simdata::Vector3 normal; double const SAFETY = 2.0; TerrainObject::IntersectionHint camera_hint = 0; ! float h = SAFETY + terrain->getGroundElevation(m_EyePoint.x(),m_EyePoint.y(),normal,camera_hint); if (m_EyePoint.z() <= h) { double alpha_2 = simdata::toRadians(scene->getViewAngle()/2.0); --- 48,54 ---- VirtualScene* scene = CSPSim::theSim->getScene(); const simdata::Ref<TerrainObject> terrain = scene->getTerrain(); double const SAFETY = 2.0; TerrainObject::IntersectionHint camera_hint = 0; ! float h = SAFETY + terrain->getGroundElevation(m_EyePoint.x(),m_EyePoint.y(),camera_hint); if (m_EyePoint.z() <= h) { double alpha_2 = simdata::toRadians(scene->getViewAngle()/2.0); |
|
From: <de...@us...> - 2004-04-04 00:05:29
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7343 Modified Files: CameraKinematics.cpp Log Message: see CHANGES.current Index: CameraKinematics.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views/CameraKinematics.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CameraKinematics.cpp 3 Apr 2004 22:16:33 -0000 1.1 --- CameraKinematics.cpp 3 Apr 2004 23:53:07 -0000 1.2 *************** *** 136,141 **** m_PanRateX = 0.0; m_PanRateZ = 0.0; ! m_AngleRotZ += dx * m_DisplacementCoefficient; ! m_AngleRotX += dy * m_DisplacementCoefficient; } --- 136,141 ---- m_PanRateX = 0.0; m_PanRateZ = 0.0; ! m_AngleRotZ -= dx * m_DisplacementCoefficient; ! m_AngleRotX -= dy * m_DisplacementCoefficient; } |
|
From: <mk...@us...> - 2004-04-04 00:02:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884/Include Modified Files: LogoScreen.h Log Message: Index: LogoScreen.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LogoScreen.h 3 Apr 2004 22:17:58 -0000 1.9 --- LogoScreen.h 3 Apr 2004 23:49:50 -0000 1.10 *************** *** 66,70 **** osg::ref_ptr<osgUtil::SceneView> m_LogoView; osg::ref_ptr<osg::Texture2D> m_Texture; ! osgProducer::Viewer m_Viewer; //SDL_Surface * m_image; int m_width, m_height; --- 66,70 ---- osg::ref_ptr<osgUtil::SceneView> m_LogoView; osg::ref_ptr<osg::Texture2D> m_Texture; ! //osgProducer::Viewer m_Viewer; //SDL_Surface * m_image; int m_width, m_height; |
|
From: <mk...@us...> - 2004-04-04 00:02:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884 Modified Files: CHANGES.current Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** CHANGES.current 3 Apr 2004 22:20:45 -0000 1.85 --- CHANGES.current 3 Apr 2004 23:49:49 -0000 1.86 *************** *** 2,5 **** --- 2,8 ---- =========================== + 2004-04-04: onsight + * Minor fixes to get the build going under linux. + 2004-04-04: delta * Add views classes to help in GameScreen. These files are |
|
From: <mk...@us...> - 2004-04-04 00:02:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884/Source/Views Modified Files: View.cpp Log Message: Index: View.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Views/View.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** View.cpp 3 Apr 2004 22:16:33 -0000 1.1 --- View.cpp 3 Apr 2004 23:49:51 -0000 1.2 *************** *** 30,33 **** --- 30,39 ---- + void View::accept(const simdata::Ref<DynamicObject> object) { + m_ActiveObject = object; + } + + View::~View() { } + void View::updateBody(simdata::Vector3& ep,simdata::Vector3& lp,simdata::Vector3& up) { simdata::Vector3 object_up = m_ActiveObject->getUpDirection(); |
|
From: <mk...@us...> - 2004-04-04 00:02:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884/Include/Views Modified Files: View.h Log Message: Index: View.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Views/View.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** View.h 3 Apr 2004 22:19:01 -0000 1.1 --- View.h 3 Apr 2004 23:49:50 -0000 1.2 *************** *** 50,54 **** virtual void activate(){} virtual void update(simdata::Vector3& ep,simdata::Vector3& lp,simdata::Vector3& up, double dt) = 0; ! void accept(const simdata::Ref<DynamicObject> object) {m_ActiveObject = object;} void accept(CameraKinematics* ck) {m_CameraKinematics = ck;} virtual void recalculate(simdata::Vector3& ep,simdata::Vector3& lp,simdata::Vector3& up, double dt){ --- 50,54 ---- virtual void activate(){} virtual void update(simdata::Vector3& ep,simdata::Vector3& lp,simdata::Vector3& up, double dt) = 0; ! void accept(const simdata::Ref<DynamicObject> object); void accept(CameraKinematics* ck) {m_CameraKinematics = ck;} virtual void recalculate(simdata::Vector3& ep,simdata::Vector3& lp,simdata::Vector3& up, double dt){ *************** *** 56,60 **** } void cull(); ! virtual ~View(){} }; --- 56,60 ---- } void cull(); ! virtual ~View(); }; |
|
From: <mk...@us...> - 2004-04-04 00:02:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884/Source Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 20 Oct 2003 00:23:23 -0000 1.21 --- Makefile.in 3 Apr 2004 23:49:50 -0000 1.22 *************** *** 89,92 **** --- 89,95 ---- Tools.cpp \ trees.cpp \ + Views/CameraAgent.cpp \ + Views/CameraKinematics.cpp \ + Views/View.cpp \ VirtualBattlefield.cpp \ VirtualScene.cpp |
|
From: <de...@us...> - 2004-04-03 22:33:07
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24563 Modified Files: CHANGES.current Log Message: see CHANGES.current Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** CHANGES.current 31 Jan 2004 17:11:40 -0000 1.84 --- CHANGES.current 3 Apr 2004 22:20:45 -0000 1.85 *************** *** 1,4 **** --- 1,35 ---- Version 0.4.0 (in progress) =========================== + + 2004-04-04: delta + * Add views classes to help in GameScreen. These files are + located under Views folders. + ==========> Linux users: add CSPSim/Source/Views folder to the + build. + + 2004-03-19: delta + * Added a vectors' arithmetic implemented with expression + template (mainly needed due to the poor performance of vs + 7.1's std::valarray<T>; recent version of g++'s std::valrray<T> + is really fancy) in Vector.h; Vector class is protected behind + a Vector namespace. By default, very few vector's arithmetic is + used and the valarray alternative is only used on vs 7.1. Two + macros parametrize its use: NOT_USE_VALARRAY (in Vector.h) and + USE_VALARRAY_ARITHMETIC (in NumericalMethod.h). + + * The abstract class VectorField has moved in VectorField.h. + + * Reformated numerical code (NumericalMethod.*); added a new + numerical method based on Cash Karp original article. Old + methods are kept during tests. + + * Changed PYTHONPATH environment variable to PYTHON_PATH and + SWIGPATH to SWIG_PATH to avoid possible names conflict with + predefined environment variables (that does only affect vs + project file). + + * Changed 0x1 value osg node mask to the safer 0xffffffff value. + + * Other minor changes. 2004-01-31: onsight *************** *** 22,25 **** --- 53,68 ---- APPLICATIONS/CSPSim/Tools/HID/Maps/gamescreen-core.map, rebuild gamescreen.hid and RebuilData(.py). + + 2004-02-24: delta + * Fixed a bug in ScreenInfoManager causing an incomplete texts + display when changing vehicule. + + * Renamed std::string SnapImageDrawCallback:builSuffix() to + getDate() in GameScreen.cpp. + + * Changed implementation in views 1 & 2. Added a safer control + of the cam position when on ground. + + * Other minor changes. 2004-01-23: delta |
|
From: <de...@us...> - 2004-04-03 22:32:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24428 Modified Files: CSPSimDLL.vcproj Log Message: see CHANGES.current Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CSPSimDLL.vcproj 7 Feb 2004 17:56:51 -0000 1.18 --- CSPSimDLL.vcproj 3 Apr 2004 22:20:11 -0000 1.19 *************** *** 24,28 **** Optimization="0" ImproveFloatingPointConsistency="FALSE" ! AdditionalIncludeDirectories="$(PYTHONPATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="FALSE" --- 24,28 ---- Optimization="0" ImproveFloatingPointConsistency="FALSE" ! AdditionalIncludeDirectories="$(PYTHON_PATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="FALSE" *************** *** 45,53 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="$(PYTHONPATH)/Lib/site-packages/SimData,$(PYTHONPATH)/libs, ../../../../THIRDPARTYLIBS/lib" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" --- 45,53 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgProducerd.lib OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="$(PYTHON_PATH)/Lib/site-packages/SimData,$(PYTHON_PATH)/libs, ../../../../THIRDPARTYLIBS/lib" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" *************** *** 100,104 **** FavorSizeOrSpeed="1" OptimizeForProcessor="0" ! AdditionalIncludeDirectories="$(PYTHONPATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" --- 100,104 ---- FavorSizeOrSpeed="1" OptimizeForProcessor="0" ! AdditionalIncludeDirectories="$(PYTHON_PATH)/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" *************** *** 122,130 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python23/libs,C:/Python23/Lib/site-packages/SimData" GenerateDebugInformation="FALSE" AssemblyDebug="0" --- 122,130 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgProducer.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,$(PYTHON_PATH)/libs,$(PYTHON_PATH)/Lib/site-packages/SimData" GenerateDebugInformation="FALSE" AssemblyDebug="0" *************** *** 401,404 **** --- 401,417 ---- </File> </Filter> + <Filter + Name="Views" + Filter=""> + <File + RelativePath="..\..\Source\Views\CameraAgent.cpp"> + </File> + <File + RelativePath="..\..\Source\Views\CameraKinematics.cpp"> + </File> + <File + RelativePath="..\..\Source\Views\View.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 478,481 **** --- 491,497 ---- </File> <File + RelativePath="..\..\Include\Exception.h"> + </File> + <File RelativePath="..\..\Include\FLCS.h"> </File> *************** *** 571,574 **** --- 587,593 ---- </File> <File + RelativePath="..\..\Include\Vector.h"> + </File> + <File RelativePath="..\..\Include\VirtualBattlefield.h"> </File> *************** *** 647,650 **** --- 666,685 ---- </File> </Filter> + <Filter + Name="Views" + Filter=""> + <File + RelativePath="..\..\Include\Views\CameraAgent.h"> + </File> + <File + RelativePath="..\..\Include\Views\CameraCommand.h"> + </File> + <File + RelativePath="..\..\Include\Views\CameraKinematics.h"> + </File> + <File + RelativePath="..\..\Include\Views\View.h"> + </File> + </Filter> </Filter> <Filter *************** *** 658,662 **** <Tool Name="VCCustomBuildTool" ! CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 693,697 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="$(SWIG_PATH)\swig -runtime -c++ -python -noexcept -I..\..\Include -I$(PYTHONPATH)\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> *************** *** 666,670 **** <Tool Name="VCCustomBuildTool" ! CommandLine="$(SWIG)\swig -runtime -c++ -python -noexcept -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 701,705 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="$(SWIG_PATH)\swig -runtime -c++ -python -noexcept -I..\..\Include -I$(PYTHON_PATH)\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> |
