[Orxonox-commit 6946] r11567 - in code/branches/SOBv2_HS17: data/levels src/modules/superorxobros

[varxth at orxonox.net]

Author: varxth
Date: 2017-11-20 14:15:02 +0100 (Mon, 20 Nov 2017)
New Revision: 11567

Modified:
   code/branches/SOBv2_HS17/data/levels/SOB.oxw
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc
Log:
komplet

Modified: code/branches/SOBv2_HS17/data/levels/SOB.oxw
===================================================================
--- code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-20 13:00:56 UTC (rev 11566)
+++ code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-20 13:15:02 UTC (rev 11567)
@@ -102,7 +102,7 @@
 
 
 
-					<SOBFireball collisionType="dynamic" speed=40 position = "20,0,100">
+					<SOBFireball collisionType="dynamic" speed=40 position = "10,0,40">
 						<attached>
 							<Model mesh="planets/sol.mesh" position="0,0,1" scale=3 pitch=90/> 
 							

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-20 13:00:56 UTC (rev 11566)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-20 13:15:02 UTC (rev 11567)
@@ -266,8 +266,6 @@
 
         //If player hits space and collides against an object under him then jump
         if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 0 && collDisZ_ <+ 10)) {
-        //if (inputAllowed && firePressed_ && isColliding_ ) {
-
             gravityAcceleration_ = 100.0;
             velocity.z = 110; 
         }

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc	2017-11-20 13:00:56 UTC (rev 11566)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc	2017-11-20 13:15:02 UTC (rev 11567)
@@ -1,4 +1,4 @@
-/*
+    /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
  *
@@ -56,7 +56,7 @@
         setAngularFactor(0.0);
         figure_ = nullptr;
         this->enableCollisionCallback();
-        gravityAcceleration_ = 3.0;
+        gravityAcceleration_ = 5.0;
         speed_ = 0;
         hasCollided_=false;
         lastPos_ = getPosition();
@@ -103,7 +103,10 @@
         {
             changeAllowed_ = false;
             Vector3 velocity = getVelocity();
+            orxout() << "before:    velocity in z = " << velocity.z << endl;
             velocity.z = -velocity.z;
+            orxout() << "after:     velocity in z = " << velocity.z << endl;
+
             setVelocity(velocity);
         }
 
@@ -110,6 +113,8 @@
         //collision with the vertical side of a block 
         else if(changeAllowed_ && (abs(collDisX_)>abs(collDisZ_))) 
         {
+            orxout() << "collision with the vertical side of a block " << endl;
+
             changeAllowed_ = false;
             goesRight_=!goesRight_;
         }
@@ -133,25 +138,26 @@
         if (!changeAllowed_) {
             changedOn_+= dt;
             // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
-            if (changedOn_> 0.200) {
+            if (changedOn_> 0.100) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;
 
             }
+        
         }
-        
+            int dir = 1;
+            if (!goesRight_)
+                dir = -1;
 
-        int dir = 1;
-        if (!goesRight_)
-            dir = -1;
+            Vector3 velocity = getVelocity();
+            velocity.z -= gravityAcceleration_*dt;
+            velocity.x = dir*speed_;
+            setVelocity(velocity);
 
-        Vector3 velocity = getVelocity();
-        velocity.z -= gravityAcceleration_*dt;
-        velocity.x = dir*speed_;
-        setVelocity(velocity);
-
-        lastPos_ = getPosition();
+            lastPos_ = getPosition();
+        
     }
+    
 
 
 }

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc	2017-11-20 13:00:56 UTC (rev 11566)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc	2017-11-20 13:15:02 UTC (rev 11567)
@@ -105,7 +105,7 @@
 
             }
         }
-        
+    
 
         int dir = 1;
         if (!goesRight_)
@@ -117,7 +117,6 @@
         setVelocity(velocity);
 
         lastPos_ = getPosition();
+
     }
-
-
 }