shattered_ogrerb 0.5.0.1 → 0.5.0.2

data/vendor/ogrerb/ogre/OgreShadowTextureManager.i

@@ -2,6 +2,11 @@
   #include "OgreShadowTextureManager.h"
 %}
 
-%template() Ogre::Singleton<Ogre::ShadowTextureManager>;
+namespace Ogre {
+	%template() Singleton<Ogre::ShadowTextureManager>;
+
+	%ignore ShadowTextureManager::operator==;
+	%ignore ShadowTextureManager::operator!=;
+}
 
 %include "OgreShadowTextureManager.h"

data/vendor/ogrerb/ogre/OgreStaticGeometry.i

@@ -1,5 +1,277 @@
 %{
   #include "OgreStaticGeometry.h"
+	#include "StaticGeometryProxies.h"
 %}
 
+namespace Ogre {
+	// Custom wrapped below
+	%ignore StaticGeometry::RegionIterator;
+	%ignore StaticGeometry::getRegionIterator;
+}
+
 %include "OgreStaticGeometry.h"
+
+namespace Ogre {
+
+	/****************************************************/
+	/* Many thanks to OgreDotNet for the following code */
+	/****************************************************/
+	
+	class SGSubMeshLodGeometryLink;
+	class SGSubMeshLodGeometryLinkList;
+	class SGQueuedSubMesh;
+	class SGQueuedGeometry;
+
+	class SGLODBucketVectorIterator;
+	class SGMaterialBucketMapIterator;
+	class SGGeometryBucketVectorIterator;
+
+	class SGGeometryBucket;
+	class SGMaterialBucket;
+	class SGLODBucket;
+	class SGRegion;
+
+	class  SGSubMeshLodGeometryLink
+	{
+	public:
+		SGSubMeshLodGeometryLink();
+		virtual ~SGSubMeshLodGeometryLink();
+
+		VertexData* getVertexData();
+		void setVertexData(VertexData* value);
+		IndexData* getIndexData();
+		void setIndexData(IndexData* value);
+	};
+
+
+	class  SGSubMeshLodGeometryLinkList
+	{
+	public:
+		SGSubMeshLodGeometryLinkList();
+		virtual ~SGSubMeshLodGeometryLinkList();
+
+		size_t size();
+		void addItem(SGSubMeshLodGeometryLink *pnewItem);
+		SGSubMeshLodGeometryLink *getFirst();
+		SGSubMeshLodGeometryLink *getLast();
+		SGSubMeshLodGeometryLink *getByIndex(int index);
+	};
+
+
+	//----------------------------------------------------------------
+	// custom code to handle StaticGeometry::QueuedSubMesh
+	class SGQueuedSubMesh
+	{
+	public:
+		SGQueuedSubMesh();
+		virtual ~SGQueuedSubMesh();
+
+		SubMesh* getSubmesh();
+		void setSubmesh(SubMesh* value);
+		SGSubMeshLodGeometryLinkList* getGeometryLodList();
+		void setGeometryLodList(SGSubMeshLodGeometryLinkList* value);
+		const String& getMaterialName();
+		void setMaterialName(const String& value);
+		const Vector3& getPosition();
+		void setPosition(const Vector3& value);
+		const Quaternion& getOrientation();
+		void setOrientation(const Quaternion& value);
+		const Vector3& getScale();
+		void setScale(const Vector3& value);
+		AxisAlignedBox* getWorldBounds();
+	};
+
+
+	/// Structure recording a queued geometry for low level builds
+	class SGQueuedGeometry
+	{
+	public:
+		SGQueuedGeometry();
+		virtual ~SGQueuedGeometry();
+
+		SGSubMeshLodGeometryLink* getGeometry();
+		void setGeometry(SGSubMeshLodGeometryLink* value);
+		const Vector3& getPosition();
+		void setPosition(const Vector3& value);
+		const Quaternion& getOrientation();
+		void setOrientation(const Quaternion& value);
+		const Vector3& getScale();
+		void setScale(const Vector3& value);
+	};
+
+
+	class SGLODBucketVectorIterator
+	{
+	public:
+		//SGLODBucketVectorIterator();
+		virtual ~SGLODBucketVectorIterator();
+		bool hasMoreElements(void) const;
+		void moveNext(void);
+		SGLODBucket *peekNext(void);
+		SGLODBucket *getNext(void);
+		SGLODBucket *next();
+	};
+
+
+	class SGMaterialBucketMapIterator
+	{
+	public:
+		//SGMaterialBucketMapIterator();
+		virtual ~SGMaterialBucketMapIterator();
+		bool hasMoreElements(void) const;
+		void moveNext(void);
+		const String& peekNextKey(void);
+		SGMaterialBucket* peekNextValue(void);
+		SGMaterialBucket* getNext(void);
+		SGMaterialBucket* next();
+	};
+
+
+	class SGGeometryBucketVectorIterator
+	{
+	public:
+		//SGGeometryBucketVectorIterator();
+		virtual ~SGGeometryBucketVectorIterator();
+		bool hasMoreElements(void) const;
+		void moveNext(void);
+		SGGeometryBucket *peekNext(void);
+		SGGeometryBucket *getNext(void);
+		SGGeometryBucket *next();
+	};
+
+
+	//----------------------------------------------------------------
+	// custom code to handle StaticGeometry::GeometryBucket
+	class SGGeometryBucket				//StaticGeometry::GeometryBucket is a Renderable
+	{
+	public:
+		SGGeometryBucket(SGMaterialBucket* parent, const String& formatString, const VertexData* vData, const IndexData* iData);
+		virtual ~SGGeometryBucket();
+
+		Ogre::Renderable * asRenderable();
+		SGMaterialBucket* getParent(void);
+		const VertexData* getVertexData(void) const;
+		const IndexData* getIndexData(void) const;
+		const MaterialPtr& getMaterial(void) const;
+		Technique* getTechnique(void) const;
+
+		//########## RenderOperation access
+		//because RenderOperation is not exported use these to access its fields
+		const Renderable * GetRO_Renderable();
+		IndexData * GetRO_IndexData();
+		void SetRO_IndexData(IndexData * v);
+		bool GetRO_UseIndexes();
+		void SetRO_UseIndexes(bool v);
+		int GetRO_OperationType();
+		void SetRO_OperationType(int v);
+		VertexData * GetRO_VertexData();
+		void SetRO_VertexData(VertexData * v);
+		//########## RenderOperation access
+
+		void getWorldTransforms(Matrix4* xform) const;
+		const Quaternion& getWorldOrientation(void) const;
+		const Vector3& getWorldPosition(void) const;
+		Real getSquaredViewDepth(const Camera* cam) const;
+		const LightList& getLights(void) const;
+		bool getCastsShadows(void) const;
+		bool assign(SGQueuedGeometry* qsm);
+		void build(bool stencilShadows);
+	};
+
+
+	//		class _OgreExport MaterialBucket
+	class SGMaterialBucket
+	{
+	public:
+		SGMaterialBucket(SGLODBucket* parent, const String& materialName);
+		virtual ~SGMaterialBucket();
+
+		SGLODBucket* getParent(void);
+		const String& getMaterialName(void) const;
+		void assign(SGQueuedGeometry* qsm);
+		void build(bool stencilShadows);
+		void addRenderables(RenderQueue* queue, RenderQueueGroupID group, Real camSquaredDist);
+		const MaterialPtr& getMaterial(void) const;
+		SGGeometryBucketVectorIterator* getGeometryIterator(void);
+		Technique* getCurrentTechnique(void) const;
+	};
+
+
+	//		class _OgreExport LODBucket
+	class SGLODBucket
+	{
+	public:
+		SGLODBucket(SGRegion* parent, unsigned short lod, Real lodDist);
+		virtual ~SGLODBucket();
+
+		SGRegion* getParent(void);
+		
+		SGMaterialBucketMapIterator* getMaterialIterator(void);
+		unsigned short getLod(void) const;
+		Real getSquaredDistance(void) const;
+		void assign(SGQueuedSubMesh* qsm, unsigned short atLod);
+		void build(bool stencilShadows);
+		void addRenderables(RenderQueue* queue, RenderQueueGroupID group, Real camSquaredDistance);
+	};
+
+
+	//----------------------------------------------------------------
+	// custom code to handle StaticGeometry::Region
+	class SGRegion					//StaticGeometry::Region is a MovableObject
+	{
+	public:
+		SGRegion(StaticGeometry* parent, const String& name, SceneManager* mgr, uint32 regionID, const Vector3& centre);
+		virtual ~SGRegion();
+		
+		Ogre::MovableObject * asMovableObject();
+		
+		StaticGeometry* getParent(void) const;
+		void assign(SGQueuedSubMesh* qmesh);
+		void build(bool stencilShadows);
+		uint32 getID(void) const;
+		const Vector3& getCentre(void) const;
+		const String& getName(void) const;
+		const String& getMovableType(void) const;
+		void _notifyCurrentCamera(Camera* cam);
+		const AxisAlignedBox& getBoundingBox(void) const;
+		Real getBoundingRadius(void) const;
+		void _updateRenderQueue(RenderQueue* queue);
+		bool isVisible(void) const;
+		SGLODBucketVectorIterator * getLodIterator(void);
+
+		Ogre::ShadowCaster::ShadowRenderableListIterator getShadowVolumeRenderableIterator(
+			ShadowTechnique shadowTechnique, const Light* light, 
+			HardwareIndexBufferSharedPtr* indexBuffer, 
+			bool extrudeVertices, Real extrusionDistance, unsigned long flags = 0 );
+	};
+
+
+	class SGRegionMapIterator
+	{
+	public:
+		//SGRegionMapIterator();
+		virtual ~SGRegionMapIterator();
+		bool hasMoreElements(void) const;
+		void moveNext(void);
+		uint32 peekNextKey(void);
+		SGRegion* peekNextValue(void);
+		SGRegion* getNext(void);
+		SGRegion* next();
+	};
+}
+
+%extend Ogre::StaticGeometry {
+	Ogre::SGRegionMapIterator* get_region_iterator()	{
+		Ogre::StaticGeometry::RegionIterator * jresult;
+		
+		//typedef std::map<uint32, Region*> RegionMap;
+		//typedef MapIterator<RegionMap> RegionIterator;
+		SwigValueWrapper<Ogre::MapIterator<std::map<Ogre::uint32, Ogre::StaticGeometry::Region * > > > result;
+
+		result = self->getRegionIterator();
+		jresult = new Ogre::StaticGeometry::RegionIterator((Ogre::StaticGeometry::RegionIterator &)result); 
+		
+		return new Ogre::SGRegionMapIterator( jresult );
+	}
+};
+

data/vendor/ogrerb/ogre/OgreStringVector.i

@@ -2,4 +2,24 @@
   #include "OgreStringVector.h"
 %}
 
+%{ 
+typedef std::vector<String> StringVector; 
+%} 
+
+%template(StringVector)   std::vector<String>;
+
+/** 
+ * Turn StringVectors into normal Ruby arrays
+ */
+%typemap(out) Ogre::StringVector {
+	VALUE arr = rb_ary_new();
+
+	int size = $1.size();
+	for(int i = 0; i < size; i++) {
+		rb_ary_push(arr, rb_str_new2($1[i].c_str()));
+	}
+
+	$result = arr;
+}
+
 %include "OgreStringVector.h"

data/vendor/ogrerb/ogre/OgreSubMesh.i

@@ -2,4 +2,8 @@
   #include "OgreSubMesh.h"
 %}
 
+namespace Ogre {
+	%rename("is_mat_initialised?") SubMesh::isMatInitialised;
+}
+
 %include "OgreSubMesh.h"

data/vendor/ogrerb/ogre/OgreTextureUnitState.i

@@ -7,6 +7,9 @@
 namespace Ogre {
   %ignore TextureUnitState::addEffect;
   %ignore TextureUnitState::removeEffect;
+
+	// Weird arguments here
+	%ignore TextureUnitState::setCubicTextureName( const String* const names, bool forUVW = false );
 }
 
 %include "OgreTextureUnitState.h"

data/vendor/ogrerb/ogre/OgreVector4.i

@@ -2,4 +2,8 @@
   #include "OgreVector4.h"
 %}
 
+namespace Ogre {
+	%ignore Vector4::ZERO;
+}
+
 %include "OgreVector4.h"

data/vendor/ogrerb/ogre/ogre_rb.i

@@ -56,7 +56,6 @@ using namespace Ogre;
 	$1 = new Ogre::UTFString(STR2CSTR($input));
 }
 
-
 // Ignore operators
 %ignore *::operator=;
 %ignore *::operator[];
@@ -65,11 +64,16 @@ using namespace Ogre;
 %ignore *::operator/=;
 %ignore *::operator*=;
 %ignore *::operator-=;
+// These sneak in from ShadowTextureManager, and are a
+// part of the Ogre namespace.  If you do not ignore them it will
+// not work on POSIX systems like the mac.
+%ignore Ogre::operator==;
+%ignore Ogre::operator!=;
 
 // we know that "Nested struct not currently supported (ignored)."
 //#pragma SWIG nowarn=312
 
-// std library typemaps and ogre templates
+// std library typemaps 
 %include std_string.i
 %include std_vector.i
 %include std_pair.i
@@ -79,6 +83,7 @@ using namespace Ogre;
 /** Templates, iterators, etc */
 %include OgreSingleton.i
 %include OgreIteratorWrappers.i
+//%include OgreTypemaps.i
 %include OgreBlendMode.i
 
 /** Base classes */
@@ -89,6 +94,7 @@ using namespace Ogre;
 // %include OgreStdHeaders.i
 %include OgreString.i
 %include OgreStringInterface.i
+%include OgreStringVector.i
 %include OgreConfigFile.i
 %include OgreController.i
 %include OgreSharedPtr.i
@@ -100,28 +106,40 @@ using namespace Ogre;
 // %include OgreNumerics.i
 // %include OgreVector2.i
 %include OgreVector3.i
-// %include OgreVector4.i
-// %include OgreQuaternion.i
+%include OgreVector4.i
+%include OgreQuaternion.i
 // %include OgreRadixSort.i
 // %include OgreRotationalSpline.i
 // %include OgreSimpleSpline.i
+%include OgreAxisAlignedBox.i
 %include OgreColourValue.i
 
-/** Resource Managers */
+/** Resource Management */
 %include OgreScriptLoader.i
 %include OgreResource.i
 %include OgreResourceManager.i
 %include OgreResourceGroupManager.i
 %include OgreShadowTextureManager.i
 %include OgreMeshManager.i
+%include OgreDataStream.i
 %include OgreMaterial.i
 %include OgreMaterialManager.i
 
+/** Hardware buffers */
+%include OgreHardwareBuffer.i
+%include OgreHardwareIndexBuffer.i
+%include OgreHardwareOcclusionQuery.i
+%include OgreHardwarePixelBuffer.i
+%include OgreHardwareVertexBuffer.i
+%include OgreHardwareBufferManager.i
+
 /** Mesh */
+%include OgreVertexIndexData.i
 %include OgreMesh.i
 %include OgrePatchMesh.i
-%include OgreStaticGeometry.i
+%include OgreSubMesh.i
 %include OgreAnimable.i
+%include OgreStaticGeometry.i
 
 /** Animation */
 %include OgreKeyFrame.i
@@ -141,6 +159,7 @@ using namespace Ogre;
 %include OgreSceneManager.i
 %include OgreSceneManagerEnumerator.i
 // %include OgreAny.i
+%include OgreSubEntity.i
 %include OgreEntity.i
 %include OgreFrustum.i
 %include OgreCamera.i
@@ -165,7 +184,6 @@ using namespace Ogre;
 // %include OgreProfiler.i
 %include OgreTimer.i
 // %include OgreStringConverter.i
-// %include OgreStringVector.i
 // %include OgreZip.i
 %include OgreViewport.i
 %include OgreRoot.i
@@ -215,12 +233,6 @@ using namespace Ogre;
 %include OgreRenderSystem.i
 %include OgreRenderTargetListener.i
 %include OgreRenderTexture.i
-%include OgreHardwareBuffer.i
-%include OgreHardwareBufferManager.i
-%include OgreHardwareIndexBuffer.i
-%include OgreHardwareOcclusionQuery.i
-%include OgreHardwarePixelBuffer.i
-%include OgreHardwareVertexBuffer.i
 
 /** Overlays */
 %include OgreWindowEventUtilities.i
@@ -252,15 +264,11 @@ using namespace Ogre;
 // %include OgreSkeletonManager.i
 // %include OgreSkeletonSerializer.i
 // %include OgreProgressiveMesh.i
-// %include OgreSubEntity.i
-// %include OgreSubMesh.i
 // %include OgreTagPoint.i
 // %include OgreVertexBoneAssignment.i
-// %include OgreVertexIndexData.i
 // %include OgreWireBoundingBox.i
 
 /** Scene objects */
-// %include OgreAxisAlignedBox.i
 // %include OgreConvexBody.i
 // %include OgreInstancedGeometry.i
 // %include OgrePolygon.i
@@ -280,7 +288,6 @@ using namespace Ogre;
 // %include OgreArchive.i
 // %include OgreArchiveManager.i
 // %include OgreCodec.i
-%include OgreDataStream.i
 // %include OgreDDSCodec.i
 // %include OgreDynLib.i
 // %include OgreDynLibManager.i
@@ -341,3 +348,4 @@ using namespace Ogre;
 
 
 
+

data/vendor/ogrerb/ogre.rb

@@ -1,9 +1,10 @@
 require File.dirname(__FILE__)+'/platform'
 
-# Ruby always looks for .so first, instead of .dll if on windows.
-# So, force .dll on windows environments
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/lib")
 
+# Ruby always looks for .so first, instead of .dll if on windows.
+# So, force .dll on windows environments
 if Platform.windows?
 	require 'lib/ogre.dll'
 	require 'lib/ruby_ois.dll'
@@ -20,4 +21,5 @@ module OIS
   include Ruby_ois
 end
 
-require 'lib/constants'
+require 'constants'
+require 'method_fixes'

data/vendor/ogrerb/samples/bsp.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/ruby -w
 
+$: << File.dirname(__FILE__) + "/.."
+require 'ogre'
 require 'application'
 require 'application_loading_bar'
 include Ogre

data/vendor/ogrerb/samples/cel_shading.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/ruby -w
+
+$: << File.dirname(__FILE__) + "/.."
+require 'ogre'
+require 'application'
+include Ogre
+
+CUSTOM_SHININESS = 1
+CUSTOM_DIFFUSE = 2
+CUSTOM_SPECULAR = 3
+
+class SkyDomeListener < ApplicationFrameListener
+  def initialize(root, window, camera, scene_manager)
+    super(root, window, camera)
+    @scene_manager = scene_manager
+    @curvature = 1
+    @tiling = 15
+
+    @time_delay = 0
+  end
+
+  def frame_started(event)
+    return false unless super(event)
+
+		$rot_node.yaw(Degree.new(event.time_since_last_frame * 30))
+
+    true
+  end
+end
+
+class SkyDomeApplication < Ogre::Application
+
+  def create_scene
+		caps = root.get_render_system.get_capabilities
+		if !caps.has_capability?(RSC_VERTEX_PROGRAM) || !caps.has_capability?(RSC_FRAGMENT_PROGRAM)
+			raise "Your card does not support vertex or fragmet programs, so we cannot run this demo. Sorry"
+		end
+
+		light = scene_manager.create_light("MainLight")
+		$rot_node = scene_manager.root_scene_node.create_child_scene_node
+		$rot_node.create_child_scene_node(Vector3.new(20, 40, 50)).attach_object(light)
+
+		ent = scene_manager.create_entity("head", "ogrehead.mesh")
+
+		camera.set_position(20, 0, 100)
+		camera.look_at(0,0,0)
+
+		# eyes
+		sub = ent.get_sub_entity(0)
+		sub.set_material_name("CelShading")
+		sub.set_custom_parameter(CUSTOM_SHININESS, Vector4.new(35.0, 0.0, 0.0, 0.0))
+		sub.set_custom_parameter(CUSTOM_DIFFUSE, Vector4.new(1.0, 0.3, 0.3, 1.0))
+		sub.set_custom_parameter(CUSTOM_SPECULAR, Vector4.new(1.0, 0.6, 0.6, 1.0))
+		# skin
+		sub = ent.get_sub_entity(1)
+		sub.set_material_name("CelShading")
+		sub.set_custom_parameter(CUSTOM_SHININESS, Vector4.new(10.0, 0.0, 0.0, 0.0))
+		sub.set_custom_parameter(CUSTOM_DIFFUSE, Vector4.new(0.0, 0.5, 0.0, 1.0))
+		sub.set_custom_parameter(CUSTOM_SPECULAR, Vector4.new(0.3, 0.5, 0.3, 1.0))
+		# earring
+		sub = ent.get_sub_entity(2)
+		sub.set_material_name("CelShading")
+		sub.set_custom_parameter(CUSTOM_SHININESS, Vector4.new(25.0, 0.0, 0.0, 0.0))
+		sub.set_custom_parameter(CUSTOM_DIFFUSE, Vector4.new(1.0, 1.0, 0.0, 1.0))
+		sub.set_custom_parameter(CUSTOM_SPECULAR, Vector4.new(1.0, 1.0, 0.7, 1.0))
+		# teeth
+		sub = ent.get_sub_entity(3)
+		sub.set_material_name("CelShading")
+		sub.set_custom_parameter(CUSTOM_SHININESS, Vector4.new(20.0, 0.0, 0.0, 0.0))
+		sub.set_custom_parameter(CUSTOM_DIFFUSE, Vector4.new(1.0, 1.0, 0.7, 1.0))
+		sub.set_custom_parameter(CUSTOM_SPECULAR, Vector4.new(1.0, 1.0, 1.0, 1.0))
+
+		# Add entity to the root scene node
+		scene_manager.root_scene_node.create_child_scene_node.attach_object(ent)
+
+		window.get_viewport(0).set_background_colour(ColourValue.White)
+  end
+
+  def create_frame_listener
+    self.frame_listener = SkyDomeListener.new(root, window, camera, scene_manager)
+  end
+end
+
+app = SkyDomeApplication.new
+app.go