Changeset 7620

Timestamp:

12/08/07 14:29:31 (6 years ago)

Author:

robert

Message:

From Robert Osfield and Richard Schmidt, made fixes inspired by an original submission from Richard which
highlighted problems with Light, ClipPlane? and Hint usage in osg::State's usage of cloneType
and reassignment of target/num in StateSet?/these StateAttributes?.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/ClipPlane (modified) (2 diffs)
• include/osg/Hint (modified) (3 diffs)
• include/osg/Light (modified) (3 diffs)
• src/osg/ClipPlane.cpp (modified) (2 diffs)
• src/osg/Hint.cpp (modified) (2 diffs)
• src/osg/Light.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/ClipPlane

@@ -28 +28 @@
 
         ClipPlane();
+        inline ClipPlane(unsigned int no) { setClipPlaneNum(no); }
         inline ClipPlane(unsigned int no,const Vec4d& plane)    { setClipPlaneNum(no); setClipPlane(plane); }
         inline ClipPlane(unsigned int no,const Plane& plane)   { setClipPlaneNum(no); setClipPlane(plane); }
@@ -43 +44 @@
         }
         
-        META_StateAttribute(osg, ClipPlane, CLIPPLANE);
+        virtual osg::Object* cloneType() const { return new ClipPlane( _clipPlaneNum ); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new ClipPlane(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const ClipPlane *>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "osg"; }
+        virtual const char* className() const { return "ClipPlane"; }
+        virtual Type getType() const { return CLIPPLANE; }
         
         /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */

OpenSceneGraph/trunk/include/osg/Hint

@@ -26 +26 @@
         Hint():
             _target(GL_NONE),
-            _mode(GL_NONE) {}
+            _mode(GL_DONT_CARE) {}
 
         Hint(GLenum target, GLenum mode):
@@ -38 +38 @@
             _mode(hint._mode) {}
 
-        META_StateAttribute(osg, Hint, HINT);
+        virtual osg::Object* cloneType() const { return new Hint( _target, GL_DONT_CARE ); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new Hint(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const Hint *>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "osg"; }
+        virtual const char* className() const { return "Light"; }
+        virtual Type getType() const { return HINT; }
 
         virtual int compare(const StateAttribute& sa) const
         {
-            // check the types are equal and then create the rhs variable
-            // used by the COMPARE_StateAttribute_Parameter macro's below.
-            COMPARE_StateAttribute_Types(Hint,sa)
+        // check the types are equal and then create the rhs variable
+        // used by the COMPARE_StateAttribute_Parameter macro's below.
+        COMPARE_StateAttribute_Types(Hint,sa)
 
             // compare each paramter in turn against the rhs.
@@ -56 +61 @@
         virtual unsigned int getMember() const { return static_cast<unsigned int>(_target); }
         
-        inline void setTarget(GLenum target) { _target = target;  }
+        inline void setTarget(GLenum target);
         inline GLenum getTarget() const { return _target;  }
         

OpenSceneGraph/trunk/include/osg/Light

@@ -28 +28 @@
         Light();
 
+        Light(unsigned int lightnum);
+
         /** Copy constructor using CopyOp to manage deep vs shallow copy. */
         Light(const Light& light,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
@@ -43 +45 @@
             _spot_cutoff(light._spot_cutoff) {}
         
-        META_StateAttribute(osg, Light, LIGHT);
+        virtual osg::Object* cloneType() const { return new Light(_lightnum); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new Light(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const Light *>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "osg"; }
+        virtual const char* className() const { return "Light"; }
+        virtual Type getType() const { return LIGHT; }
 
         /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
@@ -79 +86 @@
 
         /** Set which OpenGL light to operate on. */
-        void setLightNum(int num) { _lightnum = num; }
+        void setLightNum(int num);
         
         /** Get which OpenGL light this osg::Light operates on. */

OpenSceneGraph/trunk/src/osg/ClipPlane.cpp

@@ -12 +12 @@
 */
 #include <osg/ClipPlane>
+#include <osg/StateSet>
 #include <osg/Notify>
 
@@ -29 +30 @@
 void ClipPlane::setClipPlaneNum(unsigned int num)
 {
+    if (_clipPlaneNum==num) return;
+
+    if (_parents.empty())
+    {
+        _clipPlaneNum = num;
+        return;
+    }
+
+    // take a reference to this clip plane to prevent it from going out of scope
+    // when we remove it temporarily from its parents.
+    osg::ref_ptr<ClipPlane> clipPlaneRef = this;
+
+    // copy the parents as they _parents list will be changed by the subsequent removeAttributes.
+    ParentList parents = _parents;
+
+    // remove this attribute from its parents as its position is being changed
+    // and would no longer be valid.
+    ParentList::iterator itr;
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->removeAttribute(this);
+    }
+    
+    // assign the clip plane number
     _clipPlaneNum = num;
+
+    // add this attribute back into its original parents with its new position
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->setAttribute(this);
+    }
 }
 

OpenSceneGraph/trunk/src/osg/Hint.cpp

@@ -13 +13 @@
 
 #include <osg/Hint>
+#include <osg/StateSet>
 
 using namespace osg;
@@ -22 +23 @@
     glHint(_target, _mode);
 }
+
+void Hint::setTarget(GLenum target)
+{ 
+    if (_target==target) return;
+
+    if (_parents.empty())
+    {
+        _target = target;
+        return;
+    }
+
+    // take a reference to this clip plane to prevent it from going out of scope
+    // when we remove it temporarily from its parents.
+    osg::ref_ptr<Hint> hintRef = this;
+
+    // copy the parents as they _parents list will be changed by the subsequent removeAttributes.
+    ParentList parents = _parents;
+
+    // remove this attribute from its parents as its position is being changed
+    // and would no longer be valid.
+    ParentList::iterator itr;
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->removeAttribute(this);
+    }
+    
+    // assign the hint target
+    _target = target;
+
+    // add this attribute back into its original parents with its new position
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->setAttribute(this);
+    }
+}
+

OpenSceneGraph/trunk/src/osg/Light.cpp

@@ -12 +12 @@
 */
 #include <osg/Light>
+#include <osg/StateSet>
 #include <osg/Notify>
 
@@ -19 +20 @@
 {
     init();
-
-    //     notify(DEBUG) << "_ambient "<<_ambient<<std::endl;
-    //     notify(DEBUG) << "_diffuse "<<_diffuse<<std::endl;
-    //     notify(DEBUG) << "_specular "<<_specular<<std::endl;
-    //     notify(DEBUG) << "_position "<<_position<<std::endl;
-    //     notify(DEBUG) << "_direction "<<_direction<<std::endl;
-    //     notify(DEBUG) << "_spot_exponent "<<_spot_exponent<<std::endl;
-    //     notify(DEBUG) << "_spot_cutoff "<<_spot_cutoff<<std::endl;
-    //     notify(DEBUG) << "_constant_attenuation "<<_constant_attenuation<<std::endl;
-    //     notify(DEBUG) << "_linear_attenuation "<<_linear_attenuation<<std::endl;
-    //     notify(DEBUG) << "_quadratic_attenuation "<<_quadratic_attenuation<<std::endl;
 }
 
+Light::Light(unsigned int lightnum)
+{
+    init();
+    _lightnum = lightnum;
+}
 
 Light::~Light( void )
@@ -51 +46 @@
     _linear_attenuation = 0.0f;
     _quadratic_attenuation = 0.0f;
+
+    //     notify(DEBUG) << "_ambient "<<_ambient<<std::endl;
+    //     notify(DEBUG) << "_diffuse "<<_diffuse<<std::endl;
+    //     notify(DEBUG) << "_specular "<<_specular<<std::endl;
+    //     notify(DEBUG) << "_position "<<_position<<std::endl;
+    //     notify(DEBUG) << "_direction "<<_direction<<std::endl;
+    //     notify(DEBUG) << "_spot_exponent "<<_spot_exponent<<std::endl;
+    //     notify(DEBUG) << "_spot_cutoff "<<_spot_cutoff<<std::endl;
+    //     notify(DEBUG) << "_constant_attenuation "<<_constant_attenuation<<std::endl;
+    //     notify(DEBUG) << "_linear_attenuation "<<_linear_attenuation<<std::endl;
+    //     notify(DEBUG) << "_quadratic_attenuation "<<_quadratic_attenuation<<std::endl;
 }
+
+void Light::setLightNum(int num) 
+{
+    if (_lightnum==num) return;
+
+    if (_parents.empty())
+    {
+        _lightnum = num;
+        return;
+    }
+
+    // take a reference to this clip plane to prevent it from going out of scope
+    // when we remove it temporarily from its parents.
+    osg::ref_ptr<Light> lightRef = this;
+
+    // copy the parents as they _parents list will be changed by the subsequent removeAttributes.
+    ParentList parents = _parents;
+
+    // remove this attribute from its parents as its position is being changed
+    // and would no longer be valid.
+    ParentList::iterator itr;
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->removeAttribute(this);
+    }
+    
+    // assign the hint target
+    _lightnum = num;
+
+    // add this attribute back into its original parents with its new position
+    for(itr = parents.begin();
+        itr != parents.end();
+        ++itr)
+    {
+        osg::StateSet* stateset = *itr;
+        stateset->setAttribute(this);
+    }
+}
+