Changeset 1676

Timestamp:

06/30/09 12:46:53 (4 months ago)

Author:

borrillis

Message:

Ticket #26
- Fixed WireBoundingBox? being larger than actual entity.

This is not the implementation provided by andris11, but an update from the OGRE code.
Checked against the test included in this patch to verify.
Color changing to implemented

Files:

• trunk/Projects/Axiom/Source/Engine/Core/WireBoundingBox.cs (modified) (7 diffs)

trunk/Projects/Axiom/Source/Engine/Core/WireBoundingBox.cs

@@ -48 +48 @@
     public sealed class WireBoundingBox : SimpleRenderable
     {
-        #region Member variables
+        #region Field and Properties
 
         private float radius;
 
-        #endregion Member variables
+        #endregion Field and Properties
 
         #region Constants
 
         const int POSITION = 0;
-        const int COLOR = 1;
-
+ 
         #endregion Constants
 
@@ -78 +77 @@
             // add elements for position and color only
             decl.AddElement( POSITION, 0, VertexElementType.Float3, VertexElementSemantic.Position );
-            decl.AddElement( COLOR, 0, VertexElementType.Color, VertexElementSemantic.Diffuse );
 
             // create a new hardware vertex buffer for the position data
@@ -90 +88 @@
             binding.SetBinding( POSITION, buffer );
 
-            // create a new hardware vertex buffer for the color data
-            buffer = HardwareBufferManager.Instance.CreateVertexBuffer(
-                decl.GetVertexSize( COLOR ),
-                vertexData.vertexCount,
-                BufferUsage.StaticWriteOnly );
-
-            // bind the color buffer
-            binding.SetBinding( COLOR, buffer );
-
-                        this.Material = (Material)MaterialManager.Instance[ "BaseWhite" ];
-
-                        //Material mat = MaterialManager.Instance[ "Core/WireBB" ];
-
-                        //if ( mat == null )
-                        //{
-                        //    mat = MaterialManager.Instance[ "BaseWhite" ];
-                        //    mat = mat.Clone( "Core/WireBB", "" );
-                        //    mat.Lighting = false;
-                        //}
-
-                        //this.Material = mat;
+                        this.Material = (Material)MaterialManager.Instance[ "BaseWhiteNoLighting" ];
+
         }
 
@@ -123 +102 @@
         public override void GetWorldTransforms( Matrix4[] matrices )
         {
+            // return identity matrix to prevent parent transforms
             matrices[ 0 ] = Matrix4.Identity;
         }
@@ -129 +109 @@
         {
             SetupAABBVertices( box );
-
-            // get a reference to the color buffer
-            HardwareVertexBuffer buffer =
-                vertexData.vertexBufferBinding.GetBuffer( COLOR );
-
-            // lock the buffer
-            IntPtr colPtr = buffer.Lock( BufferLocking.Discard );
-
-            // load the color buffer with the specified color for each element
-            unsafe
-            {
-                int* pCol = (int*)colPtr.ToPointer();
-
-                for ( int i = 0; i < vertexData.vertexCount; i++ )
-                    pCol[ i ] = Root.Instance.ConvertColor( ColorEx.Red );
-            }
-
-            // unlock the buffer
-            buffer.Unlock();
 
             // store the bounding box locally
@@ -162 +123 @@
             radius = Utility.Sqrt( lengthSquared );
 
-            float maxx = max.x + 1.0f;
-            float maxy = max.y + 1.0f;
-            float maxz = max.z + 1.0f;
-
-            float minx = min.x - 1.0f;
-            float miny = min.y - 1.0f;
-            float minz = min.z - 1.0f;
+            float maxx = max.x;
+            float maxy = max.y;
+            float maxz = max.z;
+
+            float minx = min.x;
+            float miny = min.y;
+            float minz = min.z;
 
             int i = 0;
 
-            HardwareVertexBuffer buffer =
-                vertexData.vertexBufferBinding.GetBuffer( POSITION );
+            HardwareVertexBuffer buffer = vertexData.vertexBufferBinding.GetBuffer( POSITION );
 
             IntPtr posPtr = buffer.Lock( BufferLocking.Discard );
@@ -282 +242 @@
             min = box.Minimum;
             max = box.Maximum;
-            mid = ( ( min - max ) * 0.5f ) + min;
+            mid = ( ( max - min ) * 0.5f ) + min;
             dist = camera.DerivedPosition - mid;