Changeset 10926

Timestamp:

Dec 7, 2015, 1:26:23 PM (9 years ago)

Author:

meierman

Message:

Fully functional

Location:

code/branches/hoverHS15

Files:

• data/levels/Hover.oxw (modified) (3 diffs)
• data/levels/templates/spaceshipHover.oxt (modified) (1 diff)
• src/modules/hover/HoverWall.cc (modified) (1 diff)

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

@@ -30 +30 @@
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
-    gravity      = "0, -40, 0"
+    gravity      = "0, -100, 0"
   >
  
@@ -55 +55 @@
   <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" />     
+      <Model position="500, -10,500" yaw="0" pitch="0" roll="0" scale3D="500, 10, 500" 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,-10,0" halfExtents="10000, 10, 10000" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500, 0,0" halfExtents="1000, 1000, 1" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500, 0, 1000" halfExtents="1000, 1000, 1" />   
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0, 0, 500" halfExtents="1, 1000, 1000" /> 
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000, 0, 500" halfExtents="1, 1000, 1000" />           
+
+
     </collisionShapes>
   </StaticEntity>
@@ -78 +84 @@
     
     <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=HoverShip pawndesign=spaceshiphover />
+    <SpawnPoint team=0 position="50,20,50" lookat="100,20,100" spawnclass=HoverShip pawndesign=spaceshiphover />
     
   </Scene>

code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt

@@ -51 +51 @@
       <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
       <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="13,-10,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-10,0" halfExtents="3, 1, 2" />
       <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
       <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />

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

@@ -75 +75 @@
 
         model_ = new Model(context);
-        model_->setMeshSource("cube.mesh");
+        model_->setMeshSource("CuboidBody.mesh");
         model_->setScale3D(Vector3(xSize_, 30, zSize_));
         model_->setPosition(Vector3(xPos_,0,zPos_));