Changeset 7889

Timestamp:

02/27/08 12:43:58 (5 years ago)

Author:

robert

Message:

From Paul Martz, fixed get/set methods API

Location:

OpenSceneGraph/trunk

Files:

• examples/osgocclusionquery/osgocclusionquery.cpp (modified) (2 diffs)
• include/osg/OcclusionQueryNode (modified) (1 diff)
• src/osg/OcclusionQueryNode.cpp (modified) (2 diffs)
• src/osgWrappers/osg/OcclusionQueryNode.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgocclusionquery/osgocclusionquery.cpp

@@ -265 +265 @@
     osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
 
-    osg::StateSet* ss( NULL );
-    osg::StateSet* ssDebug( NULL );
-    oqn->getQueryStateSets( ss, ssDebug );
-    _state = ss;
-    _debugState = ssDebug;
+    _state = oqn->getQueryStateSet();
+    _debugState = oqn->getDebugStateSet();
 }
 
@@ -355 +352 @@
                 // Set all OQNs to use the same query StateSets (instead of multiple copies
                 //   of the same StateSet) for efficiency.
-                oqn->setQueryStateSets( _state.get(), _debugState.get() );
+                oqn->setQueryStateSet( _state.get() );
+                oqn->setDebugStateSet( _debugState.get() );
             }
         }

OpenSceneGraph/trunk/include/osg/OcclusionQueryNode

@@ -68 +68 @@
 
 
-    // Set the StateSets used by the OQN when rendering OQ geometry
-    //   or debug bounding geometry.
-    void setQueryStateSets( osg::StateSet* ss, osg::StateSet* ssDebug );
-    void getQueryStateSets( osg::StateSet* ss, osg::StateSet* ssDebug );
+    // Set and get the StateSet used by the OcclusionQueryNode
+    //   when rendering the query geometry. OQN creates its own by
+    //   default, but if you use many OQNs you might want to use
+    //   this method to set all OQNs to use the same StateSet
+    //   for more efficient processing.
+    void setQueryStateSet( osg::StateSet* ss );
+    osg::StateSet* getQueryStateSet();
+    const osg::StateSet* getQueryStateSet() const;
+
+    // Set and get the StateSet used by the OcclusionQueryNode
+    //   when rendering the debug query geometry (see setDebugDisplay).
+    void setDebugStateSet( osg::StateSet* ss );
+    osg::StateSet* getDebugStateSet();
+    const osg::StateSet* getDebugStateSet() const;
 
     // For statistics gathering, e.g., by a NodeVisitor.

OpenSceneGraph/trunk/src/osg/OcclusionQueryNode.cpp

@@ -655 +655 @@
 
 void
-OcclusionQueryNode::setQueryStateSets( osg::StateSet* ss, osg::StateSet* ssDebug )
-{
-    if (!_queryGeode.valid() || !_debugGeode.valid())
-    {
-        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid support node(s)." << std::endl;
+OcclusionQueryNode::setQueryStateSet( osg::StateSet* ss )
+{
+    if (!_queryGeode)
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
         return;
     }
 
     _queryGeode->setStateSet( ss );
-    _debugGeode->setStateSet( ssDebug );
-}
-void
-OcclusionQueryNode::getQueryStateSets( osg::StateSet* ss, osg::StateSet* ssDebug )
-{
-    ss = _queryGeode->getStateSet();
-    ssDebug = _debugGeode->getStateSet();
+}
+osg::StateSet*
+OcclusionQueryNode::getQueryStateSet()
+{
+    if (!_queryGeode)
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
+        return NULL;
+    }
+    return _queryGeode->getStateSet();
+}
+
+const osg::StateSet*
+OcclusionQueryNode::getQueryStateSet() const
+{
+    if (!_queryGeode)
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid query support node." << std::endl;
+        return NULL;
+    }
+    return _queryGeode->getStateSet();
+}
+
+void
+OcclusionQueryNode::setDebugStateSet( osg::StateSet* ss )
+{
+    if (!_debugGeode)
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        return;
+    }
+    _debugGeode->setStateSet( ss );
+}
+
+osg::StateSet*
+OcclusionQueryNode::getDebugStateSet()
+{
+    if (!_debugGeode.valid())
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        return NULL;
+    }
+    return _debugGeode->getStateSet();
+}
+const osg::StateSet*
+OcclusionQueryNode::getDebugStateSet() const
+{
+    if (!_debugGeode.valid())
+    {
+        osg::notify( osg::WARN ) << "osgOQ: OcclusionQueryNode:: Invalid debug support node." << std::endl;
+        return NULL;
+    }
+    return _debugGeode->getStateSet();
 }
 
@@ -725 +771 @@
     //   the scene graph) create a single instance of these StateSets shared
     //   between all OQNs for efficiency.
-    setQueryStateSets( initOQState(), initOQDebugState() );
+    setQueryStateSet( initOQState() );
+    setDebugStateSet( initOQDebugState() );
 }
 

OpenSceneGraph/trunk/src/osgWrappers/osg/OcclusionQueryNode.cpp

@@ -118 +118 @@
                   "",
                   "");
-        I_Method2(void, setQueryStateSets, IN, osg::StateSet *, ss, IN, osg::StateSet *, ssDebug,
-                  Properties::NON_VIRTUAL,
-                  __void__setQueryStateSets__osg_StateSet_P1__osg_StateSet_P1,
-                  "",
-                  "");
-        I_Method2(void, getQueryStateSets, IN, osg::StateSet *, ss, IN, osg::StateSet *, ssDebug,
-                  Properties::NON_VIRTUAL,
-                  __void__getQueryStateSets__osg_StateSet_P1__osg_StateSet_P1,
+        I_Method1(void, setQueryStateSet, IN, osg::StateSet *, ss,
+                  Properties::NON_VIRTUAL,
+                  __void__setQueryStateSet__osg_StateSet_P1,
+                  "",
+                  "");
+        I_Method0(osg::StateSet *, getQueryStateSet,
+                  Properties::NON_VIRTUAL,
+                  __osg_StateSet_P1__getQueryStateSet,
+                  "",
+                  "");
+        I_Method0(const osg::StateSet *, getQueryStateSet,
+                  Properties::NON_VIRTUAL,
+                  __C5_osg_StateSet_P1__getQueryStateSet,
+                  "",
+                  "");
+        I_Method1(void, setDebugStateSet, IN, osg::StateSet *, ss,
+                  Properties::NON_VIRTUAL,
+                  __void__setDebugStateSet__osg_StateSet_P1,
+                  "",
+                  "");
+        I_Method0(osg::StateSet *, getDebugStateSet,
+                  Properties::NON_VIRTUAL,
+                  __osg_StateSet_P1__getDebugStateSet,
+                  "",
+                  "");
+        I_Method0(const osg::StateSet *, getDebugStateSet,
+                  Properties::NON_VIRTUAL,
+                  __C5_osg_StateSet_P1__getDebugStateSet,
                   "",
                   "");
@@ -165 +185 @@
                          __bool__getDebugDisplay, 
                          __void__setDebugDisplay__bool);
+        I_SimpleProperty(osg::StateSet *, DebugStateSet, 
+                         __osg_StateSet_P1__getDebugStateSet, 
+                         __void__setDebugStateSet__osg_StateSet_P1);
         I_SimpleProperty(bool, Passed, 
                          __bool__getPassed, 
@@ -174 +197 @@
                          __int__getQueryFrameCount, 
                          __void__setQueryFrameCount__int);
+        I_SimpleProperty(osg::StateSet *, QueryStateSet, 
+                         __osg_StateSet_P1__getQueryStateSet, 
+                         __void__setQueryStateSet__osg_StateSet_P1);
         I_SimpleProperty(unsigned int, VisibilityThreshold, 
                          __unsigned_int__getVisibilityThreshold,