[Orxonox-commit 7735] r12328 - in code/branches/OrxoBlox_FS19: data/levels src/modules/OrxoBlox

[jeromela at orxonox.net]

Author: jeromela
Date: 2019-05-02 13:35:32 +0200 (Thu, 02 May 2019)
New Revision: 12328

Modified:
   code/branches/OrxoBlox_FS19/data/levels/Asteroids2D.oxw
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
Log:
stone is back in the game

Modified: code/branches/OrxoBlox_FS19/data/levels/Asteroids2D.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/Asteroids2D.oxw	2019-05-02 11:07:32 UTC (rev 12327)
+++ code/branches/OrxoBlox_FS19/data/levels/Asteroids2D.oxw	2019-05-02 11:35:32 UTC (rev 12328)
@@ -43,7 +43,7 @@
 
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
     <Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-    <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
+    <SpawnPoint team=0 position="0,0,50" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
 
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
 

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-02 11:07:32 UTC (rev 12327)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-02 11:35:32 UTC (rev 12328)
@@ -50,9 +50,39 @@
   </OrxoBloxBall>
 </Template>
 
+<Template name=OrxoBloxStonescameras defaults=0>
+    <OrxoBloxStones>
+      <camerapositions>
+        <CameraPosition position="55,75,200" absolute=true />
+      </camerapositions>
+    </OrxoBloxStones>
+  </Template>
+  
+  <Template name=OrxoBloxstone>
+    <OrxoBloxStones camerapositiontemplate=OrxoBloxStonescameras >
+      <attached>
+        <Model position="0,0,0" mesh="CuboidBody.mesh" scale=4.5 />
+        <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
+      </attached>
+    </OrxoBloxStones>
+  </Template>
+  
+  <Template name=OrxoBloxWallcameras defaults=0>
+    <OrxoBloxWall>
+      <camerapositions>
+        <CameraPosition position="55,75,200" absolute=true />
+        <!--CameraPosition position="0,50,160" drag=true mouselook=true />
+        <CameraPosition position="0,50,0" pitch=-90 drag=true mouselook=true /-->
+      </camerapositions>
+    </OrxoBloxWall>
+  </Template>
+  
+  <Template name=OrxoBloxwall>
+    <OrxoBloxWall camerapositiontemplate=OrxoBloxWallcameras>
+    </OrxoBloxWall>
+  </Template>
 
 
-
 <Level
   plugins = "OrxoBlox"
  gametype = "OrxoBlox"
@@ -77,9 +107,9 @@
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
 
 
-    <MovableEntity rotationrate=5 rotationaxis="0,0,1">
+    <MovableEntity rotationrate=0 rotationaxis="0,0,1">
       <attached>
-        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="120,100" balltemplate=OrxoBloxball ballspeed=200 ballaccfactor=1.0>
+          <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="120,100" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25 StoneTemplate=OrxoBloxstone WallTemplate=OrxoBloxwall>
           <attached>
             <!-- Balken die das Spielfeld begrenzen. -->
             <Model position="0,0,-50" mesh="cube.mesh" scale3D="60,1,1" />

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-02 11:07:32 UTC (rev 12327)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-05-02 11:35:32 UTC (rev 12328)
@@ -53,7 +53,6 @@
 #include "OrxoBloxWall.h"
 #include "OrxoBloxShip.h"
 
-
 namespace orxonox
 {