Fix removal of directories.

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

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 7ed5958c962b17f7609ac572306cc45e96fe364c..ee094fa61d2c85d2748e1e99916b259cf8ed08b1 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -44,9 +44,16 @@ class StateSet;
 
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/threads/SGThread.hxx> // for SGMutex
+#include <simgear/math/SGLimits.hxx>
+#include <simgear/math/SGMisc.hxx>
 #include <simgear/math/SGMath.hxx>
+#include <simgear/math/SGVec2.hxx>
+#include <simgear/math/SGRect.hxx>
 #include <simgear/bvh/BVHMaterial.hxx>
 
+typedef osg::ref_ptr<osg::Texture2D> Texture2DRef;
+typedef std::vector<SGRect <float> > AreaList;
+
 namespace simgear
 {
 class Effect;
@@ -85,13 +92,19 @@ public:
    * state information for the material.  This node is usually
    * loaded from the $FG_ROOT/materials.xml file.
    */
-  SGMaterial( const osgDB::Options*, 
-              const SGPropertyNode *props, 
-              SGPropertyNode *prop_root);
+  SGMaterial(const osgDB::Options*,
+             const SGPropertyNode *props,
+             SGPropertyNode *prop_root,
+             AreaList *a,
+                        SGSharedPtr<const SGCondition> c);
+
 
   SGMaterial(const simgear::SGReaderWriterOptions*,
              const SGPropertyNode *props,
-             SGPropertyNode *prop_root);
+             SGPropertyNode *prop_root,
+             AreaList *a,
+                        SGSharedPtr<const SGCondition> c);
+
   /**
    * Destructor.
    */
@@ -106,13 +119,13 @@ public:
   /**
    * Get the textured state.
    */
-  simgear::Effect* get_effect(const SGTexturedTriangleBin& triangleBin);
+  simgear::Effect* get_one_effect(int texIndex);
   simgear::Effect* get_effect();
 
   /**
    * Get the textured state.
    */
-  osg::Texture2D* get_object_mask(const SGTexturedTriangleBin& triangleBin);
+  osg::Texture2D* get_one_object_mask(int texIndex);
 
 
   /**
@@ -260,6 +273,14 @@ public:
    * @return the texture to use for trees.
    */
   inline std::string get_tree_texture () const { return  tree_texture; }
+
+
+  /**
+   * Get the effect file name to use for trees
+   *
+   * @return the effect to use for this set of trees.
+   */
+  inline std::string get_tree_effect () const { return  tree_effect; }
   
   /**
    * Get the cosine of the maximum tree density slope angle. We
@@ -303,9 +324,9 @@ public:
   
   /**
    * Evaluate whether this material is valid given the current global
-   * property state.
+   * property state and the tile location.
    */
-     bool valid() const;
+     bool valid(SGVec2f loc) const;
 
   /**
    * Return pointer to glyph class, or 0 if it doesn't exist.
@@ -463,14 +484,20 @@ private:
   
   // Tree texture, typically a strip of applicable tree textures
   std::string tree_texture;
+
+  // Tree effect to be used for a particular material
+  std::string tree_effect;
   
   // Object mask, a simple RGB texture used as a mask when placing
   // random vegetation, objects and buildings
-  std::vector<osg::Texture2D*> _masks;
+  std::vector<Texture2DRef> _masks;
   
   // Condition, indicating when this material is active
   SGSharedPtr<const SGCondition> condition;
   
+  // List of geographical rectangles for this material
+  AreaList* areas;
+
   // Parameters from the materials file
   const SGPropertyNode* parameters;