Changeset 11420

Timestamp:

May 18, 2017, 2:16:01 PM (7 years ago)

Author:

jkindle

Message:

Added rotation of coins

Location:

code/branches/SuperOrxoBros_FS17

Files:

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

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

@@ -1 +1 @@
 <LevelInfo
-        name = "SOOOOOOOOOOOB"
-        description = "Jump as high as you can. Use the mouse to guide the jumper."
+        name = "Super Orxo Bros."
+        description = "The retro-game Super Mario Bros. in Orxonox."
         tags = "minigame"
         screenshot = "jump.png"
@@ -130 +130 @@
                                         <!--Gumba-->
 
-                                        <SOBGumba collisionType="dynamic" speed=400 position = "240,0,0">
+                                        <SOBGumba collisionType="dynamic" speed=40 position = "240,0,0">
                                                 <attached>
                                                         <Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/> 

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc

@@ -73 +73 @@
         Vector3 velocity = getVelocity();
         velocity.z = speed_;
-
+        setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + 2*dt*Radian(6));
         setVelocity(velocity);
 

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

@@ -251 +251 @@
 
 
-        //Left-right movement with acceleration
+        //Left-right movement with acceleration and rotation
         float rot = getOrientation().getRoll().valueDegrees();
         if (moveRightPressed_) {