Changeset 11567

Timestamp:

Nov 20, 2017, 2:15:02 PM (7 years ago)

Author:

varxth

Message:

komplet

Location:

code/branches/SOBv2_HS17

Files:

• data/levels/SOB.oxw (modified) (1 diff)
• src/modules/superorxobros/SOBFigure.cc (modified) (1 diff)
• src/modules/superorxobros/SOBFireball.cc (modified) (5 diffs)
• src/modules/superorxobros/SOBGumba.cc (modified) (2 diffs)

code/branches/SOBv2_HS17/data/levels/SOB.oxw

@@ -103 +103 @@
 
 
-                                        <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/> 

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc

@@ -267 +267 @@
         //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; 

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc

@@ -1 @@
-/*
+    /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
@@ -57 +57 @@
         figure_ = nullptr;
         this->enableCollisionCallback();
-        gravityAcceleration_ = 3.0;
+        gravityAcceleration_ = 5.0;
         speed_ = 0;
         hasCollided_=false;
@@ -104 +104 @@
             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);
         }
@@ -111 +114 @@
         else if(changeAllowed_ && (abs(collDisX_)>abs(collDisZ_))) 
         {
+            orxout() << "collision with the vertical side of a block " << endl;
+
             changeAllowed_ = false;
             goesRight_=!goesRight_;
@@ -134 +139 @@
             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;
+
+            Vector3 velocity = getVelocity();
+            velocity.z -= gravityAcceleration_*dt;
+            velocity.x = dir*speed_;
+            setVelocity(velocity);
+
+            lastPos_ = getPosition();
         
-
-        int dir = 1;
-        if (!goesRight_)
-            dir = -1;
-
-        Vector3 velocity = getVelocity();
-        velocity.z -= gravityAcceleration_*dt;
-        velocity.x = dir*speed_;
-        setVelocity(velocity);
-
-        lastPos_ = getPosition();
     }
+    
 
 

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc

@@ -106 +106 @@
             }
         }
-        
+    
 
         int dir = 1;
@@ -118 +118 @@
 
         lastPos_ = getPosition();
+
     }
-
-
 }