Changeset 8390

Timestamp:

May 2, 2011, 10:54:01 PM (13 years ago)

Author:

youngk

Message:

Yess-a-doo! Okay, planets now have collision shapes. Follow the example in planets.oxw

Location:

code/branches/mac_osx2

Files:

• data/levels/planets.oxw (modified) (2 diffs)
• src/modules/objects/Planet.cc (modified) (2 diffs)

code/branches/mac_osx2/data/levels/planets.oxw

@@ -69 +69 @@
       position="10000,0,0"
       scale="100"
+      collisionType="dynamic"
+      linearDamping="0.8"
+      angularDamping="0"
+      mass="200"
       pitch="0"
       mesh="ganymede.mesh"
@@ -76 +80 @@
       atmospheresize="224.0f"
       imagesize="1024.0f"
-    />
+    >
+      <collisionShapes>
+        <SphereCollisionShape radius="100" position="0,0,0" />
+      </collisionShapes>
+    </Planet>
   </Scene>
 </Level>

code/branches/mac_osx2/src/modules/objects/Planet.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
-#include "objects/collisionshapes/SphereCollisionShape.h"
 #include "graphics/Camera.h"
 #include "CameraManager.h"
@@ -52 +51 @@
         RegisterObject(Planet);
         this->registerVariables();
-        
-        // Get notification about collisions
-        if (GameMode::isMaster())
-        {
-            //this->setMass(1.0);
-            this->enableCollisionCallback();
-            this->setCollisionResponse(false);
-            this->setCollisionType(Static);
-            
-            SphereCollisionShape* shape = new SphereCollisionShape(this);
-            //shape->setRadius(20);
-            this->attachCollisionShape(shape);
-        }
     }