Memory leak fixes from Till Busch

[simgear.git] / simgear / scene / material / matmodel.hxx

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index a0fba3ada66ef7b365fa7fccad327e6e4d9001f7..f173f5c0a309ae9636659a63e1820f2c89a90899 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -2,7 +2,7 @@
 //
 // Written by David Megginson, December 2001
 //
-// Copyright (C) 1998 - 2003  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 1998 - 2003  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -24,17 +24,21 @@
 #ifndef _SG_MAT_MODEL_HXX
 #define _SG_MAT_MODEL_HXX
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 #include <simgear/compiler.h>
 
 #include STL_STRING      // Standard C++ string library
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
+#include <osg/ref_ptr>
+#include <osg/Node>
+#include <osg/NodeVisitor>
+#include <osg/Billboard>
 
+#include <simgear/structure/SGReferenced.hxx>
+#include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/props/props.hxx>
 
 SG_USING_STD(string);
@@ -53,7 +57,7 @@ class SGModelLib;
  * different shapes of trees), but they are considered equivalent
  * and interchangeable.
  */
-class SGMatModel {
+class SGMatModel : public SGReferenced {
 
 public:
 
@@ -83,7 +87,7 @@ public:
      * @param index The index of the model.
      * @return The model.
      */
-    ssgEntity *get_model( int index,
+     osg::Node *get_model( int index,
                           SGModelLib *modellib,
                           const string &fg_root,
                           SGPropertyNode *prop_root,
@@ -95,7 +99,7 @@ public:
      *
      * @return A randomly select model from the variants.
      */
-    ssgEntity *get_random_model( SGModelLib *modellib,
+    osg::Node *get_random_model( SGModelLib *modellib,
                                  const string &fg_root,
                                  SGPropertyNode *prop_root,
                                  double sim_time_sec );
@@ -116,14 +120,15 @@ public:
      */
     HeadingType get_heading_type () const;
 
+    virtual ~SGMatModel ();
+    
+
 protected:
 
     friend class SGMatModelGroup;
 
     SGMatModel (const SGPropertyNode * node, double range_m);
 
-    virtual ~SGMatModel ();
-
 private:
 
     /**
@@ -138,7 +143,7 @@ private:
                       double sim_time_sec );
 
     vector<string> _paths;
-    mutable vector<ssgEntity *> _models;
+    mutable vector<osg::ref_ptr<osg::Node> > _models;
     mutable bool _models_loaded;
     double _coverage_m2;
     double _range_m;
@@ -154,7 +159,7 @@ private:
  * Each SGMaterial instance keeps a (possibly-empty) list of
  * object groups for placing randomly on the scenery.
  */
-class SGMatModelGroup {
+class SGMatModelGroup : public SGReferenced {
 
 public:
 
@@ -194,9 +199,7 @@ protected:
 private:
 
     double _range_m;
-    vector<SGMatModel *> _objects;
-
+    vector<SGSharedPtr<SGMatModel> > _objects;
 };
 
-
 #endif // _SG_MAT_MODEL_HXX