[Orxonox-commit 6271] r10928 - in code/branches/hoverHS15: data/levels data/levels/templates src/modules/hover

[meierman at orxonox.net]

Author: meierman
Date: 2015-12-07 14:05:58 +0100 (Mon, 07 Dec 2015)
New Revision: 10928

Modified:
   code/branches/hoverHS15/data/levels/Hover.oxw
   code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt
   code/branches/hoverHS15/src/modules/hover/Hover.cc
   code/branches/hoverHS15/src/modules/hover/HoverFlag.cc
Log:
Before finishing touch

Modified: code/branches/hoverHS15/data/levels/Hover.oxw
===================================================================
--- code/branches/hoverHS15/data/levels/Hover.oxw	2015-12-07 12:56:45 UTC (rev 10927)
+++ code/branches/hoverHS15/data/levels/Hover.oxw	2015-12-07 13:05:58 UTC (rev 10928)
@@ -29,7 +29,7 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
-    gravity      = "0, -100, 0"
+    gravity      = "0, -200, 0"
   >
  
 
@@ -38,10 +38,6 @@
 
   <StaticEntity position="0,0,0" collisionType="static">
     <attached>
-      <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="0" pitch="0" roll="0" position="500,0,0" halfExtents="500, 30, 2" />
@@ -54,9 +50,10 @@
 
   <StaticEntity position="0,0,0" collisionType="static">
     <attached>
-      <Model position="500, -10,500" yaw="0" pitch="0" roll="0" scale3D="500, 10, 500" mesh="CubeGround.mesh" />     
+      <Model position="500, -16,500" yaw="0" pitch="0" roll="0" scale3D="500, 16, 500" mesh="CubeGround.mesh" />     
     </attached> 
     <collisionShapes>
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,500,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" />   
@@ -82,7 +79,7 @@
 
 
     
-    <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"/>
+    <Light type=directional position="-50,500,-50" direction="0.577, -0.577, 0.577" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="50,20,50" lookat="100,20,100" spawnclass=HoverShip pawndesign=spaceshiphover />
     
   </Scene>

Modified: code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt	2015-12-07 12:56:45 UTC (rev 10927)
+++ code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt	2015-12-07 13:05:58 UTC (rev 10928)
@@ -17,11 +17,11 @@
    reloadrate          = 2
    reloadwaittime      = 0.5
 
-   primaryThrust     = 100
+   primaryThrust     = 200
    auxilaryThrust    = 30
    rotationThrust    = 25
 
-   jumpBoost = 30
+   jumpBoost = 90
 
    lift = 1;
    stallSpeed = 220;

Modified: code/branches/hoverHS15/src/modules/hover/Hover.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-12-07 12:56:45 UTC (rev 10927)
+++ code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-12-07 13:05:58 UTC (rev 10928)
@@ -108,6 +108,7 @@
 
     void Hover::tick(float dt)
     {
+
         SUPER(Hover, tick, dt);
 
 
@@ -125,6 +126,14 @@
             LevelOut();
             firstTick = false;
 
+            //Outer Walls
+            for(int i = 0; i<10; i++){
+                new HoverWall(origin_->getContext(), 0, i+1, 1);
+                new HoverWall(origin_->getContext(), 10, i+1, 1);
+                new HoverWall(origin_->getContext(), i+1, 0, 2);
+                new HoverWall(origin_->getContext(), i+1, 10, 2);
+            }
+
             for(int y=0; y<10; y++){
                 for(int x=0; x<10; x++){
                     switch(levelcode[y][x]){

Modified: code/branches/hoverHS15/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverFlag.cc	2015-12-07 12:56:45 UTC (rev 10927)
+++ code/branches/hoverHS15/src/modules/hover/HoverFlag.cc	2015-12-07 13:05:58 UTC (rev 10928)
@@ -95,9 +95,6 @@
     void HoverFlag::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(HoverFlag, XMLPort, xmlelement, mode);
-
-       // XMLPortParam(HoverFlag, "height", setHeight, getHeight, xmlelement, mode);
-        //XMLPortParam(HoverFlag, "width", setWidth, getWidth, xmlelement, mode);
     }
 
 
@@ -118,26 +115,8 @@
 
     bool HoverFlag::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
-        
-
-        if(otherObject->isA(Class(HoverShip))){
-
-            orxout()<<"TestCollision"<<endl;
+        if(otherObject->isA(Class(HoverShip)))
             collided_ = true;
-            //this->destroyLater();
-        }
-
-
-        /*if (GameMode::isMaster() && enableCollisionDamage_)
-        {
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
-            if (victim)
-            {
-                float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
-                victim->hit(0, contactPoint, ownCollisionShape, damage);
-            }
-        }*/
-
         return false;
     }