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

[mkarpf at orxonox.net]

Author: mkarpf
Date: 2019-04-04 17:46:25 +0200 (Thu, 04 Apr 2019)
New Revision: 12285

Modified:
   code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h
Log:
Example Level with scaling


Modified: code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
===================================================================
--- code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-04-04 15:13:42 UTC (rev 12284)
+++ code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-04-04 15:46:25 UTC (rev 12285)
@@ -34,24 +34,6 @@
 	<BoxCollisionShape position="0,0,0" halfExtents="10,10,10" /> 
     </collisionShapes>
 </MouseAPIExample>
-
-<MouseAPIExample position="100,0,100" direction="0,0,0">
-    <attached> 
-	<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" /> 
-    </attached> 
-    <collisionShapes> 
-	<BoxCollisionShape position="0,0,0" halfExtents="10,10,10" /> 
-    </collisionShapes>
-</MouseAPIExample>
-
-<MouseAPIExample position="100,0,-100" direction="0,0,0">
-    <attached> 
-	<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" /> 
-    </attached> 
-    <collisionShapes> 
-	<BoxCollisionShape position="0,0,0" halfExtents="10,10,10" /> 
-    </collisionShapes>
-</MouseAPIExample>
  
   </Scene>
 </Level>

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc	2019-04-04 15:13:42 UTC (rev 12284)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc	2019-04-04 15:46:25 UTC (rev 12285)
@@ -8,7 +8,6 @@
 MouseAPIExample::MouseAPIExample(Context* context) : ControllableEntity(context)
 {
     RegisterObject(MouseAPIExample);
-    //mouseapi = MouseAPI::getInstance();
 
 }
 
@@ -18,22 +17,18 @@
         MouseAPI::getInstance().deactivate();
 }
 
-void MouseAPIExample::tick(float dt)
+void MouseAPIExample::testfunction(MouseButtonCode::ByEnum mouse)
 {
-    ControllableEntity::tick(dt);
+    float randomnumber = (rand()%100 + 1)/100.0;
+    this->setScale(randomnumber);
+    orxout() << "Blah\n";
 
 }
 
-void MouseAPIExample::testfunction(MouseButtonCode::ByEnum mouse)
-{
-    orxout() << "MouseAPIExample: Object Clicked\n";
-}
-
 void MouseAPIExample::XMLPort(Element& xmlelement, XMLPort::Mode mode)
 {
     SUPER(MouseAPIExample, XMLPort, xmlelement, mode);
     MouseAPI::getInstance().activate();
     MouseAPI::getInstance().addClickableObject(this->getWorldPosition(),10,std::list<MouseButtonCode::ByEnum>{MouseButtonCode::Left},[this](MouseButtonCode::ByEnum mouse){this->testfunction(mouse);});
-
 }
 }

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h	2019-04-04 15:13:42 UTC (rev 12284)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h	2019-04-04 15:46:25 UTC (rev 12285)
@@ -8,6 +8,8 @@
 #include "util/output/ConsoleWriter.h"
 #include "worldentities/ControllableEntity.h"
 #include "core/CoreIncludes.h"
+#include <list>
+#include <stdlib.h>
 
 namespace orxonox
 {
@@ -18,7 +20,7 @@
     ~MouseAPIExample();
     virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     void testfunction(MouseButtonCode::ByEnum mouse);
-    virtual void tick(float dt) override;
+    static std::list<MouseAPIExample> blocks;
 };
 }
 #endif // MOUSEAPIEXAMPLE_H