Changeset 11161

Timestamp:

03/05/10 12:30:50 (3 years ago)

Author:

robert

Message:

Change Shader::getPCS(..) from protected to public scope to enable isCompiled() method to be accessible in applications.

Updated wrappers

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Shader (modified) (2 diffs)
• src/osgWrappers/introspection/osg/Shader.cpp (modified) (3 diffs)
• src/osgWrappers/introspection/osgDB/DatabasePager.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/include/osg/Shader

@@ -185 +185 @@
         static Shader::Type getTypeId( const std::string& tname );
 
-    protected:
+    public:
         /** PerContextShader (PCS) is an OSG-internal encapsulation of glShader per-GL context. */
         class PerContextShader : public osg::Referenced
@@ -228 +228 @@
         };
 
+        PerContextShader* getPCS(unsigned int contextID) const;
+
     protected:        /*methods*/
         virtual ~Shader();
 
-        PerContextShader* getPCS(unsigned int contextID) const;
 
         friend class osg::Program;

OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/Shader.cpp

@@ -172 +172 @@
                   "Query InfoLog from a glShader. ",
                   "");
+
         I_StaticMethod2(osg::Shader *, readShaderFile, IN, osg::Shader::Type, type, IN, const std::string &, fileName,
                         __Shader_P1__readShaderFile__Type__C5_std_string_R1_S,
@@ -192 +193 @@
                         "",
                         "");
-
         I_ProtectedMethod1(bool, addProgramRef, IN, osg::Program *, program,
                            Properties::NON_VIRTUAL,
@@ -222 +222 @@
 END_REFLECTOR
 
+BEGIN_OBJECT_REFLECTOR(osg::Shader::PerContextShader)
+        I_DeclaringFile("osg/Shader");
+        I_BaseType(osg::Referenced);
+        I_Constructor2(IN, const osg::Shader *, shader, IN, unsigned int, contextID,
+                       ____PerContextShader__C5_Shader_P1__unsigned_int,
+                       "",
+                       "");
+        I_Method0(GLuint, getHandle,
+                  Properties::NON_VIRTUAL,
+                  __GLuint__getHandle,
+                  "",
+                  "");
+        I_Method0(void, requestCompile,
+                  Properties::NON_VIRTUAL,
+                  __void__requestCompile,
+                  "",
+                  "");
+        I_Method1(void, compileShader, IN, osg::State &, state,
+                  Properties::NON_VIRTUAL,
+                  __void__compileShader__osg_State_R1,
+                  "",
+                  "");
+        I_Method0(bool, needsCompile,
+                  Properties::NON_VIRTUAL,
+                  __bool__needsCompile,
+                  "",
+                  "");
+        I_Method0(bool, isCompiled,
+                  Properties::NON_VIRTUAL,
+                  __bool__isCompiled,
+                  "",
+                  "");
+        I_Method1(bool, getInfoLog, IN, std::string &, infoLog,
+                  Properties::NON_VIRTUAL,
+                  __bool__getInfoLog__std_string_R1,
+                  "",
+                  "");
+        I_Method1(void, attachShader, IN, GLuint, program,
+                  Properties::NON_VIRTUAL,
+                  __void__attachShader__GLuint,
+                  "Attach our glShader to a glProgram. ",
+                  "");
+        I_Method1(void, detachShader, IN, GLuint, program,
+                  Properties::NON_VIRTUAL,
+                  __void__detachShader__GLuint,
+                  "Detach our glShader from a glProgram. ",
+                  "");
+        I_SimpleProperty(GLuint, Handle, 
+                         __GLuint__getHandle, 
+                         0);
+END_REFLECTOR
+
 BEGIN_OBJECT_REFLECTOR(osg::ShaderBinary)
         I_DeclaringFile("osg/Shader");

OpenSceneGraph/trunk/src/osgWrappers/introspection/osgDB/DatabasePager.cpp

@@ -16 +16 @@
 #include <osg/Group>
 #include <osg/Node>
-#include <osg/PagedLOD>
 #include <osg/Referenced>
 #include <osg/State>
@@ -38 +37 @@
 
 TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority)
-
-TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList)
 
 TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osg::StateSet > >, osgDB::DatabasePager::StateSetList)
@@ -406 +403 @@
                            "Iterate through the active PagedLOD nodes children removing children which havn't been visited since specified expiryTime. ",
                            "note, should be only be called from the update thread. ");
-        I_ProtectedMethod1(void, expiry_removeExpiredSubgraphs, IN, const osg::FrameStamp &, frameStamp,
-                           Properties::VIRTUAL,
-                           Properties::NON_CONST,
-                           __void__expiry_removeExpiredSubgraphs__C5_osg_FrameStamp_R1,
-                           "Old expiry delay based removeExpiredSubgraphs. ",
-                           "");
-        I_ProtectedMethod1(void, capped_removeExpiredSubgraphs, IN, const osg::FrameStamp &, frameStamp,
-                           Properties::VIRTUAL,
-                           Properties::NON_CONST,
-                           __void__capped_removeExpiredSubgraphs__C5_osg_FrameStamp_R1,
-                           "New capped based removeExpiredSubgraphs. ",
-                           "");
         I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, const osg::FrameStamp &, frameStamp,
                            Properties::NON_VIRTUAL,
@@ -599 +584 @@
 END_REFLECTOR
 
-BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PagedLOD >)
-        I_DeclaringFile("osg/ref_ptr");
-        I_Constructor0(____ref_ptr,
-                       "",
-                       "");
-        I_Constructor1(IN, osg::PagedLOD *, ptr,
-                       Properties::NON_EXPLICIT,
-                       ____ref_ptr__T_P1,
-                       "",
-                       "");
-        I_Constructor1(IN, const osg::ref_ptr< osg::PagedLOD > &, rp,
-                       Properties::NON_EXPLICIT,
-                       ____ref_ptr__C5_ref_ptr_R1,
-                       "",
-                       "");
-        I_Method0(osg::PagedLOD *, get,
-                  Properties::NON_VIRTUAL,
-                  __T_P1__get,
-                  "",
-                  "");
-        I_Method0(bool, valid,
-                  Properties::NON_VIRTUAL,
-                  __bool__valid,
-                  "",
-                  "");
-        I_Method0(osg::PagedLOD *, release,
-                  Properties::NON_VIRTUAL,
-                  __T_P1__release,
-                  "",
-                  "");
-        I_Method1(void, swap, IN, osg::ref_ptr< osg::PagedLOD > &, rp,
-                  Properties::NON_VIRTUAL,
-                  __void__swap__ref_ptr_R1,
-                  "",
-                  "");
-        I_SimpleProperty(osg::PagedLOD *, , 
-                         __T_P1__get, 
-                         0);
-END_REFLECTOR
-
 BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::DatabasePager >)
         I_DeclaringFile("osg/ref_ptr");
@@ -679 +624 @@
 END_REFLECTOR
 
-STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::PagedLOD > >)
-
 STD_MAP_REFLECTOR(std::map< unsigned int COMMA  osgDB::DatabasePager::DataToCompile >)