ruby-ogre 0.0.3-x86-linux → 0.0.4-x86-linux

data/deps/include/OGRE/RTShaderSystem/OgreShaderScriptTranslator.h

@@ -134,7 +134,8 @@ protected:
 			
 protected:
 
-	RenderState* mGeneratedRenderState; //Render state created as a result of the current node being parsed
+	//Render state created as a result of the current node being parsed
+	RenderState* mGeneratedRenderState;
 
 };
 

data/deps/include/OGRE/RTShaderSystem/OgreShaderSubRenderState.h

@@ -60,17 +60,17 @@ class _OgreRTSSExport SubRenderState : public RTShaderSystemAlloc
 public:
 
 	/** Class default constructor */
-	SubRenderState			();
+	SubRenderState();
 
 	/** Class destructor */
-	virtual ~SubRenderState	();
+	virtual ~SubRenderState();
 
 
 	/** Get the type of this sub render state.
 	@remarks
 	The type string should be unique among all registered sub render states.	
 	*/
-	virtual const String&	getType					() const = 0;
+	virtual const String& getType() const = 0;
 
 
 	/** Get the execution order of this sub render state.
@@ -78,13 +78,13 @@ public:
 	The return value should be synchronized with the predefined values
 	of the FFPShaderStage enum.
 	*/
-	virtual int				getExecutionOrder		() const = 0;
+	virtual int getExecutionOrder() const = 0;
 
 
 	/** Copy details from a given sub render state to this one.
 	@param rhs the source sub state to copy from.	
 	*/
-	virtual void			copyFrom				(const SubRenderState& rhs) = 0;
+	virtual void copyFrom(const SubRenderState& rhs) = 0;
 
 	/** Operator = declaration. Assign the given source sub state to this sub state.
 	@param rhs the source sub state to copy from.	
@@ -97,7 +97,7 @@ public:
 	implement.
 	@param programSet container class of CPU and GPU programs that this sub state will affect on.
 	*/
-	virtual bool			createCpuSubPrograms	(ProgramSet* programSet);
+	virtual bool createCpuSubPrograms(ProgramSet* programSet);
 
 	/** Update GPU programs parameters before a rendering operation occurs.
 	This method is called in the context of SceneManager::renderSingle object via the RenderObjectListener interface and
@@ -108,7 +108,7 @@ public:
 	@source The auto parameter source.
 	@pLightList The light list used in the current rendering context.
 	*/
-	virtual void			updateGpuProgramsParams	(Renderable* rend, Pass* pass,  const AutoParamDataSource* source, 	const LightList* pLightList) { }
+	virtual void updateGpuProgramsParams(Renderable* rend, Pass* pass,  const AutoParamDataSource* source, 	const LightList* pLightList) { }
 
 	/** Called before adding this sub render state to the given render state.
 	Allows this sub render state class to configure specific parameters depending on source pass or parent render state.
@@ -117,17 +117,17 @@ public:
 	@param srcPass The source pass.
 	@param dstPass The destination pass.
 	*/
-	virtual bool			preAddToRenderState		(const RenderState* renderState, Pass* srcPass, Pass* dstPass) { return true; }
+	virtual bool preAddToRenderState(const RenderState* renderState, Pass* srcPass, Pass* dstPass) { return true; }
 
 	/** Return the accessor object to this sub render state.
 	@see SubRenderStateAccessor.
 	*/
-	SubRenderStateAccessorPtr	getAccessor				();
+	SubRenderStateAccessorPtr getAccessor();
 
 	/** Return the accessor object to this sub render state.
 	@see SubRenderStateAccessor.
 	*/
-	SubRenderStateAccessorPtr	getAccessor				() const;
+	SubRenderStateAccessorPtr getAccessor() const;
 
 // Protected methods
 protected:
@@ -136,24 +136,26 @@ protected:
 	@param programSet container class of CPU and GPU programs that this sub state will affect on.
 	@remarks Internal method called in the context of SubRenderState::createCpuSubPrograms implementation.
 	*/
-	virtual bool			resolveParameters		(ProgramSet* programSet);	
+	virtual bool resolveParameters(ProgramSet* programSet);	
 
 	/** Resolve dependencies that this sub render state requires.	
 	@param programSet container class of CPU and GPU programs that this sub state will affect on.
 	@remarks Internal method called in the context of SubRenderState::createCpuSubPrograms implementation.
 	*/
-	virtual bool			resolveDependencies		(ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/** Add function invocation that this sub render state requires.	
 	@param programSet container class of CPU and GPU programs that this sub state will affect on.
 	@remarks Internal method called in the context of SubRenderState::createCpuSubPrograms implementation.
 	*/
-	virtual bool			addFunctionInvocations	(ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 // Attributes.
 private:	
-	mutable SubRenderStateAccessorPtr	mThisAccessor;			// The accessor of this instance.
-	SubRenderStateAccessorPtr			mOtherAccessor;			// The accessor of the source instance which used as base to create this instance.
+	// The accessor of this instance.
+	mutable SubRenderStateAccessorPtr mThisAccessor;
+	// The accessor of the source instance which used as base to create this instance.
+	SubRenderStateAccessorPtr mOtherAccessor;
 	
 };
 
@@ -195,10 +197,10 @@ public:
 	}
 
 	/** Return a set of all instances of the template SubRenderState. */
-	SubRenderStateSet&	getSubRenderStateInstanceSet() { return mSubRenderStateInstancesSet; }
+	SubRenderStateSet& getSubRenderStateInstanceSet() { return mSubRenderStateInstancesSet; }
 
 	/** Return a set of all instances of the template SubRenderState. (const version). */
-	const SubRenderStateSet&	getSubRenderStateInstanceSet() const { return mSubRenderStateInstancesSet; }
+	const SubRenderStateSet& getSubRenderStateInstanceSet() const { return mSubRenderStateInstancesSet; }
 
 protected:
 	/** Construct SubRenderState accessor based on the given template SubRenderState.
@@ -207,8 +209,8 @@ protected:
 
 
 protected:
-	const SubRenderState*		mTemplateSubRenderState;
-	mutable SubRenderStateSet	mSubRenderStateInstancesSet;
+	const SubRenderState* mTemplateSubRenderState;
+	mutable SubRenderStateSet mSubRenderStateInstancesSet;
 
 private:
 	friend class SubRenderState;
@@ -231,19 +233,19 @@ class _OgreRTSSExport SubRenderStateFactory : public RTShaderSystemAlloc
 {
 
 public:
-	SubRenderStateFactory			() {}
-	virtual ~SubRenderStateFactory	();
+	SubRenderStateFactory() {}
+	virtual ~SubRenderStateFactory();
 
 	/** Get the type of this sub render state factory.
 	@remarks
 	The type string should be the same as the type of the SubRenderState sub class it is going to create.	
 	@see SubRenderState::getType.
 	*/
-	virtual const String&	getType				() const = 0;
+	virtual const String& getType() const = 0;
 	
 	/** Create an instance of the SubRenderState sub class it suppose to create.	
 	*/
-	virtual SubRenderState*	createInstance		();
+	virtual SubRenderState* createInstance();
 
 	/** Create an instance of the SubRenderState based on script properties.	
 	This method is called in the context of script parsing and let this factory
@@ -252,7 +254,7 @@ public:
 	@param prop The abstract property node.
 	@param pass The pass that is the parent context of this node.
 	*/
-	virtual SubRenderState*	createInstance		(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator) { return NULL; }
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator) { return NULL; }
 
 	/** Create an instance of the SubRenderState based on script properties.	
 	This method is called in the context of script parsing and let this factory
@@ -261,22 +263,22 @@ public:
 	@param prop The abstract property node.
 	@param texState The pass that is the parent context of this node.
 	*/
-	virtual SubRenderState*	createInstance		(ScriptCompiler* compiler, PropertyAbstractNode* prop, TextureUnitState* texState, SGScriptTranslator* translator) { return NULL; }
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, TextureUnitState* texState, SGScriptTranslator* translator) { return NULL; }
 
 	/** Retrieve the previous instance the SRS in the script translator or
 	* create a new instance if not found 
 	@param translator The translator instance holding existing scripts.
 	*/
-	virtual SubRenderState*	createOrRetrieveInstance(SGScriptTranslator* translator);
+	virtual SubRenderState* createOrRetrieveInstance(SGScriptTranslator* translator);
 
 	/** Destroy the given instance.	
 	@param subRenderState The instance to destroy.
 	*/
-	virtual void			destroyInstance		(SubRenderState* subRenderState);
+	virtual void destroyInstance(SubRenderState* subRenderState);
 
 	/** Destroy all the instances that created by this factory.		
 	*/
-	virtual void			destroyAllInstances	();
+	virtual void destroyAllInstances();
 
 	/** Write the given sub-render state instance using the material serializer.
 	This method is called in the context of material serialization. It is useful for integrating into
@@ -287,7 +289,7 @@ public:
 	@param srcPass The source pass.
 	@param dstPass The generated shader based pass.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass) {}
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass) {}
 
 	/** Write the given sub-render state instance using the material serializer.
 	This method is called in the context of material serialization. It is useful for integrating into
@@ -298,17 +300,18 @@ public:
 	@param srcTextureUnit The source texture unit state.
 	@param dstTextureUnit The generated shader based texture unit state.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, const TextureUnitState* srcTextureUnit, const TextureUnitState* dstTextureUnit) {}
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, const TextureUnitState* srcTextureUnit, const TextureUnitState* dstTextureUnit) {}
 protected:
 	/** Create instance implementation method. Each sub class of this interface
 	must implement this method in which it will allocate the specific sub class of 
 	the SubRenderState.
 	*/
-	virtual SubRenderState*	createInstanceImpl	() = 0;
+	virtual SubRenderState* createInstanceImpl() = 0;
 
 // Attributes.
 protected:
-	SubRenderStateSet		mSubRenderStateList;		// List of all sub render states instances this factory created.
+	// List of all sub render states instances this factory created.
+	SubRenderStateSet mSubRenderStateList;
 };
 
 /** @} */

data/deps/include/OGRE/RenderSystems/GL/GL/wglew.h

@@ -338,7 +338,7 @@ typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC
 #define WGL_SHARE_ACCUM_ARB 0x200E
 #define WGL_SUPPORT_GDI_ARB 0x200F
 #define WGL_SUPPORT_OPENGL_ARB 0x2010
-#define WGL_DOUBLE_BUFFER_ARB 0x2012
+#define WGL_DOUBLE_BUFFER_ARB 0x2011
 #define WGL_STEREO_ARB 0x2012
 #define WGL_PIXEL_TYPE_ARB 0x2013
 #define WGL_COLOR_BITS_ARB 0x2014
@@ -619,7 +619,7 @@ typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC
 #define WGL_SHARE_ACCUM_EXT 0x200E
 #define WGL_SUPPORT_GDI_EXT 0x200F
 #define WGL_SUPPORT_OPENGL_EXT 0x2010
-#define WGL_DOUBLE_BUFFER_EXT 0x2012
+#define WGL_DOUBLE_BUFFER_EXT 0x2011
 #define WGL_STEREO_EXT 0x2012
 #define WGL_PIXEL_TYPE_EXT 0x2013
 #define WGL_COLOR_BITS_EXT 0x2014

data/deps/include/OGRE/RenderSystems/GL/GL/wglext.h

@@ -90,7 +90,7 @@ extern "C" {
 #define WGL_SHARE_ACCUM_ARB            0x200E
 #define WGL_SUPPORT_GDI_ARB            0x200F
 #define WGL_SUPPORT_OPENGL_ARB         0x2010
-#define WGL_DOUBLE_BUFFER_ARB          0x2012
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
 #define WGL_STEREO_ARB                 0x2012
 #define WGL_PIXEL_TYPE_ARB             0x2013
 #define WGL_COLOR_BITS_ARB             0x2014
@@ -194,7 +194,7 @@ extern "C" {
 #define WGL_SHARE_ACCUM_EXT            0x200E
 #define WGL_SUPPORT_GDI_EXT            0x200F
 #define WGL_SUPPORT_OPENGL_EXT         0x2010
-#define WGL_DOUBLE_BUFFER_EXT          0x2012
+#define WGL_DOUBLE_BUFFER_EXT          0x2011
 #define WGL_STEREO_EXT                 0x2012
 #define WGL_PIXEL_TYPE_EXT             0x2013
 #define WGL_COLOR_BITS_EXT             0x2014

data/deps/include/OGRE/RenderSystems/GL/OgreGLRenderSystem.h

@@ -515,7 +515,16 @@ namespace Ogre {
 
 		/// @copydoc RenderSystem::getDisplayMonitorCount
 		unsigned int getDisplayMonitorCount() const;
-    };
+        
+		/// @copydoc RenderSystem::beginProfileEvent
+        virtual void beginProfileEvent( const String &eventName );
+
+		/// @copydoc RenderSystem::endProfileEvent
+        virtual void endProfileEvent( void );
+
+		/// @copydoc RenderSystem::markProfileEvent
+        virtual void markProfileEvent( const String &eventName );
+};
 }
 #endif
 

data/deps/include/OGRE/RenderSystems/GL/OgreGLTextureManager.h

@@ -52,6 +52,8 @@ namespace Ogre {
             bool preciseFormatOnly = false);
 
     protected:
+		friend class GLRenderSystem;
+
         /// @copydoc ResourceManager::createImpl
         Resource* createImpl(const String& name, ResourceHandle handle, 
             const String& group, bool isManual, ManualResourceLoader* loader, 

data/deps/include/OGRE/Sample.h

@@ -41,6 +41,11 @@
 #	include "macUtils.h"
 #endif
 
+#if OGRE_PLATFORM == OGRE_PLATFORM_NACL && !defined(USE_RTSHADER_SYSTEM)
+#   define USE_RTSHADER_SYSTEM
+#include "OgreShaderGenerator.h"
+#endif
+
 
 namespace OgreBites
 {

data/deps/include/OGRE/SampleContext.h

@@ -155,6 +155,12 @@ namespace OgreBites
 		-----------------------------------------------------------------------------*/
 		virtual void runSample(Sample* s)
 		{
+#if OGRE_PROFILING
+            Ogre::Profiler* prof = Ogre::Profiler::getSingletonPtr();
+            if (prof)
+                prof->setEnabled(false);
+#endif
+
 			if (mCurrentSample)
 			{
 				mCurrentSample->_shutdown();    // quit current sample
@@ -165,7 +171,7 @@ namespace OgreBites
 
 			if (s)
 			{
-				// retrieve sample's required plugins and currently installed plugins
+                // retrieve sample's required plugins and currently installed plugins
 				Ogre::Root::PluginInstanceList ip = mRoot->getInstalledPlugins();
 				Ogre::StringVector rp = s->getRequiredPlugins();
 
@@ -206,7 +212,11 @@ namespace OgreBites
 #else
 				s->_setup(mWindow, mKeyboard, mMouse, mFSLayer);   // start new sample
 #endif
-			}
+            }
+#if OGRE_PROFILING
+            if (prof)
+                prof->setEnabled(true);
+#endif
 
 			mCurrentSample = s;
 		}
@@ -291,7 +301,7 @@ namespace OgreBites
 		/*-----------------------------------------------------------------------------
 		| This function encapsulates the entire lifetime of the context.
 		-----------------------------------------------------------------------------*/
-#if OGRE_PLATFORM != OGRE_PLATFORM_SYMBIAN && OGRE_PLATFORM != OGRE_PLATFORM_NACL
+#if OGRE_PLATFORM != OGRE_PLATFORM_NACL
 		virtual void go(Sample* initialSample = 0)
 		{
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS || ((OGRE_PLATFORM == OGRE_PLATFORM_APPLE) && __LP64__)

data/deps/share/OGRE/media/materials/programs/DiffuseOneTexture.glsles

@@ -0,0 +1,17 @@
+#version 100
+
+precision mediump int;
+precision mediump float;
+
+uniform sampler2D texMap;
+
+varying vec4 colour;
+varying vec4 uv;
+
+/*
+  Basic fragment program using texture and diffuse colour.
+*/
+void main()
+{
+	gl_FragColor = texture2D(texMap, uv.xy) * colour;
+}

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Ruby
   module Ogre
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/sample/charactor/sinbad.rb

@@ -35,7 +35,7 @@ class Sinbad < Ogre::FrameListener
   end
 
   def run
-    init_root()
+    return unless init_root()
     init_resources()
     init_managers()
     init_listeners()
@@ -60,9 +60,13 @@ class Sinbad < Ogre::FrameListener
     @root = Ogre::Root.new("")
     load_plugins()
 
-    return false unless @root.show_config_dialog()
-    @window = @root.initialise(true, "Sinbad")
-    @root.add_frame_listener(self)
+    if @root.show_config_dialog()
+      @window = @root.initialise(true, "Sinbad")
+      @root.add_frame_listener(self)
+      return true
+    end
+
+    return false
   end
 
   def load_plugins()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ogre
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: x86-linux
 authors:
@@ -9,15 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies: []
 description: A ruby wrapper set of Ogre, OIS and Procedural.
 email:
 - abexsoft@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- bindings/ogre/interface/ogre_wrap.cpp
+extra_rdoc_files: []
 files:
 - Rakefile
 - README.md
@@ -424,9 +423,13 @@ files:
 - deps/lib/libOgreRTShaderSystem.so
 - deps/lib/libOgrePaging.so.1.8.0
 - deps/lib/libOgreProcedural.so
+- deps/lib/libOgreMain.so.1.8.1
 - deps/lib/libOgreMain.so
+- deps/lib/libOgrePaging.so.1.8.1
 - deps/lib/libOgreTerrain.so
+- deps/lib/libOgreRTShaderSystem.so.1.8.1
 - deps/lib/libOgreRTShaderSystem.so.1.8.0
+- deps/lib/libOgreTerrain.so.1.8.1
 - deps/lib/libOgreMain.so.1.8.0
 - deps/lib/libOgrePaging.so
 - deps/lib/libOgreTerrain.so.1.8.0
@@ -436,11 +439,18 @@ files:
 - deps/lib/OGRE/Plugin_BSPSceneManager.so
 - deps/lib/OGRE/Plugin_PCZSceneManager.so.1.8.0
 - deps/lib/OGRE/Plugin_BSPSceneManager.so.1.8.0
+- deps/lib/OGRE/Plugin_BSPSceneManager.so.1.8.1
+- deps/lib/OGRE/Plugin_OctreeSceneManager.so.1.8.1
 - deps/lib/OGRE/Plugin_OctreeSceneManager.so.1.8.0
 - deps/lib/OGRE/Plugin_OctreeZone.so
 - deps/lib/OGRE/RenderSystem_GL.so
+- deps/lib/OGRE/RenderSystem_GL.so.1.8.1
 - deps/lib/OGRE/Plugin_OctreeZone.so.1.8.0
+- deps/lib/OGRE/Plugin_CgProgramManager.so.1.8.1
 - deps/lib/OGRE/Plugin_CgProgramManager.so
+- deps/lib/OGRE/Plugin_ParticleFX.so.1.8.1
+- deps/lib/OGRE/Plugin_OctreeZone.so.1.8.1
+- deps/lib/OGRE/Plugin_PCZSceneManager.so.1.8.1
 - deps/lib/OGRE/RenderSystem_GL.so.1.8.0
 - deps/lib/OGRE/Plugin_PCZSceneManager.so
 - deps/lib/OGRE/Plugin_OctreeSceneManager.so
@@ -1062,6 +1072,7 @@ files:
 - deps/share/OGRE/media/particle/Examples.particle
 - deps/share/OGRE/media/packs/Sinbad.zip
 - deps/share/OGRE/media/packs/ogretestmap.zip
+- deps/share/OGRE/media/packs/profiler.zip
 - deps/share/OGRE/media/packs/fresneldemo.zip
 - deps/share/OGRE/media/packs/chiropteraDM.pk3
 - deps/share/OGRE/media/packs/skybox.zip
@@ -1446,6 +1457,7 @@ files:
 - deps/share/OGRE/media/materials/programs/Ocean2HLSL_Cg.vert
 - deps/share/OGRE/media/materials/programs/Example_BumpMappingFp.glsles
 - deps/share/OGRE/media/materials/programs/StdQuad_Tex2a_vp.glsles
+- deps/share/OGRE/media/materials/programs/DiffuseOneTexture.glsles
 - deps/share/OGRE/media/materials/programs/HWBasicInstancing.vert
 - deps/share/OGRE/media/materials/programs/Ocean2GLSLES.frag
 - deps/share/OGRE/media/materials/programs/OffsetMapping_specular.glsles