Menu
▾
▴
[Csp-commits] svn:csp r1537 - in trunk/CSP/CSPSim: Include Include/Theater Source VisualStudio/CSPSimDLL
|
From: <sv...@ww...> - 2005-05-01 09:13:16
|
Author: delta Date: 2005-05-01 02:13:08 -0700 (Sun, 01 May 2005) New Revision: 1537 Modified: trunk/CSP/CSPSim/Include/Steerpoint.h trunk/CSP/CSPSim/Include/Theater/IsoContour.h trunk/CSP/CSPSim/Source/Atmosphere.cpp trunk/CSP/CSPSim/Source/FlightControlSystem.cpp trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Fix a few minor warnings under vc++. * Add more headers to vcproj include folder. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1537 Modified: trunk/CSP/CSPSim/Include/Steerpoint.h =================================================================== --- trunk/CSP/CSPSim/Include/Steerpoint.h 2005-05-01 06:36:15 UTC (rev 1536) +++ trunk/CSP/CSPSim/Include/Steerpoint.h 2005-05-01 09:13:08 UTC (rev 1537) @@ -61,7 +61,7 @@ virtual simdata::DateZulu const &time() const { return m_Time; } virtual simdata::Vector3 const &position() const { return m_Position; } virtual simdata::LLA const &lla() const { return m_LLA; } - virtual float altitude() const { return m_LLA.altitude(); } + virtual float altitude() const { return static_cast<float>(m_LLA.altitude()); } virtual void setAltitude(float altitude) { m_LLA.set(m_LLA.latitude(), m_LLA.longitude(), altitude); updatePosition(); } virtual void setPosition(simdata::Vector3 const &position) { m_Position = position; updateLLA(); } Modified: trunk/CSP/CSPSim/Include/Theater/IsoContour.h =================================================================== --- trunk/CSP/CSPSim/Include/Theater/IsoContour.h 2005-05-01 06:36:15 UTC (rev 1536) +++ trunk/CSP/CSPSim/Include/Theater/IsoContour.h 2005-05-01 09:13:08 UTC (rev 1537) @@ -65,7 +65,7 @@ return simdata::Vector3(m_Radius * x, m_Radius * y, 0.0f); } virtual float getArea() const { - return simdata::PI * m_Radius * m_Radius; + return static_cast<float>(simdata::PI * m_Radius * m_Radius); } virtual ~Circle() {} }; Modified: trunk/CSP/CSPSim/Source/Atmosphere.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Atmosphere.cpp 2005-05-01 06:36:15 UTC (rev 1536) +++ trunk/CSP/CSPSim/Source/Atmosphere.cpp 2005-05-01 09:13:08 UTC (rev 1537) @@ -204,7 +204,7 @@ noise.randomize(); m_WindAltY = noise.generate(100, false, 8.0, 1.0, 0.0); for (i = 0; i < 100; ++i) { - const double alt_scale = 1.0 + i * i * 0.0025; + const float alt_scale = 1.0f + i * i * 0.0025f; m_WindAltX[i] *= alt_scale; m_WindAltY[i] *= alt_scale; } @@ -304,7 +304,7 @@ m_GustIndex += dt * 3.0; const int index = static_cast<int>(m_GustIndex); const float f = static_cast<float>(m_GustIndex - index); - const float gust = m_GustTime[index%1000] * (1.0 - f) + m_GustTime[(index+1)%1000] * f; + const float gust = m_GustTime[index%1000] * (1.0f - f) + m_GustTime[(index+1)%1000] * f; m_GustModulation = std::max(1.0, 1.0 + gust); //std::cout << getWind(simdata::Vector3::ZERO) << " " << m_GustModulation << std::endl; if (m_FastUpdate < 3.0) return false; Modified: trunk/CSP/CSPSim/Source/FlightControlSystem.cpp =================================================================== --- trunk/CSP/CSPSim/Source/FlightControlSystem.cpp 2005-05-01 06:36:15 UTC (rev 1536) +++ trunk/CSP/CSPSim/Source/FlightControlSystem.cpp 2005-05-01 09:13:08 UTC (rev 1537) @@ -348,7 +348,7 @@ Schedule1() {} private: virtual void evaluate(Timer const &timer) { - setOutput(m_Schedule[getInput(timer)], timer); + setOutput(m_Schedule[static_cast<float>(getInput(timer))], timer); } }; @@ -369,7 +369,7 @@ Schedule2() {} private: virtual void evaluate(Timer const &timer) { - setOutput(getInputA(timer) * m_Schedule[getInputB(timer)], timer); + setOutput(getInputA(timer) * m_Schedule[static_cast<float>(getInputB(timer))], timer); } }; Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-05-01 06:36:15 UTC (rev 1536) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-05-01 09:13:08 UTC (rev 1537) @@ -658,6 +658,9 @@ RelativePath="..\..\Include\SmokeEffects.h"> </File> <File + RelativePath="..\..\Include\Steerpoint.h"> + </File> + <File RelativePath="..\..\Include\System.h"> </File> <File @@ -781,6 +784,64 @@ RelativePath="..\..\Include\Views\View.h"> </File> </Filter> + <Filter + Name="F16" + Filter=""> + <File + RelativePath="..\..\Source\F16\AlphaNumericDisplay.h"> + </File> + <File + RelativePath="..\..\Source\F16\DataEntry.h"> + </File> + <File + RelativePath="..\..\Source\F16\DataEntryPage.h"> + </File> + <File + RelativePath="..\..\Source\F16\F16Channels.h"> + </File> + <File + RelativePath="..\..\Source\F16\F16GearDynamics.h"> + </File> + <File + RelativePath="..\..\Source\F16\F16HUD.h"> + </File> + <File + RelativePath="..\..\Source\F16\F16InputSystem.h"> + </File> + <File + RelativePath="..\..\Source\F16\F16System.h"> + </File> + <File + RelativePath="..\..\Source\F16\GroundAvoidanceAdvisory.h"> + </File> + <File + RelativePath="..\..\Source\F16\NavigationSystem.h"> + </File> + <File + RelativePath="..\..\Source\F16\PageALOW.h"> + </File> + <File + RelativePath="..\..\Source\F16\PageCNI.h"> + </File> + <File + RelativePath="..\..\Source\F16\PageLIST.h"> + </File> + <File + RelativePath="..\..\Source\F16\PageSTPT.h"> + </File> + <File + RelativePath="..\..\Source\F16\PanelHUD.h"> + </File> + <File + RelativePath="..\..\Source\F16\Radio.h"> + </File> + <File + RelativePath="..\..\Source\F16\SpecialFonts.h"> + </File> + <File + RelativePath="..\..\Source\F16\UpFrontControls.h"> + </File> + </Filter> </Filter> <Filter Name="Resource Files" |
