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: <mk...@us...> - 2003-10-20 06:25:03
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv23200/vehicles/aircraft/m2k
Modified Files:
model.xml thrust.xml
Added Files:
systems.xml
Log Message:
--- NEW FILE: systems.xml ---
<?xml version="1.0" standalone="no"?>
<Object class="SystemsModel">
<List name="subsystems">
<Object class="AircraftInputSystem" />
<Object class="AircraftSimpleFCS">
<Float name="elevator_limit">25.0</Float>
<Float name="aileron_limit">21.5</Float>
<Float name="rudder_limit">30.0</Float>
<Float name="airbrake_limit">60.0</Float>
<Float name="elevator_rate">60.0</Float>
<Float name="aileron_rate">80.0</Float>
<Float name="rudder_rate">120.0</Float>
<Float name="airbrake_rate">15.0</Float>
<Float name="max_g">7.0</Float>
<Float name="min_g">-2.0</Float>
</Object>
<Object class="AircraftFlightSensors" />
</List>
<Object class="AircraftPhysicsModel" name="physics_model">
<List name="subsystems">
<Object class="FlightDynamics">
<Path name="flight_model">fm</Path>
</Object>
<Object class="EngineDynamics">
<List name="engine_set">
<Object class="Engine">
<Path name="thrust_data">thrust</Path>
<Float name="engine_idle_rpm">0.68</Float>
<Float name="engine_ab_thrust">0.95</Float>
<Vector name="thrust_direction">0.0 1.0 0.0</Vector>
<Vector name="engine_offset">0.0 0.0 0.0</Vector>
<Vector name="smoke_emitter_location">0.0 -5.5 0.0</Vector>
</Object>
</List>
</Object>
<Path class="GearDynamics">gear</Path>
<Object class="GroundCollisionDynamics" />
</List>
</Object>
</Object>
Index: model.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** model.xml 20 Oct 2003 00:23:22 -0000 1.13
--- model.xml 20 Oct 2003 05:13:51 -0000 1.14
***************
*** 1,5 ****
<?xml version="1.0" standalone="no"?>
! <Object class="ObjectModel" static="1">
<!--External name="model_path">f35.3DS</External-->
<External name="model_path">s.osg</External>
--- 1,5 ----
<?xml version="1.0" standalone="no"?>
! <Object class="ObjectModel">
<!--External name="model_path">f35.3DS</External-->
<External name="model_path">s.osg</External>
Index: thrust.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/thrust.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** thrust.xml 20 Jun 2003 17:45:48 -0000 1.2
--- thrust.xml 20 Oct 2003 05:13:51 -0000 1.3
***************
*** 9,20 ****
-->
! <Object class="ThrustData" static="1">
! <Table name='idle_thrust'>
! <XBreaks spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </XBreaks>
! <YBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </YBreaks>
<Values>
3636.0 2886.075 272.7 -4635.9 -12271.5 -17498.25 -16362.0 1363.5 22725.0 39541.5 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
--- 9,20 ----
-->
! <Object class="ThrustData">
! <Table2 name='idle_thrust'>
! <Breaks0 spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </Breaks0>
! <Breaks1 spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </Breaks1>
<Values>
3636.0 2886.075 272.7 -4635.9 -12271.5 -17498.25 -16362.0 1363.5 22725.0 39541.5 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
***************
*** 27,38 ****
254.52 240.885 218.16 195.435 154.53 113.625 99.99 213.615 368.145 531.765 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
! </Table>
! <Table name='mil_thrust'>
! <XBreaks spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </XBreaks>
! <YBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </YBreaks>
<Values>
63443.655 62239.23 61898.355 62043.795 63175.5 63630.0 63402.75 60675.75 56585.25 51813.0 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
--- 27,38 ----
254.52 240.885 218.16 195.435 154.53 113.625 99.99 213.615 368.145 531.765 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
! </Table2>
! <Table2 name='mil_thrust'>
! <Breaks0 spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </Breaks0>
! <Breaks1 spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </Breaks1>
<Values>
63443.655 62239.23 61898.355 62043.795 63175.5 63630.0 63402.75 60675.75 56585.25 51813.0 47613.42 43686.54 39268.8 34360.2 29328.885 24052.14 18407.25 12762.36 7362.9
***************
*** 45,56 ****
259.065 254.52 281.79 299.97 349.965 381.78 418.14 463.59 518.13 581.76 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
! </Table>
! <Table name='ab_thrust'>
! <XBreaks spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </XBreaks>
! <YBreaks spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </YBreaks>
<Values>
102262.5 97353.9 103171.5 110170.8 118488.15 124987.5 131286.87 143167.5 152257.5 154530.0 156802.5 156802.5 156802.5 154530.0 151121.25 147712.5 142031.25 136350.0 131805.0
--- 45,56 ----
259.065 254.52 281.79 299.97 349.965 381.78 418.14 463.59 518.13 581.76 649.935 722.655 754.47 763.56 768.105 768.105 768.105 763.56 745.38
</Values>
! </Table2>
! <Table2 name='ab_thrust'>
! <Breaks0 spacing='1000.0'>
0.0 3048.0 6096.0 9144.0 12192.0 15240.0 18288.0 30480.0
! </Breaks0>
! <Breaks1 spacing='0.1'>
! 0.0 0.2 0.4 0.6 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2
! </Breaks1>
<Values>
102262.5 97353.9 103171.5 110170.8 118488.15 124987.5 131286.87 143167.5 152257.5 154530.0 156802.5 156802.5 156802.5 154530.0 151121.25 147712.5 142031.25 136350.0 131805.0
***************
*** 63,66 ****
740.835 740.835 804.465 913.545 1122.615 1277.145 1436.22 1704.375 1990.71 2199.78 2345.22 2413.395 2458.845 2486.115 2499.75 2499.75 2499.75 2486.115 2413.395
</Values>
! </Table>
</Object>
--- 63,66 ----
740.835 740.835 804.465 913.545 1122.615 1277.145 1436.22 1704.375 1990.71 2199.78 2345.22 2413.395 2458.845 2486.115 2499.75 2499.75 2499.75 2486.115 2413.395
</Values>
! </Table2>
</Object>
|
|
From: <mk...@us...> - 2003-10-20 06:24:59
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/runway In directory sc8-pr-cvs1:/tmp/cvs-serv23200/theater/runway Modified Files: model.xml Log Message: Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/runway/model.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** model.xml 3 May 2003 11:57:22 -0000 1.1 --- model.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel" static="1"> <External name="model_path">runway01.osg</External> <Vector name="axis_0">1 0 0</Vector> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel"> <External name="model_path">runway01.osg</External> <Vector name="axis_0">1 0 0</Vector> |
|
From: <mk...@us...> - 2003-10-20 06:24:53
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/house In directory sc8-pr-cvs1:/tmp/cvs-serv23200/theater/house Modified Files: model.xml Log Message: Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/house/model.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** model.xml 3 May 2003 11:57:47 -0000 1.1 --- model.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel" static="1"> <External name="model_path">house.osg</External> <Vector name="axis_0">1 0 0</Vector> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel"> <External name="model_path">house.osg</External> <Vector name="axis_0">1 0 0</Vector> |
|
From: <mk...@us...> - 2003-10-20 06:24:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater In directory sc8-pr-cvs1:/tmp/cvs-serv23200/theater Modified Files: airbase.xml city.xml house.xml houses.xml runway.xml town.xml Log Message: Index: airbase.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/airbase.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** airbase.xml 3 May 2003 11:32:44 -0000 1.1 --- airbase.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel" static="1"> <List name="layout"> <Object class="FeatureLayout"> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel"> <List name="layout"> <Object class="FeatureLayout"> Index: city.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/city.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** city.xml 3 May 2003 11:32:44 -0000 1.1 --- city.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel" static="1"> <List name="layout"> <Object class="FeatureLayout"> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel"> <List name="layout"> <Object class="FeatureLayout"> Index: house.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/house.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** house.xml 3 May 2003 11:32:44 -0000 1.1 --- house.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="FeatureObjectModel" static="1"> <Path name="model">house.model</Path> <Int name="hit_points">20</Int> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="FeatureObjectModel"> <Path name="model">house.model</Path> <Int name="hit_points">20</Int> Index: houses.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/houses.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** houses.xml 3 May 2003 11:32:44 -0000 1.1 --- houses.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel" static="1"> <List name="layout"> <Object class="FeatureLayout"> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel"> <List name="layout"> <Object class="FeatureLayout"> Index: runway.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/runway.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** runway.xml 3 May 2003 11:32:44 -0000 1.1 --- runway.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="FeatureObjectModel" static="1"> <Path name="model">runway.model</Path> <Int name="hit_points">20</Int> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="FeatureObjectModel"> <Path name="model">runway.model</Path> <Int name="hit_points">20</Int> Index: town.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/theater/town.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** town.xml 3 May 2003 11:32:44 -0000 1.1 --- town.xml 20 Oct 2003 05:13:51 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel" static="1"> <List name="layout"> <Object class="FeatureLayout"> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="CustomLayoutModel"> <List name="layout"> <Object class="FeatureLayout"> |
|
From: <mk...@us...> - 2003-10-20 06:24:25
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62 In directory sc8-pr-cvs1:/tmp/cvs-serv23200/vehicles/tanks/t62 Modified Files: model.xml Log Message: Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62/model.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** model.xml 3 May 2003 11:24:13 -0000 1.3 --- model.xml 20 Oct 2003 05:13:51 -0000 1.4 *************** *** 1,5 **** <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel" static="1"> <External name="model_path">t62.osg</External> <Vector name="axis_0">1 0 0</Vector> --- 1,5 ---- <?xml version="1.0" standalone="no"?> ! <Object class="ObjectModel"> <External name="model_path">t62.osg</External> <Vector name="axis_0">1 0 0</Vector> |
|
From: <mk...@us...> - 2003-10-20 04:18:41
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv17617/VisualStudio/CSPSimDLL Modified Files: CSPSimDLL.vcproj Log Message: Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CSPSimDLL.vcproj 19 Jul 2003 14:08:52 -0000 1.13 --- CSPSimDLL.vcproj 20 Oct 2003 00:23:24 -0000 1.14 *************** *** 1,7 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.00" Name="CSPSimDLL" SccProjectName="" SccLocalPath=""> --- 1,8 ---- ! <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="CSPSimDLL" + RootNamespace="CSPSimDLL" SccProjectName="" SccLocalPath=""> *************** *** 23,27 **** AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" --- 24,28 ---- AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories=""E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config";E:\CSP\THIRDPARTYLIBS\OpenThreads\include;E:\CSP\THIRDPARTYLIBS\Producer\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5";C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" *************** *** 72,76 **** --- 73,83 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration *************** *** 86,90 **** AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" --- 93,97 ---- AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="E:\CSP\THIRDPARTYLIBS\OpenThreads\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config";E:\CSP\THIRDPARTYLIBS\Producer\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5";../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" *************** *** 104,108 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" --- 111,115 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" *************** *** 131,137 **** --- 138,152 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <References> + </References> <Files> <Filter *************** *** 151,154 **** --- 166,172 ---- </File> <File + RelativePath="..\..\Source\base.cpp"> + </File> + <File RelativePath="..\..\Source\BaseDynamics.cpp"> </File> *************** *** 157,161 **** </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File --- 175,191 ---- </File> <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File *************** *** 190,197 **** </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File ! RelativePath="..\..\Source\DynamicObject.cpp"> </File> <File --- 220,227 ---- </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File *************** *** 199,202 **** --- 229,235 ---- </File> <File + RelativePath="..\..\Source\DynamicObject.cpp"> + </File> + <File RelativePath="..\..\Source\Engine.cpp"> </File> *************** *** 226,229 **** --- 259,265 ---- </File> <File + RelativePath="..\..\Source\KineticsChannels.cpp"> + </File> + <File RelativePath="..\..\Source\LandingGear.cpp"> </File> *************** *** 250,256 **** </File> <File - RelativePath="..\..\Source\PrimaryAeroDynamics.cpp"> - </File> - <File RelativePath="..\..\Source\ScreenInfo.cpp"> </File> --- 286,289 ---- *************** *** 274,314 **** </File> <File ! RelativePath="..\..\Source\TankObject.cpp"> </File> <File ! RelativePath="..\..\Source\TerrainObject.cpp"> </File> <File ! RelativePath="..\..\Source\Theater.cpp"> </File> <File ! RelativePath="..\..\Source\Tools.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualScene.cpp"> </File> <File ! RelativePath="..\..\Source\base.cpp"> </File> <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <Filter --- 307,338 ---- </File> <File ! RelativePath="..\..\Source\SynchronousUpdate.cpp"> </File> <File ! RelativePath="..\..\Source\System.cpp"> </File> <File ! RelativePath="..\..\Source\SystemsModel.cpp"> </File> <File ! RelativePath="..\..\Source\TankObject.cpp"> </File> <File ! RelativePath="..\..\Source\TerrainObject.cpp"> </File> <File ! RelativePath="..\..\Source\Theater.cpp"> </File> <File ! RelativePath="..\..\Source\Tools.cpp"> </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\VirtualScene.cpp"> </File> <Filter *************** *** 358,361 **** --- 382,398 ---- </File> </Filter> + <Filter + Name="Systems" + Filter=""> + <File + RelativePath="..\..\Source\Systems\AircraftFlightSensors.cpp"> + </File> + <File + RelativePath="..\..\Source\Systems\AircraftInputSystem.cpp"> + </File> + <File + RelativePath="..\..\Source\Systems\AircraftSimpleFCS.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 387,391 **** </File> <File ! RelativePath="..\..\Include\CSPSim.h"> </File> <File --- 424,428 ---- </File> <File ! RelativePath="..\..\Include\Bus.h"> </File> <File *************** *** 399,402 **** --- 436,442 ---- </File> <File + RelativePath="..\..\Include\compiler.h"> + </File> + <File RelativePath="..\..\Include\Config.h"> </File> *************** *** 405,415 **** </File> <File RelativePath="..\..\Include\DataRecorder.h"> </File> <File ! RelativePath="..\..\Include\DemeterTerrain.h"> </File> <File ! RelativePath="..\..\Include\DynamicObject.h"> </File> <File --- 445,458 ---- </File> <File + RelativePath="..\..\Include\CSPSim.h"> + </File> + <File RelativePath="..\..\Include\DataRecorder.h"> </File> <File ! RelativePath="..\..\Include\debug_types.h"> </File> <File ! RelativePath="..\..\Include\DemeterTerrain.h"> </File> <File *************** *** 417,420 **** --- 460,466 ---- </File> <File + RelativePath="..\..\Include\DynamicObject.h"> + </File> + <File RelativePath="..\..\Include\Engine.h"> </File> *************** *** 474,480 **** </File> <File - RelativePath="..\..\Include\PrimaryAeroDynamics.h"> - </File> - <File RelativePath="..\..\Include\Profile.h"> </File> --- 520,523 ---- *************** *** 501,529 **** </File> <File ! RelativePath="..\..\Include\TankObject.h"> </File> <File ! RelativePath="..\..\Include\TerrainObject.h"> </File> <File ! RelativePath="..\..\Include\Theater.h"> </File> <File ! RelativePath="..\..\Include\Tools.h"> </File> <File ! RelativePath="..\..\Include\VehicleModel.h"> </File> <File ! RelativePath="..\..\Include\VirtualBattlefield.h"> </File> <File ! RelativePath="..\..\Include\compiler.h"> </File> <File ! RelativePath="..\..\Include\debug_types.h"> </File> <File ! RelativePath="..\..\Include\stdinc.h"> </File> <Filter --- 544,575 ---- </File> <File ! RelativePath="..\..\Include\stdinc.h"> </File> <File ! RelativePath="..\..\Include\SynchronousUpdate.h"> </File> <File ! RelativePath="..\..\Include\System.h"> </File> <File ! RelativePath="..\..\Include\SystemsModel.h"> </File> <File ! RelativePath="..\..\Include\TankObject.h"> </File> <File ! RelativePath="..\..\Include\TerrainObject.h"> </File> <File ! RelativePath="..\..\Include\Theater.h"> </File> <File ! RelativePath="..\..\Include\Tools.h"> </File> <File ! RelativePath="..\..\Include\VehicleModel.h"> ! </File> ! <File ! RelativePath="..\..\Include\VirtualBattlefield.h"> </File> <Filter *************** *** 579,582 **** --- 625,647 ---- </File> </Filter> + <Filter + Name="Systems" + Filter=""> + <File + RelativePath="..\..\Include\Systems\AircraftDynamics.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftFlightSensors.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftInputSystem.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftSimpleFCS.h"> + </File> + <File + RelativePath="..\..\Include\Systems\GearDynamics.h"> + </File> + </Filter> </Filter> <Filter *************** *** 598,602 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 663,667 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> |
|
From: <mk...@us...> - 2003-10-20 03:36:47
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv19779/Include/SimData
Modified Files:
Archive.h
Log Message:
Index: Archive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Archive.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Archive.h 19 Oct 2003 23:53:56 -0000 1.2
--- Archive.h 20 Oct 2003 00:38:47 -0000 1.3
***************
*** 151,159 ****
%insert("shadow") %{
def _Pointer(self):
! raise "FIXME: NOT IMPLMENTED"
def _Enum(self):
! raise "FIXME: NOT IMPLMENTED"
def _List(self):
! raise "FIXME: NOT IMPLMENTED"
def __call__(self, *args):
raise "Use explicit _* methods from Python"
--- 151,159 ----
%insert("shadow") %{
def _Pointer(self):
! raise "FIXME: NOT IMPLEMENTED"
def _Enum(self):
! raise "FIXME: NOT IMPLEMENTED"
def _List(self):
! raise "FIXME: NOT IMPLEMENTED"
def __call__(self, *args):
raise "Use explicit _* methods from Python"
|
|
From: <mk...@us...> - 2003-10-20 03:34:56
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv17617
Modified Files:
CHANGES CHANGES.current TODO acinclude.m4 configure.in
Log Message:
Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CHANGES 19 Oct 2003 23:30:42 -0000 1.8
--- CHANGES 20 Oct 2003 00:23:22 -0000 1.9
***************
*** 55,59 ****
-
Version 0.3.3 (2003-08-04)
===========================
--- 55,58 ----
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** CHANGES.current 19 Oct 2003 23:30:43 -0000 1.70
--- CHANGES.current 20 Oct 2003 00:23:22 -0000 1.71
***************
*** 1,8 ****
! Version 0.3.6 (in progress)
===========================
2003-10-19: onsight
Tagged version r0_3_5, branched to b0_3 to start version
0.3.6. The 'systems' branch will be merged into the trunk
to create version 0.4.0.
--- 1,134 ----
! Version 0.4.0 (in progress)
===========================
+ 2003-10-19: onsight
+ Tagged r0_3_5 and started branch b0_3. Merged 'systems'
+ branch into the trunk to start version 0.4.0.
+
+ 2003-10-19: onsight
+ Modified class Thrust to use simdata::Table2 instead of the
+ deprecated simdata::Table class. Note that the XML thrust
+ tables must be modified to use this new class, but that these
+ changes will not be checked into cvs (to prevent clashes with
+ the trunk). The corrected files will be posted at
+ http://csp.sourceforge.net/downloads (soon) until the systems
+ branch is merged to make v0.4.0.
+
+ SIMDATA_OBJECT(...) changed to SIMDATA_STATIC_OBJECT(...) for
+ object classes that are static. This was previously specified
+ per object in the associated xml file using the 'static' attr.
+ That use is deprecated in simdata 0.4; now object classes are
+ either static or not.
+
+ 2003-10-14: onsight
+ Removed very old TerrainSymbol.h
+
+ 2003-10-11: onsight
+ Tracked down '#define min' from windows.h (no surprise), which
+ was included via Producer/RenderSurface. Added #undef's there
+ as a temporary fix.
+
+ Changed the classes related to input events and hid mapping
+ to use reference counting.
+
+ Moved CSP_OSG_094 to CSPSim.h. You must uncomment this line
+ to use OSG version 0.9.4 or older.
+
+ ==========> VC users add System.cpp, SystemsModel.cpp, and Systems/*.cpp
+ to the project.
+
+ 2003-10-09: onsight
+ Fixed minor snprintf problem under msvc.
+
+ Split the SystemsModel class out of System.h/cpp into
+ SystemsModel.h/cpp. This seems to be a better arrangement,
+ and hopefully circumventns a problem with forward
+ declarations + simdata::Link<> under msvc.
+
+ 2003-10-05: onsight
+ Changed HID to inherit from simdata::Referenced. Minor
+ changes to BaseScreen, GameScreen, and CSPSim to support
+ this change.
+
+ 2003-09-25: onsight
+ Integrated VI's patches for OSG 096 support. Changes
+ camera handling in near/far SceneView intances in
+ VirtualScene.cpp.
+
+ Various OSG 096 fixes:
+ * SceneView aspect ratio
+ * NearView projection matrix
+ * False horizon coloring
+ * Skydome (non-TEXDOME) coloring
+
+ To use OSG 094, uncomment the #define CSP_OSG_094 line
+ in VirtualScene.cpp
+ 2003-09-17: onsight
+ Major refactoring of the aircraft components in terms of
+ the System/SystemsModel architecture. PhysicsModel is now
+ a System under the main SystemsModel for the vehicle. The
+ BaseDynamics classes are also Systems, although they only
+ function as dynamics when placed directly underneath the
+ PhysicsModel node. Almost all of the original inter-
+ component communications are now implemented through the
+ bus architecture. A few hacks remain, such as the landing
+ gear sprites (which needs to be overhauled in terms of
+ standard animations once a suitable 3d model is available).
+
+ Significant changes to the DataRecorder interface.
+
+ Changed the stats display interface to allow each System
+ to add its own info lines to the display by extending
+ getInfo().
+
+ Changes to the XML data for the m2k to support the new
+ vehicle interfaces.
+
+ 2003-09-15: onsight
+ Added SynchronousUpdate.h and SynchronousUpdate.cpp as the
+ basis for a new update callback infrastructure.
+
+ 2003-09-13: onsight
+ Renamed Model to SystemsModel
+
+ Removed F16Model from the build.
+
+ Added m_SystemsModel to DynamicObject to reference the
+ current systems model. The setHuman() and setLocal()
+ methods now handle updates of the model, using two new
+ simdata::Path member variables: m_AgentModel and m_HumanModel.
+
+ SystemModel updates are now hooked into DynamicObject updates.
+
+ Input events are chained to the systems model if the dynamic
+ object doesn't handle them.
+
+ Changed the mapped input event interface. The onCommand,
+ onAxis, and onMotion methods of InputInterface are now
+ private, and all mapped events are passed via the onMapEvent
+ method. Overriding these methods was generally used to pass
+ events to subobjects, so it is easier now that only one method
+ needs to be extended. The raw event handlers were excluded
+ from this interface, since raw events are more often handled
+ by top-level objects. MapEvent is a wrapper type that
+ encompasses the three original types of events.
+
+ 2003-09-07: onsight
+ Added Include/System.h and Include/Bus.h, which provide
+ infrastructure for constructing detailed vehicle models.
+ Several existing components such as the data recorder and
+ flight model need to be refactored to use this new
+ interface.
+
+ <<<<<<< CHANGES.current
2003-10-19: onsight
Tagged version r0_3_5, branched to b0_3 to start version
0.3.6. The 'systems' branch will be merged into the trunk
to create version 0.4.0.
+ =======
+ Minor warning cleanups in System.h and Bus.h.
+
+ 2003-08-20: onsight
+ Tagged version r0_3_4, starting version 0.3.5
+ >>>>>>> 1.69.2.5
Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO 18 Apr 2003 12:07:34 -0000 1.2
--- TODO 20 Oct 2003 00:23:22 -0000 1.3
***************
*** 23,24 ****
--- 23,72 ----
so it can be unpacked in the main CSPSim directory (right
now you have to unpack it in CSPSim/Data)
+
+
+ ////////////////////////////////////////////////////////
+ // SYSTEM CONVERSION
+
+ Bind PhysicsModel and Controller to the bus. --DONE
+
+ Revise AircraftPhysicsModel. --DONE
+
+ Update the XML for AircraftPhysicsModel. --DONE
+
+ Deal with creating FlightDynamics from FlightModel---
+ FlightDynamics should link to FlightModel, not the
+ other way around. --DONE
+
+ Fix aircraft stats --DONE
+
+ Fix landing gear access from AircraftObject --PARTIAL
+ (needs animation overhaul)
+
+ Fix smoke code in AircraftObject
+
+ Use standard channel name defs --PARTIAL
+
+ Improve code in onRender (save old position there, do
+ smoke updates, etc).
+
+ Add gear command handling to gear dynamics --DONE
+
+ share Contact points channel --DONE (sharing ObjectModel)
+
+ registerChannel(Bus::Ref) -> exportChannels --DEFER
+ bind(Bus::Ref) -> importChannels --DONE
+
+ change assertions on missing channels to use library
+ functions, with logging, screen messages, and error
+ modes.
+
+ log missing animation channels --DONE
+
+ rename SystemsModel to ComponentModel or CoreModel?
+
+ rename PhysicsModel::m_qOrientation to m_Attitude --DONE
+
+ dump diagnostics if a dynamics system overflows, then
+ exit.
+
+
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** acinclude.m4 22 Jul 2003 15:49:41 -0000 1.8
--- acinclude.m4 20 Oct 2003 00:23:22 -0000 1.9
***************
*** 37,42 ****
dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
! lib_min_version=$3
! lib_flags_opt=$4
lib=yes
AC_PATH_PROG($1[]_CONFIG, $2-config, no)
--- 37,42 ----
dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
! lib_min_version="$3"
! lib_flags_opt="$4"
lib=yes
AC_PATH_PROG($1[]_CONFIG, $2-config, no)
***************
*** 76,79 ****
--- 76,157 ----
LIBS="$$1[]_LIBS $LIBS"
])
+
+ AC_DEFUN(_CSP_CHECK_PKG_CONFIG, [
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ ])
+
+ dnl Generic version check for libraries using 'pkg-config' scripts
+ AC_DEFUN(_CSP_PKG_CONFIG, [
+ if test "$PKG_CONFIG" != "no"; then
+ CSP_LIB_VERSION=`$PKG_CONFIG --silence-errors --modversion $1`
+ CSP_LIB_LIBS=`$PKG_CONFIG --silence-errors --libs $1`
+ CSP_LIB_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $1`
+ fi
+ ])
+
+ AC_DEFUN(_CSP_LIB_CONFIG, [
+ AC_PATH_PROG(LIB_CONFIG, $1-config, no)
+ if test "$LIB_CONFIG" != "no"; then
+ CSP_LIB_VERSION=`$LIB_CONFIG --version`
+ CSP_LIB_LIBS=`$LIB_CONFIG --libs`
+ CSP_LIB_CFLAGS=`$LIB_CONFIG $2`
+ fi
+ ])
+
+
+ AC_DEFUN(CSP_CONFIG, [
+ lib_name="$1"
+ lib_id="$2"
+ lib_pkg_id="$3"
+ lib_min_version="$4"
+ lib_flags_opt="$5"
+ lib_fullname="$6"
+ lib_site="$7"
+ lib=yes
+ CSP_LIB_VERSION="0.0.0"
+ CSP_LIB_LIBS=""
+ CSP_LIB_CFLAGS=""
+ _CSP_LIB_CONFIG($lib_id, $lib_flags_opt)
+ if test "$CSP_LIB_VERSION" = "0.0.0"; then
+ _CSP_PKG_CONFIG($lib_pkg_id)
+ fi
+ AC_MSG_CHECKING(for $lib_pkg_id >= $lib_min_version)
+ no_lib=""
+ lib_version="$CSP_LIB_VERSION"
+ if test "$lib_version" = "0.0.0"; then
+ no_lib=yes
+ AC_MSG_RESULT(no)
+ else
+ lib_major=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ lib_minor=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ lib_micro=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ lib_major_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ lib_minor_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ lib_micro_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ lib_version_proper=`expr \
+ $lib_major \> $lib_major_min \| \
+ $lib_major \= $lib_major_min \& \
+ $lib_minor \> $lib_minor_min \| \
+ $lib_major \= $lib_major_min \& \
+ $lib_minor \= $lib_minor_min \& \
+ $lib_micro \>= $lib_micro_min `
+ if test "$lib_version_proper" = "1" ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ no_lib=yes
+ fi
+ fi
+ if test "$no_lib" = "yes"; then
+ CSP_LIB_ERROR($lib_fullname,$lib_min_version,$lib_site,$1[]_CONFIG)
+ fi
+ $1[]_FLAGS="$CSP_LIB_CFLAGS"
+ $1[]_LIBS="$CSP_LIB_LIBS"
+ AC_SUBST($1[]_FLAGS)
+ AC_SUBST($1[]_LIBS)
+ LIBS="$$1[]_LIBS $LIBS"
+ ])
+
+
Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.in 22 Jul 2003 15:53:11 -0000 1.13
--- configure.in 20 Oct 2003 00:23:22 -0000 1.14
***************
*** 32,35 ****
--- 32,37 ----
AC_ST_BLKSIZE
+ _CSP_CHECK_PKG_CONFIG([])
+
dnl check for Simple Direct Media Library
CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [--cflags], [Simple Direct Media Library], [http://www.libsdl.org/])
***************
*** 71,74 ****
--- 73,80 ----
CSP_OSG_CONFIG(osgText, 0.9.4, [OpenSceneGraph Text library])
CSP_OSG_CONFIG(osgParticle, 0.9.4, [OpenSceneGraph Particle library])
+
+ dnl check for libSigC++ type-safe signal libraryy
+ dnl CSP_LIB_CONFIG([SIGC], [sigc], [1.0.1], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
+ CSP_CONFIG([SIGC], [sigc], [sigc++-1.2], [1.2.0], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
#CSP_LIB_CONFIG([CCGNU2], [ccgnu2], [1.0.6], [--flags], [GNU Common C++ Library], [http://www.gnu.org/software/commonc++/])
|
|
From: <mk...@us...> - 2003-10-20 03:07:23
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv10180 Modified Files: CHANGES CHANGES.current Log Message: Index: CHANGES =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGES 21 Aug 2003 04:20:11 -0000 1.6 --- CHANGES 19 Oct 2003 23:24:30 -0000 1.7 *************** *** 2,5 **** --- 2,22 ---- to CVS. + Version 0.3.5 (2003-10-19) + =========================== + + 2003-10-09: onsight + Backported a couple fixes from the b0_4_0 branch: + * #include inside simdata namespace in Date.cpp + * snprintf replaced with stringstream in Real.cpp + + 2003-09-16: onsight + Changed Parse.py to handle misinstalled zlib modules + (usually under windows) more gracefully. + + 2003-08-20: onsight + Tagged r0_3_4, version 0_3_5 started. + Version 0.4.0 branch started. + + Version 0.3.4 (2003-08-20) =========================== Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** CHANGES.current 10 Oct 2003 00:26:00 -0000 1.77 --- CHANGES.current 19 Oct 2003 23:24:30 -0000 1.78 *************** *** 1,16 **** ! Version 0.3.5 (in progress) ! =========================== ! ! 2003-10-09: onsight ! Backported a couple fixes from the b0_4_0 branch: ! * #include inside simdata namespace in Date.cpp ! * snprintf replaced with stringstream in Real.cpp ! ! 2003-09-16: onsight ! Changed Parse.py to handle misinstalled zlib modules ! (usually under windows) more gracefully. ! ! 2003-08-20: onsight ! Tagged r0_3_4, version 0_3_5 started. ! Version 0.4.0 branch started. --- 1,3 ---- ! Version 0.3.6; branch b0_3 (in progress) ! ======================================== |
|
From: <mk...@us...> - 2003-10-20 02:39:19
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Doc In directory sc8-pr-cvs1:/tmp/cvs-serv10180/Doc Modified Files: footer.html Log Message: Index: footer.html =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** footer.html 16 Aug 2003 10:29:43 -0000 1.2 --- footer.html 19 Oct 2003 23:24:30 -0000 1.3 *************** *** 6,10 **** <td> <p align="right"> ! <a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=17780&type=2" border="0" alt="[SF.net]" /></a></p> </tr></table> </body> --- 6,10 ---- <td> <p align="right"> ! <a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=87877&type=2" border="0" alt="[SF.net]" /></a></p> </tr></table> </body> |
|
From: <mk...@us...> - 2003-10-20 02:34:00
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv17617/VisualStudio/CSPSimAppli Modified Files: CSPSimAppli.vcproj Log Message: Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CSPSimAppli.vcproj 19 Jul 2003 14:09:03 -0000 1.11 --- CSPSimAppli.vcproj 20 Oct 2003 00:23:24 -0000 1.12 *************** *** 1,6 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.00" Name="CSPSimAppli" SccProjectName="" --- 1,6 ---- ! <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="CSPSimAppli" SccProjectName="" *************** *** 68,72 **** --- 68,78 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration *************** *** 132,138 **** --- 138,152 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <References> + </References> <Files> <Filter *************** *** 149,152 **** --- 163,169 ---- </File> <File + RelativePath="..\..\Source\base.cpp"> + </File> + <File RelativePath="..\..\Source\BaseDynamics.cpp"> </File> *************** *** 155,159 **** </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File --- 172,188 ---- </File> <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File *************** *** 188,195 **** </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File ! RelativePath="..\..\Source\DynamicObject.cpp"> </File> <File --- 217,224 ---- </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File *************** *** 197,200 **** --- 226,232 ---- </File> <File + RelativePath="..\..\Source\DynamicObject.cpp"> + </File> + <File RelativePath="..\..\Source\Engine.cpp"> </File> *************** *** 224,227 **** --- 256,262 ---- </File> <File + RelativePath="..\..\Source\main.cpp"> + </File> + <File RelativePath="..\..\Source\MenuScreen.cpp"> </File> *************** *** 278,309 **** </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\VirtualScene.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\base.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File ! RelativePath="..\..\Source\main.cpp"> </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <Filter --- 313,323 ---- </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualScene.cpp"> </File> <Filter *************** *** 376,382 **** </File> <File - RelativePath="..\..\Include\CSPSim.h"> - </File> - <File RelativePath="..\..\Include\Collision.h"> </File> --- 390,393 ---- *************** *** 385,388 **** --- 396,402 ---- </File> <File + RelativePath="..\..\Include\compiler.h"> + </File> + <File RelativePath="..\..\Include\Config.h"> </File> *************** *** 394,397 **** --- 408,417 ---- </File> <File + RelativePath="..\..\Include\CSPSim.h"> + </File> + <File + RelativePath="..\..\Include\debug_types.h"> + </File> + <File RelativePath="..\..\Include\DemeterTerrain.h"> </File> *************** *** 400,407 **** </File> <File ! RelativePath="..\..\Include\DynamicObject.h"> </File> <File ! RelativePath="..\..\Include\DynamicalSystem.h"> </File> <File --- 420,427 ---- </File> <File ! RelativePath="..\..\Include\DynamicalSystem.h"> </File> <File ! RelativePath="..\..\Include\DynamicObject.h"> </File> <File *************** *** 503,512 **** <File RelativePath="..\..\Include\VirtualScene.h"> - </File> - <File - RelativePath="..\..\Include\compiler.h"> - </File> - <File - RelativePath="..\..\Include\debug_types.h"> </File> </Filter> --- 523,526 ---- |
|
From: <mk...@us...> - 2003-10-20 02:09:36
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv17617/VisualStudio
Modified Files:
CSPSim.sln
Log Message:
Index: CSPSim.sln
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSim.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CSPSim.sln 22 Mar 2003 02:26:39 -0000 1.1
--- CSPSim.sln 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 1,19 ****
! Microsoft Visual Studio Solution File, Format Version 7.00
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimAppli", "CSPSimAppli\CSPSimAppli.vcproj", "{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}"
! EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimDLL", "CSPSimDLL\CSPSimDLL.vcproj", "{A609C12F-9E38-4AFF-8560-B1099F051941}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! ConfigName.0 = Debug
! ConfigName.1 = Release
! EndGlobalSection
! GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.ActiveCfg = Debug|Win32
- {7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.Build.0 = Debug|Win32
- {7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.ActiveCfg = Release|Win32
- {7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.Build.0 = Release|Win32
{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.ActiveCfg = Debug|Win32
{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.Build.0 = Debug|Win32
--- 1,13 ----
! Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimDLL", "CSPSimDLL\CSPSimDLL.vcproj", "{A609C12F-9E38-4AFF-8560-B1099F051941}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! Debug = Debug
! Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.ActiveCfg = Debug|Win32
{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.Build.0 = Debug|Win32
|
|
From: <mk...@us...> - 2003-10-20 01:49:00
|
Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv13870/SimData
Modified Files:
Compile.py Parse.py __init__.py
Log Message:
Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Compile.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Compile.py 17 Sep 2003 07:27:01 -0000 1.3
--- Compile.py 19 Oct 2003 23:53:56 -0000 1.4
***************
*** 143,149 ****
print "%d warnings (severity=%d)." % (warnings, level)
if level > 0:
! print "Please fix these warnings and recompile."
! print "Compiled data archive NOT written!"
! sys.exit(1)
paths = master.getPaths()
DEBUG(1,"Compiling all objects")
--- 143,152 ----
print "%d warnings (severity=%d)." % (warnings, level)
if level > 0:
! if level > getWarningLevel():
! print "Run with '--warn=%d' to see all warnings." % level
! if not self.force:
! print "Please fix these warnings and recompile."
! print "Compiled data archive NOT written!"
! sys.exit(1)
paths = master.getPaths()
DEBUG(1,"Compiling all objects")
***************
*** 187,190 ****
--- 190,194 ----
print >>out, " --debug=level show debug messages (< level)"
print >>out, " --rebuild rebuild entire archive"
+ print >>out, " --force ignore warnings"
print >>out, " --help help message"
***************
*** 223,226 ****
--- 227,232 ----
elif arg == '--rebuild':
self.rebuild = 1
+ elif arg == '--force':
+ self.force = 1
elif arg in ("--help", "-h", "-help"):
self.usage()
***************
*** 240,243 ****
--- 246,250 ----
setWarningLevel(1)
self.rebuild = 0
+ self.force = 0
self.infile = None
self.outfile = None
Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Parse.py 17 Sep 2003 07:27:01 -0000 1.13
--- Parse.py 19 Oct 2003 23:53:56 -0000 1.14
***************
*** 511,514 ****
--- 511,515 ----
def __init__(self, id, base, name, attrs):
SimpleHandler.__init__(self, id, base, name, attrs)
+ WARN(1, "<Curve> is deprecated, use Table1 instead.")
for member in CurveHandler.members:
setattr(self, "_"+member, None)
***************
*** 560,563 ****
--- 561,565 ----
def __init__(self, id, base, name, attrs):
SimpleHandler.__init__(self, id, base, name, attrs)
+ WARN(1, "<Table> is deprecated, use Table2 instead.")
self._keys = {}
***************
*** 740,745 ****
self._req_variables = self._interface.getRequiredNames()
! static = attrs.get("static", "0").upper() in ("1", "TRUE")
! self._object.setStatic(static)
def endChild(self):
--- 742,747 ----
self._req_variables = self._interface.getRequiredNames()
! if attrs.has_key("static"):
! WARN(1, "'static' attribute of <Object> is deprecated.")
def endChild(self):
Index: __init__.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py 23 Apr 2003 09:14:22 -0000 1.2
--- __init__.py 19 Oct 2003 23:53:56 -0000 1.3
***************
*** 20,27 ****
## @file SimData.py
! ## @auther Mark Rose <mr...@st...>
##
## @module SimData
##
## Provides minimal glue code for interfacing between C++ and Python.
## Most of the hard work is done by SWIG. Python Objects must derive
--- 20,31 ----
## @file SimData.py
! ## @author Mark Rose <mr...@st...>
##
## @module SimData
##
+ ## @note The procedure for declaring and registering XML interfaces
+ ## is under revision, and the documentation here is likely to be
+ ## completely out of date.
+ ##
## Provides minimal glue code for interfacing between C++ and Python.
## Most of the hard work is done by SWIG. Python Objects must derive
***************
*** 48,68 ****
- # FIXME is there a more robust means of getting the class name as a
- # string? str(class) changed from python2.1 to 2.2 for new-style
- # classes...
- def getClassName(_class):
- rep = str(_class)
- if rep.startswith('<class '):
- # new-style:
- fullname = rep.split()[1][:-2] # extract name from <class 'name'>
- else:
- # old-style:
- fullname = rep
- parts = fullname.split('.')
- return parts[-1]
-
-
## The C++ InterfaceRegistry.
- #g_InterfaceRegistry = cSimData.cvar.g_InterfaceRegistry
g_InterfaceRegistry = cSimData.InterfaceRegistry.getInterfaceRegistry()
--- 52,56 ----
***************
*** 76,80 ****
## store the class directly.
! class PyInterfaceProxy(cSimData.InterfaceProxy):
def __init__(self, classname, _class, _baseinterface, interface):
cSimData.InterfaceProxy.__init__(self, classname, _class._hash)
--- 64,68 ----
## store the class directly.
! class _____PyInterfaceProxy(cSimData.InterfaceProxy):
def __init__(self, classname, _class, _baseinterface, interface):
cSimData.InterfaceProxy.__init__(self, classname, _class._hash)
***************
*** 196,200 ****
## of the archive.
! class XML:
def __init__(self, name, variable, required):
self.name = name
--- 184,188 ----
## of the archive.
! class _____XML:
def __init__(self, name, variable, required):
self.name = name
***************
*** 203,207 ****
! def XML_INTERFACE(_class, major, minor, *args):
_baseclass = None
--- 191,195 ----
! def _____XML_INTERFACE(_class, major, minor, *args):
_baseclass = None
***************
*** 210,214 ****
if isinstance(args[0], types.ClassType):
_baseclass, args = args[0], args[1:]
! _baseclass = getClassName(_baseclass)
elif isinstance(args[0], types.StringType):
_baseclass, args = args[0], args[1:]
--- 198,202 ----
if isinstance(args[0], types.ClassType):
_baseclass, args = args[0], args[1:]
! _baseclass = _baseclass.__name__
elif isinstance(args[0], types.StringType):
_baseclass, args = args[0], args[1:]
***************
*** 224,227 ****
--- 212,388 ----
_class.getClassHash = lambda x: x.__class__._hash
proxy = PyInterfaceProxy(classname, _class, _baseinterface, args).__disown__()
+
+
+ #############################################################################
+ # NEW STYLE INTERFACE
+ #############################################################################
+
+ # class SIMDATA_XML:
+ # typeString = {
+ # int: "type::int32",
+ # float: "type::float",
+ # str: "type::string"
+ # }
+ # def __init__(self, name, type, var, req):
+ # self.name = name
+ # self.type = type
+ # self.var = var
+ # self.req = req
+ # if issubclass(type, BaseType):
+ # self.typeString = type().typeString()
+ # else:
+ # self.typeString = SIMDATA_XML.typeString[type]
+ #
+ # class ObjectInterface(cSimData.ObjectInterfaceBase):
+ # """@brief Interface for simdata::Object derived classes implemented in
+ # Python.
+ #
+ # This is an internal class that provides an interfacing for accessing
+ # and introspecting object member variables that can be initialized
+ # from external (XML) data sources. The interface is equivalent to
+ # the C++ ObjectInterface class, but the implementation is entirely
+ # Python specific.
+ # """
+ #
+ # def __init__(self):
+ # """Default constructor."""
+ # self.__accessors = {}
+ #
+ # def _def(self, d):
+ # """Define a new member variable accessor.
+ #
+ # This is an internal method used by the SIMDATA_XML function. Do
+ # not call it directly.
+ # """
+ # self.__accessors[d.name] = d
+ #
+ # def variableExists(self, name):
+ # """Test if the interface defines a particular member variable.
+ #
+ # @param name The external name of the member variable to test.
+ # """
+ # return self.__accessors.has_key(name)
+ #
+ # def variableRequired(self, name):
+ # """Test if a particular member variable must be defined in external
+ # data sources.
+ #
+ # Raises IndexError if the variable does not exist.
+ #
+ # @param name The external name of the member variable to test.
+ # """
+ # return self.__accessors[name].req
+ #
+ # def set(self, obj, name, value):
+ # """Set a member variable of a given object.
+ #
+ # Assigns a new value to a particular member varible of the given
+ # object. The variable need not be previously defined, although
+ # it is strongly recommended that all externally accessible member
+ # variables be initialized during object construction. Future
+ # implementations may test for such initialization and raise
+ # exceptions when assigning to uninitialized members. Assigned
+ # values are tested for type compatibility. Type mismatches
+ # currently result in an assertion exception, although a more
+ # specific exception will be used eventually.
+ #
+ # @param obj The object to modify.
+ # @param name The external name of the member variable to set.
+ # @param value The value to assign.
+ # """
+ # a = self.__accessors[name]
+ # assert(isinstance(value, a.type))
+ # setattr(obj, a.var, value)
+ #
+ # def get(self, obj, name):
+ # """Get the value of a member variable of a given object.
+ #
+ # Returns the value of a particular member variable of the
+ # given object. Calling this method with unknown or uninitialized
+ # members will raise index and attribute exceptions, respectively.
+ #
+ # @param obj The object to access.
+ # @param name The external name of the member variable to get.
+ # @returns The value of the member variable.
+ # """
+ # a = self.__accessors[name]
+ # return getattr(obj, a.var)
+ #
+ # def push_back(self, obj, name, value):
+ # """Append a value to a member variable list of a given object.
+ # """
+ # a = self.__accessors[name]
+ # getattr(obj, a.var).append(value)
+ #
+ # def clear(self, obj, name):
+ # """Clear a member variable list of a given object.
+ # """
+ # a = self.__accessors[name]
+ # assert(isinstance([], a.type))
+ # setattr(obj, a.var, [])
+ #
+ # def getVariables(self):
+ # """Get a list of external names of all accessible member variables."""
+ # return self.__accessors.keys()
+ #
+ # def variableType(self, name):
+ # """Get the type string of a particular member variable.
+ #
+ # @param name The external name of the member variable.
+ # """
+ # a = self.__accessors[name]
+ # return a.typeString
+ #
+ #
+ # def __IF_init(self, IF):
+ # IF.__super.__init__(self, IF.__super)
+ # IF.__obi = ObjectInterface()
+ # map(IF.__obi._def, IF.__defs)
+ # self.addInterface(IF.__obi)
+ # print "Interface", IF.__classname, "registered."
+ #
+ # def __IF_getClassName(self):
+ # return self.__classname
+ #
+ # def __IF_getClassHash(self):
+ # return self.__classhash
+ #
+ # def __IF_createObject(self):
+ # return self.__class()
+ #
+ # __IF_methods = {
+ # '__init__': __IF_init,
+ # 'getClassName': __IF_getClassName,
+ # 'getClassHash': __IF_getClassHash,
+ # 'createObject': __IF_createObject,
+ # }
+ #
+ #
+ # def SIMDATA_INTERFACE(cl, v, su, defs, cln = None, abstract=0):
+ # if su is None:
+ # baselist = (InterfaceProxy,)
+ # suif = InterfaceProxy
+ # else:
+ # baselist = (su.IF,)
+ # suif = su.IF
+ # if cln is None: cln = cl.__name__
+ # iname = "%s__INTERFACE" % cln
+ # methods = __IF_methods.copy()
+ # i = type(iname, baselist, methods)
+ # i.__version = v
+ # i.__super = suif
+ # i.__class = cl
+ # i.__classname = cln
+ # i.__classhash = "%s:%d" % (cln, int(v))
+ # i.__defs = defs
+ # i.__abstract = abstract
+ # if not abstract:
+ # i.__singleton = i(i)
+ # else:
+ # i.__singleton = None
+ # cl.IF = i
+ #
+
+
|
|
From: <mk...@us...> - 2003-10-20 01:46:25
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1:/tmp/cvs-serv19658/Source Modified Files: Date.cpp Real.cpp Log Message: Index: Date.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Date.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Date.cpp 19 Oct 2003 23:53:56 -0000 1.9 --- Date.cpp 20 Oct 2003 00:37:28 -0000 1.10 *************** *** 32,43 **** #endif - #ifdef _WIN32 - #include <Windows.h> - #include <ctime> - #else - #include <sys/time.h> - #include <unistd.h> - #endif - NAMESPACE_SIMDATA --- 32,35 ---- Index: Real.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Real.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Real.cpp 19 Oct 2003 23:53:57 -0000 1.5 --- Real.cpp 20 Oct 2003 00:37:28 -0000 1.6 *************** *** 25,30 **** #include <sstream> - #include <sstream> - NAMESPACE_SIMDATA --- 25,28 ---- |
|
From: <mk...@us...> - 2003-10-20 01:36:41
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv26211 Removed Files: Updater.h Log Message: --- Updater.h DELETED --- |
|
From: <mk...@us...> - 2003-10-20 01:35:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems In directory sc8-pr-cvs1:/tmp/cvs-serv26115/Include/Systems Modified Files: AircraftFlightSensors.h AircraftSimpleFCS.h Log Message: Index: AircraftFlightSensors.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems/AircraftFlightSensors.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AircraftFlightSensors.h 20 Oct 2003 00:23:22 -0000 1.2 --- AircraftFlightSensors.h 20 Oct 2003 01:27:10 -0000 1.3 *************** *** 39,42 **** --- 39,43 ---- virtual void importChannels(Bus *bus); virtual void registerChannels(Bus *bus); + virtual void getInfo(InfoList &info) const; DataChannel<simdata::Vector3>::CRef b_Position; *************** *** 46,49 **** --- 47,52 ---- DataChannel<double>::Ref b_Pressure; DataChannel<double>::Ref b_Density; + DataChannel<double>::Ref b_Mach; + DataChannel<double>::Ref b_CAS; private: Index: AircraftSimpleFCS.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems/AircraftSimpleFCS.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AircraftSimpleFCS.h 20 Oct 2003 00:23:22 -0000 1.2 --- AircraftSimpleFCS.h 20 Oct 2003 01:27:10 -0000 1.3 *************** *** 96,100 **** virtual void postCreate(); virtual double onUpdate(double dt); ! virtual void getInfo(InfoList &info); private: --- 96,100 ---- virtual void postCreate(); virtual double onUpdate(double dt); ! virtual void getInfo(InfoList &info) const; private: |
|
From: <mk...@us...> - 2003-10-20 01:35:37
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv26115/Source
Modified Files:
AircraftObject.cpp FlightDynamics.cpp SynchronousUpdate.cpp
SystemsModel.cpp
Log Message:
Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** AircraftObject.cpp 20 Oct 2003 00:23:23 -0000 1.32
--- AircraftObject.cpp 20 Oct 2003 01:27:10 -0000 1.33
***************
*** 40,47 ****
- #ifdef _WIN32
- #define snprintf _snprintf
- #endif
-
SIMDATA_REGISTER_INTERFACE(AircraftObject)
--- 40,43 ----
Index: FlightDynamics.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/FlightDynamics.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FlightDynamics.cpp 20 Oct 2003 00:23:23 -0000 1.5
--- FlightDynamics.cpp 20 Oct 2003 01:27:10 -0000 1.6
***************
*** 122,126 ****
}
! void FlightDynamics::getInfo(InfoList &info) {
std::stringstream line;
line.setf(std::ios::fixed | std::ios::showpos);
--- 122,126 ----
}
! void FlightDynamics::getInfo(InfoList &info) const {
std::stringstream line;
line.setf(std::ios::fixed | std::ios::showpos);
Index: SynchronousUpdate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SynchronousUpdate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SynchronousUpdate.cpp 16 Sep 2003 03:34:51 -0000 1.1
--- SynchronousUpdate.cpp 20 Oct 2003 01:27:10 -0000 1.2
***************
*** 61,65 ****
if (!m_ShortList.empty()) {
UpdateList::iterator iter = m_ShortList.begin();
! UpdateList::iterator end = m_ShortList.begin();
UpdateList::iterator remove;
while (iter != end) {
--- 61,65 ----
if (!m_ShortList.empty()) {
UpdateList::iterator iter = m_ShortList.begin();
! UpdateList::iterator end = m_ShortList.end();
UpdateList::iterator remove;
while (iter != end) {
***************
*** 110,113 ****
--- 110,116 ----
}
+ void UpdateTarget::detachUpdateProxy() {
+ m_UpdateProxy = 0;
+ }
void UpdateTarget::registerUpdate(UpdateMaster *master) {
***************
*** 115,118 ****
--- 118,122 ----
if (m_UpdateProxy.valid()) m_UpdateProxy->targetSelfDetach();
m_UpdateProxy = master->registerUpdate(this);
+ std::cout << "REGISTERING UPDATE WITH MASTER\n";
}
}
***************
*** 122,124 ****
--- 126,133 ----
}
+
+ UpdateMaster *UpdateTarget::getMaster() const {
+ if (!m_UpdateProxy) return 0;
+ return m_UpdateProxy->getMaster();
+ }
Index: SystemsModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SystemsModel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SystemsModel.cpp 20 Oct 2003 00:23:23 -0000 1.2
--- SystemsModel.cpp 20 Oct 2003 01:27:10 -0000 1.3
***************
*** 32,39 ****
SIMDATA_REGISTER_INTERFACE(SystemsModel)
void SystemsModel::setDataRecorder(DataRecorder *recorder) {
if (!recorder) return;
! // TODO pass recorder to subsystems
}
--- 32,49 ----
SIMDATA_REGISTER_INTERFACE(SystemsModel)
+ class BindRecorderVisitor: public SystemVisitor {
+ DataRecorder *m_Recorder;
+ public:
+ BindRecorderVisitor(DataRecorder *recorder): m_Recorder(recorder) {}
+ void apply(System &system) {
+ system.bindRecorder(m_Recorder);
+ traverse(system);
+ }
+ void apply(SystemsModel &model) { traverse(model); }
+ };
void SystemsModel::setDataRecorder(DataRecorder *recorder) {
if (!recorder) return;
! accept(new BindRecorderVisitor(recorder));
}
|
|
From: <mk...@us...> - 2003-10-20 01:35:36
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems
In directory sc8-pr-cvs1:/tmp/cvs-serv26115/Source/Systems
Modified Files:
AircraftFlightSensors.cpp AircraftSimpleFCS.cpp
Log Message:
Index: AircraftFlightSensors.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems/AircraftFlightSensors.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AircraftFlightSensors.cpp 20 Oct 2003 00:23:23 -0000 1.2
--- AircraftFlightSensors.cpp 20 Oct 2003 01:27:10 -0000 1.3
***************
*** 29,32 ****
--- 29,35 ----
#include <CSPSim.h>
+ #include <sstream>
+ #include <iomanip>
+
using bus::Kinetics;
***************
*** 37,47 ****
--- 40,55 ----
double AircraftFlightSensors::onUpdate(double dt) {
simdata::Vector3 pos = b_Position->value();
+ double speed = b_Velocity->value().length();
Atmosphere const *atmosphere = CSPSim::theSim->getAtmosphere();
if (atmosphere) {
b_Density->value() = atmosphere->getDensity(pos.z());
+ b_Temperature->value() = atmosphere->getTemperature(pos.z());
b_Pressure->value() = atmosphere->getPressure(pos.z());
simdata::Vector3 wind = atmosphere->getWind(pos);
wind += atmosphere->getTurbulence(pos, m_Distance);
b_WindVelocity->value() = wind;
+ double mach = atmosphere->getMach(speed, pos.z());
+ b_Mach->value() = mach;
+ b_CAS->value() = atmosphere->getCAS(mach, pos.z());
m_Distance += (wind - b_Velocity->value()).length() * dt;
} else {
***************
*** 64,68 ****
--- 72,88 ----
b_Density = bus->registerLocalDataChannel<double>("Conditions.Density", 1.25);
b_Temperature = bus->registerLocalDataChannel<double>("Conditions.Temperature", 300);
+ b_Mach = bus->registerLocalDataChannel<double>("Conditions.Mach", 0.0);
+ b_CAS = bus->registerLocalDataChannel<double>("Conditions.CAS", 0.0);
}
+ void AircraftFlightSensors::getInfo(InfoList &info) const {
+ std::stringstream line;
+ line.setf(std::ios::fixed | std::ios::showpos);
+ line.precision(0);
+ line << "P: " << std::setw(3) << b_Pressure->value()
+ << ", T: " << std::setw(3) << b_Temperature->value()
+ << ", Mach: " << std::setw(3) << b_Mach->value()
+ << ", CAS: " << std::setw(3) << b_CAS->value();
+ info.push_back(line.str());
+ }
Index: AircraftSimpleFCS.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems/AircraftSimpleFCS.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AircraftSimpleFCS.cpp 20 Oct 2003 00:23:23 -0000 1.2
--- AircraftSimpleFCS.cpp 20 Oct 2003 01:27:10 -0000 1.3
***************
*** 110,114 ****
}
! void AircraftSimpleFCS::getInfo(InfoList &info) {
std::stringstream line;
line.setf(std::ios::fixed | std::ios::showpos);
--- 110,114 ----
}
! void AircraftSimpleFCS::getInfo(InfoList &info) const {
std::stringstream line;
line.setf(std::ios::fixed | std::ios::showpos);
|
|
From: <mk...@us...> - 2003-10-20 01:20:24
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Doc In directory sc8-pr-cvs1:/tmp/cvs-serv13870/Doc Modified Files: footer.html Log Message: Index: footer.html =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/footer.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** footer.html 19 Oct 2003 23:24:30 -0000 1.3 --- footer.html 19 Oct 2003 23:53:56 -0000 1.4 *************** *** 2,6 **** <table width="100%"> <tr><td> ! For more information on SimData, visit the <a href='http://simdata-csp.sourceforge.net'>SimData Homepage</a>.<br><br> <i>Generated on $datetime, using Doxygen $doxygenversion.</i> <td> --- 2,6 ---- <table width="100%"> <tr><td> ! SimData version pre-0.4.0. For more information on SimData, visit the <a href='http://simdata-csp.sourceforge.net'>SimData Homepage</a>.<br><br> <i>Generated on $datetime, using Doxygen $doxygenversion.</i> <td> |
|
From: <mk...@us...> - 2003-10-20 01:12:05
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv13870 Modified Files: CHANGES.current Makefile setup.py Added Files: runtests.py Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** CHANGES.current 19 Oct 2003 23:24:30 -0000 1.78 --- CHANGES.current 19 Oct 2003 23:53:55 -0000 1.79 *************** *** 1,3 **** ! Version 0.3.6; branch b0_3 (in progress) ! ======================================== --- 1,143 ---- ! Version 0.4.0 (in progress) ! =========================== ! 2003-10-19: onsight ! * Merged b0_4_0 into the trunk. The old head was tagged as r0_3_5, ! then branched to b0_3. ! ! 2003-10-19: onsight ! * Fixed error message in data compiler for the deprecated <Table> tag. ! ! 2003-10-13: onsight ! * Changed the 'static' property of Objects from an object property to a ! class property. The use of the 'static' attribute in Object xml tags ! is now deprecated. To specify a static Object class, use the ! SIMDATA_STATIC_OBJECT macro instead of SIMDATA_OBJECT. ! ! * Added '--force' option to Compile.py, allowing warnings to be ignored. ! ! * Added a deprecation warning to 'static' attribute of the Object tag. ! ! * Added a more informative message in Compile.py if there are warnings ! that exceed the current warning level, explaining how to use the ! '--warn=X' option. ! ! * Changed the format of the CHANGES.current file. Main points are now ! prefixed by a '*', and subpoints by a '+'. Indent is now 2 spaces, ! and the max line width is 78. A syntax highlighting file for vim to ! support this format can be downloaded from: ! http://csp.sourceforge.net/downloads/CHANGES.vim ! ! * Added deprecation warnings for <Curve> and <Table> xml tags. ! ! * Improved and added some doxygen comments. ! ! * Made InterfaceRegistry::addInterface private. ! ! * Made Referenced copy and assignment operators private (and ! unimplemented). ! ! ==> NOTE all data archives must be fully rebuilt to use these changes. ! ! 2003-10-09: onsight ! * Added simdata:: prefix to Ref<N> in class FindVisitor and FindAllVisitor ! (Composite.h) to fix msvc namespace resolution problems. ! ! * Renamed 'interface' variables in InterfaceRegistry to 'objectinterface' ! to avoid a msvc reserved keyword. ! ! 2003-09-27: onsight ! * Added the VisualStudio2003 directory from the main trunk, along with ! Stormbringer's patches to the project file. ! ! 2003-09-17: onsight ! * Changed Real::asString() to use std::stringstream instead of snprintf. ! ! * Changed DataArchive to use std::stringstream for an error message. ! ! * Fixed including std headers into simdata namespace in Date.cpp. ! ! * Fixed numerous double->float conversions (mostly in LUT.cpp). ! ! * Fixed numerous shadowed variables/methods in Quat, Matrix, Vector, UTM, ! GeoPos, and others. ! ! * Added additional warning flags for g++. ! ! ==> NOTE changes to the ObjectInterface templates trigger a regression in ! swig 1.3.19. Use either 1.3.16 or the most recent cvs (pre-1.3.20). ! ! ==> NOTE that Quaternion.h/cpp are now Quat.h/cpp ! ! 2003-09-07: onsight ! * Fixed signed/unsigned comparisons in Composite.h ! ! 2003-09-05: onsight ! * Added Composite.h, which contains template classes for implementing ! the Composite/Visitor design pattern. ! ! * Improved doxygen comments, small bug fixes, added isContainer and ! canBeAdded properties, adding logging of warning messages. ! ! 2003-09-04: onsight ! * Changed Referenced from a nonvirtual to a virtual base class of Object. ! ! 2003-08-25: onsight ! * Refactored InterfaceProxy, moving most of the functionality into the ! InterfaceProxyBase class. The base class now maintains a list of ! ObjectInterface instances that is used to access externalized member ! variables. MemberAccessor classes are now fully encapsulated within ! the templated ObjectInterface classes, so that the ObjectInterfaceBase ! class can be extended in Python without any of the template meta- ! programming trickery that C++ demands. ! ! * ObjectInterfaceBase now also keeps track of the object interface ! hierarchy (both by class name and hash). ! ! * Access to the ObjectInterface corresponding to a particular member ! variable name is now via a std::map lookup, which should be faster than ! the previous implementation involving a linear search via base class ! method calls. ! ! 2003-08-21: onsight ! * Convertied from pack/unpack to serialize for BaseType serialization: ! + Removed Pack.i, Pack.h, Pack.cpp ! + Added Archive.h, Archive.i ! + Appropriate changes to setup.py and Source/Makefile ! ! * Object classes should now only implement serialize(Archive&) to save ! and load themselves from data archives. The Archive parameter is a ! functor, which handles both saving and loading transparently. So ! instead of one list of Packer.pack(...) methods, and another identical ! list of UnPacker.unpack(..) methods, you now just make one list of ! archive(..) calls: ! ! void MyClass::serialize(Archive& archive) { ! MyBaseClass::serialize(archive); ! archive(member_var1); ! archive(member_var2); ! ... ! } ! ! See the basic data type implementations for additional examples. ! Note however that the basic data types generally have more complicated ! serialization routines than most object classes will require. Many ! basic data types test whether the archive is loading or saving and ! respond differently depending on the situation. For object classes ! this should almost always be unnecessary. ! ! * Added equality and inequality operators to several base types. ! ! * Modified the Python serialization interface (still subject to further ! changes). ! ! * Added a unit testing framework based on Python's unittest module: ! + runtests.py runs all the tests (not many so far) ! + SimData/Tests contains the unit test modules ! + SimData/Tests/ArchiveTests tests storage and retrieval ! of many basic data types (not complete yet) ! ! 2003-08-20: onsight ! * Tagged r0_3_4, version 0_3_5 started. ! * Version 0.4.0 branch started. ! >>>>>>> 1.75.2.12 Index: Makefile =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile 16 Aug 2003 07:56:39 -0000 1.20 --- Makefile 19 Oct 2003 23:53:55 -0000 1.21 *************** *** 3,12 **** export PYTHON_INCLUDE := $(shell python setup.py python_include_path) ! export GDEBUGF = -g -W -Wall -Werror -pedantic #-DSIMDATA_NOLOADCHECK export GCFLAGS = -fPIC -O2 # -march=athlon-tbird export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept ! export CXX = g++ #-3.3 ! export SWIG = swig .PHONY: all clean clean-deps --- 3,12 ---- export PYTHON_INCLUDE := $(shell python setup.py python_include_path) ! export GDEBUGF = -g -W -Wall -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK export GCFLAGS = -fPIC -O2 # -march=athlon-tbird export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept ! export CXX = g++ ! export SWIG = swig .PHONY: all clean clean-deps Index: setup.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** setup.py 16 Aug 2003 10:29:43 -0000 1.30 --- setup.py 19 Oct 2003 23:53:55 -0000 1.31 *************** *** 245,249 **** "Object", "Noise", - "Pack", "Path", "Quat", --- 245,248 ---- *************** *** 256,260 **** --- 255,261 ---- headers = [ + "Archive.h", "BaseType.h", + "Composite.h", "Conversions.h", "DataArchive.h", *************** *** 285,289 **** "ObjectInterface.h", "osg.h", - "Pack.h", "Path.h", "PTS.h", --- 286,289 ---- *************** *** 302,305 **** --- 302,306 ---- interfaces = [ "cSimData.i", + "Archive.i", "BaseType.i", "Conversions.i", *************** *** 323,327 **** "Noise.i", "Object.i", - "Pack.i", "Path.i", "Quat.i", --- 324,327 ---- |
|
From: <mk...@us...> - 2003-10-20 01:09:39
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater
In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Include/Theater
Modified Files:
CustomLayoutModel.h FeatureGroup.h FeatureGroupList.h
FeatureLayout.h FeatureObjectModel.h FeatureQuad.h Objective.h
RandomBillboardModel.h RandomForestModel.h
Log Message:
Index: CustomLayoutModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/CustomLayoutModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomLayoutModel.h 26 Jun 2003 09:25:45 -0000 1.1
--- CustomLayoutModel.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 46,50 ****
public:
! SIMDATA_OBJECT(CustomLayoutModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)
--- 46,50 ----
public:
! SIMDATA_STATIC_OBJECT(CustomLayoutModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)
***************
*** 71,83 ****
virtual ~CustomLayoutModel();
! virtual void pack(simdata::Packer& p) const {
! FeatureGroupModel::pack(p);
! p.pack(m_FeatureLayout);
}
- virtual void unpack(simdata::UnPacker& p) {
- FeatureGroupModel::unpack(p);
- p.unpack(m_FeatureLayout);
- }
};
--- 71,79 ----
virtual ~CustomLayoutModel();
! virtual void serialize(simdata::Archive &archive) {
! FeatureGroupModel::serialize(archive);
! archive(m_FeatureLayout);
}
};
Index: FeatureGroup.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureGroup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureGroup.h 26 Jun 2003 09:25:45 -0000 1.1
--- FeatureGroup.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 133,148 ****
virtual ~FeatureGroup();
! virtual void pack(simdata::Packer& p) const {
! Object::pack(p);
! p.pack(m_Model);
! p.pack(m_Position);
! p.pack(m_Orientation);
! }
!
! virtual void unpack(simdata::UnPacker& p) {
! Object::unpack(p);
! p.unpack(m_Model);
! p.unpack(m_Position);
! p.unpack(m_Orientation);
}
--- 133,141 ----
virtual ~FeatureGroup();
! virtual void serialize(simdata::Archive &archive) {
! SimObject::serialize(archive);
! archive(m_Model);
! archive(m_Position);
! archive(m_Orientation);
}
Index: FeatureGroupList.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureGroupList.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureGroupList.h 26 Jun 2003 09:25:45 -0000 1.1
--- FeatureGroupList.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 46,50 ****
public:
! SIMDATA_OBJECT(FeatureGroupList, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)
--- 46,50 ----
public:
! SIMDATA_STATIC_OBJECT(FeatureGroupList, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)
***************
*** 56,67 ****
virtual ~FeatureGroupList();
! virtual void pack(simdata::Packer& p) const {
! Object::pack(p);
! p.pack(m_FeatureGroups);
! }
!
! virtual void unpack(simdata::UnPacker& p) {
! Object::unpack(p);
! p.unpack(m_FeatureGroups);
}
--- 56,62 ----
virtual ~FeatureGroupList();
! virtual void serialize(simdata::Archive &archive) {
! Object::serialize(archive);
! archive(m_FeatureGroups);
}
Index: FeatureLayout.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureLayout.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FeatureLayout.h 22 Jul 2003 15:48:51 -0000 1.2
--- FeatureLayout.h 20 Oct 2003 00:23:23 -0000 1.3
***************
*** 109,129 ****
void makeFeatures(std::vector<Feature> &features, int value) const;
! virtual void pack(simdata::Packer& p) const {
! Object::pack(p);
! p.pack(m_FeatureModel);
! p.pack(m_X);
! p.pack(m_Y);
! p.pack(m_Orientation);
! p.pack(m_ValueModifier);
}
- virtual void unpack(simdata::UnPacker& p) {
- Object::unpack(p);
- p.unpack(m_FeatureModel);
- p.unpack(m_X);
- p.unpack(m_Y);
- p.unpack(m_Orientation);
- p.unpack(m_ValueModifier);
- }
};
--- 109,121 ----
void makeFeatures(std::vector<Feature> &features, int value) const;
! virtual void serialize(simdata::Archive &archive) {
! Object::serialize(archive);
! archive(m_FeatureModel);
! archive(m_X);
! archive(m_Y);
! archive(m_Orientation);
! archive(m_ValueModifier);
}
};
Index: FeatureObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureObjectModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureObjectModel.h 26 Jun 2003 09:25:45 -0000 1.1
--- FeatureObjectModel.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 84,88 ****
virtual void makeFeatures(std::vector<Feature> &features, int value) const;
! SIMDATA_OBJECT(FeatureObjectModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)
--- 84,88 ----
virtual void makeFeatures(std::vector<Feature> &features, int value) const;
! SIMDATA_STATIC_OBJECT(FeatureObjectModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)
***************
*** 96,112 ****
virtual ~FeatureObjectModel();
! virtual void pack(simdata::Packer& p) const {
! Object::pack(p);
! p.pack(m_HitPoints);
! p.pack(m_Value);
! p.pack(m_ObjectModel);
}
- virtual void unpack(simdata::UnPacker& p) {
- Object::unpack(p);
- p.unpack(m_HitPoints);
- p.unpack(m_Value);
- p.unpack(m_ObjectModel);
- }
};
--- 96,106 ----
virtual ~FeatureObjectModel();
! virtual void serialize(simdata::Archive &archive) {
! Object::serialize(archive);
! archive(m_HitPoints);
! archive(m_Value);
! archive(m_ObjectModel);
}
};
Index: FeatureQuad.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureQuad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureQuad.h 26 Jun 2003 09:25:45 -0000 1.1
--- FeatureQuad.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 59,63 ****
public:
! SIMDATA_OBJECT(FeatureQuad, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)
--- 59,63 ----
public:
! SIMDATA_STATIC_OBJECT(FeatureQuad, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)
***************
*** 82,103 ****
osg::StateSet * getStateSet() const;
! virtual void pack(simdata::Packer& p) const {
! Object::pack(p);
! p.pack(m_Texture);
! p.pack(m_Width);
! p.pack(m_Height);
! p.pack(m_OffsetX);
! p.pack(m_OffsetY);
! p.pack(m_Lighting);
! }
!
! virtual void unpack(simdata::UnPacker& p) {
! Object::unpack(p);
! p.unpack(m_Texture);
! p.unpack(m_Width);
! p.unpack(m_Height);
! p.unpack(m_OffsetX);
! p.unpack(m_OffsetY);
! p.unpack(m_Lighting);
}
};
--- 82,93 ----
osg::StateSet * getStateSet() const;
! virtual void serialize(simdata::Archive &archive) {
! Object::serialize(archive);
! archive(m_Texture);
! archive(m_Width);
! archive(m_Height);
! archive(m_OffsetX);
! archive(m_OffsetY);
! archive(m_Lighting);
}
};
Index: Objective.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/Objective.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Objective.h 26 Jun 2003 09:25:45 -0000 1.1
--- Objective.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 51,61 ****
virtual ~Objective();
! virtual void pack(simdata::Packer& p) const {
! FeatureGroup::pack(p);
! p.pack(m_StrategicValueModifier);
! }
! virtual void unpack(simdata::UnPacker& p) {
! FeatureGroup::unpack(p);
! p.unpack(m_StrategicValueModifier);
}
};
--- 51,57 ----
virtual ~Objective();
! virtual void serialize(simdata::Archive &archive) {
! FeatureGroup::serialize(archive);
! archive(m_StrategicValueModifier);
}
};
Index: RandomBillboardModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/RandomBillboardModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RandomBillboardModel.h 26 Jun 2003 09:25:45 -0000 1.1
--- RandomBillboardModel.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 52,56 ****
public:
! SIMDATA_OBJECT(RandomBillboardModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)
--- 52,56 ----
public:
! SIMDATA_STATIC_OBJECT(RandomBillboardModel, 0, 0)
BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)
***************
*** 76,93 ****
virtual ~RandomBillboardModel();
! virtual void pack(simdata::Packer& p) const {
! FeatureGroupModel::pack(p);
! p.pack(m_Models);
! p.pack(m_Density);
! p.pack(m_MinimumSpacing);
! p.pack(m_Seed);
! }
!
! virtual void unpack(simdata::UnPacker& p) {
! FeatureGroupModel::unpack(p);
! p.unpack(m_Models);
! p.unpack(m_Density);
! p.unpack(m_MinimumSpacing);
! p.unpack(m_Seed);
}
--- 76,85 ----
virtual ~RandomBillboardModel();
! virtual void serialize(simdata::Archive &archive) {
! FeatureGroupModel::serialize(archive);
! archive(m_Models);
! archive(m_Density);
! archive(m_MinimumSpacing);
! archive(m_Seed);
}
Index: RandomForestModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/RandomForestModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RandomForestModel.h 26 Jun 2003 09:25:45 -0000 1.1
--- RandomForestModel.h 20 Oct 2003 00:23:23 -0000 1.2
***************
*** 90,106 ****
virtual ~RandomForestModel();
! virtual void pack(simdata::Packer& p) const {
! FeatureGroupModel::pack(p);
! p.pack(m_Models);
! p.pack(m_Density);
! p.pack(m_MinimumSpacing);
! p.pack(m_Seed);
! }
! virtual void unpack(simdata::UnPacker& p) {
! FeatureGroupModel::unpack(p);
! p.unpack(m_Models);
! p.unpack(m_Density);
! p.unpack(m_MinimumSpacing);
! p.unpack(m_Seed);
}
--- 90,99 ----
virtual ~RandomForestModel();
! virtual void serialize(simdata::Archive &archive) {
! FeatureGroupModel::serialize(archive);
! archive(m_Models);
! archive(m_Density);
! archive(m_MinimumSpacing);
! archive(m_Seed);
}
|
|
From: <mk...@us...> - 2003-10-20 01:03:59
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Data Modified Files: CSPSim.ini Log Message: Index: CSPSim.ini =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CSPSim.ini 24 Jul 2003 08:10:55 -0000 1.14 --- CSPSim.ini 20 Oct 2003 00:23:22 -0000 1.15 *************** *** 7,12 **** [Screen] ! Width = 800 ! Height = 600 FullScreen = 0 --- 7,12 ---- [Screen] ! Width = 1024 ! Height = 768 FullScreen = 0 *************** *** 14,18 **** CachePath = ../Data InputMapPath = Input ! DataPath = ../Data FontPath = Fonts ModelPath = Models --- 14,18 ---- CachePath = ../Data InputMapPath = Input ! DataPath = ../../../../data FontPath = Fonts ModelPath = Models |
|
From: <mk...@us...> - 2003-10-20 01:03:10
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Data/XML/vehicles/aircraft/m2k Modified Files: model.xml Log Message: Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** model.xml 18 Jul 2003 21:56:38 -0000 1.12 --- model.xml 20 Oct 2003 00:23:22 -0000 1.13 *************** *** 3,8 **** <Object class="ObjectModel" static="1"> <!--External name="model_path">f35.3DS</External--> ! <!--External name="model_path">s.osg</External--> ! <External name="model_path">m2k2g.3ds</External> <Vector name="axis_0">1 0 0</Vector> <Vector name="axis_1">0 1 0</Vector> --- 3,8 ---- <Object class="ObjectModel" static="1"> <!--External name="model_path">f35.3DS</External--> ! <External name="model_path">s.osg</External> ! <!--External name="model_path">m2k2g.3ds</External--> <Vector name="axis_0">1 0 0</Vector> <Vector name="axis_1">0 1 0</Vector> *************** *** 31,35 **** <List name="animations"> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Rudder</Key> <Key name="model_id">Aircraft.Rudder</Key> <Int name="lod_limit">1</Int> --- 31,35 ---- <List name="animations"> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.RudderDeflection</String> <Key name="model_id">Aircraft.Rudder</Key> <Int name="lod_limit">1</Int> *************** *** 37,41 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Elevator</Key> <Key name="model_id">Aircraft.LeftElevator</Key> <Int name="lod_limit">1</Int> --- 37,41 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.ElevatorDeflection</String> <Key name="model_id">Aircraft.LeftElevator</Key> <Int name="lod_limit">1</Int> *************** *** 43,47 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Elevator</Key> <Key name="model_id">Aircraft.RightElevator</Key> <Int name="lod_limit">1</Int> --- 43,47 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.ElevatorDeflection</String> <Key name="model_id">Aircraft.RightElevator</Key> <Int name="lod_limit">1</Int> *************** *** 49,53 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Aileron</Key> <Key name="model_id">Aircraft.LeftAileron</Key> <Int name="lod_limit">1</Int> --- 49,53 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AileronDeflection</String> <Key name="model_id">Aircraft.LeftAileron</Key> <Int name="lod_limit">1</Int> *************** *** 55,59 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Aileron</Key> <Key name="model_id">Aircraft.RightAileron</Key> <Int name="lod_limit">1</Int> --- 55,59 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AileronDeflection</String> <Key name="model_id">Aircraft.RightAileron</Key> <Int name="lod_limit">1</Int> *************** *** 61,65 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Airbrake</Key> <Key name="model_id">Aircraft.LowerRightAirbrake</Key> <Int name="lod_limit">1</Int> --- 61,65 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AirbrakeDeflection</String> <Key name="model_id">Aircraft.LowerRightAirbrake</Key> <Int name="lod_limit">1</Int> *************** *** 67,71 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Airbrake</Key> <Key name="model_id">Aircraft.LowerLeftAirbrake</Key> <Int name="lod_limit">1</Int> --- 67,71 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AirbrakeDeflection</String> <Key name="model_id">Aircraft.LowerLeftAirbrake</Key> <Int name="lod_limit">1</Int> *************** *** 73,77 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Airbrake</Key> <Key name="model_id">Aircraft.UpperRightAirbrake</Key> <Int name="lod_limit">1</Int> --- 73,77 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AirbrakeDeflection</String> <Key name="model_id">Aircraft.UpperRightAirbrake</Key> <Int name="lod_limit">1</Int> *************** *** 79,83 **** </Object> <Object class="DrivenRotation"> ! <Key name="control_id">Aircraft.Airbrake</Key> <Key name="model_id">Aircraft.UpperLeftAirbrake</Key> <Int name="lod_limit">1</Int> --- 79,83 ---- </Object> <Object class="DrivenRotation"> ! <String name="channel_name">ControlSurfaces.AirbrakeDeflection</String> <Key name="model_id">Aircraft.UpperLeftAirbrake</Key> <Int name="lod_limit">1</Int> |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Include/Systems Added Files: AircraftDynamics.h AircraftFlightSensors.h AircraftInputSystem.h AircraftSimpleFCS.h GearDynamics.h LandingGear.h Log Message: |
|
From: <mk...@us...> - 2003-10-20 00:52:39
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Bin
In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Bin
Modified Files:
CSPSim.py
Log Message:
Index: CSPSim.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/CSPSim.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CSPSim.py 16 Aug 2003 10:23:12 -0000 1.11
--- CSPSim.py 20 Oct 2003 00:23:22 -0000 1.12
***************
*** 46,49 ****
--- 46,50 ----
print " --log=classes set the logging classes"
print " --slog=level set the simdata logging level"
+ print " --dump-data show the contents of sim.dar"
print " --help help message"
***************
*** 92,100 ****
def compileData(args):
datapath = CSP.getDataPath()
cachepath = CSP.getCachePath()
dar = os.path.join(cachepath, "sim.dar")
! XML = os.path.join(datapath, "XML")
CSP.csplog().setLogLevels(CSP.CSP_ALL, SimData.LOG_ALERT)
#print "compile %s %s" % (XML, dar)
--- 93,113 ----
+ def dumpData(args):
+ cachepath = CSP.getCachePath()
+ dar = os.path.join(cachepath, "sim.dar")
+ for arg in args:
+ if arg.startswith('--dump-data='):
+ dar = arg[12:]
+ archive = SimData.DataArchive(dar, 1)
+ archive.dump()
+ archive.getObject("sim:terrain.balkan")
+ archive.getObject("sim:theater.balkan")
+
+
def compileData(args):
datapath = CSP.getDataPath()
cachepath = CSP.getCachePath()
dar = os.path.join(cachepath, "sim.dar")
! XML = os.path.join(cachepath, "XML")
CSP.csplog().setLogLevels(CSP.CSP_ALL, SimData.LOG_ALERT)
#print "compile %s %s" % (XML, dar)
***************
*** 220,223 ****
--- 233,241 ----
if arg == '--compile-data':
action = compileData
+ elif arg == '--dump-data':
+ action = dumpData
+ elif arg.startswith('--dump-data='):
+ action = dumpData
+ other_args.append(arg)
elif arg in ("--help", "-h", "-help"):
if action == None:
|
