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-05-02 20:59:07
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv3500
Modified Files:
CHANGES CHANGES.current setup.py
Log Message:
see CHANGES
Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGES 18 Apr 2003 11:51:27 -0000 1.3
--- CHANGES 2 May 2003 20:59:04 -0000 1.4
***************
*** 2,5 ****
--- 2,136 ----
to CVS.
+ Version 0.3.2 (2003-05-02)
+ ===========================
+
+ 2003-04-26: onsight
+ Removed exception surpression from Link<>. If a link isn't
+ found in the archive, the exception will now propagate out
+ of SimData. Beware that this can leave objects in an
+ inconsistent state. It may be necessary to do exception
+ handling in the unpack() method if you want to gracefully
+ recover.
+
+ Added cleanStatics() methods to DataArchive and DataManager
+ that purge any cached objects not in use. Calling this
+ method after you delete many objects can free up unused
+ memory.
+
+ Fixed a date rollover bug in SimData that cause the clock to
+ advance by one day for every update call after midnight!
+
+ Fixed some other date bugs related to the number of seconds
+ in a day (some methods were using 86000 instead of 86400).
+
+ The XML parser now supports hex notation for integers, such
+ as '0xF00' and '0x9a'.
+
+ Added support for char and short data types. This is primarily
+ to allow more memory efficient object types. There are no plans
+ to support unsigned versions of char, short, and int at this
+ point. The same XML tag (<Int>) is used for all the types, and
+ no range checking is done, although this could be easily added
+ to TypeAdapter::set().
+
+ Added support for bit-packed booleans. In the interface
+ definition use:
+
+ SIMDATA_BIT("var_name", class::memvar, mask, req)
+
+ instead of the usual SIMDATA_XML. The data type for memvar can
+ be either char, short, or int. The mask field is the bit mask
+ that will be or'd with memvar if the boolean is true. If the
+ boolean is false, the mask complement is and'd with memvar. So
+ for instance, you might have:
+
+ SIMDATA_BIT("flag0", myclass::flags, 0x01, false)
+ SIMDATA_BIT("flag1", myclass::flags, 0x02, false)
+ SIMDATA_BIT("flag2", myclass::flags, 0x04, false)
+
+ In the xml data, if you specify:
+
+ <Bool name="flag0">true</Bool>
+ <Bool name="flag2">true</Bool>
+
+ then flags will be set to 5, assuming it was zero to begin with.
+ Since bits are set and cleared by true and false XML tags, you
+ can specify default bit settings (both true and false) by
+ initializing flags in the myclass ctor.
+
+ *** NOTE: Bit-packed booleans are *not* supported under VC6 by
+ the partial template specialization (PTS) hack. Since the
+ arrival of VC.net, PTS is deprecated and I have no plans to add
+ new enhancements (such as bit-packed booleans) to it.
+
+ 2003-04-25: onsight
+ Added != operator to Ref<>.
+
+ Added MakeModifiedEulerAnglesFromQ() method to Quaternion to
+ provide direct support CSP's coordinate frame. This is still
+ experimental and may not ultimately be needed.
+
+ 2003-04-25: delta
+ Updated .net project file.
+
+ 2003-04-24: onsight
+ Fix for Object::operator=() return value.
+
+ Added list and vector typedefs to class Ref.
+
+ 2003-04-22: onsight
+ Data archive files now store the parent/child relationship
+ between object paths, so it is possible to search for all
+ objects in a given path. The full list of human-readable
+ paths is also stored now, allowing path hash values to be
+ converted to more informative debugging messages.
+
+ Various methods have been added to DataArchive to access
+ this new information:
+
+ getChildren, getPathString, hasObject, getAllPathStrings
+
+ Integrated these changes with the DataManager class.
+
+ *** WARNING: ALL DAR FILES MUST NOW BE REBUILT ***
+
+ 2003-04-21: onsight
+ Abstracted the reference counting interface from class Object
+ to class Referenced.
+
+ Added a Ref<> smart-pointer for Referenced objects.
+
+ Renamed PointerBase and Pointer<> to LinkBase and Link. Moved
+ them out of Path.h/cpp into Link.h/cpp.
+
+ 2003-04-21: delta
+ Removed RadiansToDegrees and DegreesToRadians calls in
+ Quaternion::MakeQFromEulerAngles and
+ Quaternion::MakeEulerAnglesFromQ; now you must specify your
+ angles in radians.
+
+ Cleaned the code in these functions.
+
+ 2003-04-20: onsight
+ Fix for a nasty little bug in ObjectInterface.h that could
+ cause memory corruption during data compiling. Rebuild
+ SimData, install it, then rebuild CSPSim from scratch (just
+ to be sure).
+
+ 2003-04-19: delta
+ Use swig 1.3.19 on windows now so need to change custom build.
+
+
+ 2003-04-18: onsight
+ Wrote a specialized vector rotation method for quaternions
+ that should be a little bit faster.
+
+ Added DataManager.* to setup.py so it is now installed
+ properly. DataManager is also wrapped by SWIG now.
+
+ More documentation in Quaternion.h.
+
+
+
Version 0.3.1 (2003-04-18)
===========================
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** CHANGES.current 25 Apr 2003 20:36:05 -0000 1.30
--- CHANGES.current 2 May 2003 20:59:04 -0000 1.31
***************
*** 1,70 ****
! Version 0.3.2 (in progress)
===========================
-
- 2003-04-25: onsight
- Added != operator to Ref<>.
-
- Added MakeModifiedEulerAnglesFromQ() method to Quaternion
- to provide direct support CSP's coordinate frame. This
- is still experimental and may not ultimately be needed.
-
- 2003-04-25: delta
- Updated .net project file.
-
- 2003-04-24: onsight
- Fix for Object::operator=() return value.
-
- Added list and vector typedefs to class Ref.
-
- 2003-04-22: onsight
- Data archive files now store the parent/child relationship
- between object paths, so it is possible to search for all
- objects in a given path. The full list of human-readable
- paths is also stored now, allowing path hash values to be
- converted to more informative debugging messages.
-
- Various methods have been added to DataArchive to access
- this new information:
-
- getChildren, getPathString, hasObject, getAllPathStrings
-
- Integrated these changes with the DataManager class.
-
- *** WARNING: ALL DAR FILES MUST NOW BE REBUILT ***
-
- 2003-04-21: onsight
- Abstracted the reference counting interface from class Object
- to class Referenced.
-
- Added a Ref<> smart-pointer for Referenced objects.
-
- Renamed PointerBase and Pointer<> to LinkBase and Link. Moved
- them out of Path.h/cpp into Link.h/cpp.
-
- 2003-04-21: delta
- Removed RadiansToDegrees and DegreesToRadians calls in
- Quaternion::MakeQFromEulerAngles and
- Quaternion::MakeEulerAnglesFromQ; now you must specify your
- angles in radians.
-
- Cleaned the code in these functions.
-
- 2003-04-20: onsight
- Fix for a nasty little bug in ObjectInterface.h that could
- cause memory corruption during data compiling. Rebuild
- SimData, install it, then rebuild CSPSim from scratch (just
- to be sure).
-
- 2003-04-19: delta
- Use swig 1.3.19 on windows now so need to change custom build.
-
-
- 2003-04-18: onsight
- Wrote a specialized vector rotation method for quaternions
- that should be a little bit faster.
-
- Added DataManager.* to setup.py so it is now installed
- properly. DataManager is also wrapped by SWIG now.
-
- More documentation in Quaternion.h.
--- 1,3 ----
! Version 0.3.3 (in progress)
===========================
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** setup.py 25 Apr 2003 12:03:24 -0000 1.19
--- setup.py 2 May 2003 20:59:04 -0000 1.20
***************
*** 260,263 ****
--- 260,264 ----
"Object.h",
"ObjectInterface.h",
+ "osg.h",
"Pack.h",
"Path.h",
|
|
From: <mk...@us...> - 2003-05-02 20:59:07
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Doc In directory sc8-pr-cvs1:/tmp/cvs-serv3500/Doc Modified Files: Doxyfile Log Message: see CHANGES Index: Doxyfile =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/Doxyfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Doxyfile 26 Mar 2003 06:38:02 -0000 1.1 --- Doxyfile 2 May 2003 20:59:04 -0000 1.2 *************** *** 341,345 **** # certain files from those directories. ! EXCLUDE_PATTERNS = */cSimData_wrap.cpp # The EXAMPLE_PATH tag can be used to specify one or more files or --- 341,345 ---- # certain files from those directories. ! EXCLUDE_PATTERNS = */cSimData_wrap.cpp */test/* # The EXAMPLE_PATH tag can be used to specify one or more files or |
|
From: <mk...@us...> - 2003-04-25 20:36:45
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1956/Include/SimData
Modified Files:
Quaternion.h Ref.h
Log Message:
see CHANGES.current
Index: Quaternion.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quaternion.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Quaternion.h 18 Apr 2003 11:51:28 -0000 1.7
--- Quaternion.h 25 Apr 2003 20:36:07 -0000 1.8
***************
*** 333,344 ****
/**
* Convert a quaternion to Euler angles.
*/
static Vector3 MakeEulerAnglesFromQ(Quaternion const &q);
/**
* Construct a new quaternion from Euler angles.
*/
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
!
/**
* String representation.
--- 333,361 ----
/**
* Convert a quaternion to Euler angles.
+ *
+ * X axis is roll.
+ * Y axis is pitch.
+ * Z axis is yaw.
*/
static Vector3 MakeEulerAnglesFromQ(Quaternion const &q);
/**
+ * Convert a quaternion to Modified Euler angles.
+ *
+ * X axis is pitch.
+ * Y axis is roll.
+ * Z axis is -yaw.
+ */
+ static Vector3 MakeModifiedEulerAnglesFromQ(Quaternion const &q);
+
+ /**
* Construct a new quaternion from Euler angles.
+ *
+ * @param x roll angle (radians)
+ * @param y pitch angle (radians)
+ * @param z yaw angle (radians)
*/
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
!
/**
* String representation.
Index: Ref.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Ref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ref.h 24 Apr 2003 21:50:43 -0000 1.3
--- Ref.h 25 Apr 2003 20:36:07 -0000 1.4
***************
*** 217,220 ****
--- 217,235 ----
}
+ /**
+ * Comparison with other simdata pointers.
+ */
+ template <class Q>
+ inline bool operator!=(Ref<Q> const & p) const {
+ return _reference != p.get();
+ }
+
+ /**
+ * Comparison with other simdata pointers.
+ */
+ inline bool operator!=(Referenced const * p) const {
+ return _reference != p;
+ }
+
protected:
|
|
From: <mk...@us...> - 2003-04-25 20:36:13
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv1956/Source
Modified Files:
Quaternion.cpp
Log Message:
see CHANGES.current
Index: Quaternion.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Quaternion.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Quaternion.cpp 23 Apr 2003 09:14:24 -0000 1.6
--- Quaternion.cpp 25 Apr 2003 20:36:07 -0000 1.7
***************
*** 459,462 ****
--- 459,496 ----
}
+ Vector3 Quaternion::MakeModifiedEulerAnglesFromQ(Quaternion const& q)
+ {
+ Vector3 u;
+
+ double q00 = q.w * q.w;
+ double q11 = q.x * q.x;
+ double q22 = q.y * q.y;
+ double q33 = q.z * q.z;
+
+ double r11 = q00 + q22 - q11 - q33;
+ double r21 = 2 * ( q.x*q.y - q.w*q.z);
+ double r31 = 2 * (- q.y*q.z - q.w*q.x);
+ double r32 = 2 * (- q.x*q.z + q.w*q.y);
+ double r33 = q00 - q22 - q11 + q33;
+
+ double tmp = fabs(r31);
+ if(tmp > 0.999999)
+ {
+ double r12 = 2 * ( q.x*q.y + q.w*q.z);
+ double r13 = 2 * (- q.y*q.z + q.w*q.x);
+
+ u.x = -(G_PI/2) * r31/tmp; // pitch
+ u.y = 0.0f; //roll
+ u.z = atan2(-r12, -r31*r13); // yaw
+ }
+ else {
+ u.x = asin(-r31); // pitch
+ u.y = atan2(r32, r33); // roll
+ u.z = atan2(r21, r11); // yaw
+ }
+
+ return u;
+ }
+
Vector3 Quaternion::MakeEulerAnglesFromQ(Quaternion const& q)
{
***************
*** 485,496 ****
}
else {
! u.x = atan2(r32, r33); // roll
! u.y = asin(-r31); // pitch
! u.z = atan2(r21, r11); // yaw
}
return u;
-
-
}
--- 519,528 ----
}
else {
! u.x = atan2(r32, r33); // roll
! u.y = asin(-r31); // pitch
! u.z = atan2(r21, r11); // yaw
}
return u;
}
|
|
From: <mk...@us...> - 2003-04-25 20:36:11
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv1956 Modified Files: CHANGES.current Log Message: see CHANGES.current Index: CHANGES.current =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** CHANGES.current 25 Apr 2003 12:03:24 -0000 1.29 --- CHANGES.current 25 Apr 2003 20:36:05 -0000 1.30 *************** *** 2,5 **** --- 2,12 ---- =========================== + 2003-04-25: onsight + Added != operator to Ref<>. + + Added MakeModifiedEulerAnglesFromQ() method to Quaternion + to provide direct support CSP's coordinate frame. This + is still experimental and may not ultimately be needed. + 2003-04-25: delta Updated .net project file. |
|
From: <de...@us...> - 2003-04-25 12:04:58
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv7447 Modified Files: CSPSimDLL.vcproj Log Message: no message Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CSPSimDLL.vcproj 18 Apr 2003 20:36:00 -0000 1.7 --- CSPSimDLL.vcproj 25 Apr 2003 12:04:56 -0000 1.8 *************** *** 419,423 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 419,423 ---- <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"/> |
|
From: <de...@us...> - 2003-04-25 12:04:39
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv7343 Modified Files: CSPSimAppli.vcproj Log Message: no message Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CSPSimAppli.vcproj 18 Apr 2003 20:35:43 -0000 1.5 --- CSPSimAppli.vcproj 25 Apr 2003 12:04:35 -0000 1.6 *************** *** 420,424 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp ..\..\Bin\$(InputName).py"/> --- 420,424 ---- <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 ..\..\Bin\$(InputName).py"/> *************** *** 428,432 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 428,432 ---- <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"/> |
|
From: <de...@us...> - 2003-04-25 12:03:54
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv6983 Modified Files: SimData.vcproj Log Message: no message Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimData.vcproj 11 Apr 2003 20:00:27 -0000 1.5 --- SimData.vcproj 25 Apr 2003 12:03:51 -0000 1.6 *************** *** 13,18 **** <Configuration Name="Release|Win32" ! OutputDirectory="../SimData" ! IntermediateDirectory="../SimData" ConfigurationType="2" UseOfMFC="0" --- 13,18 ---- <Configuration Name="Release|Win32" ! OutputDirectory="./Release" ! IntermediateDirectory="./Release" ConfigurationType="2" UseOfMFC="0" *************** *** 99,103 **** AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="Debug/_cSimDatad.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" --- 99,103 ---- AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib" ! OutputFile="../SimData/_cSimDatad.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" *************** *** 105,109 **** GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/_cSimDatad.pdb" ! ImportLibrary=".\Debug/_cSimDatad.lib"/> <Tool Name="VCMIDLTool" --- 105,109 ---- GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/_cSimDatad.pdb" ! ImportLibrary="../SimData/_cSimDatad.lib"/> <Tool Name="VCMIDLTool" *************** *** 170,173 **** --- 170,176 ---- </File> <File + RelativePath="..\Source\Link.cpp"> + </File> + <File RelativePath="..\Source\List.cpp"> </File> *************** *** 203,206 **** --- 206,212 ---- </File> <File + RelativePath="..\Source\Ref.cpp"> + </File> + <File RelativePath="..\Source\TypeAdapter.cpp"> </File> *************** *** 214,232 **** RelativePath="..\Source\cSimData_wrap.cpp"> </File> - <File - RelativePath="..\Source\main.cpp"> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> </Filter> <Filter --- 220,223 ---- *************** *** 273,276 **** --- 264,270 ---- </File> <File + RelativePath="..\Include\SimData\Link.h"> + </File> + <File RelativePath="..\Include\SimData\List.h"> </File> *************** *** 309,312 **** --- 303,309 ---- </File> <File + RelativePath="..\Include\SimData\Ref.h"> + </File> + <File RelativePath="..\Include\SimData\String.h"> </File> *************** *** 340,344 **** <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"/> --- 337,341 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> *************** *** 348,352 **** <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"/> --- 345,349 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> |
|
From: <de...@us...> - 2003-04-25 12:03:28
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv6776
Modified Files:
setup.py CHANGES.current
Log Message:
no message
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** setup.py 24 Apr 2003 21:50:43 -0000 1.18
--- setup.py 25 Apr 2003 12:03:24 -0000 1.19
***************
*** 71,119 ****
if not os.path.isdir(src_name):
if verbose:
! print "%s => %s" % (src_name, dst_name)
copy_file(src_name, dst_name)
def make_install(win, args):
! lib = sysconfig.get_python_lib()
! inc = sysconfig.get_python_inc()
! modpath = os.path.join(lib, "SimData")
! incpath = os.path.join(inc, "SimData")
! localinc = os.path.normpath("Include/SimData")
! libpath = default_libpath
! verbose = 0
! for arg in args:
! if arg.startswith("--prefix="):
! libpath = arg[9:]
! elif arg=='-v' or arg=='--verbose':
! verbose = 1
! package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
! if win:
! package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib'])
! src = os.path.join("VisualStudio","cSimData.py")
! if os.path.exists(src):
! from distutils.file_util import copy_file
! copy_file(src, os.path.join("SimData","cSimData.py"))
! else:
! package_files.extend(['cSimData.py', '_cSimData.so'])
! try:
! print "Installing SimData package to", modpath
! copy_dir("SimData", modpath, package_files, verbose)
! print "Installing SimData headers to", incpath
! copy_dir(localinc, incpath, headers, verbose)
! copy_dir(localinc, incpath, interfaces, verbose)
! if not win:
! print "Installing SimData libraries to", libpath
! copy_dir("SimData", libpath, ['_cSimData.so', 'libSimData.a'], verbose)
! print "Byte compiling the Python modules..."
! import py_compile
! for file in package_files:
! if file.endswith(".py"):
! script = os.path.join(modpath, file)
! py_compile.compile(script)
! os.chmod(script+"c", 0644)
! except Exception, e:
! print e
! sys.exit(1)
! sys.exit(0)
class build_swig_ext(build_ext):
--- 71,119 ----
if not os.path.isdir(src_name):
if verbose:
! print "%s => %s" % (src_name, dst_name)
copy_file(src_name, dst_name)
def make_install(win, args):
! lib = sysconfig.get_python_lib()
! inc = sysconfig.get_python_inc()
! modpath = os.path.join(lib, "SimData")
! incpath = os.path.join(inc, "SimData")
! localinc = os.path.normpath("Include/SimData")
! libpath = default_libpath
! verbose = 0
! for arg in args:
! if arg.startswith("--prefix="):
! libpath = arg[9:]
! elif arg=='-v' or arg=='--verbose':
! verbose = 1
! package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
! if win:
! package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib','_cSimDatad.dll', '_cSimDatad.lib'])
! src = os.path.join("VisualStudio","cSimData.py")
! if os.path.exists(src):
! from distutils.file_util import copy_file
! copy_file(src, os.path.join("SimData","cSimData.py"))
! else:
! package_files.extend(['cSimData.py', '_cSimData.so'])
! try:
! print "Installing SimData package to", modpath
! copy_dir("SimData", modpath, package_files, verbose)
! print "Installing SimData headers to", incpath
! copy_dir(localinc, incpath, headers, verbose)
! copy_dir(localinc, incpath, interfaces, verbose)
! if not win:
! print "Installing SimData libraries to", libpath
! copy_dir("SimData", libpath, ['_cSimData.so', 'libSimData.a'], verbose)
! print "Byte compiling the Python modules..."
! import py_compile
! for file in package_files:
! if file.endswith(".py"):
! script = os.path.join(modpath, file)
! py_compile.compile(script)
! os.chmod(script+"c", 0644)
! except Exception, e:
! print e
! sys.exit(1)
! sys.exit(0)
class build_swig_ext(build_ext):
***************
*** 210,214 ****
"Exception",
"External",
! "FileUtility",
"GeoPos",
"HashUtility",
--- 210,214 ----
"Exception",
"External",
! "FileUtility",
"GeoPos",
"HashUtility",
***************
*** 242,246 ****
"Export.h",
"External.h",
! "FileUtility.h",
"GeoPos.h",
"GlibCsp.h",
--- 242,246 ----
"Export.h",
"External.h",
! "FileUtility.h",
"GeoPos.h",
"GlibCsp.h",
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** CHANGES.current 24 Apr 2003 21:14:14 -0000 1.28
--- CHANGES.current 25 Apr 2003 12:03:24 -0000 1.29
***************
*** 2,5 ****
--- 2,8 ----
===========================
+ 2003-04-25: delta
+ Updated .net project file.
+
2003-04-24: onsight
Fix for Object::operator=() return value.
|
|
From: <mk...@us...> - 2003-04-24 21:50:47
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv17567/Include/SimData
Modified Files:
Ref.h
Log Message:
Index: Ref.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Ref.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Ref.h 24 Apr 2003 21:14:15 -0000 1.2
--- Ref.h 24 Apr 2003 21:50:43 -0000 1.3
***************
*** 61,65 ****
*/
template<class T>
! class SIMDATA_EXPORT Ref {
public:
typedef std::vector< Ref<T> > vector;
--- 61,65 ----
*/
template<class T>
! class Ref {
public:
typedef std::vector< Ref<T> > vector;
|
|
From: <mk...@us...> - 2003-04-24 21:50:47
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv17567 Modified Files: setup.py Log Message: Index: setup.py =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** setup.py 23 Apr 2003 09:14:19 -0000 1.17 --- setup.py 24 Apr 2003 21:50:43 -0000 1.18 *************** *** 53,57 **** # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL ! VERSION = "\"0.3.1\"" def copy_dir(src, dst, files, verbose=0): --- 53,57 ---- # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL ! VERSION = "\"0.3.2\"" def copy_dir(src, dst, files, verbose=0): |
|
From: <mk...@us...> - 2003-04-24 21:14:19
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1377/Include/SimData
Modified Files:
Object.h Ref.h
Log Message:
see CHANGES.current
Index: Object.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Object.h 23 Apr 2003 09:14:20 -0000 1.8
--- Object.h 24 Apr 2003 21:14:15 -0000 1.9
***************
*** 120,124 ****
// Objects should never be copied
Object(Object const &) { assert(0); }
! Object const &operator=(Object const &) { assert(0); }
void _setPath(hasht);
--- 120,124 ----
// Objects should never be copied
Object(Object const &) { assert(0); }
! Object const &operator=(Object const &) { assert(0); return *this; }
void _setPath(hasht);
Index: Ref.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Ref.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Ref.h 23 Apr 2003 09:14:21 -0000 1.1
--- Ref.h 24 Apr 2003 21:14:15 -0000 1.2
***************
*** 31,34 ****
--- 31,36 ----
#include <cassert>
+ #include <list>
+ #include <vector>
#include <SimData/ns-simdata.h>
***************
*** 61,64 ****
--- 63,68 ----
class SIMDATA_EXPORT Ref {
public:
+ typedef std::vector< Ref<T> > vector;
+ typedef std::list< Ref<T> > list;
/* TODO add Python bindings
|
|
From: <mk...@us...> - 2003-04-24 21:14:18
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1377
Modified Files:
CHANGES.current
Log Message:
see CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** CHANGES.current 23 Apr 2003 09:14:19 -0000 1.27
--- CHANGES.current 24 Apr 2003 21:14:14 -0000 1.28
***************
*** 2,5 ****
--- 2,10 ----
===========================
+ 2003-04-24: onsight
+ Fix for Object::operator=() return value.
+
+ Added list and vector typedefs to class Ref.
+
2003-04-22: onsight
Data archive files now store the parent/child relationship
|
|
From: <de...@us...> - 2003-04-23 18:48:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv4233
Modified Files:
ScreenInfoManager.cpp ScreenInfo.cpp
Log Message:
no message
Index: ScreenInfoManager.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfoManager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ScreenInfoManager.cpp 23 Apr 2003 09:51:38 -0000 1.6
--- ScreenInfoManager.cpp 23 Apr 2003 18:48:00 -0000 1.7
***************
*** 31,37 ****
void set2dScene(osg::Group* rootNode, int ScreenWidth, int ScreenHeight)
{
! osg::ref_ptr<Framerate> framerate = new Framerate(11,ScreenHeight - 11);
! osg::ref_ptr<ScreenInfo> pause = new ScreenInfo(ScreenWidth - 5 * 8 - 11, ScreenHeight - 11,"PAUSE", "PAUSE");
! osg::ref_ptr<GeneralStats> generalStats = new GeneralStats(11, ScreenHeight / 3);
rootNode->addChild(framerate.get());
--- 31,38 ----
void set2dScene(osg::Group* rootNode, int ScreenWidth, int ScreenHeight)
{
! const unsigned short offsetpos = 11;
! osg::ref_ptr<Framerate> framerate = new Framerate(offsetpos,ScreenHeight - offsetpos);
! osg::ref_ptr<ScreenInfo> pause = new ScreenInfo(ScreenWidth-5*offsetpos,ScreenHeight-offsetpos,"PAUSE", "PAUSE");
! osg::ref_ptr<GeneralStats> generalStats = new GeneralStats(offsetpos, ScreenHeight / 3);
rootNode->addChild(framerate.get());
***************
*** 63,67 ****
if (os)
m_modelview_abs->removeChild(os);
! osg::ref_ptr<ObjectStats> objectStats = new ObjectStats(11, 2 * ScreenHeight / 3,vehicle);
m_modelview_abs->addChild(objectStats.get());
}
--- 64,68 ----
if (os)
m_modelview_abs->removeChild(os);
! osg::ref_ptr<ObjectStats> objectStats = new ObjectStats(12, 2 * ScreenHeight / 3,vehicle);
m_modelview_abs->addChild(objectStats.get());
}
Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScreenInfo.cpp 23 Apr 2003 09:51:38 -0000 1.10
--- ScreenInfo.cpp 23 Apr 2003 18:48:00 -0000 1.11
***************
*** 61,72 ****
ScreenInfo::ScreenInfo(int posx,int posy, std::string const & name, std::string const & text):
! m_TTFPath("ltype.ttf"),m_FontSize(11),
! m_Text(new osgText::Text)
{
- int heightFont = m_FontSize;
m_Text->setFont(m_TTFPath);
m_Text->setFontSize(m_FontSize, m_FontSize);
! m_Text->setCharacterSize(m_FontSize, 1.0);
! m_Text->setPosition(osg::Vec3(posx,posy - heightFont,0));
setUpdateCallback(new UpdateCallback());
m_Text->setText(text);
--- 61,70 ----
ScreenInfo::ScreenInfo(int posx,int posy, std::string const & name, std::string const & text):
! m_TTFPath("ltype.ttf"),m_CharacterSize(11),m_FontSize(15), m_Text(new osgText::Text)
{
m_Text->setFont(m_TTFPath);
m_Text->setFontSize(m_FontSize, m_FontSize);
! m_Text->setCharacterSize(m_CharacterSize, 1.0);
! m_Text->setPosition(osg::Vec3(posx, posy - m_CharacterSize, 0));
setUpdateCallback(new UpdateCallback());
m_Text->setText(text);
***************
*** 76,86 ****
}
! Framerate::Framerate(int posx, int posy): ScreenInfo(posx, posy, "FRAMERATE"), m_minFps(60), m_maxFps(25)
{
m_Date = new osgText::Text();
m_Date->setFont(m_TTFPath);
m_Date->setFontSize(m_FontSize, m_FontSize);
! m_Date->setCharacterSize(m_FontSize, 1.0);
! m_Date->setPosition(osg::Vec3(posx,posy - 2 * m_FontSize,0));
addDrawable(m_Date);
}
--- 74,84 ----
}
! Framerate::Framerate(int posx, int posy): ScreenInfo(posx, posy, "FRAMERATE"), m_minFps(60), m_maxFps(25), m_cumul(0.0)
{
m_Date = new osgText::Text();
m_Date->setFont(m_TTFPath);
m_Date->setFontSize(m_FontSize, m_FontSize);
! m_Date->setCharacterSize(m_CharacterSize, 1.0);
! m_Date->setPosition(osg::Vec3(posx, posy - 2 * m_CharacterSize, 0));
addDrawable(m_Date);
}
***************
*** 88,102 ****
void Framerate::update()
{
float fps = CSPSim::theSim->getFrameRate();
! static int i = 0;
! if (i++ >= 1000) { // reset occasionally
m_minFps = 100.0;
m_maxFps = 0.0;
- i = 0;
}
m_minFps = min(m_minFps,fps);
m_maxFps = max(m_maxFps,fps);
std::ostringstream osstr;
! osstr << setprecision(1) << setw(5) << fixed << fps << " FPS min: " << m_minFps << " max: " << m_maxFps;
m_Text->setText(osstr.str());
--- 86,102 ----
void Framerate::update()
{
+ static unsigned long count = 0;
float fps = CSPSim::theSim->getFrameRate();
!
! if ((count++)%1000 == 0) { // reset occasionally
m_minFps = 100.0;
m_maxFps = 0.0;
}
m_minFps = min(m_minFps,fps);
m_maxFps = max(m_maxFps,fps);
+ m_cumul += fps;
std::ostringstream osstr;
! osstr << setprecision(1) << setw(5) << fixed << fps << " FPS min: " << m_minFps << " max: " << m_maxFps << " av:"
! << m_cumul / count;
m_Text->setText(osstr.str());
***************
*** 108,135 ****
GeneralStats::GeneralStats(int posx,int posy):ScreenInfo(posx,posy,"GENERAL STATS")
{
! unsigned int yOffset;
!
! yOffset = 50 - m_FontSize;
m_LocalPosition = new osgText::Text();
m_LocalPosition->setFont(m_TTFPath);
m_LocalPosition->setFontSize(m_FontSize, m_FontSize);
! m_LocalPosition->setCharacterSize(m_FontSize, 1.0);
! m_LocalPosition->setPosition(osg::Vec3(0, yOffset, 0));
addDrawable(m_LocalPosition);
! yOffset -= m_FontSize;
m_GlobalPosition = new osgText::Text();
m_GlobalPosition->setFont(m_TTFPath);
m_GlobalPosition->setFontSize(m_FontSize, m_FontSize);
! m_GlobalPosition->setCharacterSize(m_FontSize, 1.0);
! m_GlobalPosition->setPosition(osg::Vec3(0, yOffset, 0));
addDrawable(m_GlobalPosition);
! yOffset -= m_FontSize;
m_Velocity = new osgText::Text();
m_Velocity->setFont(m_TTFPath);
m_Velocity->setFontSize(m_FontSize, m_FontSize);
! m_Velocity->setCharacterSize(m_FontSize, 1.0);
! m_Velocity->setPosition(osg::Vec3(0, yOffset, 0));
addDrawable(m_Velocity);
}
--- 108,133 ----
GeneralStats::GeneralStats(int posx,int posy):ScreenInfo(posx,posy,"GENERAL STATS")
{
! float yOffset = 50.0 - m_CharacterSize;
m_LocalPosition = new osgText::Text();
m_LocalPosition->setFont(m_TTFPath);
m_LocalPosition->setFontSize(m_FontSize, m_FontSize);
! m_LocalPosition->setCharacterSize(m_CharacterSize, 1.0);
! m_LocalPosition->setPosition(osg::Vec3(m_CharacterSize, yOffset, 0));
addDrawable(m_LocalPosition);
! yOffset -= m_CharacterSize;
m_GlobalPosition = new osgText::Text();
m_GlobalPosition->setFont(m_TTFPath);
m_GlobalPosition->setFontSize(m_FontSize, m_FontSize);
! m_GlobalPosition->setCharacterSize(m_CharacterSize, 1.0);
! m_GlobalPosition->setPosition(osg::Vec3(m_CharacterSize, yOffset, 0));
addDrawable(m_GlobalPosition);
! yOffset -= m_CharacterSize;
m_Velocity = new osgText::Text();
m_Velocity->setFont(m_TTFPath);
m_Velocity->setFontSize(m_FontSize, m_FontSize);
! m_Velocity->setCharacterSize(m_CharacterSize, 1.0);
! m_Velocity->setPosition(osg::Vec3(m_CharacterSize, yOffset, 0));
addDrawable(m_Velocity);
}
***************
*** 176,183 ****
short n = stringStats.size();
for (;n-->0;) {
! posy -= m_FontSize;
osgText::Text* aStat = new osgText::Text();
aStat->setFont(m_TTFPath);
! aStat->setCharacterSize(m_FontSize, 1.0);
aStat->setPosition(osg::Vec3(posx, posy, 0));
m_ObjectStats.push_back(aStat);
--- 174,181 ----
short n = stringStats.size();
for (;n-->0;) {
! posy -= m_CharacterSize;
osgText::Text* aStat = new osgText::Text();
aStat->setFont(m_TTFPath);
! aStat->setCharacterSize(m_CharacterSize, 1.0);
aStat->setPosition(osg::Vec3(posx, posy, 0));
m_ObjectStats.push_back(aStat);
***************
*** 198,206 ****
short m = stringStats.size();
if (m < n) n = m;
! for (;--n>=0;) {
m_ObjectStats[n]->setText(stringStats[n]);
- // std::cout << stringStats[n] << std::endl;
- }
- // std::cout << stringStats.size() << std::endl;
}
}
--- 196,201 ----
short m = stringStats.size();
if (m < n) n = m;
! for (;--n>=0;)
m_ObjectStats[n]->setText(stringStats[n]);
}
}
|
|
From: <de...@us...> - 2003-04-23 18:47:49
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv4093
Modified Files:
ScreenInfo.h
Log Message:
no message
Index: ScreenInfo.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ScreenInfo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScreenInfo.h 23 Apr 2003 10:02:11 -0000 1.5
--- ScreenInfo.h 23 Apr 2003 18:47:45 -0000 1.6
***************
*** 39,42 ****
--- 39,43 ----
std::string m_TTFPath;
int m_FontSize;
+ float m_CharacterSize;
osgText::Text* m_Text;
public:
***************
*** 51,55 ****
class Framerate: public ScreenInfo
{
! float m_minFps, m_maxFps;
osgText::Text* m_Date;
public:
--- 52,56 ----
class Framerate: public ScreenInfo
{
! float m_minFps, m_maxFps, m_cumul;
osgText::Text* m_Date;
public:
|
|
From: <de...@us...> - 2003-04-23 18:47:36
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv4011
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CHANGES.current 23 Apr 2003 12:02:16 -0000 1.26
--- CHANGES.current 23 Apr 2003 18:47:29 -0000 1.27
***************
*** 2,5 ****
--- 2,13 ----
===========================
+ 2003-04-23: delta
+ Added m_CharacterSize to ScreenInfo to control size of character
+ (m_FontSIze controls now font resolution).
+
+ Cleaned a bit this code.
+
+ Added average fps.
+
2003-04-23: onsight
Upgraded configure.in to check for OSG 0.9.4. The full test,
|
|
From: <mk...@us...> - 2003-04-23 12:03:07
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv1355a
Modified Files:
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CHANGES.current 23 Apr 2003 11:03:21 -0000 1.25
--- CHANGES.current 23 Apr 2003 12:02:16 -0000 1.26
***************
*** 2,5 ****
--- 2,12 ----
===========================
+ 2003-04-23: onsight
+ Upgraded configure.in to check for OSG 0.9.4. The full test,
+ which was broken in 0.9.3, works again. The test for osgGLUT
+ has been removed since it is no longer needed.
+
+ Removed osgGLUT from the Linux makefile.
+
2003-04-22: onsight
Port to OSG 0.9.4, mostly changes to text display code. The new
|
|
From: <mk...@us...> - 2003-04-23 11:14:01
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv15890 Modified Files: configure.in Log Message: Index: configure.in =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** configure.in 26 Mar 2003 10:17:54 -0000 1.11 --- configure.in 23 Apr 2003 11:13:29 -0000 1.12 *************** *** 53,73 **** dnl check for OpenSceneGraph ! CSP_OSG_CONFIG(osg, 0.9.3, [OpenSceneGraph]) # osg 0.9.3 segfaults when any of these libs are linked against a # minimal version test script. so, no version check for now, just # see if the libs exist. hopefully the next osg release will fix # this! ! AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, , ! [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! AC_CHECK_LIB(osgUtil, osgUtilGetVersion, , ! [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! AC_CHECK_LIB(osgText, osgTextGetVersion, , ! [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! AC_CHECK_LIB(osgParticle, osgParticleGetVersion, , ! [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) #CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library]) ! #CSP_OSG_CONFIG(osgUtil, 0.9.3, [OpenSceneGraph Util library]) ! #CSP_OSG_CONFIG(osgText, 0.9.3, [OpenSceneGraph Util library]) ! #CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) --- 53,74 ---- dnl check for OpenSceneGraph ! CSP_OSG_CONFIG(osg, 0.9.4, [OpenSceneGraph]) # osg 0.9.3 segfaults when any of these libs are linked against a # minimal version test script. so, no version check for now, just # see if the libs exist. hopefully the next osg release will fix # this! ! #AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, , ! # [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! #AC_CHECK_LIB(osgUtil, osgUtilGetVersion, , ! # [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! #AC_CHECK_LIB(osgText, osgTextGetVersion, , ! # [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! #AC_CHECK_LIB(osgParticle, osgParticleGetVersion, , ! # [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],) ! # GLUT is no longer needed. #CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library]) ! CSP_OSG_CONFIG(osgUtil, 0.9.4, [OpenSceneGraph Util library]) ! CSP_OSG_CONFIG(osgText, 0.9.4, [OpenSceneGraph Text library]) ! CSP_OSG_CONFIG(osgParticle, 0.9.4, [OpenSceneGraph Particle library]) CSP_PYTHON(2.2.0) |
|
From: <mk...@us...> - 2003-04-23 11:03:50
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv11623
Modified Files:
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CHANGES.current 21 Apr 2003 19:36:18 -0000 1.24
--- CHANGES.current 23 Apr 2003 11:03:21 -0000 1.25
***************
*** 2,40 ****
===========================
2003-04-21: delta
! Removed non necessaray calls to DegreesToRadians and
! RadiansToDegrees. Now angles must be specified in radians. If it is
! needed to display angle in degree call simdata::RadiansToDegrees at
! this stage.
2003-04-19: delta
! Got ride of more than one hundred of warnings (complaining about
! casting from double to float) in ColorSpace.cpp while compiling
! with vc++.
2003-04-19: onsight
! Changed AircraftObject:: m_heading, m_pitch, m_roll to m_Heading,
! m_Pitch, m_Roll. These are now in radians, and converted to
! degrees only if necessary (for display). setAttitude(x, y, z)
! still takes degrees.
2003-04-18: delta
! Added Runge-Kutta Cask-Karp numerical method.doSimStep2() is now
! calling it.
Added a note on initialization of 'pause'.
! Added a simdata::Pointer<DynamicalObject> parameter in ObjectStats
! methods.
! Added a check to non nullitty of m_GameScreen in CSPSim::setActiveObject.
Fixed a getStats non const method in AircraftObject class.
! Checked Onsight changes: a couple of forward class declarations causing
! compilation problems in vc++ have been fixed thanks to Onsight.
Updated .NET project.
-
2003-04-18: onsight
Lots of changes to many parts of CSPSim. First and foremost, the
--- 2,61 ----
===========================
+ 2003-04-22: onsight
+ Port to OSG 0.9.4, mostly changes to text display code. The new
+ osgText code seems a bit inefficient, causing a frame rate hit
+ for the onscreen status display. Text under Linux appears to be
+ working again though.
+
+ Changed classes that had been inheriting from simdata::Object
+ just for reference counting to use simdata::Referenced instead.
+
+ All non-XML simdata references now use simdata::Ref<>, and the
+ XML refences use simdata::Link<>. simdata::Pointer<>, which had
+ been used for both purposes, is no longer available. Ref is the
+ basic smart-pointer class with reference counting. Link is
+ similar but meant only for simdata::Objects that are creating
+ automatically as part of the data archive loading process (ie.
+ members that have SIMDATA_XML(...) lines in the interface.
+
+ Some general header cleanups, which managaed to eliminate some
+ unnecessary interdependency.
+
2003-04-21: delta
! Removed non necessaray calls to DegreesToRadians and
! RadiansToDegrees. Now angles must be specified in radians. If it
! is needed to display angle in degree call
! simdata::RadiansToDegrees at this stage.
2003-04-19: delta
! Got ride of more than one hundred of warnings (complaining about
! casting from double to float) in ColorSpace.cpp while compiling
! with vc++.
2003-04-19: onsight
! Changed AircraftObject:: m_heading, m_pitch, m_roll to
! m_Heading, m_Pitch, m_Roll. These are now in radians, and
! converted to degrees only if necessary (for display).
! setAttitude(x, y, z) still takes degrees.
2003-04-18: delta
! Added Runge-Kutta Cask-Karp numerical method.doSimStep2() is now
! calling it.
Added a note on initialization of 'pause'.
! Added a simdata::Pointer<DynamicalObject> parameter in
! ObjectStats methods.
! Added a check to non nullitty of m_GameScreen in
! CSPSim::setActiveObject.
Fixed a getStats non const method in AircraftObject class.
! Checked Onsight changes: a couple of forward class declarations
! causing compilation problems in vc++ have been fixed thanks to
! Onsight.
Updated .NET project.
2003-04-18: onsight
Lots of changes to many parts of CSPSim. First and foremost, the
***************
*** 47,58 ****
+------------ ROOT -------------+
! | |
! BACKGROUND +--------OBJECTS-----+
! | | | |
EYE_TRANSFORM TERRAIN STATIC DYNAMIC
! | |
SKY SKYLIGHTS
! / \
! SUNLIGHT MOONLIGHT
Fixed an initialization error in AeroDynamics that could cause
--- 68,79 ----
+------------ ROOT -------------+
! | |
! BACKGROUND +--------OBJECTS-----+
! | | | |
EYE_TRANSFORM TERRAIN STATIC DYNAMIC
! | |
SKY SKYLIGHTS
! / \
! SUNLIGHT MOONLIGHT
Fixed an initialization error in AeroDynamics that could cause
|
|
From: <mk...@us...> - 2003-04-23 09:33:25
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv30421
Modified Files:
cSimData.i
Log Message:
Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cSimData.i 23 Apr 2003 09:28:19 -0000 1.8
--- cSimData.i 23 Apr 2003 09:32:58 -0000 1.9
***************
*** 63,67 ****
} catch (SIMDATA(PythonException) &e) {
printf("SWIG: passing Python exception back\n");
! e.datails();
return NULL;
} catch (SIMDATA(Exception) e) {
--- 63,67 ----
} catch (SIMDATA(PythonException) &e) {
printf("SWIG: passing Python exception back\n");
! e.details();
return NULL;
} catch (SIMDATA(Exception) e) {
|
|
From: <mk...@us...> - 2003-04-23 09:28:36
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv28400/Include/SimData
Modified Files:
Types.i cSimData.i
Log Message:
Index: Types.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Types.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Types.i 23 Apr 2003 09:14:21 -0000 1.7
--- Types.i 23 Apr 2003 09:28:19 -0000 1.8
***************
*** 7,10 ****
--- 7,11 ----
$action
} catch (SIMDATA(PythonException) &e) {
+ e.details();
printf("passing it back\n");
return NULL;
Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cSimData.i 18 Apr 2003 11:51:28 -0000 1.7
--- cSimData.i 23 Apr 2003 09:28:19 -0000 1.8
***************
*** 62,75 ****
$action
} catch (SIMDATA(PythonException) &e) {
! printf("SWIG: passing Python exception back\n");
! return NULL;
} catch (SIMDATA(Exception) e) {
! printf("SWIG: caught a SimData Exception\n");
! e.details();
! return NULL;
} catch (...) {
! printf("SWIG: passing C++ exception back\n");
! return NULL;
! }
}
--- 62,76 ----
$action
} catch (SIMDATA(PythonException) &e) {
! printf("SWIG: passing Python exception back\n");
! e.datails();
! return NULL;
} catch (SIMDATA(Exception) e) {
! printf("SWIG: caught a SimData Exception\n");
! e.details();
! return NULL;
} catch (...) {
! printf("SWIG: passing C++ exception back\n");
! return NULL;
! }
}
|
|
From: <mk...@us...> - 2003-04-23 09:15:09
|
Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv22187/SimData
Modified Files:
Parse.py __init__.py
Log Message:
see CHANGES.current
Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Parse.py 11 Apr 2003 18:06:37 -0000 1.3
--- Parse.py 23 Apr 2003 09:14:22 -0000 1.4
***************
*** 399,403 ****
def getElement(self):
! p = SimData.PointerBase()
p.setPath(self._element.encode('ascii'))
return p
--- 399,403 ----
def getElement(self):
! p = SimData.LinkBase()
p.setPath(self._element.encode('ascii'))
return p
Index: __init__.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py 18 Mar 2003 10:04:04 -0000 1.1
--- __init__.py 23 Apr 2003 09:14:22 -0000 1.2
***************
*** 92,96 ****
self.interface_by_name[i.name] = i
def createObject(self):
! return Pointer(self._class())
# def createObject(self, disown=1):
# Reference counting the newly created object is a bit subtle.
--- 92,96 ----
self.interface_by_name[i.name] = i
def createObject(self):
! return Link(self._class())
# def createObject(self, disown=1):
# Reference counting the newly created object is a bit subtle.
***************
*** 98,107 ****
# retain ownership. The only caller of createObject(), however,
# should be the DataArchive class, which wraps the resulting
! # object in a Pointer<>. The Pointer maintains its own
# reference count and deletes the C++ object (and its associated
# Python object) when the referencecount goes to zero.
#
# Keep in mind that if you use this method elsewhere and don't
! # wrap the object in a Pointer<>, you will be responsible
# for deleting the object (which can only be done from C++).
# o = self._class()
--- 98,107 ----
# retain ownership. The only caller of createObject(), however,
# should be the DataArchive class, which wraps the resulting
! # object in a Link<>. The Link maintains its own
# reference count and deletes the C++ object (and its associated
# Python object) when the referencecount goes to zero.
#
# Keep in mind that if you use this method elsewhere and don't
! # wrap the object in a Link<>, you will be responsible
# for deleting the object (which can only be done from C++).
# o = self._class()
***************
*** 229,239 ****
from cSimData import *
! ## Specialized Pointer class for Python. This class behaves like
## Object, but automatically combines C++ and Python reference
## counting to handle object lifetime in a sane way. Both C++
! ## and Python createObject methods return Pointer class objects
## under Python, so it should never be necessary to handle a
## raw Object instance.
! class Pointer(cSimData.Object):
def __init__(self, obj):
# NOTE: skip base class __init__
--- 229,239 ----
from cSimData import *
! ## Specialized Link class for Python. This class behaves like
## Object, but automatically combines C++ and Python reference
## counting to handle object lifetime in a sane way. Both C++
! ## and Python createObject methods return Link class objects
## under Python, so it should never be necessary to handle a
## raw Object instance.
! class Link(cSimData.Object):
def __init__(self, obj):
# NOTE: skip base class __init__
***************
*** 241,247 ****
self.this = obj.this
# increase the reference count of the C++ object
! self.ptr = PointerBase(obj)
# disown the C++ object from Python, C++ reference
! # counting by PointerBase is now responsible for
# the C++ object's lifetime. when self.ptr is
# destroyed, the reference count will decrease.
--- 241,247 ----
self.this = obj.this
# increase the reference count of the C++ object
! self.ptr = LinkBase(obj)
# disown the C++ object from Python, C++ reference
! # counting by LinkBase is now responsible for
# the C++ object's lifetime. when self.ptr is
# destroyed, the reference count will decrease.
***************
*** 253,259 ****
! ## Override createObject to return a Pointer(Object)
cSimData.InterfaceProxy.createObject = \
! lambda self, method=cSimData.InterfaceProxy.createObject: Pointer(method(self))
--- 253,259 ----
! ## Override createObject to return a Link(Object)
cSimData.InterfaceProxy.createObject = \
! lambda self, method=cSimData.InterfaceProxy.createObject: Link(method(self))
|
|
From: <mk...@us...> - 2003-04-23 09:15:07
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv22187
Modified Files:
CHANGES.current TODO setup.py
Log Message:
see CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CHANGES.current 21 Apr 2003 19:19:57 -0000 1.26
--- CHANGES.current 23 Apr 2003 09:14:19 -0000 1.27
***************
*** 2,5 ****
--- 2,30 ----
===========================
+ 2003-04-22: onsight
+ Data archive files now store the parent/child relationship
+ between object paths, so it is possible to search for all
+ objects in a given path. The full list of human-readable
+ paths is also stored now, allowing path hash values to be
+ converted to more informative debugging messages.
+
+ Various methods have been added to DataArchive to access
+ this new information:
+
+ getChildren, getPathString, hasObject, getAllPathStrings
+
+ Integrated these changes with the DataManager class.
+
+ *** WARNING: ALL DAR FILES MUST NOW BE REBUILT ***
+
+ 2003-04-21: onsight
+ Abstracted the reference counting interface from class Object
+ to class Referenced.
+
+ Added a Ref<> smart-pointer for Referenced objects.
+
+ Renamed PointerBase and Pointer<> to LinkBase and Link. Moved
+ them out of Path.h/cpp into Link.h/cpp.
+
2003-04-21: delta
Removed RadiansToDegrees and DegreesToRadians calls in
Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TODO 10 Feb 2003 05:16:19 -0000 1.3
--- TODO 23 Apr 2003 09:14:19 -0000 1.4
***************
*** 29,47 ****
what is now in SimData.py.
OTHER
----------------------------------------------------------------
! * Improve the build on Linux.
!
! * Create a build for Windows. (in progress)
! * Install target to put SimData.py and _cSimData.so in
! the Python site-local directory, and libSimData.a in
! $prefix/lib.
!
! * Eliminate most inline code from headers.
! * Check for unnecessary header includes
* Bug Dave about adding nested class support to SWIG
--- 29,52 ----
what is now in SimData.py.
+ Recently (April 2003) I've been considering Boost::Python
+ bindings as well. Boost supports nested classes and poly-
+ morphism, but requires more hands-on wrapping. A new
+ project called Pyste promises to provide much more automated
+ wrapping capabilities to Boost, using an interface design
+ that is very similar to SWIG. This is still a bit too
+ immature for use in SimData, but it may be a viable option
+ before long.
+
OTHER
----------------------------------------------------------------
! * Improve the build on Linux and Windows. This has already
! gotten considerably better, but there's always more work
! to do.
! * Eliminate unnecessary inline code from headers.
! * Check for unnecessary header includes.
* Bug Dave about adding nested class support to SWIG
***************
*** 58,68 ****
this feature for the time being.
! * Store path hash in loaded simdata::Object instances (done)
!
! * Change getClassName() to return just the classname, without version
! number (done)
!
! * Add getClassVersion() method to simdata::Object. Return
! "major:minor". (done)
--- 63,68 ----
this feature for the time being.
! * More cleanup of the Link<> base classes.
+ * Add an OSG Math adapter header.
Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** setup.py 18 Apr 2003 11:51:28 -0000 1.16
--- setup.py 23 Apr 2003 09:14:19 -0000 1.17
***************
*** 215,218 ****
--- 215,219 ----
"InterfaceRegistry",
"Interpolate",
+ "Link",
"List",
"LogStream",
***************
*** 249,252 ****
--- 250,254 ----
"InterfaceRegistry.h",
"Interpolate.h",
+ "Link.h",
"List.h",
"Log.h",
***************
*** 263,266 ****
--- 265,269 ----
"Random.h",
"Real.h",
+ "Ref.h",
"String.h",
"TypeAdapter.h",
***************
*** 286,289 ****
--- 289,293 ----
"InterfaceRegistry.i",
"Interpolate.i",
+ "Link.i",
"List.i",
"Log.i",
|
|
From: <de...@us...> - 2003-04-21 21:57:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv17495a Modified Files: CSPSim.cpp Log Message: no message Index: CSPSim.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CSPSim.cpp 18 Apr 2003 20:29:41 -0000 1.23 --- CSPSim.cpp 21 Apr 2003 21:57:24 -0000 1.24 *************** *** 261,265 **** assert(ao.valid()); ao->setGlobalPosition(483000, 499000, 91.2); ! ao->setAttitude(2.0, 0.0, 0.0); ao->setVelocity(0, 2.0, 0); m_Battlefield->addObject(ao); --- 261,265 ---- assert(ao.valid()); ao->setGlobalPosition(483000, 499000, 91.2); ! ao->setAttitude(0.03, 0.0, 0.0); ao->setVelocity(0, 2.0, 0); m_Battlefield->addObject(ao); |
|
From: <de...@us...> - 2003-04-21 19:36:24
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv13520
Modified Files:
CHANGES.current
Log Message:
no message
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CHANGES.current 18 Apr 2003 20:59:54 -0000 1.23
--- CHANGES.current 21 Apr 2003 19:36:18 -0000 1.24
***************
*** 2,22 ****
===========================
2003-04-19: onsight
Changed AircraftObject:: m_heading, m_pitch, m_roll to m_Heading,
! m_Pitch, m_Roll. These are now in radians, and converted to
! degrees only if necessary (for display). setAttitude(x, y, z)
! still takes degrees.
2003-04-18: delta
! Added Runge-Kutta Cask-Karp numerical method.doSimStep2() is now
! calling it.
! Added a note on initialization of 'pause'.
! Added a simdata::Pointer<DynamicalObject> parameter in ObjectStats methods.
! Added a check to non nullitty of m_GameScreen in CSPSim::setActiveObject.
! Fixed a getStats non const method in AircraftObject class.
! Checked Onsight changes: a couple of forward class declarations causing
! compilation problems in vc++ have been fixed thanks to Onsight.
! Updated .NET project.
2003-04-18: onsight
--- 2,39 ----
===========================
+ 2003-04-21: delta
+ Removed non necessaray calls to DegreesToRadians and
+ RadiansToDegrees. Now angles must be specified in radians. If it is
+ needed to display angle in degree call simdata::RadiansToDegrees at
+ this stage.
+
+ 2003-04-19: delta
+ Got ride of more than one hundred of warnings (complaining about
+ casting from double to float) in ColorSpace.cpp while compiling
+ with vc++.
+
2003-04-19: onsight
Changed AircraftObject:: m_heading, m_pitch, m_roll to m_Heading,
! m_Pitch, m_Roll. These are now in radians, and converted to
! degrees only if necessary (for display). setAttitude(x, y, z)
! still takes degrees.
2003-04-18: delta
! Added Runge-Kutta Cask-Karp numerical method.doSimStep2() is now
! calling it.
! Added a note on initialization of 'pause'.
!
! Added a simdata::Pointer<DynamicalObject> parameter in ObjectStats
! methods.
!
! Added a check to non nullitty of m_GameScreen in CSPSim::setActiveObject.
!
! Fixed a getStats non const method in AircraftObject class.
!
! Checked Onsight changes: a couple of forward class declarations causing
! compilation problems in vc++ have been fixed thanks to Onsight.
!
! Updated .NET project.
2003-04-18: onsight
***************
*** 29,41 ****
adding more static and dynamic objects:
! +------------ ROOT -------------+
! | |
BACKGROUND +--------OBJECTS-----+
! | | | |
! EYE_TRANSFORM TERRAIN STATIC DYNAMIC
! | |
! SKY SKYLIGHTS
! / \
! SUNLIGHT MOONLIGHT
Fixed an initialization error in AeroDynamics that could cause
--- 46,58 ----
adding more static and dynamic objects:
! +------------ ROOT -------------+
! | |
BACKGROUND +--------OBJECTS-----+
! | | | |
! EYE_TRANSFORM TERRAIN STATIC DYNAMIC
! | |
! SKY SKYLIGHTS
! / \
! SUNLIGHT MOONLIGHT
Fixed an initialization error in AeroDynamics that could cause
***************
*** 124,126 ****
*********** VC USERS: please add VirtualScene.cpp to the VC project files
-
--- 141,142 ----
|
