Explorar o código

Adds joystick control to forms test and fixes projectPoint in framework (protect against null scene and use world matrix not local one).

Ken Whatmough %!s(int64=13) %!d(string=hai) anos
pai
achega
d697de8ba9
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      gameplay/src/Form.cpp

+ 3 - 3
gameplay/src/Form.cpp

@@ -711,12 +711,12 @@ bool Form::projectPoint(int x, int y, Vector3* point)
 {
     Scene* scene = _node->getScene();
     GP_ASSERT(scene);
-    Camera* camera = scene->getActiveCamera();
+    Camera* camera;
 
-    if (camera)
+    if (scene && (camera = scene->getActiveCamera()))
     {
         // Get info about the form's position.
-        Matrix m = _node->getMatrix();
+        Matrix m = _node->getWorldMatrix();
         Vector3 min(0, 0, 0);
         m.transformPoint(&min);