Changeset 10708 for code

Timestamp:

Oct 26, 2015, 4:07:58 PM (9 years ago)

Author:

meierman

Message:

HoverWall introduced

Location:

code/branches/hoverHS15

Files:

• data/levels/Hover.oxw (modified) (2 diffs)
• src/modules/hover/CMakeLists.txt (modified) (2 diffs)
• src/modules/hover/Hover.cc (modified) (4 diffs)
• src/modules/hover/HoverPrereqs.h (modified) (1 diff)

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

@@ -36 +36 @@
   <StaticEntity position="200,0,0" collisionType="static">
     <attached>
-      <Model position="0, 0,0" yaw="90" pitch="-90" roll="0" scale3D="300, 2, 30" mesh="cube_red.mesh" />
-      <Model position="-300, 0,0" yaw="90" pitch="-90" roll="0" scale3D="300, 2, 30" mesh="cube_red.mesh" />      
-      <Model position="-150, 0,150" yaw="90" pitch="-90" roll="0" scale3D="2, 300, 30" mesh="cube_green.mesh" />      
-      <Model position="-150, 0,-150" yaw="90" pitch="-90" roll="0" scale3D="2, 300, 30" mesh="cube_green.mesh" />
+      <Model position="500, 0, 0" yaw="0" pitch="0" roll="0" scale3D="500, 30, 2" mesh="cube_red.mesh" />
+      <Model position="500, 0, 1000" yaw="0" pitch="0" roll="0" scale3D="500, 30, 2" mesh="cube_red.mesh" />      
+      <Model position="0, 0, 500" yaw="0" pitch="0" roll="0" scale3D="2, 30, 500" mesh="cube_green.mesh" />      
+      <Model position="1000, 0, 500" yaw="0" pitch="0" roll="0" scale3D="2, 30, 500" mesh="cube_green.mesh" />
     </attached> 
     <collisionShapes>
-      <BoxCollisionShape yaw="90" pitch="-90" roll="0" position="0,0,0" halfExtents="300, 2, 30" />
-      <BoxCollisionShape yaw="90" pitch="-90" roll="0" position="-300,0,0" halfExtents="300, 2, 30" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,0" halfExtents="500, 30, 2" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,1000" halfExtents="500, 30, 2" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,500" halfExtents="2, 30, 500" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000,500,0" halfExtents="2, 30, 500" />
+
     </collisionShapes>
   </StaticEntity>
 
-  <StaticEntity position="0,-10,0" collisionType="static">
+  <StaticEntity position="0,0,0" collisionType="static">
     <attached>
       <Model position="0, 0,0" yaw="0" pitch="0" roll="0" scale3D="10000, 1, 10000" mesh="CubeGround.mesh" />     
     </attached> 
     <collisionShapes>
-      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,0" halfExtents="10000, 1, 10000" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,0" halfExtents="1, 1, 1" />
     </collisionShapes>
   </StaticEntity>
@@ -59 +62 @@
     
     <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,0,0" lookat="10,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <SpawnPoint team=0 position="0,100,0" lookat="100,100,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
     
   </Scene>

code/branches/hoverHS15/src/modules/hover/CMakeLists.txt

@@ -2 +2 @@
 Hover.cc
 HoverShip.cc
+HoverWall.cc
 )
 
@@ -8 +9 @@
   FIND_HEADER_FILES
   LINK_LIBRARIES
+        objects
     orxonox
     overlays

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

@@ -34 +34 @@
 //#include "orxonox/worldentities/pawns/SpaceShip.h"
 #include "Hover.h"
-//#include "HoverShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
+
+#include "HoverWall.h"
 #include "core/CoreIncludes.h"
 
@@ -43 +44 @@
     Hover::Hover(Context* context) : Gametype(context)
     {
+        
         RegisterObject(Hover);
-
+        new HoverWall(context);
         //this->setHUDTemplate("HoverHUD");
     }
@@ -52 +54 @@
     void Hover::tick(float dt)
     {
-
         SUPER(Hover, tick, dt);
     }
@@ -61 +62 @@
     {
 
-
         // Call start for the parent class.
         Gametype::start();
+
     }
 

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

@@ -70 +70 @@
     class Hover;
     class HoverShip;
+    class HoverWall;
 }