Changeset 12263

Timestamp:

Mar 28, 2019, 5:00:24 PM (6 years ago)

Author:

tkuonen

Message:

Repair MouseAPI

Location:

code/branches/MouseAPI_FS19

Files:

• data/levels/MouseAPIExample.oxw (modified) (3 diffs)
• src/modules/MouseAPI/mouseapi.cc (modified) (2 diffs)

code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw

@@ -16 +16 @@
 ?>
 
-<Level>
+<Level >
   <templates>
     <Template link=lodtemplate_default />
@@ -25 +25 @@
     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"/>
@@ -31 +34 @@
         <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>
     

code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc

@@ -12 +12 @@
      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);
@@ -38 +38 @@
 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()));