Modified Files:

[flightgear.git] / src / Model / acmodel.cxx

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 7096473e810fb8b92a57075de2788a9606cbdbaa..a322f66c6ea2a312c68d130abe682a9a56ce281f 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -9,25 +9,24 @@
 
 #include <string.h>            // for strcmp()
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/placement.hxx>
+#include <simgear/scene/util/SGNodeMasks.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/renderer.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
 
 #include "model_panel.hxx"
 
 #include "acmodel.hxx"
 
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGAircraftModel
@@ -35,9 +34,8 @@
 
 FGAircraftModel::FGAircraftModel ()
   : _aircraft(0),
-    _selector(new ssgSelector),
-    _scene(new ssgRoot),
-    _nearplane(0.01f),
+    _selector(new osg::Switch),
+    _nearplane(0.10f),
     _farplane(1000.0f)
 {
 }
@@ -45,43 +43,57 @@ FGAircraftModel::FGAircraftModel ()
 FGAircraftModel::~FGAircraftModel ()
 {
   delete _aircraft;
-  delete _scene;
                                // SSG will delete it
-  globals->get_scenery()->get_aircraft_branch()->removeKid(_selector);
+  globals->get_scenery()->get_aircraft_branch()->removeChild(_selector.get());
 }
 
 void 
 FGAircraftModel::init ()
 {
+  SGPath liveryPath;
   _aircraft = new SGModelPlacement;
   string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+  string texture_path = fgGetString("/sim/model/texture-path");
+  if( texture_path.size() ) {
+      SGPath temp_path;
+      if ( !ulIsAbsolutePathName( texture_path.c_str() ) ) {
+          temp_path = globals->get_fg_root();
+          temp_path.append( SGPath( path ).dir() );
+          temp_path.append( texture_path );
+          liveryPath = temp_path;
+      } else
+          liveryPath = texture_path;
+  }
   try {
-    ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
+    osg::Node *model = fgLoad3DModelPanel( globals->get_fg_root(),
                                            path,
                                            globals->get_props(),
-                                           globals->get_sim_time_sec() );
+                                           globals->get_sim_time_sec(),
+                                           liveryPath);
     _aircraft->init( model );
   } catch (const sg_exception &ex) {
     SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path);
     SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
-    ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
+    osg::Node *model = fgLoad3DModelPanel( globals->get_fg_root(),
                                            "Models/Geometry/glider.ac",
                                            globals->get_props(),
-                                           globals->get_sim_time_sec() );
+                                           globals->get_sim_time_sec(),
+                                           liveryPath);
     _aircraft->init( model );
   }
-  _scene->addKid(_aircraft->getSceneGraph());
-  _selector->addKid(_aircraft->getSceneGraph());
-  globals->get_scenery()->get_aircraft_branch()->addKid(_selector);
+  _selector->addChild(_aircraft->getSceneGraph(), true);
+  // Do not do altitude computations with that model
+  _selector->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
+  globals->get_scenery()->get_aircraft_branch()->addChild(_selector.get());
 }
 
-void 
+void
 FGAircraftModel::bind ()
 {
   // No-op
 }
 
-void 
+void
 FGAircraftModel::unbind ()
 {
   // No-op
@@ -91,8 +103,9 @@ void
 FGAircraftModel::update (double dt)
 {
   int view_number = globals->get_viewmgr()->get_current();
+  int is_internal = fgGetBool("/sim/current-view/internal");
 
-  if (view_number == 0 && !fgGetBool("/sim/view/internal")) {
+  if (view_number == 0 && !is_internal) {
     _aircraft->setVisible(false);
   } else {
     _aircraft->setVisible(true);
@@ -104,27 +117,8 @@ FGAircraftModel::update (double dt)
   _aircraft->setOrientation(fgGetDouble("/orientation/roll-deg"),
                            fgGetDouble("/orientation/pitch-deg"),
                            fgGetDouble("/orientation/heading-deg"));
-  _aircraft->update( globals->get_scenery()->get_center() );
-
+  _aircraft->update();
 }
 
-void
-FGAircraftModel::draw ()
-{
-                               // OK, now adjust the clip planes and draw
-                               // FIXME: view number shouldn't be 
-                               // hard-coded.
-  int view_number = globals->get_viewmgr()->get_current();
-  if (_aircraft->getVisible() && view_number == 0) {
-    glClearDepth(1);
-    glClear(GL_DEPTH_BUFFER_BIT);
-    ssgSetNearFar(_nearplane, _farplane);
-    ssgCullAndDraw(_scene);
-    _selector->select(0);
-  } else {
-    _selector->select(1);
-  }
-
-}
 
 // end of model.cxx