model paging patch from Till Busch

[simgear.git] / simgear / scene / model / model.hxx

diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index db7f663806d48a006f21aba6d4167cb922c7b159..1de3bf40c0e77d99b845bf5cf923e688762e669d 100644 (file)
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -23,63 +23,6 @@ SG_USING_STD(set);
 #include <osgDB/ReaderWriter>
 
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/props/props.hxx>
-
-
-// Has anyone done anything *really* stupid, like making min and max macros?
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
-
-
-/**
- * Abstract class for adding data to the scene graph.  modelLoaded() is
- * called by sgLoad3DModel() after the model was loaded, and the destructor
- * when the branch is removed from the graph.
- */
-class SGModelData : public osg::Referenced {
-public:
-    virtual ~SGModelData() {}
-    virtual void modelLoaded( const string& path, SGPropertyNode *prop,
-                              osg::Node*branch) = 0;
-};
-
-
-/**
- * Load a 3D model with or without XML wrapper.  Note, this version
- * Does not know about or load the panel/cockpit information.  Use the
- * "model_panel.hxx" version if you want to load an aircraft
- * (i.e. ownship) with a panel.
- *
- * If the path ends in ".xml", then it will be used as a property-
- * list wrapper to add animations to the model.
- *
- * Subsystems should not normally invoke this function directly;
- * instead, they should use the FGModelLoader declared in loader.hxx.
- */
-osg::Node*
-sgLoad3DModel( const string& fg_root, const string &path,
-               SGPropertyNode *prop_root, double sim_time_sec,
-               osg::Node *(*load_panel)(SGPropertyNode *) = 0,
-               SGModelData *data = 0,
-               const SGPath& texturePath = SGPath() );
-
-
-/**
- * Make the animation
- */
-void
-sgMakeAnimation( osg::Node* model,
-                 const char * name,
-                 vector<SGPropertyNode_ptr> &name_nodes,
-                 SGPropertyNode *prop_root,
-                 SGPropertyNode_ptr node,
-                 double sim_time_sec,
-                 SGPath &texture_path,
-                 set<osg::Node*> &ignore_branches );
 
 osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const std::string& path,