[Flightgear-devel] fgdata merge request for p51d
I just put in another p51d-jsbsim merge request. This merge mostly affect the exterior 3D model. It now has much improve textures with seams, rivets and access panels. Some changes were made to the nose area of the 3D model to make the line smoother. This also includes some minor improvements to the cockpit models. I also corrected the fuel tank setup so that it will be correct when the fuel density patch is applied. The merge is to the master branch but I think this should also go into the 2.2.0 branch. Hal -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
On Sun, Jan 30, 2011 at 8:51 PM, Frederic Bouvier wrote:
>
> But if you start without a joystick, you won't be able to open that dialog
That is true. Easily fixed by reevaluating the menu state after the
reload. Should probably be refactored a little to avoid code
duplication (I simply copied the line from gui.nas)
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 0d2cc52..05c7133 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -571,6 +571,10 @@
reinit
input
+
+ nasal
+
gui.menuEnable("joystick-info",
size(props.globals.getNode("/input/joysticks").getChildren("js")));
+
--
Csaba/Jester
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
On Sun, 30 Jan 2011, Frederic Bouvier wrote: > > Maybe DirectInput would do a better job here, but we still use the > legacy api inherited from the early days of Windows. > DirectInput support would be a huge win for the Windows build. g. -- Proud owner of F-15C 80-0007 http://www.f15sim.com - The only one of its kind. http://www.simpits.org/geneb - The Me-109F/X Project ScarletDME - The red hot Data Management Environment A Multi-Value database for the masses, not the classes. http://www.scarletdme.org - Get it _today_! Political correctness is a doctrine, fostered by a delusional, illogical minority, and rabidly promoted by an unscrupulous mainstream media, which holds forth the proposition that it is entirely possible to pick up a turd by the clean end. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
- "Csaba Halász" a écrit : > On Sun, Jan 30, 2011 at 1:58 PM, Frederic Bouvier > wrote: > > > > I noticed three things under Windows : > > 1. the state of menu entry "Help > Joystick information" is not modified > > when I remove or add a joystick after start > > Confirmed, but unrelated to the patch. The joystick information > window > does however show the correct data after it is re-opened following a > reload input, even if I have plugged in a different joystick in the > meantime. But if you start without a joystick, you won't be able to open that dialog -Fred -- Frédéric Bouvier http://www.youtube.com/user/fgfred64 Videos -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
> > 2. if I do "Reload input" with the joystick already recognized, axes > > goes wrong and I have to do a Reset to initialize them. > > 3. if I remove the joystick while the joystick information dialog is > > displayed and reload input, fgfs segfault. > > Don't see these problems under debian linux with plib/svn. The Windows functions segfault when we reinit input with the joystick removed. In fact, these functions don't detect that the joystick was removed, although the plug&play system correctly detect the loss of the device. The segfault happens every time, joystick information dialog shown or not, and the symptom is clearly a stack corruption inside the api. Maybe DirectInput would do a better job here, but we still use the legacy api inherited from the early days of Windows. -Fred -- Frédéric Bouvier http://www.youtube.com/user/fgfred64 Videos -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
On 30 Jan 2011, at 14:24, Csaba Halász wrote: >> 2. if I do "Reload input" with the joystick already recognized, axes >>goes wrong and I have to do a Reset to initialize them. >> 3. if I remove the joystick while the joystick information dialog is >>displayed and reload input, fgfs segfault. > > Don't see these problems under debian linux with plib/svn. Same here on Mac all works fine. Is this a platform variation in the PLIB joystick init code, I wonder? This certainly makes me less inclined to merge the change to the release branch - though we could of course add a platform #ifdef James -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Fix for bugs #47 and #184
On 30 Jan 2011, at 14:07, ThorstenB wrote: > Great, would be awesome to have this part of FDM integration fixed! I'll > do a few tests and then push to "next". > Everyone else please test and report new issues (JSBSim and YASim). > If nothing new is reported, we should also patch the 2.2.0 branch. Agreed on all counts - great work Bertrand! James -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
On Sun, Jan 30, 2011 at 1:58 PM, Frederic Bouvier wrote: > > I noticed three things under Windows : > 1. the state of menu entry "Help > Joystick information" is not modified > when I remove or add a joystick after start Confirmed, but unrelated to the patch. The joystick information window does however show the correct data after it is re-opened following a reload input, even if I have plugged in a different joystick in the meantime. > 2. if I do "Reload input" with the joystick already recognized, axes > goes wrong and I have to do a Reset to initialize them. > 3. if I remove the joystick while the joystick information dialog is > displayed and reload input, fgfs segfault. Don't see these problems under debian linux with plib/svn. -- Csaba/Jester -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Fix for bugs #47 and #184
On 30.01.2011 14:55, Bertrand Coconnier wrote: > Please find attached a patch that fixes bugs #47 and #184. It restores > functionality of command line arguments --vc, --roll-deg, --pitch-deg, > etc. Note also that this patch has also a positive side effect : it > restores functionality of the 'airspeed (kt)' cell of the 'Position > Aircraft in air' dialog box. Though in most cases, the engines are not > started, and the aircraft is just thrown into the air with correct > altitude/attitude/airspeed/etc. > > I have only tested it for JSBSim models. So further tests might be needed. Great, would be awesome to have this part of FDM integration fixed! I'll do a few tests and then push to "next". Everyone else please test and report new issues (JSBSim and YASim). If nothing new is reported, we should also patch the 2.2.0 branch. Thanks Bertrand! cheers, Thorsten -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Fix for bugs #47 and #184
Hi all,
Please find attached a patch that fixes bugs #47 and #184. It restores
functionality of command line arguments --vc, --roll-deg, --pitch-deg,
etc. Note also that this patch has also a positive side effect : it
restores functionality of the 'airspeed (kt)' cell of the 'Position
Aircraft in air' dialog box. Though in most cases, the engines are not
started, and the aircraft is just thrown into the air with correct
altitude/attitude/airspeed/etc.
I have only tested it for JSBSim models. So further tests might be needed.
Cheers,
Bertrand.
diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 5676e68..d501d15 100644
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -268,15 +268,15 @@ FGInterface::bind ()
// Orientation
fgTie("/orientation/roll-deg", this,
&FGInterface::get_Phi_deg,
- &FGInterface::set_Phi_deg);
+ &FGInterface::set_Phi_deg, false);
fgSetArchivable("/orientation/roll-deg");
fgTie("/orientation/pitch-deg", this,
&FGInterface::get_Theta_deg,
- &FGInterface::set_Theta_deg);
+ &FGInterface::set_Theta_deg, false);
fgSetArchivable("/orientation/pitch-deg");
fgTie("/orientation/heading-deg", this,
&FGInterface::get_Psi_deg,
- &FGInterface::set_Psi_deg);
+ &FGInterface::set_Psi_deg, false);
fgSetArchivable("/orientation/heading-deg");
fgTie("/orientation/track-deg", this,
&FGInterface::get_Track);
@@ -331,11 +331,11 @@ FGInterface::bind ()
// LaRCSim are fixed (LaRCSim adds the
// earth's rotation to the east velocity).
fgTie("/velocities/speed-north-fps", this,
- &FGInterface::get_V_north, &FGInterface::set_V_north);
+ &FGInterface::get_V_north, &FGInterface::set_V_north, false);
fgTie("/velocities/speed-east-fps", this,
- &FGInterface::get_V_east, &FGInterface::set_V_east);
+ &FGInterface::get_V_east, &FGInterface::set_V_east, false);
fgTie("/velocities/speed-down-fps", this,
- &FGInterface::get_V_down, &FGInterface::set_V_down);
+ &FGInterface::get_V_down, &FGInterface::set_V_down, false);
fgTie("/velocities/north-relground-fps", this,
&FGInterface::get_V_north_rel_ground);
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Patch for fix animation in Fokker-50 AI model
Hello, all. Please find attached patch for fix animation in existing Fokker-50 AI model (fgdata/AI/Aircraft/Fokker-50/*xml). PS: I found that some AI models does take-of from opposite runways at near one time (most of 737's taking of from RW 20, all other from RW 2) during testing of my changes in EVRA with ~ 10 departure flights (F50, Dash8, 737) --- Regards, Alexey. 0001-Fix-Fokker-50-AI-model-animation-fix.patch.gz Description: GNU Zip compressed data signature.asc Description: PGP signature -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Reload joystick config
Hi, > On 28 Jan 2011, at 09:02, James Turner wrote: > > > Looks good to me, from a visual inspection. I'll apply over the > weekend, and poke some people to test. Depending on when 2.2.0 happens > this might even be worth back-porting, but we should wait for some > positive testing feedback before that. > > This is in 'next' now, and works well for me here - if some other > people could test (on Windows and Linux), then I'll merge this to > 2.2.0 assuming the responses are positive. I noticed three things under Windows : 1. the state of menu entry "Help > Joystick information" is not modified when I remove or add a joystick after start 2. if I do "Reload input" with the joystick already recognized, axes goes wrong and I have to do a Reset to initialize them. 3. if I remove the joystick while the joystick information dialog is displayed and reload input, fgfs segfault. Regards, -Fred -- Frédéric Bouvier http://www.youtube.com/user/fgfred64 Videos -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] [FlightGear-devel] Hudson build artifact not pointing to 2.2.0 ?
Hi Tom, > I was going to test 2.2.0 release candidate on Windows, so proceeded to > download the following: http://flightgear.simpits.org:8080/job/Win32-installer/lastSuccessfulBuild/artifact/fgfs_win32_nightly_2.2.0.exe > The program installed is not a 2.2.0 but a 2.0.0. > Did I download the wrong one, even if it's marked 2.2.0 ? Please verify that the path in fgrun points to the nightly install Regards, -Fred -- Frédéric Bouvier http://www.youtube.com/user/fgfred64 Videos -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Incorrect conversion used for lbs to gallon of fuel
2011/1/29 Ron Jensen :
>
> + double fuelDensity = Propulsion->GetTank(i)->GetDensity();
>
> ( ... )
>
> + Propulsion->GetTank(i)->GetContents() / fuelDensity);
>
>
> Should we guard against GetDensity() returning 0?
Correct.
Please find an updated version of the patch that uses the standard
fuel density (6.0 lbs/gal) if the density is too low or negative ( <
0.1). This is assuming that if the density goes below that threshold
it can only be an error. Another policy would be to clamp the value to
0.1.
Suggestions ?
Also, unlike the existing code base, this patch is assuming that the
fuel weight is the reference and that the fuel volume should be
adjusted to the fuel density modifications. When the fuel temperature
drops, its volume decreases but its weight is not changing. I would
think that this does not break backward compatibility : the
fuel/payload menu is checking the fuel volume against the tank
capacity and is reacting well to density modifications in the property
tree. But I would like to have other opinions.
This version 3 of the patches supersedes the other two.
Cheers,
Bertrand.
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index a9e9be7..2e75e44 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -213,14 +213,28 @@ FGJSBsim::FGJSBsim( double dt )
// Set initial fuel levels if provided.
for (unsigned int i = 0; i < Propulsion->GetNumTanks(); i++) {
SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
+ FGTank* tank = Propulsion->GetTank(i);
+ double fuelDensity;
+
+ if (node->getChild("density-ppg", 0, false) != 0) {
+fuelDensity = node->getDoubleValue("density-ppg");
+tank->SetDensity(fuelDensity);
+ }
+ else {
+fuelDensity = tank->GetDensity();
+node->setDoubleValue("density-ppg", fuelDensity);
+ }
+
+ if (fuelDensity < 0.1)
+fuelDensity = 6.0; // Use average fuel value
+
if (node->getChild("level-gal_us", 0, false) != 0) {
-Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
+tank->SetContents(node->getDoubleValue("level-gal_us") * fuelDensity);
} else {
-node->setDoubleValue("level-lbs", Propulsion->GetTank(i)->GetContents());
-node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6);
+node->setDoubleValue("level-lbs", tank->GetContents());
+node->setDoubleValue("level-gal_us", tank->GetContents() / fuelDensity);
}
- node->setDoubleValue("capacity-gal_us",
- Propulsion->GetTank(i)->GetCapacity() / 6.6);
+ node->setDoubleValue("capacity-gal_us", tank->GetCapacity() / fuelDensity);
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
@@ -695,8 +709,14 @@ bool FGJSBsim::copy_to_JSBsim()
for (i = 0; i < Propulsion->GetNumTanks(); i++) {
SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
FGTank * tank = Propulsion->GetTank(i);
- tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
-// tank->SetContents(node->getDoubleValue("level-lbs"));
+ double fuelDensity = node->getDoubleValue("density-ppg");
+
+ if (fuelDensity < 0.1)
+fuelDensity = 6.0; // Use average fuel value
+
+ tank->SetDensity(fuelDensity);
+// tank->SetContents(node->getDoubleValue("level-gal_us") * fuelDensity);
+ tank->SetContents(node->getDoubleValue("level-lbs"));
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
@@ -934,7 +954,13 @@ bool FGJSBsim::copy_from_JSBsim()
FGTank* tank = Propulsion->GetTank(i);
double contents = tank->GetContents();
double temp = tank->GetTemperature_degC();
-node->setDoubleValue("level-gal_us", contents/6.6);
+double fuelDensity = tank->GetDensity();
+
+if (fuelDensity < 0.1)
+ fuelDensity = 6.0; // Use average fuel value
+
+node->setDoubleValue("density-ppg" , fuelDensity);
+node->setDoubleValue("level-gal_us", contents/fuelDensity);
node->setDoubleValue("level-lbs", contents);
if (temp != -.0) node->setDoubleValue("temperature_degC", temp);
}
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Tried to initialize a non-existent engine!
On Sat, 2011-01-29 at 01:36 +0100, Bertrand Coconnier wrote: > Hi all, > > I think I have a final bug fix for JSBSim reset issues (bug #204 and > #222). I have investigated James Turner's fix and tried to understand > why it fixes the issue in every case but for gliders. This fix has been committed to FlightGear/Next (but not the 2.2.0 codebase yet). I did some testing using a variety of aircraft and did not see any problem so far, great work Bertrand! If some people could test this out and let me know the results then it can go in 2.2.0 soon. The one-liner diff to the JSBSim codebase is in discussion at the JSBSim mailinglist. Erik -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
