[Orxonox-commit 6792] r11420 - in code/branches/SuperOrxoBros_FS17: data/levels src/modules/superorxobros

[jkindle at orxonox.net]

Author: jkindle
Date: 2017-05-18 14:16:01 +0200 (Thu, 18 May 2017)
New Revision: 11420

Modified:
   code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw
   code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc
   code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc
Log:
Added rotation of coins

Modified: code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw
===================================================================
--- code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw	2017-05-18 11:50:21 UTC (rev 11419)
+++ code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw	2017-05-18 12:16:01 UTC (rev 11420)
@@ -1,6 +1,6 @@
 <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"
 	/>
@@ -129,7 +129,7 @@
 
 					<!--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/> 
 							

Modified: code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc
===================================================================
--- code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc	2017-05-18 11:50:21 UTC (rev 11419)
+++ code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc	2017-05-18 12:16:01 UTC (rev 11420)
@@ -72,7 +72,7 @@
 
         Vector3 velocity = getVelocity();
         velocity.z = speed_;
-
+        setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + 2*dt*Radian(6));
         setVelocity(velocity);
 
 

Modified: code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc	2017-05-18 11:50:21 UTC (rev 11419)
+++ code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc	2017-05-18 12:16:01 UTC (rev 11420)
@@ -250,7 +250,7 @@
         }
 
 
-        //Left-right movement with acceleration
+        //Left-right movement with acceleration and rotation
         float rot = getOrientation().getRoll().valueDegrees();
         if (moveRightPressed_) {
             if (!(rot < 5.0 && -5.0 < rot))