From cc7b15fa7bb18f5c14364265d2e0b93f6c649a3f Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 24 Oct 2003 17:06:39 +0000 Subject: [PATCH] Various 0.9.3 updates. --- FlightGear.dsp | 90 ++++++++++++++++++++++++++++++++++++ NEWS | 17 +++++-- Thanks | 6 +++ configure.ac | 2 +- scripts/perl/web/mkindex.pl | 20 +++++--- src/Main/main.cxx | 2 +- src/Network/native_ctrls.cxx | 4 +- src/Network/net_ctrls.hxx | 6 +-- 8 files changed, 131 insertions(+), 16 deletions(-) diff --git a/FlightGear.dsp b/FlightGear.dsp index 68f9f05b3..25840f4f9 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -6654,6 +6654,96 @@ SOURCE=.\src\FDM\YASim\RigidBody.hpp # End Source File # Begin Source File +SOURCE=.\src\FDM\YASim\Rotor.cpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\Rotor.hpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\Rotorblade.cpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\Rotorblade.hpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\Rotorpart.cpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\Rotorpart.hpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\FDM\YASim\SimpleJet.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" diff --git a/NEWS b/NEWS index 9833947e3..5967b0ab2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ New in 0.9.3 -* October 15, 2003 +* October 22, 2003 * Added a flight "replay" system. * Many updates to the ATC and AI aircraft subsystem. (David Luff) @@ -18,6 +18,12 @@ New in 0.9.3 * Many buildings and bridges added in the San Francisco area. * Updated airport and navaid database, many new taxiways, many corrected runways, many new airports (especially outside the USA.) +* Updates to the man page. +* Better Win32 packaging (more standardized installer, plus a launcher + which allows selection of starting location and starting aircraft.) +* Added an initial cut at modeling helicopters. +* Support multiple inside the cockpit views. +* Updated FlightGear Flight School tutorial. * Use the field elevation for GS when no specific altitude listed in FAA/DAFIF data @@ -35,7 +41,8 @@ New in 0.9.3 * JSBSim updates including a new turbine engine model that supports things like starting and stopping procedures and thrust reversing. * UIUCsim updates (compiler warning and namespace conflict fixes.) -* YASim updates (fix drag from shutdown engine.) +* YASim updates (fix drag from shutdown engine, helicopter support, + better in airr startup support.) * Support for "clock" instruments that operate independently of computer system time. * Annunciators shouldn't work if electrical system not serviceable. @@ -50,13 +57,15 @@ New in 0.9.3 * Updated aircraft: 747, A320, T-38, A-10, B-52, F-104, Fokker 50, Fokker 100, Piper Cub, P-51, UFO, YF-23, Ornithopter, A-4, C172, and F-16 -* New Aircraft: J-22, Paraglider, SGS-126 Sailplane, ASW 20, and AN-225. +* New Aircraft: J-22, Paraglider, SGS-126 Sailplane, ASW 20, and + AN-225 aircraft; Bell 206 JetRanger, CH-47 Chinook, and Ecureuil + AS-350 helicoptors. * Updated cloud textures. * Removed dependency on Metakit. The airport and runway databases are now stored in a simple flat file ascii database. -* FreeBSD, Solaris, MSVC, Irix, cygwin, and mingwin fixes. +* FreeBSD, Solaris, MSVC, Irix, Mac OSX, cygwin, and mingwin fixes. New in 0.9.2 diff --git a/Thanks b/Thanks index 1f04748c7..c227431b0 100644 --- a/Thanks +++ b/Thanks @@ -23,6 +23,12 @@ Michele America Contributed to the HUD code. +Andrei Barbu + Completely overhauled the look and feel of our web site to bring us + into the current century. Also did some nice reorganization to make + information more accessible. + + Michael Basler Author of the Getting Started guide. diff --git a/configure.ac b/configure.ac index 360401f04..490ddecf8 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(FlightGear, 0.9.3-pre1) +AM_INIT_AUTOMAKE(FlightGear, 0.9.3) dnl Checks for programs. AC_PROG_MAKE_SET diff --git a/scripts/perl/web/mkindex.pl b/scripts/perl/web/mkindex.pl index 496980a37..0b1cb28fc 100755 --- a/scripts/perl/web/mkindex.pl +++ b/scripts/perl/web/mkindex.pl @@ -4,6 +4,12 @@ # adapted from a script by Bob Hain, 11/30/99 # +# +# default values +# + +$outfile = "new.index.html"; + # # process arguments @@ -14,6 +20,9 @@ while ( $arg = shift @ARGV ) { if ( $arg eq "--large" ) { $use_large = 1; } + if ( $arg eq "--outfile" ) { + $outfile = shift @ARGV; + } } @@ -28,7 +37,7 @@ $mdir = "Movies"; $columns = 3; -$swidth = 170; +$wwidth = 170; $sheight = 128; $lwidth = 1024; @@ -148,8 +157,6 @@ mkdir $link, 0755; # Assemble index.html # -$outfile = "index.html"; - $dir = `pwd`; chop($dir); $title = `basename $dir`; @@ -278,8 +285,9 @@ while ( ) { print OUT "\n"; $thumbinfo = `identify $mdir/$linkname.jpg`; - ($name, $geom, $junk) = split(/\s+/, $thumbinfo, 3); + ($name, $type, $geom, $junk) = split(/\s+/, $thumbinfo, 4); ($twidth, $theight) = split(/x/, $geom); + print "movie thumb geom = $geom $twidth $theight\n"; print OUT ""; print OUT "\"$linkname\""; @@ -298,8 +306,8 @@ while ( ) { print OUT "\n"; } else { if ( $twidth < $swidth ) { - print OUT "
\n"; - } + print OUT "
\n"; + } print OUT "\n"; print OUT "$linkname\n"; print OUT "\n"; diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 76e389489..9f2b701d2 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -1549,7 +1549,7 @@ bool fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "0.9.3-pre1"; + static char required_version[] = "0.9.3"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx index c7537598f..cae87ff48 100644 --- a/src/Network/native_ctrls.cxx +++ b/src/Network/native_ctrls.cxx @@ -372,7 +372,9 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes, } for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) { node = fgGetNode( "/controls/gear/wheel", i ); - node->getChild( "brake" )->setDoubleValue( net->brake[i] ); + if ( node != NULL ) { + node->getChild( "brake" )->setDoubleValue( net->brake[i] ); + } } node = fgGetNode( "/controls/gear", true ); diff --git a/src/Network/net_ctrls.hxx b/src/Network/net_ctrls.hxx index 54baaf0b0..d44b9362f 100644 --- a/src/Network/net_ctrls.hxx +++ b/src/Network/net_ctrls.hxx @@ -30,7 +30,7 @@ # error This library requires C++ #endif -const int FG_NET_CTRLS_VERSION = 16; +const int FG_NET_CTRLS_VERSION = 17; // Define a structure containing the control parameters @@ -43,8 +43,8 @@ public: enum { FG_MAX_ENGINES = 4, - FG_MAX_WHEELS = 3, - FG_MAX_TANKS = 4 + FG_MAX_WHEELS = 16, + FG_MAX_TANKS = 6 }; // Aero controls