[Orxonox-commit 7670] r12263 - in code/branches/MouseAPI_FS19: data/levels src/modules/MouseAPI

[tkuonen at orxonox.net]

Author: tkuonen
Date: 2019-03-28 17:00:24 +0100 (Thu, 28 Mar 2019)
New Revision: 12263

Modified:
   code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
Log:
Repair MouseAPI


Modified: code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
===================================================================
--- code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-03-28 16:00:18 UTC (rev 12262)
+++ code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-03-28 16:00:24 UTC (rev 12263)
@@ -15,7 +15,7 @@
   include("templates/spaceshipEscort.oxt")
 ?>
 
-<Level>
+<Level >
   <templates>
     <Template link=lodtemplate_default />
   </templates>
@@ -24,6 +24,9 @@
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
   >
+  <camerapositions>
+        <CameraPosition position="0,0,0" lookat="100,0,0" absolute=true drag=true mouselook=true/>
+  </camerapositions>
 
     <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"/>
     <SpawnPoint team=0 position="0,0,0" lookat="0,0,0"/>
@@ -30,11 +33,12 @@
     
 	<MouseAPIExample position="100,0,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
 	    <attached> 
-		<Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" /> 
+		<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" /> 
 	    </attached> 
 	    <collisionShapes> 
-		<BoxCollisionShape position="0,0,0" halfExtents="10000,10000,1000" /> 
-	    </collisionShapes> 
+		<BoxCollisionShape position="0,0,0" halfExtents="10,10,10" /> 
+	    </collisionShapes>
+        
 	</MouseAPIExample>
     
   </Scene>

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-03-28 16:00:18 UTC (rev 12262)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-03-28 16:00:24 UTC (rev 12263)
@@ -11,8 +11,8 @@
 {
      if(InputManager::exists())
      {
-        cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
-        state = InputManager::getInstance().createInputState("MouseAPI");
+        //cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
+        state = InputManager::getInstance().createInputState("MouseAPI",true,true,99);
         state->setMouseExclusive(false);//does this work
         state->setMouseHandler(this);
         InputManager::getInstance().enterState("MouseAPI");
@@ -37,6 +37,7 @@
 
 void MouseAPI::buttonPressed(MouseButtonCode::ByEnum button)
 {
+    cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
     Ogre::Viewport *vp = GraphicsManager::getInstance().getViewport();
     Ogre::Ray ray = cam->getCameraToViewportRay(mousePos.x/((float)vp->getActualWidth()),mousePos.y/((float)vp->getActualHeight()));
     for(auto event: clickEvents)