[Orxonox-commit 7279] r11894 - in code/branches/3DPacman_FS18: data/levels src/modules/Pacman

[dreherm at orxonox.net]

Author: dreherm
Date: 2018-04-20 10:18:23 +0200 (Fri, 20 Apr 2018)
New Revision: 11894

Modified:
   code/branches/3DPacman_FS18/data/levels/3DPacman.oxw
   code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc
   code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h
Log:
Load Backup

Modified: code/branches/3DPacman_FS18/data/levels/3DPacman.oxw
===================================================================
--- code/branches/3DPacman_FS18/data/levels/3DPacman.oxw	2018-04-19 14:11:27 UTC (rev 11893)
+++ code/branches/3DPacman_FS18/data/levels/3DPacman.oxw	2018-04-20 08:18:23 UTC (rev 11894)
@@ -30,20 +30,41 @@
     <SpawnPoint team=0 position="0,10,245" lookat="0,0,0" spawnclass=SpaceShip pawndesign=PacmanGelb />
 
 
-<PacmanGhost position="0,20,245">
+<PacmanGhost position="215,10,220" resetposition="215,10,220">
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
     </attached>
 </PacmanGhost>
 
+<PacmanGhost position="215,10,220" resetposition="215,10,220">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
+    </attached>
+</PacmanGhost>
 
+<PacmanGhost position="215,10,220" resetposition="215,10,220">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
+    </attached>
+</PacmanGhost>
+
+<PacmanGhost position="215,10,220" resetposition="215,10,220">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />
+    </attached>
+</PacmanGhost>
+
+<PacmanPointSphere position="0,10,0" resetposition="0,10,0">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
+    </attached>
+</PacmanPointSphere>
+
 <StaticEntity position="0,0,25" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
     <attached> 
         <Model position="0,0,0" mesh="PacmanMap.mesh" scale="50" /> 
     </attached> 
     <collisionShapes> 
-        <BoxCollisionShape position="0,0,0" halfExtents="250,1,250" />
-        <BoxCollisionShape position="0,200000,0" halfExtents="250,1,250" />
 
 	<BoxCollisionShape position="250,10,0" halfExtents="1,15,250" />
 	<BoxCollisionShape position="-250,10,0" halfExtents="1,15,250" />
@@ -62,34 +83,6 @@
     </collisionShapes> 
 </StaticEntity>
 
-
-<StaticEntity position="-10,10,-10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
-    <attached> 
-        <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" /> 
-    </attached> 
-    <collisionShapes> 
-        <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" /> 
-    </collisionShapes> 
-</StaticEntity>
-
-<StaticEntity position="10,10,-10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
-    <attached> 
-        <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" /> 
-    </attached> 
-    <collisionShapes> 
-        <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" /> 
-    </collisionShapes> 
-</StaticEntity>
-
-<StaticEntity position="-10,10,10" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
-    <attached> 
-        <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" /> 
-    </attached> 
-    <collisionShapes> 
-        <BoxCollisionShape position="0,0,0" halfExtents="0.5,0.5,0.5" /> 
-    </collisionShapes> 
-</StaticEntity>
-
 <PortalEndPoint position="-240,10,0" id="1" distance="40" target="Pawn"/>
 <PortalEndPoint position="240,10,0" id="2" distance="40" target="Pawn"/>
 <PortalLink fromID="1" toID="2" />

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc	2018-04-19 14:11:27 UTC (rev 11893)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.cc	2018-04-20 08:18:23 UTC (rev 11894)
@@ -45,21 +45,11 @@
 
     void PacmanGelb::tick(float dt)
     {
+    	SUPER(PacmanGelb, tick, dt);
         //bring player back to ground
         actuelposition = this->getPosition();
-        actuelposition.y = 0;
+        actuelposition.y = 10;
         this->setPosition(actuelposition);
-
-        // Camera
-        Camera* camera = this->getCamera();
-        if (camera != nullptr)
-        {
-            actuelorient = camera->getOrientation();
-            actuelorient.y = 0;
-            camera->setOrientation(actuelorient);
-        }
-
-        SUPER(PacmanGelb, tick, dt);
     }
 }
     
\ No newline at end of file

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h	2018-04-19 14:11:27 UTC (rev 11893)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGelb.h	2018-04-20 08:18:23 UTC (rev 11894)
@@ -50,6 +50,10 @@
 
             virtual void tick(float dt);
 
+            //no rotation
+            virtual void rotateYaw(const Vector2& value) override{};
+            virtual void rotateYaw(const Vector2& value) override{};
+
         private:
             Vector3 actuelposition;
             Quaternion actuelorient;