Menu
▾
▴
[Csp-commits] svn:csp r1517 - in trunk/CSP/CSPSim: . Source/F16 Source/HUD VisualStudio/CSPSimDLL
|
From: <sv...@ww...> - 2005-04-10 12:12:58
|
Author: delta Date: 2005-04-10 05:12:33 -0700 (Sun, 10 Apr 2005) New Revision: 1517 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/F16/AlphaNumericDisplay.h trunk/CSP/CSPSim/Source/F16/DataEntry.h trunk/CSP/CSPSim/Source/F16/F16HUD.cpp trunk/CSP/CSPSim/Source/F16/F16InputSystem.h trunk/CSP/CSPSim/Source/HUD/HUD.h trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Updated vcproj. * Minor fixes to the vs build. Great job OS! Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1517 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/CHANGES.current 2005-04-10 12:12:33 UTC (rev 1517) @@ -1,6 +1,13 @@ Version 0.4.0 (in progress) =========================== +2005-04-10: delta + * Updated vcproj. + + * Minor fixes to the vs build. + +Great job OS! + 2005-04-09: onsight * Finally checking in a large chunk of changes I've been working on for many weeks that begin the implementation of the f16 detailed Modified: trunk/CSP/CSPSim/Source/F16/AlphaNumericDisplay.h =================================================================== --- trunk/CSP/CSPSim/Source/F16/AlphaNumericDisplay.h 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/Source/F16/AlphaNumericDisplay.h 2005-04-10 12:12:33 UTC (rev 1517) @@ -31,6 +31,10 @@ #include <vector> #include <SimData/Ref.h> +#if !defined(__GNUC__) && !defined(snprintf) +#define snprintf _snprintf +#endif + class AlphaNumericDisplay: public simdata::Referenced { public: typedef enum { NORMAL, INVERSE } Video; Modified: trunk/CSP/CSPSim/Source/F16/DataEntry.h =================================================================== --- trunk/CSP/CSPSim/Source/F16/DataEntry.h 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/Source/F16/DataEntry.h 2005-04-10 12:12:33 UTC (rev 1517) @@ -37,6 +37,9 @@ #include <SimData/Vector3.h> #include <cmath> +#if !defined(__GNUC__) && !defined(snprintf) +#define snprintf _snprintf +#endif ////// // todo Modified: trunk/CSP/CSPSim/Source/F16/F16HUD.cpp =================================================================== --- trunk/CSP/CSPSim/Source/F16/F16HUD.cpp 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/Source/F16/F16HUD.cpp 2005-04-10 12:12:33 UTC (rev 1517) @@ -761,10 +761,10 @@ for (int i=-4; i <= 4; ++i) { float angle = i * simdata::toRadians(10.0); float r1 = r0 - 0.0015; - if (i == 4 or i == -4) { + if ((i == 4) || (i == -4)) { angle *= 4.5/4.0; } - if (i == 0 or std::abs(i) > 2) { + if ((i == 0) || (std::abs(i) > 2)) { r1 = r0 - 0.003; } rolltape.drawLine(r1 * sin(angle), y0 - r1 * cos(angle), r0 * sin(angle), y0 - r0 * cos(angle)); Modified: trunk/CSP/CSPSim/Source/F16/F16InputSystem.h =================================================================== --- trunk/CSP/CSPSim/Source/F16/F16InputSystem.h 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/Source/F16/F16InputSystem.h 2005-04-10 12:12:33 UTC (rev 1517) @@ -26,7 +26,7 @@ #ifndef __F16INPUTSYSTEM_H__ #define __F16INPUTSYSTEM_H__ -#include <System/AircraftInputSystem.h> +#include <Systems/AircraftInputSystem.h> class F16InputSystem: public AircraftInputSystem { Modified: trunk/CSP/CSPSim/Source/HUD/HUD.h =================================================================== --- trunk/CSP/CSPSim/Source/HUD/HUD.h 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/Source/HUD/HUD.h 2005-04-10 12:12:33 UTC (rev 1517) @@ -30,6 +30,10 @@ #include <osg/PositionAttitudeTransform> #include <osgText/Text> +#if !defined(__GNUC__) && !defined(snprintf) +#define snprintf _snprintf +#endif + namespace osg { class ClipNode; } namespace osg { class Geode; } namespace osg { class Geometry; } Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-04-10 09:12:45 UTC (rev 1516) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-04-10 12:12:33 UTC (rev 1517) @@ -272,22 +272,6 @@ <File RelativePath="..\..\Source\HID.cpp"> </File> - <Filter - Name="HUD" - Filter=""> - <File - RelativePath="..\..\Source\HUD\HUD.cpp"> - </File> - <File - RelativePath="..\..\Source\HUD\PitchLadder.cpp"> - </File> - <File - RelativePath="..\..\Source\HUD\Tape.cpp"> - </File> - <File - RelativePath="..\..\Source\HUD\Text.cpp"> - </File> - </Filter> <File RelativePath="..\..\Source\InputEvent.cpp"> </File> @@ -352,6 +336,22 @@ RelativePath="..\..\Source\VirtualScene.cpp"> </File> <Filter + Name="HUD" + Filter=""> + <File + RelativePath="..\..\Source\HUD\HUD.cpp"> + </File> + <File + RelativePath="..\..\Source\HUD\PitchLadder.cpp"> + </File> + <File + RelativePath="..\..\Source\HUD\Tape.cpp"> + </File> + <File + RelativePath="..\..\Source\HUD\Text.cpp"> + </File> + </Filter> + <Filter Name="Theater" Filter=""> <File @@ -433,6 +433,55 @@ </FileConfiguration> </File> </Filter> + <Filter + Name="F16" + Filter=""> + <File + RelativePath="..\..\Source\F16\AlphaNumericDisplay.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\DataEntryPage.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\F16Channels.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\F16GearDynamics.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\F16HUD.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\F16INS.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\F16System.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\FLCS.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\GroundAvoidanceAdvisory.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\NavigationSystem.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\PageCNI.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\PageLIST.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\PanelHUD.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\Radio.cpp"> + </File> + <File + RelativePath="..\..\Source\F16\UpFrontControls.cpp"> + </File> + </Filter> </Filter> <Filter Name="Header Files" @@ -533,22 +582,6 @@ <File RelativePath="..\..\Include\HID.h"> </File> - <Filter - Name="HUD" - Filter=""> - <File - RelativePath="..\..\Source\HUD\HUD.h"> - </File> - <File - RelativePath="..\..\Source\HUD\PitchLadder.h"> - </File> - <File - RelativePath="..\..\Source\HUD\Tape.h"> - </File> - <File - RelativePath="..\..\Source\HUD\Text.h"> - </File> - </Filter> <File RelativePath="..\..\Include\InputEvent.h"> </File> @@ -634,6 +667,22 @@ RelativePath="..\..\Include\VirtualScene.h"> </File> <Filter + Name="HUD" + Filter=""> + <File + RelativePath="..\..\Source\HUD\HUD.h"> + </File> + <File + RelativePath="..\..\Source\HUD\PitchLadder.h"> + </File> + <File + RelativePath="..\..\Source\HUD\Tape.h"> + </File> + <File + RelativePath="..\..\Source\HUD\Text.h"> + </File> + </Filter> + <Filter Name="Theater" Filter=""> <File |
