Changeset 12056 for OpenSceneGraph/trunk/examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp

Timestamp:

12/22/10 21:11:05 (2 years ago)

Author:

robert

Message:

Converted FrameStamp::g/setFrameNumber from int to uint

Files:

• OpenSceneGraph/trunk/examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp

@@ -92 +92 @@
 
         ElevationLayerBlendingCallback(osgFX::MultiTextureControl* mtc, const Elevations& elevations, float animationTime=4.0f):
-            _previousFrame(-1),
+            _previousFrame(0),
             _previousTime(0.0),
             _animationTime(animationTime),
@@ -106 +106 @@
 
                 float deltaTime = 0.01f;
-                if (_previousFrame!=-1)
+                if (_previousFrame!=0)
                 {
                     deltaTime = float(nv->getFrameStamp()->getReferenceTime() - _previousTime);
@@ -172 +172 @@
         }
 
-        int                                             _previousFrame;
+        unsigned int                                    _previousFrame;
         double                                          _previousTime;
         float                                           _animationTime;