fly/flightgear
1
0
Fork 0
Code Activity

Renamed fg_types.hxx -> sg_types.hxx

Browse source 
Started work on an interactive property manager traverser/setter.
This commit is contained in:
curt 2000-09-26 23:39:29 +00:00
parent 567967cef1
commit 2c59508156
9 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/steam.cxx
View file

@ -30,8 +30,8 @@
#endif #endif
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_types.hxx>
#include <simgear/misc/props.hxx> #include <simgear/misc/props.hxx>
#include <simgear/math/fg_types.hxx>
#include <Aircraft/aircraft.hxx> #include <Aircraft/aircraft.hxx>
#include <Main/options.hxx> #include <Main/options.hxx>
#include <Main/bfi.hxx> #include <Main/bfi.hxx>

26
src/FDM/LaRCsim.cxx
View file

@ -31,11 +31,11 @@
#include <FDM/LaRCsim/ls_generic.h> #include <FDM/LaRCsim/ls_generic.h>
#include <FDM/LaRCsim/ls_interface.h> #include <FDM/LaRCsim/ls_interface.h>
#include "10520d.hxx" #include "IO360.hxx"
#include "LaRCsim.hxx" #include "LaRCsim.hxx"
// #define USE_NEW_ENGINE_CODE 1 #define USE_NEW_ENGINE_CODE 1
FGEngine eng; FGEngine eng;
@ -89,12 +89,24 @@ int FGLaRCsim::update( int multiloop ) {
// update simple engine model // update simple engine model
eng.set_IAS( V_calibrated_kts ); eng.set_IAS( V_calibrated_kts );
eng.set_Throttle_Lever_Pos( controls.get_throttle( 0 ) * 100.0 ); eng.set_Throttle_Lever_Pos( controls.get_throttle( 0 ) * 100.0 );
eng.set_Propeller_Lever_Pos( 95 ); eng.set_Propeller_Lever_Pos( 100 );
eng.set_Mixture_Lever_Pos( 100 ); eng.set_Mixture_Lever_Pos( 80 );
eng.update(); eng.update();
cout << " Thrust = " << eng.get_FGProp1_Thrust() << endl;
F_X_engine = eng.get_FGProp1_Thrust() * 1.5; #if 0
#endif cout << "Throttle = " << controls.get_throttle( 0 ) * 100.0;
cout << " Mixture = " << 80;
cout << " RPM = " << eng.get_RPM();
cout << " MP = " << eng.get_Manifold_Pressure();
cout << " HP = " << ( eng.get_MaxHP() * eng.get_Percentage_Power()
/ 100.0 );
cout << " EGT = " << eng.get_EGT();
cout << " Thrust (N) " << eng.get_prop_thrust_SI(); // Thrust in Newtons
cout << '\n';
#endif // 0
F_X_engine = eng.get_prop_thrust_SI() * 0.07;
#endif // USE_NEW_ENGINE_CODE
double save_alt = 0.0; double save_alt = 0.0;
double time_step = (1.0 / current_options.get_model_hz()) * multiloop; double time_step = (1.0 / current_options.get_model_hz()) * multiloop;

2
src/FDM/Makefile.am
View file

@ -3,10 +3,10 @@ SUBDIRS = Balloon JSBSim LaRCsim UIUCModel
noinst_LIBRARIES = libFlight.a noinst_LIBRARIES = libFlight.a
libFlight_a_SOURCES = \ libFlight_a_SOURCES = \
10520d.cxx 10520d.hxx \
Balloon.cxx Balloon.h \ Balloon.cxx Balloon.h \
External.cxx External.hxx \ External.cxx External.hxx \
flight.cxx flight.hxx \ flight.cxx flight.hxx \
IO360.cxx IO360.hxx \
JSBSim.cxx JSBSim.hxx \ JSBSim.cxx JSBSim.hxx \
LaRCsim.cxx LaRCsim.hxx \ LaRCsim.cxx LaRCsim.hxx \
MagicCarpet.cxx MagicCarpet.hxx MagicCarpet.cxx MagicCarpet.hxx

2
src/Main/bfi.cxx
View file

@ -34,7 +34,7 @@
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/ephemeris/ephemeris.hxx> #include <simgear/ephemeris/ephemeris.hxx>
#include <simgear/math/fg_types.hxx> #include <simgear/math/sg_types.hxx>
#include <simgear/misc/props.hxx> #include <simgear/misc/props.hxx>
#include <simgear/timing/sg_time.hxx> #include <simgear/timing/sg_time.hxx>

3
src/Main/fg_io.cxx
View file

@ -30,8 +30,7 @@
#include <simgear/io/sg_file.hxx> #include <simgear/io/sg_file.hxx>
#include <simgear/io/sg_serial.hxx> #include <simgear/io/sg_serial.hxx>
#include <simgear/io/sg_socket.hxx> #include <simgear/io/sg_socket.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/math/fg_types.hxx>
#include <Main/options.hxx> #include <Main/options.hxx>

2
src/Main/options.hxx
View file

@ -46,7 +46,7 @@
extern bool global_fullscreen; extern bool global_fullscreen;
#endif #endif
#include <simgear/math/fg_types.hxx> #include <simgear/math/sg_types.hxx>
#include <simgear/timing/sg_time.hxx> #include <simgear/timing/sg_time.hxx>
#include STL_STRING #include STL_STRING

2
src/Main/save.hxx
View file

@ -31,7 +31,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include <simgear/math/fg_types.hxx> #include <simgear/math/sg_types.hxx>
#include <iostream> #include <iostream>
FG_USING_NAMESPACE(std); FG_USING_NAMESPACE(std);

1
src/Network/Makefile.am
View file

@ -5,6 +5,7 @@ libNetwork_a_SOURCES = \
native.cxx native.hxx \ native.cxx native.hxx \
garmin.cxx garmin.hxx \ garmin.cxx garmin.hxx \
nmea.cxx nmea.hxx \ nmea.cxx nmea.hxx \
props.cxx props.hxx \
pve.cxx pve.hxx \ pve.cxx pve.hxx \
ray.cxx ray.hxx \ ray.cxx ray.hxx \
rul.cxx rul.hxx \ rul.cxx rul.hxx \

2
src/NetworkOLK/features.cxx
View file

@ -29,7 +29,7 @@
# include <iostream> # include <iostream>
#endif #endif
#include <simgear/math/fg_types.hxx> #include <simgear/math/sg_types.hxx>
FG_USING_NAMESPACE(std); FG_USING_NAMESPACE(std);