Alex Perry writes: > > I hacked model.hxx to make the compiler happy. David, I think you > > must have just missed committing your changed version of model.hxx. > > How about a checkin, to save the rest of us the hassle ?
Alex, I doubt I exactly replicated David's changes and I don't want to create cvs conflicts for him. The file is short so how about I just attach it here for those that are trying to build right now, and I assume that David will return at some point soon and commit 'official' changes. Hey David, I hope this isn't a social life conflicting with FlightGear! :-) Also, I was crashing with the latest runways.mk4 committed today, but I regenerated it myself and could run fine. Maybe something got hosed in the earlier commit ??? so I committed my re-re-generated version and hopefully that will work for everyone. Regards, Curt. -- Curtis Olson IVLab / HumanFIRST Program FlightGear Project Twin Cities [EMAIL PROTECTED] [EMAIL PROTECTED] Minnesota http://www.menet.umn.edu/~curt http://www.flightgear.org // model.hxx - manage a 3D aircraft model. // Written by David Megginson, started 2002. // // This file is in the Public Domain, and comes with no warranty. #ifndef __MODEL_HXX #define __MODEL_HXX 1 #ifndef __cplusplus # error This library requires C++ #endif #include <string> #include <vector> SG_USING_STD(string); SG_USING_STD(vector); #include "fgfs.hxx" #include <simgear/misc/props.hxx> #include <simgear/timing/timestamp.hxx> class FGAircraftModel : public FGSubsystem { public: FGAircraftModel (); virtual ~FGAircraftModel (); virtual void init (); virtual void bind (); virtual void unbind (); virtual void update (int dt); private: struct Animation { enum Type { None, Spin, Rotate }; string name; Type type; ssgTransform * transform; sgMat4 matrix; SGPropertyNode * prop; float factor; float offset; float position; bool has_min; float min; bool has_max; float max; sgVec3 center; sgVec3 axis; void setRotation (); }; void read_animation (Animation &animation, const string &object_name, const SGPropertyNode * node); void do_animation (Animation &animation, long elapsed_ms); ssgEntity * _model; ssgSelector * _selector; ssgTransform * _position; SGTimeStamp _last_timestamp; SGTimeStamp _current_timestamp; vector<Animation> _animations; }; extern FGAircraftModel current_model; #endif // __MODEL_HXX _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
