Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2003-03-22 02:26:15
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv6785 Added Files: CSPSimDLL.vcproj Log Message: no message --- NEW FILE: CSPSimDLL.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="CSPSimDLL" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="C:/Python22/include,../../../SimData/Include,../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/demeter" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS;_STLP_USE_OWN_NAMESPACE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Debug/CSPSimDLL.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib odbc32.lib odbccp32.lib" OutputFile=".\Debug/CSPSimDLL.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="C:/Python22/libs, ../../../../THIRDPARTYLIBS/lib" IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/CSPSimDLL.pdb" ImportLibrary=".\Debug/CSPSimDLL.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Debug/CSPSimDLL.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../Include,../../../SimData/Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include,../../SimData/include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS;_STLP_USE_OWN_NAMESPACE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" PrecompiledHeaderFile=".\Release/CSPSimDLL.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool 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/_CSP.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python22/libs" ImportLibrary=".\Release/_CSP.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Release/CSPSimDLL.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AeroDynamics.cpp"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../../Include"/> </FileConfiguration> </File> <File RelativePath="..\..\Source\AircraftModel.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File RelativePath="..\..\Source\Atmosphere.cpp"> </File> <File RelativePath="..\..\Source\BaseScreen.cpp"> </File> <File RelativePath="..\..\Source\CSPSim.cpp"> </File> <File RelativePath="..\..\Source\CSP_wrap.cpp"> </File> <File RelativePath="..\..\Source\Colorspace.cpp"> </File> <File RelativePath="..\..\Source\Config.cpp"> </File> <File RelativePath="..\..\Source\Console.cpp"> </File> <File RelativePath="..\..\Source\ConsoleCommands.cpp"> </File> <File RelativePath="..\..\Source\DynamicObject.cpp"> </File> <File RelativePath="..\..\Source\DynamicalSystem.cpp"> </File> <File RelativePath="..\..\Source\EventMapIndex.cpp"> </File> <File RelativePath="..\..\Source\EventMapping.cpp"> </File> <File RelativePath="..\..\Source\F16Model.cpp"> </File> <File RelativePath="..\..\Source\GameScreen.cpp"> </File> <File RelativePath="..\..\Source\HID.cpp"> </File> <File RelativePath="..\..\Source\InputInterface.cpp"> </File> <File RelativePath="..\..\Source\LandingGear.cpp"> </File> <File RelativePath="..\..\Source\LogStream.cpp"> </File> <File RelativePath="..\..\Source\LogoScreen.cpp"> </File> <File RelativePath="..\..\Source\MenuScreen.cpp"> </File> <File RelativePath="..\..\Source\Message.cpp"> </File> <File RelativePath="..\..\Source\ObjectModel.cpp"> </File> <File RelativePath="..\..\Source\ObjectRangeInfo.cpp"> </File> <File RelativePath="..\..\Source\Platform.cpp"> </File> <File RelativePath="..\..\Source\ScreenInfo.cpp"> </File> <File RelativePath="..\..\Source\ScreenInfoManager.cpp"> </File> <File RelativePath="..\..\Source\SimObject.cpp"> </File> <File RelativePath="..\..\Source\SimpleConfig.cpp"> </File> <File RelativePath="..\..\Source\SmokeEffects.cpp"> </File> <File RelativePath="..\..\Source\StaticObject.cpp"> </File> <File RelativePath="..\..\Source\TankObject.cpp"> </File> <File RelativePath="..\..\Source\TerrainObject.cpp"> </File> <File RelativePath="..\..\Source\Tools.cpp"> </File> <File RelativePath="..\..\Source\VirtualBattlefield.cpp"> </File> <File RelativePath="..\..\Source\base.cpp"> </File> <File RelativePath="..\..\Source\sky.cpp"> </File> <File RelativePath="..\..\Source\trees.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File RelativePath="..\..\Include\AeroDynamics.h"> </File> <File RelativePath="..\..\Include\AircraftObject.h"> </File> <File RelativePath="..\..\Include\Atmosphere.h"> </File> <File RelativePath="..\..\Include\BaseController.h"> </File> <File RelativePath="..\..\Include\BasePhysics.h"> </File> <File RelativePath="..\..\Include\BaseScreen.h"> </File> <File RelativePath="..\..\Include\CSPSim.h"> </File> <File RelativePath="..\..\Include\Colorspace.h"> </File> <File RelativePath="..\..\Include\Config.h"> </File> <File RelativePath="..\..\Include\Console.h"> </File> <File RelativePath="..\..\Include\DynamicObject.h"> </File> <File RelativePath="..\..\Include\EventMapIndex.h"> </File> <File RelativePath="..\..\Include\EventMapping.h"> </File> <File RelativePath="..\..\Include\FLCS.h"> </File> <File RelativePath="..\..\Include\GameScreen.h"> </File> <File RelativePath="..\..\Include\GlibCsp.h"> </File> <File RelativePath="..\..\Include\HID.h"> </File> <File RelativePath="..\..\Include\InputInterface.h"> </File> <File RelativePath="..\..\Include\LandingGear.h"> </File> <File RelativePath="..\..\Include\LogStream.h"> </File> <File RelativePath="..\..\Include\LogoScreen.h"> </File> <File RelativePath="..\..\Include\MenuScreen.h"> </File> <File RelativePath="..\..\Include\Message.h"> </File> <File RelativePath="..\..\Include\OGLText.h"> </File> <File RelativePath="..\..\Include\ObjectModel.h"> </File> <File RelativePath="..\..\Include\ObjectRangeInfo.h"> </File> <File RelativePath="..\..\Include\Platform.h"> </File> <File RelativePath="..\..\Include\ScreenInfo.h"> </File> <File RelativePath="..\..\Include\ScreenInfoManager.h"> </File> <File RelativePath="..\..\Include\SimObject.h"> </File> <File RelativePath="..\..\Include\SimpleConfig.h"> </File> <File RelativePath="..\..\Include\SmokeEffects.h"> </File> <File RelativePath="..\..\Include\StaticObject.h"> </File> <File RelativePath="..\..\Include\TankObject.h"> </File> <File RelativePath="..\..\Include\TerrainObject.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> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> </Filter> <File RelativePath="..\..\Source\CSP.i"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -IC:/Python22/include -I../../Include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: <de...@us...> - 2003-03-22 02:25:48
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv6625 Modified Files: CSPSimDLL.dsp Log Message: no message Index: CSPSimDLL.dsp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CSPSimDLL.dsp 19 Feb 2003 23:14:05 -0000 1.3 --- CSPSimDLL.dsp 22 Mar 2003 02:25:44 -0000 1.4 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /I "../../SimData/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 69,75 **** # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 69,76 ---- # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../SimData/include" /I "../../../THIRDPARTYLIBS/demeter" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 125,135 **** SOURCE=..\..\Source\Colorspace.cpp - - !IF "$(CFG)" == "CSPSimDLL - Win32 Release" - - !ELSEIF "$(CFG)" == "CSPSimDLL - Win32 Debug" - - !ENDIF - # End Source File # Begin Source File --- 126,129 ---- *************** *** 147,150 **** --- 141,148 ---- # Begin Source File + SOURCE=..\..\Source\DynamicalSystem.cpp + # End Source File + # Begin Source File + SOURCE=..\..\Source\DynamicObject.cpp # End Source File *************** *** 176,183 **** SOURCE=..\..\Source\LogoScreen.cpp - # End Source File - # Begin Source File - - SOURCE=..\..\Source\LogStream.cpp # End Source File # Begin Source File --- 174,177 ---- |
|
From: <de...@us...> - 2003-03-22 02:18:53
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv3028 Modified Files: SimData.vcproj Log Message: no message Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimData.vcproj 21 Mar 2003 18:24:13 -0000 1.2 --- SimData.vcproj 22 Mar 2003 02:16:03 -0000 1.3 *************** *** 267,270 **** --- 267,273 ---- </File> <File + RelativePath="..\Include\SimData\Log.h"> + </File> + <File RelativePath="..\Include\SimData\LogStream.h"> </File> |
|
From: <de...@us...> - 2003-03-22 02:18:47
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv4026
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGES.current 21 Mar 2003 20:09:16 -0000 1.2
--- CHANGES.current 22 Mar 2003 02:18:44 -0000 1.3
***************
*** 1,4 ****
--- 1,8 ----
Version 0.3.1 (in progress)
===========================
+
+ 2003-03-21 delta
+ CSPSim is back on windows (thx a lot Onsight).
+
2003-03-21 onsight
Merged delta's changes.
***************
*** 6,22 ****
2003-03-19 onsight
*** Project Change ***
! Added LandingGear.cpp and Console.cpp
! Cleanup up Linux bulid a bit:
!
! - Removed SDL_console check.
! - Added test for correct Python path.
! - Removed files related to Automake.
! - Adapted to new SimData installation path. There should
! be no more relative paths to SimData in the configure
! script and Makefiles.
2003-03-14 onsight
! *** SimData library and data incompatibility ***
Added ContactList to ObjectModel for bounding hardpoints that
--- 10,26 ----
2003-03-19 onsight
*** Project Change ***
! Added LandingGear.cpp and Console.cpp
! Cleanup up Linux build a bit:
!
! - Removed SDL_console check.
! - Added test for correct Python path.
! - Removed files related to Automake.
! - Adapted to new SimData installation path. There should
! be no more relative paths to SimData in the configure
! script and Makefiles.
2003-03-14 onsight
! *** SimData library and data incompatibility ***
Added ContactList to ObjectModel for bounding hardpoints that
***************
*** 59,72 ****
Added landing gear parameters to XML/vehicles/aircraft/m2k.xml
!
2003-03-12 delta
Cleaning code for ScreenInfo and ScreenInfoManager. It still
needs some improvements but it should be better now. Note that
! osgText has been entirely reimplemented. Although, I didn t use
it, we ll need to switch to it soon: more flexible interface,
robuster and faster code.
! I added a Runge-Kutta method RK_24, with a predictive step and a
corrective one; it is implemented as an abstract class in
DynamicalSystem (.cpp & .h). A dynamical system is roughly
--- 63,76 ----
Added landing gear parameters to XML/vehicles/aircraft/m2k.xml
!
2003-03-12 delta
Cleaning code for ScreenInfo and ScreenInfoManager. It still
needs some improvements but it should be better now. Note that
! osgText has been entirely reimplemented. Although, we didn t use
it, we ll need to switch to it soon: more flexible interface,
robuster and faster code.
! Added a Runge-Kutta method RK_24, with a predictive step and a
corrective one; it is implemented as an abstract class in
DynamicalSystem (.cpp & .h). A dynamical system is roughly
***************
*** 85,89 ****
line to be changed to switch back).
! I added a line in CSPSim.ini to read sound files (still
hardcoded). At the moment, SDL API is used but it should be
replaced by OpenAL soon (Wolverine is working on it). Looks like
--- 89,93 ----
line to be changed to switch back).
! Added a line in CSPSim.ini to read sound files (still
hardcoded). At the moment, SDL API is used but it should be
replaced by OpenAL soon (Wolverine is working on it). Looks like
|
|
From: <mk...@us...> - 2003-03-22 00:42:49
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv29953
Modified Files:
CHANGES.current
Log Message:
CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CHANGES.current 21 Mar 2003 18:38:01 -0000 1.8
--- CHANGES.current 22 Mar 2003 00:42:41 -0000 1.9
***************
*** 4,20 ****
Moved Python include path setting to the main Makefile.
2003-03-20: delta
Fixes for msvc.
2003-03-20: onsight
! Fixed const cast in matrix * vector routines. Why doesn't
! gcc 3.2.1 -Wall catch this? (!)
!
! Changed cSimData.i in Source to include the main version in
! Include/SimData. These differ in their %module directive.
! The main one uses SimData.cSimData, which is needed for 3rd
! party apps than import the SimData interface for SWIG. The
! version used to build SimData (in Source) uses just
! %module SimData.
2003-03-19: onsight
--- 4,30 ----
Moved Python include path setting to the main Makefile.
+ Added export modifiers to Spread and enumeration classes.
+
+ Fixed pack(unsigned) in ObjectInterface.h with static cast for
+ windows.
+
+ Got rid of generic template set() method in TypeAdapter that was
+ causing problems under windows (ambiguity between set(T&) and
+ set(Pointer<T>&)). Now all the set(BaseType&) methods are
+ written explicitly, and must be updated by hand whenever new
+ types are added.
+
2003-03-20: delta
Fixes for msvc.
2003-03-20: onsight
! Fixed const cast in matrix * vector routines. Why doesn't gcc
! 3.2.1 -Wall catch this? (!)
!
! Changed cSimData.i in Source to include the main version in
! Include/SimData. These differ in their %module directive. The
! main one uses SimData.cSimData, which is needed for 3rd party
! apps than import the SimData interface for SWIG. The version
! used to build SimData (in Source) uses just %module SimData.
2003-03-19: onsight
***************
*** 27,44 ****
as well.
! Added __mul__ and __rmul__ operators to Vector3 and Matrix3
! to allow: V*V, M*M, V*M, M*V, M*F, F*M, V*F, F*V.
! Optimized Matrix3*Vector3 and Vector3*Matrix3 slightly by
! using vector members instead of integer indexing (which
! required nine extra function calls). Access to the matrix
! elements is also faster using pointer arithmatic, and the
! for loops have been unrolled by hand.
! Fixed setup.py to preserve file and directory permissions
! during installation.
! Added make_install target to setup.py which is used by the
! standard Makefile to install SimData (make install).
2003-03-17: onsight
--- 37,54 ----
as well.
! Added __mul__ and __rmul__ operators to Vector3 and Matrix3 to
! allow: V*V, M*M, V*M, M*V, M*F, F*M, V*F, F*V.
! Optimized Matrix3*Vector3 and Vector3*Matrix3 slightly by using
! vector members instead of integer indexing (which required nine
! extra function calls). Access to the matrix elements is also
! faster using pointer arithmatic, and the for loops have been
! unrolled by hand.
! Fixed setup.py to preserve file and directory permissions during
! installation.
! Added make_install target to setup.py which is used by the
! standard Makefile to install SimData (make install).
2003-03-17: onsight
|
|
From: <mk...@us...> - 2003-03-22 00:40:32
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv28257
Modified Files:
Enum.h ObjectInterface.h Spread.h
Log Message:
Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Enum.h 20 Mar 2003 00:24:47 -0000 1.4
--- Enum.h 22 Mar 2003 00:40:26 -0000 1.5
***************
*** 63,67 ****
* Base class for Enum exceptions.
*/
! class EnumError {
protected:
std::string _msg;
--- 63,67 ----
* Base class for Enum exceptions.
*/
! class SIMDATA_EXPORT EnumError {
protected:
std::string _msg;
***************
*** 78,82 ****
* Enum exception for values not defined in the associated enumeration set.
*/
! class EnumIndexError: public EnumError {
public:
EnumIndexError(const std::string s=""): EnumError() { _msg = "Enumeration::IndexError: " + s; }
--- 78,82 ----
* Enum exception for values not defined in the associated enumeration set.
*/
! class SIMDATA_EXPORT EnumIndexError: public EnumError {
public:
EnumIndexError(const std::string s=""): EnumError() { _msg = "Enumeration::IndexError: " + s; }
***************
*** 87,91 ****
* Enum exception for errors related to mixing multiple enumeration sets.
*/
! class EnumTypeError: public EnumError {
public:
EnumTypeError(const std::string s=""): EnumError() { _msg = "Enumeration::TypeError: " + s; }
--- 87,91 ----
* Enum exception for errors related to mixing multiple enumeration sets.
*/
! class SIMDATA_EXPORT EnumTypeError: public EnumError {
public:
EnumTypeError(const std::string s=""): EnumError() { _msg = "Enumeration::TypeError: " + s; }
***************
*** 100,104 ****
* A class representing a particular value from an associated enumeration set.
*/
! class Enum: public BaseType {
friend class Enumeration;
Enum(const Enumeration& parent, const std::string &s, int idx);
--- 100,104 ----
* A class representing a particular value from an associated enumeration set.
*/
! class SIMDATA_EXPORT Enum: public BaseType {
friend class Enumeration;
Enum(const Enumeration& parent, const std::string &s, int idx);
***************
*** 150,154 ****
* An enumeration class representing a set of possible values indexed by strings.
*/
! class Enumeration {
typedef std::map<std::string, int> string_map;
string_map _map;
--- 150,154 ----
* An enumeration class representing a set of possible values indexed by strings.
*/
! class SIMDATA_EXPORT Enumeration {
typedef std::map<std::string, int> string_map;
string_map _map;
Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ObjectInterface.h 21 Mar 2003 18:23:38 -0000 1.8
--- ObjectInterface.h 22 Mar 2003 00:40:26 -0000 1.9
***************
*** 188,192 ****
C * object = dynamic_cast<C *>(o);
T &m = object->*member;
! p.pack(m.size());
typename T::iterator idx;
for (idx = m.begin(); idx != m.end(); idx++) {
--- 188,192 ----
C * object = dynamic_cast<C *>(o);
T &m = object->*member;
! p.pack(static_cast<int>(m.size()));
typename T::iterator idx;
for (idx = m.begin(); idx != m.end(); idx++) {
Index: Spread.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Spread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Spread.h 28 Jan 2003 23:26:06 -0000 1.2
--- Spread.h 22 Mar 2003 00:40:26 -0000 1.3
***************
*** 31,35 ****
! class Spread: public BaseType {
float _mean, _sigma;
float _value;
--- 31,35 ----
! class SIMDATA_EXPORT Spread: public BaseType {
float _mean, _sigma;
float _value;
|
|
From: <mk...@us...> - 2003-03-21 23:50:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv29599 Modified Files: LogStream.h Log Message: Index: LogStream.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogStream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LogStream.h 21 Mar 2003 20:08:35 -0000 1.5 --- LogStream.h 21 Mar 2003 23:49:59 -0000 1.6 *************** *** 48,51 **** --- 48,52 ---- // $Id$ + #ifndef __LOGSTREAM_H__ #define __LOGSTREAM_H__ |
|
From: <mk...@us...> - 2003-03-21 23:49:37
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv29478 Modified Files: LogStream.cpp Log Message: Index: LogStream.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogStream.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LogStream.cpp 21 Mar 2003 20:07:55 -0000 1.2 --- LogStream.cpp 21 Mar 2003 23:49:34 -0000 1.3 *************** *** 1,4 **** - - // This file orginated from FlightGear, Modififed by Wolverine --- 1,2 ---- |
|
From: <mk...@us...> - 2003-03-21 22:57:18
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv8641/Include/SimData
Modified Files:
TypeAdapter.h
Log Message:
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TypeAdapter.h 18 Mar 2003 10:04:03 -0000 1.7
--- TypeAdapter.h 21 Mar 2003 22:57:13 -0000 1.8
***************
*** 40,43 ****
--- 40,45 ----
#include <SimData/Path.h>
+ #include <SimData/Types.h>
+
NAMESPACE_SIMDATA
***************
*** 54,57 ****
--- 56,60 ----
class SimDate;
class ListBase;
+ class GeoPos;
class Object;
***************
*** 141,148 ****
x = *nc;
}
template <typename T>
! void set(T & x) const {
! setBase(x);
! }
void set(int &x) const { IntCheck(); x = static_cast<int>(var.i); }
void set(bool &x) const { IntCheck(); x = (var.i != 0); }
--- 144,164 ----
x = *nc;
}
+
+ /*
template <typename T>
! void set(T & x) const { setBase(x); }
! */
!
! void set(SimDate & x) const { setBase(x); }
! void set(GeoPos & x) const { setBase(x); }
! void set(Vector3 & x) const { setBase(x); }
! void set(Matrix3 & x) const { setBase(x); }
! void set(Spread & x) const { setBase(x); }
! void set(Curve & x) const { setBase(x); }
! void set(Table & x) const { setBase(x); }
! void set(External & x) const { setBase(x); }
! void set(Path & x) const { setBase(x); }
! // list
!
void set(int &x) const { IntCheck(); x = static_cast<int>(var.i); }
void set(bool &x) const { IntCheck(); x = (var.i != 0); }
|
|
From: <mk...@us...> - 2003-03-21 22:26:05
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv24387 Modified Files: AircraftObject.h Log Message: Index: AircraftObject.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/AircraftObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AircraftObject.h 21 Mar 2003 20:08:30 -0000 1.4 --- AircraftObject.h 21 Mar 2003 22:16:23 -0000 1.5 *************** *** 157,161 **** // landing gear ! LandingGearSet m_Gear; bool m_PhysicsInitialized; --- 157,161 ---- // landing gear ! simdata::Pointer<LandingGearSet> m_Gear; bool m_PhysicsInitialized; |
|
From: <mk...@us...> - 2003-03-21 22:25:57
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv27693/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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** model.xml 21 Mar 2003 20:09:41 -0000 1.3 --- model.xml 21 Mar 2003 22:25:52 -0000 1.4 *************** *** 3,8 **** <Object class="ObjectModel" static="1"> <!--External name="model_path">Models/f35.3DS</External--> ! <External name="model_path">Models/f35.3DS</External> ! <!--External name="model_path">Models/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">Models/f35.3DS</External--> ! <!--External name="model_path">Models/f35.3DS</External--> ! <External name="model_path">Models/m2k2g.3ds</External> <Vector name="axis_0">1 0 0</Vector> <Vector name="axis_1">0 1 0</Vector> |
|
From: <mk...@us...> - 2003-03-21 22:17:37
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv24313
Modified Files:
AircraftObject.cpp LandingGear.cpp
Log Message:
Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AircraftObject.cpp 21 Mar 2003 20:07:55 -0000 1.7
--- AircraftObject.cpp 21 Mar 2003 22:16:12 -0000 1.8
***************
*** 138,142 ****
DynamicObject::postCreate();
m_FlightModel->bindObject(m_LocalPosition, m_LinearVelocity, m_AngularVelocity, m_qOrientation);
! m_FlightModel->bindGearSet(m_Gear);
m_FlightModel->bindContacts(m_Model->getContacts());
m_FlightModel->setBoundingRadius(getBoundingSphereRadius());
--- 138,142 ----
DynamicObject::postCreate();
m_FlightModel->bindObject(m_LocalPosition, m_LinearVelocity, m_AngularVelocity, m_qOrientation);
! m_FlightModel->bindGearSet(*(m_Gear.get()));
m_FlightModel->bindContacts(m_Model->getContacts());
m_FlightModel->setBoundingRadius(getBoundingSphereRadius());
***************
*** 197,201 ****
float braking = m_BrakeInput + m_BrakePulse;
if (braking > 1.0) braking = 1.0;
! m_Gear.setBraking(braking);
if (m_decayAileron > 0) {
--- 197,201 ----
float braking = m_BrakeInput + m_BrakePulse;
if (braking > 1.0) braking = 1.0;
! m_Gear->setBraking(braking);
if (m_decayAileron > 0) {
***************
*** 234,238 ****
{
m_RudderInput = x;
! m_Gear.setSteering(x);
}
--- 234,238 ----
{
m_RudderInput = x;
! m_Gear->setSteering(x);
}
Index: LandingGear.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LandingGear.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LandingGear.cpp 21 Mar 2003 20:07:55 -0000 1.1
--- LandingGear.cpp 21 Mar 2003 22:16:13 -0000 1.2
***************
*** 45,48 ****
--- 45,49 ----
using simdata::QVRotate;
using simdata::Vector3;
+ using simdata::Dot;
|
|
From: <mk...@us...> - 2003-03-21 20:09:44
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k In directory sc8-pr-cvs1:/tmp/cvs-serv3251/vehicles/aircraft/m2k Modified Files: model.xml Log Message: see CHANGES.current Index: model.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** model.xml 2 Feb 2003 20:53:27 -0000 1.2 --- model.xml 21 Mar 2003 20:09:41 -0000 1.3 *************** *** 9,12 **** --- 9,24 ---- <Matrix name="rotation">1 0 0 0 1 0 0 0 1</Matrix> <Real name="scale">1.0</Real> + <List name="contacts"> + <Vector>0.0 3.3 -2.0</Vector> + <Vector>-1.4 -0.7 -2.0</Vector> + <Vector>1.4 -0.7 -2.0</Vector> + <Vector>0.0 8.55 -0.4</Vector> + <Vector>0.0 5.0 0.9</Vector> + <Vector>4.7 -3.0 -0.5</Vector> + <Vector>-4.7 -3.0 -0.5</Vector> + <Vector>0.0 -5.6 0.0</Vector> + <Vector>0.0 -5.6 -0.5</Vector> + <Vector>0.0 -5.1 3.2</Vector> + </List> </Object> |
|
From: <mk...@us...> - 2003-03-21 20:09:44
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft In directory sc8-pr-cvs1:/tmp/cvs-serv3251/vehicles/aircraft Modified Files: m2k.xml Log Message: see CHANGES.current Index: m2k.xml =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** m2k.xml 26 Jan 2003 23:15:54 -0000 1.1 --- m2k.xml 21 Mar 2003 20:09:40 -0000 1.2 *************** *** 23,32 **** <!-- Mass/Inertial properties --> ! <Real name="mass">7500.0</Real> <Matrix name="inertia"> ! 135691.0 0.0 0.0 ! 0.0 20354.0 6785.0 ! 0.0 6785.0 135691.0 </Matrix> </Object> --- 23,83 ---- <!-- Mass/Inertial properties --> ! <!-- ! <Real name="mass">7500.0</Real> ! <Matrix name="inertia"> ! 135691.0 0.0 0.0 ! 0.0 20354.0 6785.0 ! 0.0 6785.0 135691.0 ! </Matrix> ! --> ! <Real name="mass">10000.0</Real> <Matrix name="inertia"> ! 100000.0 0.0 0.0 ! 0.0 25000.0 6785.0 ! 0.0 6785.0 120000.0 </Matrix> + + <Object class="LandingGearSet" name="landing_gear"> + <List name="gear_set"> + <!-- all of these values are complete guesses for testing only! --> + <Object class="LandingGear"> <!-- nosewheel --> + <Vector name="max_position">0.0 3.3 -2.0</Vector> + <Vector name="motion">0 0 1.0</Vector> + <Number name="damage_limit">80000.0:10000.0</Number> + <Real name="compression_limit">0.5</Real> + <Real name="K">200000.0</Real> + <Real name="beta">10000.0</Real> + <Real name="brake_limit">3000.0</Real> + <Real name="static_friction">0.7</Real> + <Real name="dynamic_friction">0.5</Real> + <Real name="steering_limit">45.0</Real> + <Real name="tire_K">200000.0</Real> + </Object> + <Object class="LandingGear"> <!-- left main --> + <Vector name="max_position">-1.4 -0.7 -2.0</Vector> + <Vector name="motion">0 0 1.0</Vector> + <Number name="damage_limit">80000.0</Number> + <Real name="compression_limit">0.5</Real> + <Real name="K">200000.0</Real> + <Real name="beta">10000.0</Real> + <Real name="brake_limit">3000.0</Real> + <Real name="static_friction">0.7</Real> + <Real name="dynamic_friction">0.5</Real> + <Real name="tire_K">200000.0</Real> + </Object> + <Object class="LandingGear"> <!-- right main --> + <Vector name="max_position">1.4 -0.7 -2.0</Vector> + <Vector name="motion">0 0 1.0</Vector> + <Number name="damage_limit">80000.0:10000.0</Number> + <Real name="compression_limit">0.5</Real> + <Real name="K">200000.0</Real> + <Real name="beta">10000.0</Real> + <Real name="brake_limit">3000.0</Real> + <Real name="static_friction">0.7</Real> + <Real name="dynamic_friction">0.5</Real> + <Real name="tire_K">200000.0</Real> + </Object> + </List> + </Object> </Object> |
|
From: <mk...@us...> - 2003-03-21 20:09:20
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv3141 Modified Files: CHANGES.current Makefile.in Log Message: see CHANGES.current Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CHANGES.current 12 Mar 2003 21:40:18 -0000 1.1 --- CHANGES.current 21 Mar 2003 20:09:16 -0000 1.2 *************** *** 1,31 **** ! 3-12-2003 delta ! Cleaning code for ScreenInfo and ScreenInfoManager. It still needs ! some improvements but it should be better now. Note that osgText has ! been entirely reimplemented. Although, I didn t use it, we ll need to ! switch to it soon: more flexible interface, robuster and faster code. ! I added a Runge-Kutta method RK_24, with a predictive step and a ! corrective one; it is implemented as an abstract class in ! DynamicalSystem (.cpp & .h). ! A dynamical system is roughly speaking a system of differential ! equations (ODE); a pure virtual method is the vector field which looks ! like vector f(time,vector); here, vector is a ! std::vector<double> of any dimension; you need to pass its size when you ! instantiate a DynamicalSystem. This class is generic and could be use as ! soon as a vector field may be defined. ! Aerodynamics inherites now from DynamicalSystem. I ve done some minor ! cleaning in code and implement some helper functions to use with dynamical ! system. Call to this numerical method occurs in doSimStep2; it will be keep ! until others will have tested it enough (so, old code is still available and ! functional - just 1 line to be changed to switch back). ! I added a line in CSPSim.ini to read sound files (still hardcoded). At the ! moment, SDL API is used but it should be replaced by OpenAL soon (Wolverine ! is working on it). Looks like that here: ! SoundPath = ../Data/Sounds ! Changed the radius of skydome to 64000 (hardcoded!, pkz Onsight, check it) ! Others changes are minor. \ No newline at end of file --- 1,97 ---- ! Version 0.3.1 (in progress) ! =========================== ! 2003-03-21 onsight ! Merged delta's changes. ! 2003-03-19 onsight ! *** Project Change *** ! Added LandingGear.cpp and Console.cpp ! Cleanup up Linux bulid a bit: ! ! - Removed SDL_console check. ! - Added test for correct Python path. ! - Removed files related to Automake. ! - Adapted to new SimData installation path. There should ! be no more relative paths to SimData in the configure ! script and Makefiles. ! 2003-03-14 onsight ! *** SimData library and data incompatibility *** ! Added ContactList to ObjectModel for bounding hardpoints that ! interact with the ground. There is a new osg::Switch called ! m_DebugMarkers that will contain various visual cues for ! debugging. Currently you can enable visual markers for the ! contact points, and eventually other geometries like hierarchical ! bounding boxes can be added. ! Added ground interaction code for model contact points to ! AeroDynamics. This should probably be abstracted to a base class ! for use with other vehicles. Right now the ground acts as a hard, ! highly damped spring on the points. There is also a large ! (ad-hoc) tangential friction component. Forces beyond a threshold ! need to be passed to a damage model for further processing (not ! yet implemented). ! Added landing gear to AircraftObject. This is implemented in two ! new classes: LandingGearSet and LandingGear. The first is just a ! container that provides several methods to act on all the gear at ! once. Each landing gear has a complex physics model (need to add ! a simplified model as well) including shock absorption, braking, ! and steering. Gear damage, aerodynamic drag, and continuous ! retraction/extension are not yet modelled. Hooks in Aerodynamics ! activate the gear simulation (in the inner loop) when the a/c is ! near the ground. ! ! Added a simple ground effect model to AeroDynamics. ! ! Added a wind vector to the AeroDynamics calculations. The ! magnitude and direction are hard coded right now for testing. ! ! Changes to all the object pack and unpack methods to ensure that ! they are inverse operations. Added postCreate() methods as needed ! (see recent SimData changes for details). ! ! New input hooks for wheel brakes. ! ! Added new (experimental) Python runtime console. ! ! Added landing gear parameters to XML/vehicles/aircraft/m2k.xml ! ! ! 2003-03-12 delta ! Cleaning code for ScreenInfo and ScreenInfoManager. It still ! needs some improvements but it should be better now. Note that ! osgText has been entirely reimplemented. Although, I didn t use ! it, we ll need to switch to it soon: more flexible interface, ! robuster and faster code. ! ! I added a Runge-Kutta method RK_24, with a predictive step and a ! corrective one; it is implemented as an abstract class in ! DynamicalSystem (.cpp & .h). A dynamical system is roughly ! speaking a system of differential equations (ODE); a pure virtual ! method is the vector field which looks like vector ! f(time,vector); here, vector is a std::vector<double> of any ! dimension; you need to pass its size when you instantiate a ! DynamicalSystem. This class is generic and could be use as soon ! as a vector field may be defined. ! ! Aerodynamics inherites now from DynamicalSystem. I ve done some ! minor cleaning in code and implement some helper functions to use ! with dynamical system. Call to this numerical method occurs in ! doSimStep2; it will be keep until others will have tested it ! enough (so, old code is still available and functional - just 1 ! line to be changed to switch back). ! ! I added a line in CSPSim.ini to read sound files (still ! hardcoded). At the moment, SDL API is used but it should be ! replaced by OpenAL soon (Wolverine is working on it). Looks like ! that here: ! ! SoundPath = ../Data/Sounds ! ! Changed the radius of skydome to 64000 (hardcoded!, pkz Onsight, ! check it) ! ! Others changes are minor. Index: Makefile.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 15 Mar 2003 02:08:58 -0000 1.3 --- Makefile.in 21 Mar 2003 20:09:16 -0000 1.4 *************** *** 2,9 **** export DEMETER_RELATIVE = ../../THIRDPARTYLIBS/demeter - export SIMDATA_RELATIVE = ../SimData export GDEBUGF = -g -Wall ! export GCFLAGS = -I/usr/local/include/python2.2 -fPIC -Wall -DSWIG_GLOBAL -O2 export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept --- 2,8 ---- export DEMETER_RELATIVE = ../../THIRDPARTYLIBS/demeter export GDEBUGF = -g -Wall ! export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL #-march=athon-tbird export GLDOPTS = -shared -lswigpy -ldl export GSWOPTS = -c -c++ -python -noexcept *************** *** 25,33 **** # done ! swig: ! rm Source/cSimData_wrap.cpp || true; ! make -C Source all ! ! Makefile: Makefile.in configure.in aclocal.m4 ./configure --- 24,29 ---- # done ! Makefile: Makefile.in configure.in acinclude.m4 ! aclocal ; autoconf ./configure |
|
From: <mk...@us...> - 2003-03-21 19:05:53
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1:/tmp/cvs-serv25147/Source Modified Files: Makefile Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 20 Mar 2003 00:24:48 -0000 1.5 --- Makefile 21 Mar 2003 18:38:03 -0000 1.6 *************** *** 103,107 **** cSimData_wrap.o: cSimData_wrap.cpp ! $(CXX) -I/usr/local/include/python2.2 -DSWIG_GLOBAL -c $(SWCXXF) $(@:.o=.cpp) %.o: %.cpp --- 103,107 ---- cSimData_wrap.o: cSimData_wrap.cpp ! $(CXX) -I$(PYTHON_INCLUDE) -DSWIG_GLOBAL -c $(SWCXXF) $(@:.o=.cpp) %.o: %.cpp |
|
From: <de...@us...> - 2003-03-21 18:48:28
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv15456
Modified Files:
README CHANGES.current
Log Message:
no message
Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README 20 Mar 2003 00:24:47 -0000 1.4
--- README 21 Mar 2003 18:23:16 -0000 1.5
***************
*** 75,78 ****
--- 75,122 ----
TESTING
+ As a quick test, change to the Source directory and run Python.
+ Try typing "import SimData". You should see a line similar to
+ "loaded @ 0x4883012". If not, something went wrong... post to
+ the CSP developer's forum and we can try to find the problem.
+
+
+ USING SIMDATA WITH CSPSIM
+
+ The new CSP application called CSPSim relies on SimData in
+ two ways. First, libSimData.a is statically linked to make
+ the CSPSim executable. Second, the simulation data for CSPSim
+ needs to be compiled from XML source files to a binary data
+ archive using the data compiler application included with
+ SimData. This Python program is found in the directory
+ Tools/DataCompiler. Once you have built your CSPSim executable,
+ go to Tools/DataCompiler and run Compiler.py (from a command
+ prompt on windows you would probably need to type something like
+ "python Compiler.py"). If the Compiler can't find CSPSim
+ initially, it will prompt you to enter a path to CSPSim. This
+ path is saved in a file named .csp_path so you shouldn't have
+ to do this more than once. The Compiler will then print a
+ usage message and exit. To compile the data for CSPSim, you
+ must specify the top level data directory to archive, and the
+ name of the output archive. Given the standard location of
+ the files in CVS, you would type:
+
+ ./Compiler.py ../../../CSPSim/Data/Sim ../../../CSPSim/Data/Sim.dar
+
+ This will parse all the XML files under CSPSim/Data/Sim and create
+ the binary archive (named Sim.dar) needed to run CSPSim. A
+ script named "make_simdar" that runs the above command is provided
+ for your convienience. This must be rerun whenever you modify
+ the XML data files to incorporate the changes into Sim.dar.
+
+
+ BUILDING on Windows with msvc++6(sp5), stlport-4.5.3 (hints)
+
+ 1) Install python2.2 and swig 1.3.17
+ 2) Add python path to your global path
+ 3) Load SimDataMSVC.dsw
+ 4) Build it in release mode; in process, it should create a new file
+ called cSimData_wrap.cpp (this file name should already be in
+ project/Source) from cSimData.i which is parsed by swig.
+ 5) Testing procedure is same as above:
As a quick test, change to the Source directory and run Python. Try
typing "import SimData". You should see a line similar to "loaded @
***************
*** 87,90 ****
--- 131,147 ----
available.
+ ----------
+
+ 2003-03-20: Edited - work on progress. On windows, you have to
+ do:
+
+ > python setup.py make_install_win
+
+ It will install files and folders in python directory (better to be
+ power user or admin for that on xp).
+
+ ----------
+
+
Under Linux, depending on which method you used to build SimData, do
either:
***************
*** 107,111 ****
#include <SimData/Types.h>
-
-
-
--- 164,165 ----
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CHANGES.current 20 Mar 2003 17:53:37 -0000 1.6
--- CHANGES.current 21 Mar 2003 18:23:17 -0000 1.7
***************
*** 1,8 ****
Version 0.3.1 (in progress)
===========================
2003-03-20: onsight
Fixed const cast in matrix * vector routines. Why doesn't
gcc 3.2.1 -Wall catch this? (!)
!
Changed cSimData.i in Source to include the main version in
Include/SimData. These differ in their %module directive.
--- 1,12 ----
Version 0.3.1 (in progress)
===========================
+
+ 2003-03-20: delta
+ Fixes for msvc.
+
2003-03-20: onsight
Fixed const cast in matrix * vector routines. Why doesn't
gcc 3.2.1 -Wall catch this? (!)
!
Changed cSimData.i in Source to include the main version in
Include/SimData. These differ in their %module directive.
***************
*** 42,45 ****
--- 46,56 ----
Fixes for building with MS VC.Net
+ Changes to hash stuff to make it compile with native stl .net
+ Restructured some header files
+
+ Added .net project
+
+ Added a test on using stlport with msvc <= 6.0 in hash_map.h
+
2003-03-16: onsight
Created a new setup.py script to allow SimData to be build and
***************
*** 101,105 ****
Big simplification of the various smart pointer types.
PathPointer<T> is gone; now just use Pointer<T> for all object
! references. PathPointerBase is not PointerBase, and what was
originally PointerBase is now ReferencedPointer (although you
shouldn't need to use these classed directly).
--- 112,116 ----
Big simplification of the various smart pointer types.
PathPointer<T> is gone; now just use Pointer<T> for all object
! references. PathPointerBase is now PointerBase, and what was
originally PointerBase is now ReferencedPointer (although you
shouldn't need to use these classed directly).
|
|
From: <de...@us...> - 2003-03-21 18:42:32
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv15693
Modified Files:
ObjectInterface.h LogStream.h Log.h InterfaceRegistry.h
hash_map.h
Log Message:
no message
Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ObjectInterface.h 18 Mar 2003 10:04:02 -0000 1.7
--- ObjectInterface.h 21 Mar 2003 18:23:38 -0000 1.8
***************
*** 314,319 ****
template <class C, typename T>
struct SELECT_ACCESSOR {
! typedef typename PTS::IF<PTS::ISVECTOR<T>::RET,
! VectorMemberAccessor<C, T>, MemberAccessor<C, T> >::RET ACCESSOR;
};
}
--- 314,319 ----
template <class C, typename T>
struct SELECT_ACCESSOR {
! typedef typename IF<ISVECTOR<T>::RET,
! simdata::VectorMemberAccessor<C, T>, simdata::MemberAccessor<C, T> >::RET ACCESSOR;
};
}
Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogStream.h 18 Mar 2003 10:04:02 -0000 1.1
--- LogStream.h 21 Mar 2003 18:23:38 -0000 1.2
***************
*** 52,85 ****
#include <iostream>
-
- // briefly try to find the right sstream header
- #ifdef _MSC_VER
- # if !defined(_STLP_WIN32)
- # define STL_SSTREAM <strstream>
- # else
- # define STL_SSTREAM <sstream>
- # endif
- #else
- # ifdef __GNUC__
- # if __GNUC__ < 3
- # define STL_SSTREAM <strstream>
- # else
- # define STL_SSTREAM <sstream>
- # endif
- # else
- # define STL_SSTREAM <strstream>
- # endif
- #endif
-
#include <fstream>
- #include <string>
-
#include <SimData/ns-simdata.h>
#include <SimData/Export.h>
-
NAMESPACE_SIMDATA
//
--- 52,63 ----
#include <iostream>
#include <fstream>
#include <SimData/ns-simdata.h>
#include <SimData/Export.h>
NAMESPACE_SIMDATA
+ using std::ostream;
//
***************
*** 223,232 ****
* correct order of construction and destruction.
*/
! struct logstream_base
{
logstream_base() {}
logbuf lbuf;
};
!
/**
* Class to manage the debug logging stream.
--- 201,210 ----
* correct order of construction and destruction.
*/
! struct SIMDATA_EXPORT logstream_base
{
logstream_base() {}
logbuf lbuf;
};
!
/**
* Class to manage the debug logging stream.
***************
*** 242,246 ****
logstream( std::ostream& out )
: logstream_base(),
! std::ostream(&lbuf),
m_out(NULL)
{
--- 220,224 ----
logstream( std::ostream& out )
: logstream_base(),
! ostream(&lbuf), // msvc6 accepts ostream(&lbuf) _using std::ostream_, but not std::ostream(&lbuf) ...
m_out(NULL)
{
***************
*** 299,303 ****
return *this;
}
-
NAMESPACE_END // namespace simdata
--- 277,280 ----
Index: Log.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Log.h 18 Mar 2003 10:04:02 -0000 1.1
--- Log.h 21 Mar 2003 18:23:38 -0000 1.2
***************
*** 29,37 ****
#include <SimData/LogStream.h>
#include <SimData/ns-simdata.h>
#include <SimData/Export.h>
-
- #include <cstdio>
--- 29,39 ----
+ #include <cstdio>
+ #include<string>
+
+
#include <SimData/LogStream.h>
#include <SimData/ns-simdata.h>
#include <SimData/Export.h>
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InterfaceRegistry.h 18 Mar 2003 10:04:02 -0000 1.10
--- InterfaceRegistry.h 21 Mar 2003 18:23:38 -0000 1.11
***************
*** 170,178 ****
return Singleton<InterfaceRegistry>::getInstance();
}
!
private:
friend class Singleton<InterfaceRegistry>;
InterfaceRegistry();
- virtual ~InterfaceRegistry();
void __cleanup();
--- 170,186 ----
return Singleton<InterfaceRegistry>::getInstance();
}
!
! #if defined(_MSC_VER ) && (_MSC_VER <= 1200)
! virtual ~InterfaceRegistry();
! #endif
!
private:
+
+ #if !defined(_MSC_VER ) || (_MSC_VER > 1200)
+ virtual ~InterfaceRegistry();
+ #endif
+
friend class Singleton<InterfaceRegistry>;
InterfaceRegistry();
void __cleanup();
***************
*** 184,187 ****
--- 192,196 ----
proxy_id_map *__id_map;
interface_list *__list;
+
};
Index: hash_map.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/hash_map.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hash_map.h 18 Mar 2003 06:41:35 -0000 1.3
--- hash_map.h 21 Mar 2003 18:23:38 -0000 1.4
***************
*** 19,23 ****
#else
#ifdef _MSC_VER
! #if (_MSC_VER <= 1200) && defined(_STLP_MSVC)
#include <hash_map>
#define HASH_MAP std::hash_map
--- 19,23 ----
#else
#ifdef _MSC_VER
! #if (_MSC_VER <= 1200) && defined(_STLP_WIN32)
#include <hash_map>
#define HASH_MAP std::hash_map
|
|
From: <mk...@us...> - 2003-03-21 18:38:52
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv25147 Modified Files: CHANGES.current Makefile Log Message: Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CHANGES.current 21 Mar 2003 18:23:17 -0000 1.7 --- CHANGES.current 21 Mar 2003 18:38:01 -0000 1.8 *************** *** 1,4 **** --- 1,6 ---- Version 0.3.1 (in progress) =========================== + 2003-03-21: onsight + Moved Python include path setting to the main Makefile. 2003-03-20: delta Index: Makefile =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 20 Mar 2003 00:24:47 -0000 1.5 --- Makefile 21 Mar 2003 18:38:02 -0000 1.6 *************** *** 1,4 **** --- 1,6 ---- SUBDIRS = Source + export PYTHON_INCLUDE = /usr/include/python2.2 + export GDEBUGF = -g -Wall export GCFLAGS = -fPIC -O2 # -march=athlon-tbird |
|
From: <de...@us...> - 2003-03-21 18:26:56
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv16164 Modified Files: SimData.vcproj SimData.dsp Log Message: no message Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimData.vcproj 18 Mar 2003 06:44:22 -0000 1.1 --- SimData.vcproj 21 Mar 2003 18:24:13 -0000 1.2 *************** *** 13,18 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Release|Win32" ! OutputDirectory="../SimData" ! IntermediateDirectory="../SimData" ConfigurationType="2" UseOfMFC="0" *************** *** 41,50 **** AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="Release/_cSimData.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="C:/Python22/libs" ProgramDatabaseFile=".\Release/_cSimData.pdb" ! ImportLibrary=".\Release/_cSimData.lib"/> <Tool Name="VCMIDLTool" --- 41,50 ---- AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="../SimData/_cSimData.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="C:/Python22/libs" ProgramDatabaseFile=".\Release/_cSimData.pdb" ! ImportLibrary="../SimData/_cSimData.lib"/> <Tool Name="VCMIDLTool" *************** *** 167,170 **** --- 167,173 ---- </File> <File + RelativePath="..\Source\LogStream.cpp"> + </File> + <File RelativePath="..\Source\Math.cpp"> </File> *************** *** 264,267 **** --- 267,273 ---- </File> <File + RelativePath="..\Include\SimData\LogStream.h"> + </File> + <File RelativePath="..\Include\SimData\Math.h"> </File> *************** *** 325,329 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i" Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> --- 331,336 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i ! " Outputs="..\Source\$(InputName)_wrap.cpp"/> </FileConfiguration> Index: SimData.dsp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimData.dsp 18 Mar 2003 06:42:29 -0000 1.3 --- SimData.dsp 21 Mar 2003 18:24:13 -0000 1.4 *************** *** 55,59 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/_cSimData.dll" /libpath:"C:/Python22/libs" !ELSEIF "$(CFG)" == "SimData - Win32 Debug" --- 55,60 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../SimData/_cSimData.dll" /implib:"../SimData/_cSimData.lib" /libpath:"C:/Python22/libs" ! # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "SimData - Win32 Debug" *************** *** 143,147 **** # Begin Source File ! SOURCE=..\Source\main.cpp # End Source File # Begin Source File --- 144,148 ---- # Begin Source File ! SOURCE=..\Source\LogStream.cpp # End Source File # Begin Source File *************** *** 252,255 **** --- 253,260 ---- SOURCE=..\Include\SimData\List.h + # End Source File + # Begin Source File + + SOURCE=..\Include\SimData\LogStream.h # End Source File # Begin Source File |
|
From: <mk...@us...> - 2003-03-20 19:13:11
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1427
Modified Files:
setup.py
Log Message:
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** setup.py 20 Mar 2003 18:59:43 -0000 1.6
--- setup.py 20 Mar 2003 19:13:06 -0000 1.7
***************
*** 59,62 ****
--- 59,63 ----
modpath = os.path.join(lib, "SimData")
incpath = os.path.join(inc, "SimData")
+ localinc = os.path.normpath("Include/SimData")
package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
if win:
***************
*** 68,73 ****
copy_dir("SimData", modpath, package_files)
print "Installing SimData headers to", incpath
! copy_dir("Include/SimData", incpath, headers)
! copy_dir("Include/SimData", incpath, interfaces)
except Exception, e:
print e
--- 69,74 ----
copy_dir("SimData", modpath, package_files)
print "Installing SimData headers to", incpath
! copy_dir(localinc, incpath, headers)
! copy_dir(localinc, incpath, interfaces)
except Exception, e:
print e
|
|
From: <mk...@us...> - 2003-03-20 18:59:54
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv26355 Modified Files: setup.py Log Message: Index: setup.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** setup.py 20 Mar 2003 18:58:14 -0000 1.5 --- setup.py 20 Mar 2003 18:59:43 -0000 1.6 *************** *** 61,65 **** package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py'] if win: ! package_files.extend(['cSimData.py', '_cSimData.dll']) else: package_files.extend(['cSimData.py', '_cSimData.so']) --- 61,65 ---- package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py'] if win: ! package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib']) else: package_files.extend(['cSimData.py', '_cSimData.so']) |
|
From: <mk...@us...> - 2003-03-20 18:58:18
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv25687
Modified Files:
setup.py
Log Message:
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setup.py 20 Mar 2003 18:53:37 -0000 1.4
--- setup.py 20 Mar 2003 18:58:14 -0000 1.5
***************
*** 60,73 ****
incpath = os.path.join(inc, "SimData")
package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
! win_files = []
! if not win:
! package_files.extend(['cSimData.py', '_cSimData.so'])
else:
! win_files.extend(['cSimData.py', '_cSimData.dll'])
try:
print "Installing SimData package to", modpath
copy_dir("SimData", modpath, package_files)
- if win:
- copy_dir("VisualStudio", modpath, win_files)
print "Installing SimData headers to", incpath
copy_dir("Include/SimData", incpath, headers)
--- 60,70 ----
incpath = os.path.join(inc, "SimData")
package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
! if win:
! package_files.extend(['cSimData.py', '_cSimData.dll'])
else:
! package_files.extend(['cSimData.py', '_cSimData.so'])
try:
print "Installing SimData package to", modpath
copy_dir("SimData", modpath, package_files)
print "Installing SimData headers to", incpath
copy_dir("Include/SimData", incpath, headers)
|
|
From: <mk...@us...> - 2003-03-20 18:53:45
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv22894
Modified Files:
setup.py
Log Message:
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py 20 Mar 2003 17:53:39 -0000 1.3
--- setup.py 20 Mar 2003 18:53:37 -0000 1.4
***************
*** 50,56 ****
dst_name = os.path.join(dst, n)
if not os.path.isdir(src_name):
copy_file(src_name, dst_name)
! def make_install():
from distutils import sysconfig, dir_util
lib = sysconfig.get_python_lib()
--- 50,57 ----
dst_name = os.path.join(dst, n)
if not os.path.isdir(src_name):
+ print "%s => %s" % (src_name, dst_name)
copy_file(src_name, dst_name)
! def make_install(win):
from distutils import sysconfig, dir_util
lib = sysconfig.get_python_lib()
***************
*** 58,64 ****
modpath = os.path.join(lib, "SimData")
incpath = os.path.join(inc, "SimData")
try:
print "Installing SimData package to", modpath
! copy_dir("SimData", modpath, ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py', 'cSimData.py', '_cSimData.so'])
print "Installing SimData headers to", incpath
copy_dir("Include/SimData", incpath, headers)
--- 59,73 ----
modpath = os.path.join(lib, "SimData")
incpath = os.path.join(inc, "SimData")
+ package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
+ win_files = []
+ if not win:
+ package_files.extend(['cSimData.py', '_cSimData.so'])
+ else:
+ win_files.extend(['cSimData.py', '_cSimData.dll'])
try:
print "Installing SimData package to", modpath
! copy_dir("SimData", modpath, package_files)
! if win:
! copy_dir("VisualStudio", modpath, win_files)
print "Installing SimData headers to", incpath
copy_dir("Include/SimData", incpath, headers)
***************
*** 264,269 ****
! if len(sys.argv)==2 and sys.argv[1]=="make_install":
! make_install()
cSimData = Extension("SimData._cSimData",
--- 273,280 ----
! if len(sys.argv)==2:
! command = sys.argv[1]
! if command.startswith("make_install"):
! make_install(command.endswith("win"))
cSimData = Extension("SimData._cSimData",
|
|
From: <mk...@us...> - 2003-03-20 18:39:24
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv14314 Modified Files: configure.in acinclude.m4 Log Message: config fixes Index: configure.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.in 20 Mar 2003 18:38:01 -0000 1.9 --- configure.in 20 Mar 2003 18:39:21 -0000 1.10 *************** *** 71,83 **** #CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library]) - AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, , - [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],) - AC_CHECK_LIB(osgUtil, osgUtilGetVersion, , - [AC_MSG_ERROR(OpenSceneGraph Util library not found. See http://www.openscenegraph.org)],) - AC_CHECK_LIB(osgText, osgTextGetVersion, , - [AC_MSG_ERROR(OpenSceneGraph Text library not found. See http://www.openscenegraph.org)],) - AC_CHECK_LIB(osgParticle, osgParticleGetVersion, , - [AC_MSG_ERROR(OpenSceneGraph Particle library not found. See http://www.openscenegraph.org)],) - CSP_PYTHON(2.2.0) --- 71,74 ---- Index: acinclude.m4 =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** acinclude.m4 19 Feb 2003 12:40:06 -0000 1.4 --- acinclude.m4 20 Mar 2003 18:39:21 -0000 1.5 *************** *** 139,142 **** --- 139,144 ---- AC_MSG_RESULT(yes) python=yes + PYTHON_PREFIX=`python -c 'import sys; print sys.prefix'` + AC_SUBST(PYTHON_PREFIX) else AC_MSG_RESULT(no) |
