[Orxonox-commit 7317] r11934 - in code/branches/OrxyRoad_FS18: data/levels/templates src/modules/orxyroad

[sehirsch at orxonox.net]

Author: sehirsch
Date: 2018-05-03 15:47:08 +0200 (Thu, 03 May 2018)
New Revision: 11934

Modified:
   code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt
   code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc
Log:
updated camera and cube pattern

Modified: code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt	2018-05-03 13:45:20 UTC (rev 11933)
+++ code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt	2018-05-03 13:47:08 UTC (rev 11934)
@@ -73,4 +73,19 @@
       </collisionShapes>
 	</OrxyRoadCube>
 
+</Template>
+
+<Template name=cokebottle>
+	
+	<OrxyRoadCube position="0,0,0" direction="0,0,0"   scale="1" collisionType=dynamic mass=1 friction=0.01 >
+      <attached>
+        <Model position="0,0,0" 		mesh="cokebottle.mesh" 		scale="50" 	/>
+		
+      </attached>
+      <collisionShapes>
+		<BoxCollisionShape position="0,0,0" 		 		halfExtents="100,100,100" 	/>
+		
+      </collisionShapes>
+	</OrxyRoadCube>
+
 </Template>
\ No newline at end of file

Modified: code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt	2018-05-03 13:45:20 UTC (rev 11933)
+++ code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt	2018-05-03 13:47:08 UTC (rev 11934)
@@ -79,7 +79,7 @@
 <Template name=spaceshipescortcameras defaults=0>
   <OrxyRoadShip>
     <camerapositions>
-		<CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
+		<CameraPosition position="200,200,360" direction="-0.4, -0.4, -1" yaw="0" drag=false mouselook=true />
 		<CameraPosition position="0,200,250" direction="0, -0.4, -1" drag=false mouselook=true />
 		<CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
 		<CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-05-03 13:45:20 UTC (rev 11933)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-05-03 13:47:08 UTC (rev 11934)
@@ -90,6 +90,8 @@
 
     void OrxyRoad::tick(float dt)
     {
+        SUPER(OrxyRoad, tick, dt);
+        
         OrxyRoadShip* player = this->getPlayer();
         if (player != nullptr)
         {
@@ -147,7 +149,6 @@
             }
 
         }
-        SUPER(OrxyRoad, tick, dt);
     }
 
     OrxyRoadShip* OrxyRoad::getPlayer()

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc	2018-05-03 13:45:20 UTC (rev 11933)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc	2018-05-03 13:47:08 UTC (rev 11934)
@@ -143,7 +143,7 @@
         Camera* camera = this->getCamera();
         if (camera != nullptr)
         {
-            //camera->setPosition(Vector3(pos1.x - 10 ,50,0));
+           camera->setPosition(Vector3(0 ,50,50)); // try to get side/top view
             //camera->setOrientation(Vector3(-1,-1,0), Degree(45));
             //camera->setOrientation(Vector3(-1,-1,-1), Degree(0));
            camera->setOrientation(Vector3::UNIT_Z, Degree(0));