[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: FlightGear/src/Main fg_init.cxx,1.14,1.15 main.cxx,1.33,1.34
From:       "Curtis L. Olson" <curt () seneca ! me ! umn ! edu>
Date:       2002-10-29 19:44:08
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/FlightGear/src/Main
In directory seneca:/tmp/cvs-serv6632/Main

Modified Files:
	fg_init.cxx main.cxx 
Log Message:
Andy Ross:

The biggest and coolest patch adds mouse sensitivity to the 3D
cockpits, so we can finally work the radios.  This ended up requiring
significant modifications outside of the 3D cockpit code.  Stuff folks
will want to look at:

+ The list of all "3D" cockpits is stored statically in the
   panelnode.cxx file.  This is clumsy, and won't migrate well to a
   multiple-aircraft feature.  Really, there should be a per-model list
   of 3D panels, but I couldn't find a clean place to put this.  The
   only handle you get back after parsing a model is a generic ssg
   node, to which I obviously can't add panel-specific methods.

+ The aircraft model is parsed *very* early in the initialization
   order.  Earlier, in fact, than the static list of allowable command
   bindings is built in fgInitCommands().  This is bad, as it means
   that mouse bindings on the instruments can't work yet.  I moved the
   call to fgInitCommands, but someone should look carefully to see
   that I picked the right place.  There's a lot of initialization
   code, and I got a little lost in there... :)

+ I added yet another "update" hook to the fgRenderFrame routine to
   hook the updates for the 3D panels.  This is only required for
   "mouse press delay", and it's a fairly clumsy mechanism based on
   frame rate instead of real time.  There appears to be delay handling
   already in place in the Input stuff, and there's a discussion going
   on about different mouse behavior right now.  Maybe this is a good
   time to unify these two (now three) approaches?



Index: fg_init.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Main/fg_init.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** fg_init.cxx	10 Oct 2002 18:39:52 -0000	1.14
--- fg_init.cxx	29 Oct 2002 19:44:04 -0000	1.15
***************
*** 1126,1135 ****
      }
  
-     ////////////////////////////////////////////////////////////////////
-     // Initialize the built-in commands.
-     ////////////////////////////////////////////////////////////////////
-     fgInitCommands();
- 
- 
  #ifdef ENABLE_AUDIO_SUPPORT
      ////////////////////////////////////////////////////////////////////
--- 1126,1129 ----

Index: main.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Main/main.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** main.cxx	24 Oct 2002 14:05:40 -0000	1.33
--- main.cxx	29 Oct 2002 19:44:04 -0000	1.34
***************
*** 108,111 ****
--- 108,112 ----
  #include <Model/modelmgr.hxx>
  #include <Main/location.hxx>
+ #include <Model/panelnode.hxx>
  #ifdef FG_NETWORK_OLK
  #include <NetworkOLK/network.h>
***************
*** 134,137 ****
--- 135,139 ----
  #include <Scenery/tileentry.hxx>
  
+ #include "fg_commands.hxx"
  
  // #define FG_EXPERIMENTAL_LIGHTING
***************
*** 841,844 ****
--- 843,847 ----
  	    current_panel->update(delta_time_sec);
  	}
+         fgUpdate3DPanels();
  
  	// We can do translucent menus, so why not. :-)
***************
*** 1637,1640 ****
--- 1640,1648 ----
      globals->get_scenery()->init();
      globals->get_scenery()->bind();
+ 
+     ////////////////////////////////////////////////////////////////////
+     // Initialize the property-based built-in commands
+     ////////////////////////////////////////////////////////////////////
+     fgInitCommands();
  
      ////////////////////////////////////////////////////////////////////


_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-cvslogs
[prev in list] [next in list] [prev in thread] [next in thread]