Changeset 10760

Timestamp:

Nov 2, 2015, 6:01:56 PM (9 years ago)

Author:

fvultier

Message:

2 problems fixed: The collidesAgainst function in the hovership get now properly called. The Hoverhalls have a collisionShape that works.

Location:

code/branches/hoverHS15

Files:

• data/levels/Hover.oxw (modified) (2 diffs)
• data/levels/templates/spaceshipHover.oxt (added)
• src/modules/hover/Hover.cc (modified) (1 diff)
• src/modules/hover/HoverShip.cc (modified) (2 diffs)
• src/modules/hover/HoverShip.h (modified) (2 diffs)
• src/modules/hover/HoverWall.cc (modified) (2 diffs)
• src/modules/invader/InvaderShip.cc (modified) (1 diff)
• src/modules/invader/InvaderShip.h (modified) (1 diff)

code/branches/hoverHS15/data/levels/Hover.oxw

@@ -14 +14 @@
 <?lua
   include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipHover.oxt")
 ?>
 
@@ -75 +76 @@
     
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="0,100,0" lookat="100,100,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <SpawnPoint team=0 position="0,100,0" lookat="100,100,0" spawnclass=HoverShip pawndesign=spaceshiphover />
     
   </Scene>

code/branches/hoverHS15/src/modules/hover/Hover.cc

@@ -56 +56 @@
         SUPER(Hover, tick, dt);
 
-        if(firstTick){
+        if(firstTick)
+        {
             firstTick = false;
             new HoverWall(origin_->getContext(), 1, 2);
+            new HoverWall(origin_->getContext(), 2, 6);
         }      
 

code/branches/hoverHS15/src/modules/hover/HoverShip.cc

@@ -49 +49 @@
     }
 
-    void HoverShip::moveFrontBack(const Vector2& value)
+    /*void HoverShip::moveFrontBack(const Vector2& value)
                 { this->steering_.z -= value.x; }
 
@@ -60 +60 @@
     void HoverShip::rotateYaw(const Vector2& value) {}
     void HoverShip::rotatePitch(const Vector2& value) {}
-    void HoverShip::rotateRoll(const Vector2& value) {}
+    void HoverShip::rotateRoll(const Vector2& value) {}*/
 
-    bool HoverShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool HoverShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
+        orxout() << "collision" << endl;
+
         /*if (contactPoint.m_normalWorldOnB.y() > 0.6)
             this->isFloor_ = true;

code/branches/hoverHS15/src/modules/hover/HoverShip.h

@@ -53 +53 @@
             virtual void tick(float dt);
 
-                    virtual void moveFrontBack(const Vector2& value);
+                    /*virtual void moveFrontBack(const Vector2& value);
 
                     virtual void moveRightLeft(const Vector2& value);
@@ -63 +63 @@
                     virtual void rotatePitch(const Vector2& value);
                     
-                    virtual void rotateRoll(const Vector2& value);
+                    virtual void rotateRoll(const Vector2& value);*/
 
-                    virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+                    virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
                     virtual void boost(bool bBoost);

code/branches/hoverHS15/src/modules/hover/HoverWall.cc

@@ -50 +50 @@
     {
         RegisterObject(HoverWall);
-        model_ = new Model(context);
-        cs_ = new BoxCollisionShape(context);
-        model_->setMeshSource("cube.mesh");
-        model_->setScale3D(Vector3(100, 30, 2));
-        model_->setPosition(Vector3(100,0,100));
-        cs_->setPosition(Vector3(100,0,100));
-        cs_->setHalfExtents(Vector3(100, 30, 2));
-
-
-
+        model_ = NULL;
+        cs_ = NULL;
     }
 
@@ -65 +57 @@
     {
         RegisterObject(HoverWall);
+
         model_ = new Model(context);
+        model_->setMeshSource("cube.mesh");
+        model_->setScale3D(Vector3(100, 30, 2));
+        model_->setPosition(Vector3(x*100-50,0,y*100-50));
+
+        this->attach(model_);
+
+        this->enableCollisionCallback();
+        this->setCollisionResponse(true);
+        this->setCollisionType(Static);
+
         cs_ = new BoxCollisionShape(context);
-        model_->setMeshSource("cube.mesh");
-        model_->setScale3D(Vector3(50, 30, 2));
-        model_->setPosition(Vector3(x*100-50,0,y*100-50));
+        cs_->setHalfExtents(Vector3(100, 30, 2));
         cs_->setPosition(Vector3(x*100-50,0,y*100-50));
-        cs_->setHalfExtents(Vector3(50, 30, 2));
 
-
-
+        this->attachCollisionShape(cs_);
     }
 

code/branches/hoverHS15/src/modules/invader/InvaderShip.cc

@@ -139 +139 @@
         isFireing = bBoost;
     }
-    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;

code/branches/hoverHS15/src/modules/invader/InvaderShip.h

@@ -65 +65 @@
             virtual void updateLevel();
 
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
         protected: