Changeset 3215

Timestamp:

08/02/04 15:57:47 (9 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk/src/osg

Files:

• FragmentProgram.cpp (modified) (1 diff)
• PagedLOD.cpp (modified) (1 diff)
• PointSprite.cpp (modified) (1 diff)
• Referenced.cpp (modified) (1 diff)
• Texture.cpp (modified) (1 diff)
• VertexProgram.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osg/FragmentProgram.cpp

@@ -191 +191 @@
 void FragmentProgram::releaseGLObjects(State* state) const
 {
-    const_cast<FragmentProgram*>(this)->dirtyFragmentProgramObject();
+    if (!state) const_cast<FragmentProgram*>(this)->dirtyFragmentProgramObject();
+    else
+    {
+        unsigned int contextID = state->getContextID();
+        if (_fragmentProgramIDList[contextID] != 0)
+        {
+            FragmentProgram::deleteFragmentProgramObject(contextID,_fragmentProgramIDList[contextID]);
+            _fragmentProgramIDList[contextID] = 0;
+        }
+    }
 }
 

OpenSceneGraph/trunk/src/osg/PagedLOD.cpp

@@ -186 +186 @@
         if (!_perRangeDataList[_children.size()-1]._filename.empty() && _perRangeDataList[_children.size()-1]._timeStamp<expiryTime)
         {
-            //removedChildren.push_back(_children[_children.size()-1].get());
-            Group::removeChild(_children[_children.size()-1].get());
+            osg::Node* nodeToRemove = _children[_children.size()-1].get();
+            removedChildren.push_back(nodeToRemove);
+            Group::removeChild(nodeToRemove);
         }
     }

OpenSceneGraph/trunk/src/osg/PointSprite.cpp

@@ -20 +20 @@
 int PointSprite::compare(const StateAttribute& sa) const
 {
-    // check the types are equal and then create the rhs variable
-    // used by the COMPARE_StateAttribute_Paramter macro's below.
-    COMPARE_StateAttribute_Types(PointSprite,sa)
+    if (this==&sa) return 0;\
+    const std::type_info* type_lhs = &typeid(*this);\
+    const std::type_info* type_rhs = &typeid(sa);\
+    if (type_lhs->before(*type_rhs)) return -1;\
+    if (*type_lhs != *type_rhs) return 1;\
+
     return 0; // passed all the above comparison macro's, must be equal.
 }

OpenSceneGraph/trunk/src/osg/Referenced.cpp

@@ -24 +24 @@
 void Referenced::setDeleteHandler(DeleteHandler* handler)
 {
-//    s_deleteHandler.reset(handler);
+#if defined(_MSC_VER) && (_MSC_VER <= 1200) // 1200 == VC++ 6.0
+    s_deleteHandler = handler;
+#else
+    s_deleteHandler.reset(handler);
+#endif
 }
 

OpenSceneGraph/trunk/src/osg/Texture.cpp

@@ -1071 +1071 @@
 void Texture::releaseGLObjects(State* state) const
 {
-    const_cast<Texture*>(this)->dirtyTextureObject();
+    if (!state) const_cast<Texture*>(this)->dirtyTextureObject();
+    else
+    {
+        unsigned int contextID = state->getContextID();
+        if (_textureObjectBuffer[contextID].valid()) 
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getTextureObjectManager()->_mutex);
+            
+            getTextureObjectManager()->_textureObjectListMap[contextID].push_back(_textureObjectBuffer[contextID]);
+            _textureObjectBuffer[contextID] = 0;
+        }
+    }
 }
 

OpenSceneGraph/trunk/src/osg/VertexProgram.cpp

@@ -192 +192 @@
 void VertexProgram::releaseGLObjects(State* state) const
 {
-    const_cast<VertexProgram*>(this)->dirtyVertexProgramObject();
+    if (!state) const_cast<VertexProgram*>(this)->dirtyVertexProgramObject();
+    else
+    {
+        unsigned int contextID = state->getContextID();
+        if (_vertexProgramIDList[contextID] != 0)
+        {
+            VertexProgram::deleteVertexProgramObject(contextID,_vertexProgramIDList[contextID]);
+            _vertexProgramIDList[contextID] = 0;
+        }
+    }
 }