Changeset 1597Tweet

Timestamp:

Jul 8, 2012, 7:36:10 PM (9 years ago)

Author:

touky

Message:

Added sphere in EasyPhysics

Location:

trunk/test

Files:

• PhysicObject.h (modified) (1 diff)
• Physics/EasyPhysics.cpp (modified) (1 diff)
• Physics/EasyPhysics.h (modified) (1 diff)

trunk/test/PhysicObject.h

@@ -45 +45 @@
                 MeshRand << "[sc#aad afcb2 2 2 -.1]";
 
+                int SphereLimit = MeshRand.Count();
+
+                MeshRand << "[sc#add asph16 2 2 2]";
+                MeshRand << "[sc#dad asph16 2 2 2]";
+                MeshRand << "[sc#dda asph16 2 2 2]";
+                MeshRand << "[sc#daa asph16 2 2 2]";
+                MeshRand << "[sc#ada asph16 2 2 2]";
+                MeshRand << "[sc#aad asph16 2 2 2]";
+
+
                 int RandValue = (int)(lol::RandF() * (MeshRand.Count() - 1));
 
                 m_mesh.Compile(MeshRand[RandValue]);
                 vec3 BoxSize = vec3(2.0f);
-                m_physics.SetShapeToBox(BoxSize);
+                if (RandValue >= SphereLimit)
+                        m_physics.SetShapeToSphere(BoxSize.x);
+                else
+                        m_physics.SetShapeToBox(BoxSize);
                 m_physics.SetMass(base_mass);
                 m_physics.SetBaseTransform(base_location);

trunk/test/Physics/EasyPhysics.cpp

@@ -69 +69 @@
 }
 
-//void EasyPhysics::SetShapeToSphere(lol::vec3& box_size)
-//{
-//      SetShapeTo(new btBoxShape(LOL2BT_VEC3(box_size * LOL2BT_UNIT * LOL2BT_SIZE)));
-//}
+void EasyPhysics::SetShapeToSphere(float radius)
+{
+        SetShapeTo(new btSphereShape(radius * LOL2BT_UNIT * LOL2BT_SIZE));
+}
 
 //-------------------------------------------------------------------------

trunk/test/Physics/EasyPhysics.h

@@ -37 +37 @@
 
         void SetShapeToBox(lol::vec3& box_size);
+        void SetShapeToSphere(float radius);
         void SetBaseTransform(const lol::vec3& base_location, const lol::quat& base_rotation=lol::quat(lol::mat4(1.0f)));
         void SetMass(float mass);