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

[jeromela at orxonox.net]

Author: jeromela
Date: 2019-05-09 16:22:55 +0200 (Thu, 09 May 2019)
New Revision: 12364

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
Log:
orxoblox.oxw: Auskommentiert, orxobloxball.cc: mauskoordinaten auslesen.

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 14:04:30 UTC (rev 12363)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 14:22:55 UTC (rev 12364)
@@ -18,7 +18,7 @@
   include("templates/spaceshipOrxoBlox.oxt")
 ?>
 
-<Template name=OrxoBloxbatcameras defaults=0>
+<!--Template name=OrxoBloxbatcameras defaults=0>
   <OrxoBloxBat>
     <camerapositions>
       <CameraPosition position="0,150,0"  absolute=true />
@@ -27,7 +27,7 @@
       <CameraPosition position="0,30, 90" drag=true mouselook=true />
     </camerapositions>
   </OrxoBloxBat>
-</Template>
+</Template-->
 
 <Template name=OrxoBloxball>
   <OrxoBloxBall 
@@ -96,7 +96,7 @@
    skybox       = "Orxonox/skyBoxBasic"
   >
     <!-- <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" />
+    <Light type=directional position="-100, 10000, -700" direction="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,150,0" lookat="0,0,0" spawnclass= Asteroids2DShip />
 
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-05-09 14:04:30 UTC (rev 12363)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-05-09 14:22:55 UTC (rev 12364)
@@ -44,6 +44,7 @@
 
 #include "sound/WorldSound.h"
 #include "core/XMLPort.h"
+#include "core/input/InputManager.h"
 
 
 namespace orxonox
@@ -164,12 +165,24 @@
                 //ChatManager::message("Waiting for your input");
                 //Input new speed here:
                 //ChatManager::message("Setting new speed");
-
+                
+                //%%%%%%%%%%%%
+                //MAUSPOSITION
+                //%%%%%%%%%%%%
+                //Reads current mouse position
+                //TODO: read Mouse position on click!
+                //int mousex = InputManager::getInstance().getMousePosition().first;
+                //int mousey = InputManager::getInstance().getMousePosition().second;
+                //ChatManager::message("Read mouse position");
+                //orxout() << "Mouseposition" << endl;
+                //orxout() << mousex << endl;
+                //ChatManager::message(mousex);
+                //ChatManager::message("mousey");
+                //ChatManager::message(mousey);
                 //Set new speed here!!
                 velocity.x = rnd(-100,100);
-                velocity.z = rnd(-10,-100);
+                velocity.z = rnd(-50,-100);
                 
-                
 
             }
             if (position.z < -this->fieldHeight_ / 2){