Changeset 1591Tweet

Timestamp:

Jul 8, 2012, 6:16:57 PM (9 years ago)

Author:

touky

Message:

Behold the power of LolPhysics !
Added lol::phys::Simulation, lol::phys::EasyPhysics for easy physic uses.
Added PhysicsObject, wich hold EasyMesh & EasyPhysics components so it is easy to use. Easy seems to be the consensus.
BtPhysTest now works with new physics classes.

Known problem for this commit:
Physics is not properly setup.
There might be memory leaks, I don't think I've parsed all new/delete.
A LOT of primitives are not taken into account.

Location:

trunk

Files:

• build/vs2010/Lol.Core.Vars.props (modified) (1 diff)
• test/BtPhysTest.cpp (modified) (13 diffs)
• test/BtPhysTest.h (modified) (2 diffs)
• test/BtPhysTest.vcxproj (modified) (1 diff)
• test/BtPhysTest.vcxproj.filters (modified) (2 diffs)
• test/PhysicObject.h (added)
• test/Physics (added)
• test/Physics/EasyPhysics.cpp (added)
• test/Physics/EasyPhysics.h (added)
• test/Physics/LolBtPhysicsIntegration.h (added)
• test/Physics/LolPhysics.h (added)

trunk/build/vs2010/Lol.Core.Vars.props

@@ -23 +23 @@
     <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
     <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
+        <Win32Defines>HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
 
-    <!-- GTK+ & GtkGl -->
+          <!-- GTK+ & GtkGl -->
     <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
     <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>

trunk/test/BtPhysTest.cpp

@@ -41 +41 @@
 using namespace lol;
 
+#ifndef HAVE_PHYS_USE_BULLET
+#define HAVE_PHYS_USE_BULLET
+#endif /* HAVE_PHYS_USE_BULLET */
+
+#include "Physics\LolPhysics.h"
+#include "Physics\EasyPhysics.h"
+#include "PhysicObject.h"
 #include "BtPhysTest.h"
+
+using namespace lol::phys;
 
 #define CUBE_HALF_EXTENTS .5f
@@ -61 +70 @@
     m_ready = false;
 
+        m_simulation = new Simulation();
+        m_simulation->InitContext();
+        m_simulation->SetGravity(vec3(.0f, -10.0f, .0f));
+
+        m_ground_object = new PhysicsObject(m_simulation);
+        Ticker::Ref(m_ground_object);
+
+        for (int x=0; x < 10; x++)
+        {
+                for (int y=0; y < 10; y++)
+                {
+                        PhysicsObject* new_physobj = new PhysicsObject(m_simulation, 10.f, vec3(0.f, 20.f, -20.0f) + vec3(.0f, 4.f * (float)y, 4.f * (float)x));
+                        m_physobj_list << new_physobj;
+                        Ticker::Ref(new_physobj);
+                }
+        }
+
+#if 0
         //init Physics
         {
@@ -70 +97 @@
                 //use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded)
                 m_bt_dispatcher = new btCollisionDispatcher(m_bt_collision_config);
-                m_bt_dispatcher->registerCollisionCreateFunc(BOX_SHAPE_PROXYTYPE,BOX_SHAPE_PROXYTYPE,m_bt_collision_config->getCollisionAlgorithmCreateFunc(CONVEX_SHAPE_PROXYTYPE,CONVEX_SHAPE_PROXYTYPE));
+                m_bt_dispatcher->registerCollisionCreateFunc(BOX_SHAPE_PROXYTYPE,
+                                                                                                        BOX_SHAPE_PROXYTYPE,
+                                                                                                        m_bt_collision_config->getCollisionAlgorithmCreateFunc(CONVEX_SHAPE_PROXYTYPE,
+                                                                                                                                                                                                                        CONVEX_SHAPE_PROXYTYPE));
 
                 m_bt_broadphase = new btDbvtBroadphase();
@@ -89 +119 @@
                 btCollisionShape* groundShape = box;
                 m_bt_collision_shapes << groundShape;
-        m_ground_mesh.Compile("[sc#ddd afcb110 1 110 -1]");
+        m_ground_mesh.Compile("[sc#ddd afcb220 2 220 -1]");
 
                 //m_bt_collision_shapes << new btCylinderShape(btVector3(.5f,.5f,.5f));
@@ -152 +182 @@
                                 //stack them
                                 int colsize = 10;
-                                int row = (i*CUBE_HALF_EXTENTS*2)/(colsize*2*CUBE_HALF_EXTENTS);
+                                int row = int(((float)i*CUBE_HALF_EXTENTS*2.0f)/((float)colsize*2.0f*CUBE_HALF_EXTENTS));
                                 int row2 = row;
                                 int col = (i)%(colsize)-colsize/2;
@@ -200 +230 @@
                 }
         }
+#endif
 }
 
@@ -209 +240 @@
         Ticker::Shutdown();
 
+        m_simulation->TickContext(seconds);
+
+        m_camera->SetTarget(vec3(.0f));
+        m_camera->SetPosition(vec3(-30.0f, 10.0f, .0f));
+
+#if 0
         ///step the simulation
         if (m_bt_world)
         {
-                int steps = (int)(seconds / 0.005f);
-                for (int i = 0; i < steps; i++)
-                        m_bt_world->stepSimulation(seconds / steps);
+                //int steps = (int)(seconds / 0.005f);
+                //for (int i = 0; i < steps; i++)
+                        m_bt_world->stepSimulation(seconds /*/ steps*/);
                 //optional but useful: debug drawing
                 //m_bt_world->debugDrawWorld();
         }
+#endif
 }
 
@@ -226 +264 @@
     if (!m_ready)
     {
+#if 0
                 m_ground_mesh.MeshConvert();
                 m_rigid_mesh[0].MeshConvert();
@@ -233 +272 @@
                 m_rigid_mesh[4].MeshConvert();
                 m_rigid_mesh[5].MeshConvert();
+#endif
         /* FIXME: this object never cleans up */
         m_ready = true;
@@ -239 +279 @@
     Video::SetClearColor(vec4(0.0f, 0.0f, 0.12f, 1.0f));
 
+#if 0
         vec3 BarycenterLocation = vec3(.0f);
         float BarycenterFactor = 0.0f;
@@ -275 +316 @@
                 m_camera->SetPosition(BarycenterLocation + vec3(-20.0f, 8.0f, .0f));
         }
+#endif
 }
 
@@ -281 +323 @@
         Ticker::Unref(m_camera);
 
+#if 0
         //Exit Physics
         {
@@ -310 +353 @@
                 delete m_bt_collision_config;
         }
+#endif
 }
 

trunk/test/BtPhysTest.h

@@ -24 +24 @@
     Camera*                                                             m_camera;
     bool                                                                m_ready;
+
+        lol::phys::Simulation*                          m_simulation;
+        Array<PhysicsObject*>                           m_physobj_list;
+        PhysicsObject*                                          m_ground_object;
+
+#if 0
         EasyMesh                                                        m_ground_mesh;
         EasyMesh                                                        m_rigid_mesh[6];
@@ -41 +47 @@
         Array<btCollisionShape*>                                m_bt_collision_shapes;
         Array<btCollisionShape*>                                m_bt_dynamic_shapes;
+#endif
 };
 

trunk/test/BtPhysTest.vcxproj

@@ -37 +37 @@
   <ItemGroup>
     <ClInclude Include="BtPhysTest.h" />
+    <ClInclude Include="PhysicObject.h" />
+    <ClInclude Include="Physics\EasyPhysics.h" />
+    <ClInclude Include="Physics\LolBtPhysicsIntegration.h" />
+    <ClInclude Include="Physics\LolPhysics.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BtPhysTest.cpp" />
+    <ClCompile Include="Physics\EasyPhysics.cpp" />
   </ItemGroup>
   <ItemGroup>

trunk/test/BtPhysTest.vcxproj.filters

@@ -3 +3 @@
   <ItemGroup>
     <ClInclude Include="BtPhysTest.h" />
+    <ClInclude Include="Physics\EasyPhysics.h">
+      <Filter>Physics</Filter>
+    </ClInclude>
+    <ClInclude Include="Physics\LolPhysics.h">
+      <Filter>Physics</Filter>
+    </ClInclude>
+    <ClInclude Include="Physics\LolBtPhysicsIntegration.h">
+      <Filter>Physics</Filter>
+    </ClInclude>
+    <ClInclude Include="PhysicObject.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BtPhysTest.cpp" />
+    <ClCompile Include="Physics\EasyPhysics.cpp">
+      <Filter>Physics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -11 +24 @@
       <UniqueIdentifier>{4fc7662b-b17a-49b9-acd1-0cf767183b06}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Physics">
+      <UniqueIdentifier>{ccecd634-9321-4c49-9471-e9da50dda6d3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>