Changeset 10827 for OpenSceneGraph/trunk/include/osgParticle/Particle

Timestamp:

11/24/09 16:00:11 (3 years ago)

Author:

robert

Message:

From Martin Scheffler, "osgParticle: method to set start and end tile for particle texture (for animated particles). I also updated examples/osgParticle to show the feature.
The texture in data/Images should be copied to osg-data. I created the texture myself with the help of an explosion generator, so no license issues there.
"

Files:

• OpenSceneGraph/trunk/include/osgParticle/Particle (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgParticle/Particle

@@ -155 +155 @@
         
         /// Get number of texture tiles
-        inline int getNumTiles() const { return _num_tile; }
+        inline int getNumTiles() const { return _end_tile - _start_tile + 1; }
         
         /** Kill the particle on next update
@@ -247 +247 @@
         inline float getCurrentSize() const;
         
-        /// Specify how the particle texture is tiled
-        inline void setTextureTile(int sTile, int tTile, int numTiles = 0);
+        /// Specify how the particle texture is tiled.
+        /// All tiles in the given range are sequentially displayed during the lifetime
+        /// of the particle. When no range is given, all tiles are displayed during the lifetime.
+        inline void setTextureTileRange(int sTile, int tTile, int startTile, int endTile);
+
+        /// Same as above, range starts at 0 and ends at end
+        inline void setTextureTile(int sTile, int tTile, int end = -1);
 
         /// Set the previous particle
@@ -300 +305 @@
         float _s_tile;
         float _t_tile;
-        int _num_tile;
+        int _start_tile;
+        int _end_tile;
         int _cur_tile;
         float _s_coord;
@@ -567 +573 @@
     }
 
-    inline void Particle::setTextureTile(int sTile, int tTile, int numTiles)
-    {
-        _s_tile = (sTile>0) ? 1.0f / static_cast<float>(sTile) : 1.0f;
-        _t_tile = (tTile>0) ? 1.0f / static_cast<float>(tTile) : 1.0f;
-        if (numTiles <= 0)
-        {
-            _num_tile = sTile * tTile;
-        }
-        else
-        {
-            _num_tile = numTiles;
-        }
-    }
-
+
+    inline void Particle::setTextureTile(int sTile, int tTile, int end)
+    {
+        setTextureTileRange(sTile, tTile, -1, end);
+    }
+
+    inline void Particle::setTextureTileRange(int sTile, int tTile, int startTile, int endTile)
+    {
+       _s_tile = (sTile>0) ? 1.0f / static_cast<float>(sTile) : 1.0f;
+       _t_tile = (tTile>0) ? 1.0f / static_cast<float>(tTile) : 1.0f;
+       
+       if(startTile == -1)
+       {
+          _start_tile = 0;
+       }
+       else
+       {
+          _start_tile = startTile;
+       }
+
+       if(endTile == -1)
+       {
+          _end_tile = sTile * tTile;
+       }
+       else
+       {
+          _end_tile = endTile;
+       }
+    }
 
 }