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: <sv...@ww...> - 2005-10-16 22:08:41
|
Author: mkrose Date: 2005-10-16 15:08:31 -0700 (Sun, 16 Oct 2005) New Revision: 1653 Modified: trunk/CSP/CSPSim/Source/Animation.cpp Log: Remove more overzealous asserts for missing channels. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1653 Modified: trunk/CSP/CSPSim/Source/Animation.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Animation.cpp 2005-10-16 22:06:04 UTC (rev 1652) +++ trunk/CSP/CSPSim/Source/Animation.cpp 2005-10-16 22:08:31 UTC (rev 1653) @@ -149,11 +149,11 @@ int value = -2; std::string token; if (m_Channel.valid()) { + if (!m_Channel) return false; value = m_Channel->value().getValue(); if (value == m_Value) return false; token = m_Channel->value().getToken(); } else { - assert(m_BoolChannel.valid()); if (!m_BoolChannel) return false; value = m_BoolChannel->value() ? 1 : 0; if (value == m_Value) return false; @@ -200,7 +200,6 @@ e.cycle(); // TODO push } } else { - assert(m_BoolChannel.valid()); if (m_BoolChannel.valid()) { if (m_BoolChannel->isShared()) { bool &b = const_cast<bool&>(m_BoolChannel->value()); |
|
From: <sv...@ww...> - 2005-10-16 22:06:11
|
Author: mkrose Date: 2005-10-16 15:06:04 -0700 (Sun, 16 Oct 2005) New Revision: 1652 Modified: trunk/CSP/CSPSim/Source/Animation.cpp Log: Remove an overzealous assert for missing animation channels. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1652 Modified: trunk/CSP/CSPSim/Source/Animation.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Animation.cpp 2005-10-16 22:00:45 UTC (rev 1651) +++ trunk/CSP/CSPSim/Source/Animation.cpp 2005-10-16 22:06:04 UTC (rev 1652) @@ -95,7 +95,6 @@ * changed since the last call to update. */ bool update() { - assert(m_Channel.valid()); if (!m_Channel) return false; const float value = static_cast<float>(m_Channel->value()); const bool changed = (value != m_Value); |
|
From: <sv...@ww...> - 2005-10-16 22:00:53
|
Author: mkrose Date: 2005-10-16 15:00:45 -0700 (Sun, 16 Oct 2005) New Revision: 1651 Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/thrust.xml Log: Remove an incorrect breakpoint from the thrust data. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1651 Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/thrust.xml =================================================================== --- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/thrust.xml 2005-10-16 21:27:06 UTC (rev 1650) +++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/thrust.xml 2005-10-16 22:00:45 UTC (rev 1651) @@ -8,7 +8,7 @@ <Object class="ThrustData"> <Table2 name='idle_thrust'> <Breaks0 spacing='1000.0'> - 0 3048 6096 9144 12192 15240 18288 21336 22860 + 0 3048 6096 9144 12192 15240 18288 22860 </Breaks0> <Breaks1 spacing='0.1'> 0 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.05 1.1 1.15 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.2 @@ -26,7 +26,7 @@ </Table2> <Table2 name='mil_thrust'> <Breaks0 spacing='1000.0'> - 0 3048 6096 9144 12192 15240 18288 21336 22860 + 0 3048 6096 9144 12192 15240 18288 22860 </Breaks0> <Breaks1 spacing='0.1'> 0 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.05 1.1 1.15 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.2 @@ -44,7 +44,7 @@ </Table2> <Table2 name='ab_thrust'> <Breaks0 spacing='1000.0'> - 0 3048 6096 9144 12192 15240 18288 21336 22860 + 0 3048 6096 9144 12192 15240 18288 22860 </Breaks0> <Breaks1 spacing='0.1'> 0 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.05 1.1 1.15 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.2 |
|
From: <sv...@ww...> - 2005-10-16 21:37:41
|
Author: mkrose Date: 2005-10-16 14:27:06 -0700 (Sun, 16 Oct 2005) New Revision: 1650 Added: trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit05.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit06.tga Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Data/Models/F16/DJ/Cockpit.osg trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit-alpha.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit-light.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit01.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit02.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit03.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T-pit04.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T1.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T2.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T3.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T4.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T5.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/T6.tga trunk/CSP/CSPSim/Data/Models/F16/DJ/images/f16-lak.tga trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/cockpit.xml Log: * Integrate Lologramme's f-16 cockpit upgrade (2005-08-22), and bind a few new cockpit animations. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1650 /usr/local/lib/subversion/commit-email.pl: `/usr/bin/svnlook diff /home/svn/csp -r 1650' failed with this output: Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-16 20:47:33 UTC (rev 1649) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-16 21:27:06 UTC (rev 1650) @@ -39,6 +39,9 @@ * Update thrust data for the f-16 based on PW229 curves from HFFM. + * Integrate Lologramme's f-16 cockpit upgrade (2005-08-22), and bind + a few new cockpit animations. + 2005-10-15: onsight * Refactor rotation animation classes, moving some common operations to the base class. Add an optional non-linear gain to the rotation Modified: trunk/CSP/CSPSim/Data/Models/F16/DJ/Cockpit.osg =================================================================== |
|
From: <sv...@ww...> - 2005-10-16 20:47:40
|
Author: mkrose Date: 2005-10-16 13:47:33 -0700 (Sun, 16 Oct 2005) New Revision: 1649 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/thrust.xml Log: * Update thrust data for the f-16 based on PW229 curves from HFFM. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1649 Diff omitted (10435 bytes). |
|
From: <sv...@ww...> - 2005-10-16 20:45:04
|
Author: mkrose Date: 2005-10-16 13:44:54 -0700 (Sun, 16 Oct 2005) New Revision: 1648 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml Log: * Increase damping of the f-16 main gear to reduce instabilities when landing. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1648 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-16 20:36:23 UTC (rev 1647) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-16 20:44:54 UTC (rev 1648) @@ -34,6 +34,9 @@ * Add f-16 fuel system code. + * Increase damping of the f-16 main gear to reduce instabilities + when landing. + 2005-10-15: onsight * Refactor rotation animation classes, moving some common operations to the base class. Add an optional non-linear gain to the rotation Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml =================================================================== --- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml 2005-10-16 20:36:23 UTC (rev 1647) +++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/gear.xml 2005-10-16 20:44:54 UTC (rev 1648) @@ -50,7 +50,7 @@ <!-- 0.191 --> <Float name="compression_limit">0.223</Float> <Float name="K">350000.0</Float> - <Float name="beta">90000.0</Float> + <Float name="beta">190000.0</Float> <Float name="brake_limit">50000.0</Float> <Float name="brake_slip">0.8</Float> <Float name="tire_radius">0.4</Float> @@ -81,7 +81,7 @@ <Real name="damage_limit">80000.0:10000.0</Real> <Float name="compression_limit">0.223</Float> <Float name="K">350000.0</Float> - <Float name="beta">90000.0</Float> + <Float name="beta">190000.0</Float> <Float name="brake_limit">50000.0</Float> <Float name="brake_slip">0.8</Float> <Float name="tire_radius">0.4</Float> |
|
From: <sv...@ww...> - 2005-10-16 20:36:29
|
Author: mkrose Date: 2005-10-16 13:36:23 -0700 (Sun, 16 Oct 2005) New Revision: 1647 Modified: trunk/CSP/SimData/Source/DataArchive.cpp Log: Fix indentation. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1647 Modified: trunk/CSP/SimData/Source/DataArchive.cpp =================================================================== --- trunk/CSP/SimData/Source/DataArchive.cpp 2005-10-16 20:34:08 UTC (rev 1646) +++ trunk/CSP/SimData/Source/DataArchive.cpp 2005-10-16 20:36:23 UTC (rev 1647) @@ -380,7 +380,7 @@ dup->serialize(reader); } catch (DataUnderflow &e) { if (temp_buffer.size() == 0) --_buffer; - e.clear(); + e.clear(); SIMDATA_LOG(LOG_ARCHIVE, LOG_ERROR, "INTERNAL ERROR: Object extraction incomplete for class '" << dup->getClassName() << "': " << from << " (data underflow)."); throw CorruptArchive("Object extraction incomplete for class '" + std::string(dup->getClassName()) + "'"); } |
|
From: <sv...@ww...> - 2005-10-16 20:34:16
|
Author: mkrose Date: 2005-10-16 13:34:08 -0700 (Sun, 16 Oct 2005) New Revision: 1646 Added: trunk/CSP/CSPSim/Source/F16/FuelSystem.cpp Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/SConscript trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Add f-16 fuel system code. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1646 Diff omitted (14977 bytes). |
|
From: <sv...@ww...> - 2005-10-16 20:31:47
|
Author: mkrose Date: 2005-10-16 13:31:35 -0700 (Sun, 16 Oct 2005) New Revision: 1645 Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: Add StabilityFlightModel.* to the VC project. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1645 Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-10-16 20:10:14 UTC (rev 1644) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2005-10-16 20:31:35 UTC (rev 1645) @@ -333,6 +333,9 @@ RelativePath="..\..\Source\SmokeEffects.cpp"> </File> <File + RelativePath="..\..\Source\StabilityFlightModel.cpp"> + </File> + <File RelativePath="..\..\Source\Station.cpp"> </File> <File @@ -719,6 +722,9 @@ RelativePath="..\..\Include\SmokeEffects.h"> </File> <File + RelativePath="..\..\Include\StabilityFlightModel.h"> + </File> + <File RelativePath="..\..\Include\Station.h"> </File> <File |
|
From: <sv...@ww...> - 2005-10-16 20:10:25
|
Author: mkrose Date: 2005-10-16 13:10:14 -0700 (Sun, 16 Oct 2005) New Revision: 1644 Added: trunk/CSP/CSPSim/Data/XML/objects/ trunk/CSP/CSPSim/Data/XML/objects/freefall_fm.xml trunk/CSP/CSPSim/Data/XML/objects/freefall_systems.xml trunk/CSP/CSPSim/Data/XML/objects/stores_drag.xml trunk/CSP/CSPSim/Data/XML/stores/ trunk/CSP/CSPSim/Data/XML/stores/missiles/ trunk/CSP/CSPSim/Data/XML/stores/missiles/aim9.xml trunk/CSP/CSPSim/Data/XML/stores/racks/ trunk/CSP/CSPSim/Data/XML/stores/racks/f16/ trunk/CSP/CSPSim/Data/XML/stores/racks/f16/centerline.xml trunk/CSP/CSPSim/Data/XML/stores/racks/f16/wingfuel.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/ trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/ trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/centerline_300gal.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/centerline_300gal/ trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/centerline_300gal/model.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/centerline_300gal/object.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/wing_370gal.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/wing_370gal/ trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/wing_370gal/model.xml trunk/CSP/CSPSim/Data/XML/stores/tanks/f16/wing_370gal/object.xml Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/CSPSim.cpp Log: * Add initial stores data. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1644 Diff omitted (17218 bytes). |
Author: mkrose Date: 2005-10-16 12:37:41 -0700 (Sun, 16 Oct 2005) New Revision: 1643 Added: trunk/CSP/CSPSim/Include/StabilityFlightModel.h trunk/CSP/CSPSim/Source/F16/F16FlightModel.cpp trunk/CSP/CSPSim/Source/F16/F16FlightModel.h trunk/CSP/CSPSim/Source/StabilityFlightModel.cpp Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/channel_mirrors.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/fcs.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/fm.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/F16/DJ/model.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fcs.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml trunk/CSP/CSPSim/Include/FlightDynamics.h trunk/CSP/CSPSim/Include/FlightModel.h trunk/CSP/CSPSim/Source/F16/F16System.cpp trunk/CSP/CSPSim/Source/F16/F16System.h trunk/CSP/CSPSim/Source/F16/FLCS.cpp trunk/CSP/CSPSim/Source/FlightDynamics.cpp trunk/CSP/CSPSim/Source/FlightModel.cpp trunk/CSP/CSPSim/Source/SConscript trunk/CSP/CSPSim/Source/Stores/Projectile.cpp trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/outputs.py trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/pitch.py trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/roll.py trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/sensors.py trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/trailingedge.py trunk/CSP/CSPSim/Tools/FlightControlSystem/F16/yaw.py trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/outputs.py trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Refactor existing flight model code and add a new flight model implementation for the f-16 based on NASA low speed wind tunnel data and Raptor/Mav-JP's high speed flight model data. The FlightModel class is now abstract, with StabilityFlightModel implementing a concrete subclass that is similar to the old FlightModel class (mostly linear stability derivatives). The F16FlightModel subclass implements more specialized routines based on the NASA 1979 paper, using tabular data for most coefficients over a broad range of AOA (-20 to +90 deg). This includes deep stall modeling. Improved modeling for the f-16 fcs yaw limiter. Also improved the pitch limiter in TO/landing gains. Changed the control surface deflection sense to match the literature. Updated the model animations accordingly. Updated animation gains to compensate for an earlier change to the deflection, limit, and rate scaling. Rotations are now assumed to be in degrees, so the control surface deflections need to be prescaled by 180/PI. Added the MPO switch and made minor realism tweaks to the f-16 flcs. This change breaks the air refueling door. That logic is moving to the new fuel system code which will be submitted in a later change. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1643 Diff omitted (243435 bytes). |
|
From: <sv...@ww...> - 2005-10-16 09:56:34
|
Author: mkrose Date: 2005-10-16 02:56:20 -0700 (Sun, 16 Oct 2005) New Revision: 1642 Modified: trunk/CSP/CSPSim/Include/Bus.h Log: Improve error logging for missing bus channels. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1642 Modified: trunk/CSP/CSPSim/Include/Bus.h =================================================================== --- trunk/CSP/CSPSim/Include/Bus.h 2005-10-16 00:24:47 UTC (rev 1641) +++ trunk/CSP/CSPSim/Include/Bus.h 2005-10-16 09:56:20 UTC (rev 1642) @@ -667,8 +667,12 @@ ChannelBase::CRef getChannel(std::string const &name, bool required = true) { ChannelMap::iterator iter = m_Channels.find(name); if (iter == m_Channels.end()) { - CSP_LOG(OBJECT, DEBUG, "Bus::getChannel(" << name << ") failed."); - assert(!required); + if (required) { + CSP_LOG(OBJECT, ERROR, "Bus::getChannel(" << name << ") failed."); + assert(0); + } else { + CSP_LOG(OBJECT, DEBUG, "Bus::getChannel(" << name << ") failed."); + } return 0; } return iter->second; |
|
From: <sv...@ww...> - 2005-10-16 00:24:54
|
Author: mkrose Date: 2005-10-15 17:24:47 -0700 (Sat, 15 Oct 2005) New Revision: 1641 Modified: trunk/CSP/CSPSim/Source/LandingGear.cpp Log: Add a sanity check to the landing gear physics. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1641 Modified: trunk/CSP/CSPSim/Source/LandingGear.cpp =================================================================== --- trunk/CSP/CSPSim/Source/LandingGear.cpp 2005-10-16 00:23:06 UTC (rev 1640) +++ trunk/CSP/CSPSim/Source/LandingGear.cpp 2005-10-16 00:24:47 UTC (rev 1641) @@ -645,6 +645,7 @@ if (gear.isFullyRetracted()) continue; b_FullyRetracted->value() = false; const double extension = gear.getExtension(); + assert(extension >= -0.001 && extension <= 1.001); // Approx: gear move to center with retraction. currently LandingGear does not take // extension into account when computing forces, so really only effects wind drag. // at least it _shouldn't_ be common to retract gear while touching the ground... |
|
From: <sv...@ww...> - 2005-10-16 00:23:15
|
Author: mkrose Date: 2005-10-15 17:23:06 -0700 (Sat, 15 Oct 2005) New Revision: 1640 Modified: trunk/CSP/CSPSim/Source/F16/F16Channels.cpp trunk/CSP/CSPSim/Source/F16/F16Channels.h Log: Add channel names for f-16 mpo switch. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1640 Modified: trunk/CSP/CSPSim/Source/F16/F16Channels.cpp =================================================================== --- trunk/CSP/CSPSim/Source/F16/F16Channels.cpp 2005-10-16 00:07:55 UTC (rev 1639) +++ trunk/CSP/CSPSim/Source/F16/F16Channels.cpp 2005-10-16 00:23:06 UTC (rev 1640) @@ -33,6 +33,8 @@ const char *F16::TrailingEdgeFlapExtension = "F16.TrailingEdgeFlapExtension"; const char *F16::AirbrakeLimit = "F16.AirbrakeLimit"; const char *F16::CatIII = "F16.CatIII"; +const char *F16::ManualPitchOverride = "F16.ManualPitchOverride"; +const char *F16::ManualPitchOverrideActive = "F16.ManualPitchOverrideActive"; const char *F16::TakeoffLandingGains = "F16.TakeoffLandingGains"; const char *F16::StandbyGains = "F16.StandbyGains"; const char *F16::INSAttitude = "F16.INS.Attitude"; Modified: trunk/CSP/CSPSim/Source/F16/F16Channels.h =================================================================== --- trunk/CSP/CSPSim/Source/F16/F16Channels.h 2005-10-16 00:07:55 UTC (rev 1639) +++ trunk/CSP/CSPSim/Source/F16/F16Channels.h 2005-10-16 00:23:06 UTC (rev 1640) @@ -33,6 +33,8 @@ static const char *AirbrakeLimit; static const char *AltFlaps; static const char *CatIII; + static const char *ManualPitchOverride; + static const char *ManualPitchOverrideActive; static const char *GearHandleUp; static const char *INSAttitude; static const char *StandbyGains; |
|
From: <sv...@ww...> - 2005-10-16 00:08:03
|
Author: mkrose Date: 2005-10-15 17:07:55 -0700 (Sat, 15 Oct 2005) New Revision: 1639 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/F16/F16HUD.cpp trunk/CSP/CSPSim/Source/F16/F16HUD.h Log: * Add ghost horizon to f-16 hud. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1639 Diff omitted (10442 bytes). |
|
From: <sv...@ww...> - 2005-10-15 23:33:10
|
Author: mkrose Date: 2005-10-15 16:33:03 -0700 (Sat, 15 Oct 2005) New Revision: 1638 Modified: trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.cpp Log: * Fix a trivial warning. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1638 Modified: trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.cpp 2005-10-15 23:31:29 UTC (rev 1637) +++ trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.cpp 2005-10-15 23:33:03 UTC (rev 1638) @@ -443,7 +443,7 @@ m_ReleasedObjects.clear(); } -double StoresManagementSystem::onUpdate(double dt) { +double StoresManagementSystem::onUpdate(double /*dt*/) { return -1; } |
|
From: <sv...@ww...> - 2005-10-15 23:31:37
|
Author: mkrose Date: 2005-10-15 16:31:29 -0700 (Sat, 15 Oct 2005) New Revision: 1637 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h trunk/CSP/CSPSim/Source/Channels.cpp Log: * Add new standard channels, deprecate GForce channel in favor of G. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1637 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-15 23:24:51 UTC (rev 1636) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-15 23:31:29 UTC (rev 1637) @@ -28,6 +28,10 @@ * Add basic fuel management system infrastructure. + * Add fuel tank, pylon, and aim-9 models. + + * Add new standard channels, deprecate GForce channel in favor of G. + 2005-08-27: onsight * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC. Modified: trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h =================================================================== --- trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h 2005-10-15 23:24:51 UTC (rev 1636) +++ trunk/CSP/CSPSim/Include/ControlSurfacesChannels.h 2005-10-15 23:31:29 UTC (rev 1637) @@ -34,6 +34,8 @@ static const char *ElevatorDeflection; static const char *RudderDeflection; static const char *AirbrakeDeflection; + static const char *LeadingEdgeFlapDeflection; + static const char *TrailingEdgeFlapDeflection; }; } Modified: trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h =================================================================== --- trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h 2005-10-15 23:24:51 UTC (rev 1636) +++ trunk/CSP/CSPSim/Include/FlightDynamicsChannels.h 2005-10-15 23:31:29 UTC (rev 1637) @@ -34,7 +34,9 @@ static const char *Beta; static const char *Airspeed; static const char *QBar; - static const char *GForce; + static const char *GForce; // DEPRECATED; use "G" instead. + static const char *G; // normal G, includes gravity and rotation + static const char *LateralG; // includes gravity and rotation static const char *PressureAltitude; static const char *VerticalVelocity; }; Modified: trunk/CSP/CSPSim/Source/Channels.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Channels.cpp 2005-10-15 23:24:51 UTC (rev 1636) +++ trunk/CSP/CSPSim/Source/Channels.cpp 2005-10-15 23:31:29 UTC (rev 1637) @@ -61,9 +61,9 @@ const char *FlightDynamics::Beta = "FlightDynamics.Beta"; const char *FlightDynamics::Airspeed = "FlightDynamics.Airspeed"; const char *FlightDynamics::QBar = "FlightDynamics.QBar"; - const char *FlightDynamics::GForce = "FlightDynamics.G"; - //const char *FlightDynamics::G = "FlightDynamics.G"; - //const char *FlightDynamics::LateralG = "FlightDynamics.LateralG"; + const char *FlightDynamics::GForce = "FlightDynamics.G"; // DEPRECATED + const char *FlightDynamics::G = "FlightDynamics.G"; + const char *FlightDynamics::LateralG = "FlightDynamics.LateralG"; const char *FlightDynamics::PressureAltitude = "FlightDynamics.PressureAltitude"; const char *FlightDynamics::VerticalVelocity = "FlightDynamics.VerticalVelocity"; @@ -78,8 +78,8 @@ const char *ControlSurfaces::ElevatorDeflection = "ControlSurfaces.ElevatorDeflection"; const char *ControlSurfaces::RudderDeflection = "ControlSurfaces.RudderDeflection"; const char *ControlSurfaces::AirbrakeDeflection = "ControlSurfaces.AirbrakeDeflection"; - //const char *ControlSurfaces::TrailingEdgeFlapDeflection = "ControlSurfaces.TrailingEdgeFlapDeflection"; - //const char *ControlSurfaces::LeadingEdgeFlapDeflection = "ControlSurfaces.LeadingEdgeFlapDeflection"; + const char *ControlSurfaces::TrailingEdgeFlapDeflection = "ControlSurfaces.TrailingEdgeFlapDeflection"; + const char *ControlSurfaces::LeadingEdgeFlapDeflection = "ControlSurfaces.LeadingEdgeFlapDeflection"; const char *ControlInputs::PitchInput = "ControlInputs.PitchInput"; const char *ControlInputs::RollInput = "ControlInputs.RollInput"; |
|
From: <sv...@ww...> - 2005-10-15 23:24:59
|
Author: mkrose Date: 2005-10-15 16:24:51 -0700 (Sat, 15 Oct 2005) New Revision: 1636 Added: trunk/CSP/CSPSim/Data/Models/stores/ trunk/CSP/CSPSim/Data/Models/stores/aim9.osg trunk/CSP/CSPSim/Data/Models/stores/f16_center_fuel_pylon.osg trunk/CSP/CSPSim/Data/Models/stores/f16_center_fuel_tank.osg trunk/CSP/CSPSim/Data/Models/stores/f16_wing_fuel_pylon.osg trunk/CSP/CSPSim/Data/Models/stores/f16_wing_fuel_tank.osg trunk/CSP/CSPSim/Data/Models/stores/images/ trunk/CSP/CSPSim/Data/Models/stores/images/aim9-t1.tga trunk/CSP/CSPSim/Data/Models/stores/images/environment.tga trunk/CSP/CSPSim/Data/Models/stores/images/t1.tga trunk/CSP/CSPSim/Data/Models/stores/images/t5.tga trunk/CSP/CSPSim/Data/Models/stores/images/t7.tga Log: * Add fuel tank, pylon, and aim-9 models. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1636 Diff omitted (800943 bytes). |
|
From: <sv...@ww...> - 2005-10-15 22:41:51
|
Author: mkrose Date: 2005-10-15 15:41:43 -0700 (Sat, 15 Oct 2005) New Revision: 1635 Added: trunk/CSP/CSPSim/Include/FuelManagementSystem.h trunk/CSP/CSPSim/Source/FuelManagementSystem.cpp Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/SConscript trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Add basic fuel management system infrastructure. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1635 Diff omitted (13881 bytes). |
|
From: <sv...@ww...> - 2005-10-15 22:19:11
|
Author: mkrose Date: 2005-10-15 15:19:02 -0700 (Sat, 15 Oct 2005) New Revision: 1634 Modified: trunk/CSP/CSPSim/Include/AircraftObject.h trunk/CSP/CSPSim/Include/DynamicObject.h trunk/CSP/CSPSim/Include/KineticsChannels.h trunk/CSP/CSPSim/Include/SystemsModel.h trunk/CSP/CSPSim/Source/Channels.cpp trunk/CSP/CSPSim/Source/DynamicObject.cpp trunk/CSP/CSPSim/Source/SystemsModel.cpp Log: More stores-related changes. Fixes build breakage from previous checkin. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1634 Diff omitted (15690 bytes). |
|
From: <sv...@ww...> - 2005-10-15 21:51:40
|
Author: mkrose Date: 2005-10-15 14:51:33 -0700 (Sat, 15 Oct 2005) New Revision: 1633 Added: trunk/CSP/CSPSim/Source/Stores/ trunk/CSP/CSPSim/Source/Stores/DragProfile.cpp trunk/CSP/CSPSim/Source/Stores/DragProfile.h trunk/CSP/CSPSim/Source/Stores/Projectile.cpp trunk/CSP/CSPSim/Source/Stores/Projectile.h trunk/CSP/CSPSim/Source/Stores/Stores.cpp trunk/CSP/CSPSim/Source/Stores/Stores.h trunk/CSP/CSPSim/Source/Stores/StoresDatabase.cpp trunk/CSP/CSPSim/Source/Stores/StoresDatabase.h trunk/CSP/CSPSim/Source/Stores/StoresDefinition.cpp trunk/CSP/CSPSim/Source/Stores/StoresDefinition.h trunk/CSP/CSPSim/Source/Stores/StoresDynamics.h trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.cpp trunk/CSP/CSPSim/Source/Stores/StoresManagementSystem.h Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/SConscript trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: * Add infrastructure for external stores. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1633 Diff omitted (85202 bytes). |
|
From: <sv...@ww...> - 2005-10-15 21:29:25
|
Author: mkrose Date: 2005-10-15 14:29:19 -0700 (Sat, 15 Oct 2005) New Revision: 1632 Modified: trunk/CSP/SimCore/Battlefield/SimObject.h Log: Make several event hooks in SimObject protected instead of private. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1632 Modified: trunk/CSP/SimCore/Battlefield/SimObject.h =================================================================== --- trunk/CSP/SimCore/Battlefield/SimObject.h 2005-10-15 21:24:42 UTC (rev 1631) +++ trunk/CSP/SimCore/Battlefield/SimObject.h 2005-10-15 21:29:19 UTC (rev 1632) @@ -115,6 +115,7 @@ // HUMAN/AGENT ------------------------------------------------------- +private: void setHuman() { _debug("set human"); assert(isAgent()); @@ -131,12 +132,14 @@ onAgent(); } +protected: virtual void onHuman() { } virtual void onAgent() { } // LOCAL/REMOTE ----------------------------------------------------- +private: void setLocal() { _debug("set local"); if (!getFlags(F_INIT)) { @@ -161,12 +164,14 @@ onRemote(); } +protected: virtual void onLocal() { } virtual void onRemote() { } // AGGREGATE/DEAGGREGATE -------------------------------------------- +private: void aggregate() { _debug("aggregate"); assert(!isAggregated()); @@ -183,6 +188,7 @@ onDeaggregate(); } +protected: /** Called when an object that was deaggregated leaves all * deaggregation bubbles. * @@ -200,6 +206,7 @@ // SCENE MANAGEMENT ------------------------------------------------- +private: void enterScene() { _debug("enter scene"); assert(!isInScene()); @@ -216,6 +223,7 @@ onLeaveScene(); } +protected: /** Called before an object is added to the scene graph. * * This method is called even if no scene graph exists (e.g. on an @@ -233,6 +241,7 @@ // ------------------------------------------------------------------ +private: /** Set the object's unique identifier number. * * Can only be called once. |
|
From: <sv...@ww...> - 2005-10-15 21:24:49
|
Author: mkrose Date: 2005-10-15 14:24:42 -0700 (Sat, 15 Oct 2005) New Revision: 1631 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/FlightControlSystem.cpp Log: * Add a scale parameter to fcs input channels. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1631 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-15 21:22:55 UTC (rev 1630) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-15 21:24:42 UTC (rev 1631) @@ -22,6 +22,8 @@ * Show mach readout to 2 decimal places on info display. + * Add a scale parameter to fcs input channels. + 2005-08-27: onsight * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC. Modified: trunk/CSP/CSPSim/Source/FlightControlSystem.cpp =================================================================== --- trunk/CSP/CSPSim/Source/FlightControlSystem.cpp 2005-10-15 21:22:55 UTC (rev 1630) +++ trunk/CSP/CSPSim/Source/FlightControlSystem.cpp 2005-10-15 21:24:42 UTC (rev 1631) @@ -489,9 +489,10 @@ */ class InputChannel: public ControlNode { std::string m_Name; + double m_Scale; public: SIMDATA_DECLARE_ABSTRACT_OBJECT(InputChannel) - InputChannel() { } + InputChannel(): m_Scale(1.0) { } virtual void importChannels(Bus *bus) { DataChannelBase::CRef channel; channel = bus->getChannel(m_Name); @@ -502,12 +503,13 @@ virtual void setChannel(DataChannelBase::CRef &channel)=0; private: virtual void evaluate(Timer const &timer) { - setOutput(getChannelValue(), timer); + setOutput(getChannelValue() * m_Scale, timer); } }; SIMDATA_XML_BEGIN(InputChannel) SIMDATA_DEF("channel", m_Name, true) + SIMDATA_DEF("scale", m_Scale, false) SIMDATA_XML_END |
|
From: <sv...@ww...> - 2005-10-15 21:23:02
|
Author: mkrose Date: 2005-10-15 14:22:55 -0700 (Sat, 15 Oct 2005) New Revision: 1630 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp Log: * Show mach readout to 2 decimal places on info display. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1630 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-15 21:07:03 UTC (rev 1629) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-15 21:22:55 UTC (rev 1630) @@ -20,6 +20,8 @@ * Add an interface for accessing the vehicle 3D model from subsystem instances. + * Show mach readout to 2 decimal places on info display. + 2005-08-27: onsight * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC. Modified: trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp 2005-10-15 21:07:03 UTC (rev 1629) +++ trunk/CSP/CSPSim/Source/Systems/AircraftFlightSensors.cpp 2005-10-15 21:22:55 UTC (rev 1630) @@ -90,8 +90,8 @@ line.precision(0); line << "P: " << std::setw(3) << b_Pressure->value() << ", T: " << std::setw(3) << b_Temperature->value() - << ", Mach: " << std::setw(3) << b_Mach->value() - << ", CAS: " << std::setw(3) << simdata::convert::mps_kts(b_CAS->value()) << " kts"; + << ", Mach: " << std::setw(5) << std::setprecision(2) << b_Mach->value() + << ", CAS: " << std::setw(3) << std::setprecision(0) << simdata::convert::mps_kts(b_CAS->value()) << " kts"; info.push_back(line.str()); } |
|
From: <sv...@ww...> - 2005-10-15 21:07:14
|
Author: mkrose Date: 2005-10-15 14:07:03 -0700 (Sat, 15 Oct 2005) New Revision: 1629 Added: trunk/CSP/CSPSim/Include/DynamicModel.h Modified: trunk/CSP/CSPSim/CHANGES.current Log: * Add an interface for accessing the vehicle 3D model from subsystem instances. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1629 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2005-10-15 20:20:41 UTC (rev 1628) +++ trunk/CSP/CSPSim/CHANGES.current 2005-10-15 21:07:03 UTC (rev 1629) @@ -17,6 +17,9 @@ * Move ThrustData to its own header and source files. Remove unused parameters from the Engine XML interface. + * Add an interface for accessing the vehicle 3D model from subsystem + instances. + 2005-08-27: onsight * Link against sigc-2.0, not sigc-1.2 for debug builds under MSVC. Added: trunk/CSP/CSPSim/Include/DynamicModel.h =================================================================== --- trunk/CSP/CSPSim/Include/DynamicModel.h 2005-10-15 20:20:41 UTC (rev 1628) +++ trunk/CSP/CSPSim/Include/DynamicModel.h 2005-10-15 21:07:03 UTC (rev 1629) @@ -0,0 +1,61 @@ +// Combat Simulator Project +// Copyright (C) 2005 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file DynamicModel.h + * + * Provides an interface for vehicle subsystems to interact with the 3D world. + **/ + +#ifndef __DYNAMICMODEL_H__ +#define __DYNAMICMODEL_H__ + +#include <sigc++/signal.h> +#include <SimData/Ref.h> +#include <ObjectModel.h> // TODO forward declare scenemodel and move signalCreateSceneModel to a cpp file + + +namespace osg { class Group; } + +/** Interface provided by DynamicObjects to allow System classes to interact + * with the scene. + */ +class DynamicModel: public simdata::Referenced { +public: + // const DynamicModel can add handlers but not send signals. + void addInternalViewSignalHandler(sigc::slot<void, bool> const &slot) const { m_InternalViewSignal.connect(slot); } + void addCreateSceneModelHandler(sigc::slot<void, osg::Group*> const &slot) const { m_CreateSceneModelSignal.connect(slot); } + void addDeleteSceneModelHandler(sigc::slot<void> const &slot) const { m_DeleteSceneModelSignal.connect(slot); } + + void signalCreateSceneModel(SceneModel *model) { + assert(model); + m_CreateSceneModelSignal.emit(model->getDynamicGroup()); + } + void signalDeleteSceneModel() { m_DeleteSceneModelSignal.emit(); } + void signalInternalView(bool internal_view) { m_InternalViewSignal.emit(internal_view); } + +private: + mutable sigc::signal<void, osg::Group*> m_CreateSceneModelSignal; + mutable sigc::signal<void> m_DeleteSceneModelSignal; + mutable sigc::signal<void, bool> m_InternalViewSignal; +}; + + +#endif // __DYNAMICMODEL_H__ + |
