Fixed bound calculations for renderables with no meshes

BansheeEngine/Include/BsRenderable.h

@@ -88,11 +88,6 @@ namespace BansheeEngine
 		 */
 		void setTransform(const Matrix4& transform, const Matrix4& transformNoScale);
 
-		/**
-		 * @brief	Sets the world position of the renderable.
-		 */
-		void setPosition(const Vector3& position);
-
 		/**
 		 * @brief	Sets whether the object should be rendered or not.
 		 */

BansheeEngine/Source/BsRenderable.cpp

@@ -106,13 +106,8 @@ namespace BansheeEngine
 	{
 		mTransform = transform;
 		mTransformNoScale = transformNoScale;
-		_markCoreDirty(RenderableDirtyFlag::Transform);
-	}
+		mPosition = mTransform.getTranslation();
 
-	template<bool Core>
-	void TRenderable<Core>::setPosition(const Vector3& position)
-	{
-		mPosition = position;
 		_markCoreDirty(RenderableDirtyFlag::Transform);
 	}
 

BansheeUtility/Include/BsMatrix4.h

@@ -284,6 +284,9 @@ namespace BansheeEngine
          */
         void decomposition(Vector3& position, Quaternion& rotation, Vector3& scale) const;
 
+		/** Extracts the translation (position) part of the matrix. */
+		Vector3 getTranslation() const { return Vector3(m[0][3], m[1][3], m[2][3]); }
+
         /**
 		 * Check whether or not the matrix is affine matrix.
 		 *

MBansheeEngine/Renderable.cs

@@ -1,163 +1,163 @@
-using System;
-
-namespace BansheeEngine
-{
-    /// <summary>
-    /// Renderable represents any visible object in the scene. It has a mesh, bounds and a set of materials. Renderer will 
-    /// render any Renderable objects visible by a camera.
-    /// </summary>
-    [RunInEditor]
-    public sealed class Renderable : Component
-    {
-        private NativeRenderable _native;
-
-        [SerializeField]
-        private SerializableData serializableData = new SerializableData();
-
-        /// <summary>
-        /// Returns the non-component version of Renderable that is wrapped by this component. 
-        /// </summary>
-        internal NativeRenderable Native
-        {
-            get { return _native; }
-        }
-
-        /// <summary>
-        /// Mesh to render. 
-        /// </summary>
-        public Mesh Mesh
-        {
-            get { return _native.Mesh; }
-            set 
-            { 
-                _native.Mesh = value; 
-                serializableData.mesh = value;
-
-                int subMeshCount = 0;
-                if (value != null)
-                    subMeshCount = value.SubMeshCount;
-
-                Material[] newMaterials = new Material[subMeshCount];
-                int numToCopy = MathEx.Min(newMaterials.Length, serializableData.materials.Length);
-                Array.Copy(serializableData.materials, newMaterials, numToCopy);
-                serializableData.materials = newMaterials;
-            }
-        }
-
-        /// <summary>
-        /// Material to use when rendering the mesh. If the mesh contains multiple sub-meshes then you may set individual
-        /// materials for each sub-mesh.
-        /// </summary>
-        public Material Material
-        {
-            get { return _native.GetMaterial(0); }
-            set 
-            { _native.SetMaterial(value); serializableData.materials[0] = value; }
-        }
-
-        /// <summary>
-        /// Materials to use when rendering the mesh. 
-        /// </summary>
-        public Material[] Materials
-        {
-            get { return _native.Materials; }
-            set
-            {
-                _native.Materials = value;
-
-                serializableData.materials = new Material[value.Length];
-                Array.Copy(value, serializableData.materials, value.Length);
-            }
-        }
-
-        /// <summary>
-        /// Returns a material for a specific sub-mesh.
-        /// </summary>
-        /// <param name="index">Index of the sub-mesh.</param>
-        /// <returns>Material used for rendering the sub-mesh at the specified index.</returns>
-        public Material GetMaterial(int index = 0)
-        {
-            return _native.GetMaterial(index);
-        }
-
-        /// <summary>
-        /// Sets a material for a specific sub-mesh.
-        /// </summary>
-        /// <param name="material">Material to use for rendering the sub-mesh at the specified index.</param>
-        /// <param name="index">Index of the sub-mesh.</param>
-        public void SetMaterial(Material material, int index = 0)
-        {
-            _native.SetMaterial(material, index);
-            serializableData.materials[index] = material;
-        }
-
-        /// <summary>
-        /// Layer bitfield that controls whether a renderable is considered visible in a specific camera. Renderable layer 
-        /// must match camera layer in order for the camera to render the component.
-        /// </summary>
-        public UInt64 Layers
-        {
-            get { return _native.Layers; }
-            set { _native.Layers = value; serializableData.layers = value; }
-        }
-
-        /// <summary>
-        /// Gets world bounds of the mesh rendered by this object.
-        /// </summary>
-        public Bounds Bounds
-        {
-            get { return _native.GetBounds(SceneObject); }
-        }
-
-        private void OnReset()
-        {
-            if (_native != null)
-                _native.OnDestroy();
-
-            _native = new NativeRenderable(SceneObject);
-
-            // Restore saved values after reset
-            _native.Mesh = serializableData.mesh;
-
-            if (serializableData.materials != null)
-            {
-                for (int i = 0; i < serializableData.materials.Length; i++)
-                    _native.SetMaterial(serializableData.materials[i], i);
-            }
-
-            _native.Layers = serializableData.layers;
-        }
-
-        private void OnUpdate()
-        {
-            _native.UpdateTransform(SceneObject);
-        }
-
-        private void OnDestroy()
-        {
-            _native.OnDestroy();
-        }
-
-        /// <inheritdoc/>
-        internal protected override bool CalculateBounds(out AABox box, out Sphere sphere)
-        {
-            Bounds bounds = Bounds;
-
-            box = bounds.Box;
-            sphere = bounds.Sphere;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Holds all data the renderable component needs to persist through serialization.
-        /// </summary>
-        [SerializeObject]
-        private class SerializableData
-        {
-            public Mesh mesh;
-            public Material[] materials = new Material[0];
-            public UInt64 layers = 1;
-        }
-    }
-}
+using System;
+
+namespace BansheeEngine
+{
+    /// <summary>
+    /// Renderable represents any visible object in the scene. It has a mesh, bounds and a set of materials. Renderer will 
+    /// render any Renderable objects visible by a camera.
+    /// </summary>
+    [RunInEditor]
+    public sealed class Renderable : Component
+    {
+        private NativeRenderable _native;
+
+        [SerializeField]
+        private SerializableData serializableData = new SerializableData();
+
+        /// <summary>
+        /// Returns the non-component version of Renderable that is wrapped by this component. 
+        /// </summary>
+        internal NativeRenderable Native
+        {
+            get { return _native; }
+        }
+
+        /// <summary>
+        /// Mesh to render. 
+        /// </summary>
+        public Mesh Mesh
+        {
+            get { return _native.Mesh; }
+            set 
+            { 
+                _native.Mesh = value; 
+                serializableData.mesh = value;
+
+                int subMeshCount = 0;
+                if (value != null)
+                    subMeshCount = value.SubMeshCount;
+
+                Material[] newMaterials = new Material[subMeshCount];
+                int numToCopy = MathEx.Min(newMaterials.Length, serializableData.materials.Length);
+                Array.Copy(serializableData.materials, newMaterials, numToCopy);
+                serializableData.materials = newMaterials;
+            }
+        }
+
+        /// <summary>
+        /// Material to use when rendering the mesh. If the mesh contains multiple sub-meshes then you may set individual
+        /// materials for each sub-mesh.
+        /// </summary>
+        public Material Material
+        {
+            get { return _native.GetMaterial(0); }
+            set 
+            { _native.SetMaterial(value); serializableData.materials[0] = value; }
+        }
+
+        /// <summary>
+        /// Materials to use when rendering the mesh. 
+        /// </summary>
+        public Material[] Materials
+        {
+            get { return _native.Materials; }
+            set
+            {
+                _native.Materials = value;
+
+                serializableData.materials = new Material[value.Length];
+                Array.Copy(value, serializableData.materials, value.Length);
+            }
+        }
+
+        /// <summary>
+        /// Returns a material for a specific sub-mesh.
+        /// </summary>
+        /// <param name="index">Index of the sub-mesh.</param>
+        /// <returns>Material used for rendering the sub-mesh at the specified index.</returns>
+        public Material GetMaterial(int index = 0)
+        {
+            return _native.GetMaterial(index);
+        }
+
+        /// <summary>
+        /// Sets a material for a specific sub-mesh.
+        /// </summary>
+        /// <param name="material">Material to use for rendering the sub-mesh at the specified index.</param>
+        /// <param name="index">Index of the sub-mesh.</param>
+        public void SetMaterial(Material material, int index = 0)
+        {
+            _native.SetMaterial(material, index);
+            serializableData.materials[index] = material;
+        }
+
+        /// <summary>
+        /// Layer bitfield that controls whether a renderable is considered visible in a specific camera. Renderable layer 
+        /// must match camera layer in order for the camera to render the component.
+        /// </summary>
+        public UInt64 Layers
+        {
+            get { return _native.Layers; }
+            set { _native.Layers = value; serializableData.layers = value; }
+        }
+
+        /// <summary>
+        /// Gets world bounds of the mesh rendered by this object.
+        /// </summary>
+        public Bounds Bounds
+        {
+            get { return _native.GetBounds(SceneObject); }
+        }
+
+        private void OnReset()
+        {
+            if (_native != null)
+                _native.OnDestroy();
+
+            _native = new NativeRenderable(SceneObject);
+
+            // Restore saved values after reset
+            _native.Mesh = serializableData.mesh;
+
+            if (serializableData.materials != null)
+            {
+                for (int i = 0; i < serializableData.materials.Length; i++)
+                    _native.SetMaterial(serializableData.materials[i], i);
+            }
+
+            _native.Layers = serializableData.layers;
+        }
+
+        private void OnUpdate()
+        {
+            _native.UpdateTransform(SceneObject);
+        }
+
+        private void OnDestroy()
+        {
+            _native.OnDestroy();
+        }
+
+        /// <inheritdoc/>
+        protected internal override bool CalculateBounds(out AABox box, out Sphere sphere)
+        {
+            Bounds bounds = Bounds;
+
+            box = bounds.Box;
+            sphere = bounds.Sphere;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Holds all data the renderable component needs to persist through serialization.
+        /// </summary>
+        [SerializeObject]
+        private class SerializableData
+        {
+            public Mesh mesh;
+            public Material[] materials = new Material[0];
+            public UInt64 layers = 1;
+        }
+    }
+}