Merge pull request #159 from blackberry-gaming/next-ablake

Next ablake: Forms on QNX

gameplay.sln

@@ -25,8 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample03-character", "gamep
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay-encoder", "gameplay-encoder\gameplay-encoder.vcxproj", "{9D69B743-4872-4DD1-8E30-0087C64298D7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3CA8AE2-3ED6-458B-963A-EDA671E6F51C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32

gameplay/src/CheckBox.cpp

@@ -6,7 +6,7 @@ namespace gameplay
 
 static std::vector<CheckBox*> __checkBoxes;
 
-CheckBox::CheckBox()
+CheckBox::CheckBox() : _checked(false)
 {
 }
 
@@ -27,6 +27,7 @@ CheckBox* CheckBox::create(Theme::Style* style, Properties* properties)
     checkbox->_id = properties->getId();
     properties->getVector2("position", &checkbox->_position);
     properties->getVector2("size", &checkbox->_size);
+    checkbox->_checked = properties->getBool("checked");
     checkbox->_text = properties->getString("text");
 
     __checkBoxes.push_back(checkbox);
@@ -141,4 +142,4 @@ void CheckBox::drawText(const Vector2& position)
     _dirty = false;
 }
 
-}
+}

gameplay/src/Form.cpp

@@ -327,30 +327,22 @@ namespace gameplay
                     const float& a = normal.x; const float& b = normal.y; const float& c = normal.z;
                     const float d = -(a*min.x) - (b*min.y) - (c*min.z);
                     const float distance = abs(d) /  sqrt(a*a + b*b + c*c);
-                    Plane plane(normal, distance);
+                    Plane plane(normal, -distance);
 
                     // Check for collision with plane.
-                    float collides = ray.intersects(plane);
-                    if (collides != Ray::INTERSECTS_NONE)
+                    float collisionDistance = ray.intersects(plane);
+                    if (collisionDistance != Ray::INTERSECTS_NONE)
                     {
-                        // Check for collision with form.
                         // Multiply the ray's direction vector by collision distance
                         // and add that to the ray's origin.
-                        Vector3 rayOrigin = ray.getOrigin();
-                        Vector3 rayDirection = ray.getDirection();
-                        float alpha = (distance - normal.dot(rayOrigin)) / normal.dot(rayDirection);
-                        Vector3 point = rayOrigin + alpha*rayDirection;
+                        Vector3 point = ray.getOrigin() + collisionDistance*ray.getDirection();
 
                         // Project this point into the plane.
                         m.invert();
                         m.transformPoint(&point);
 
-                        // If this point lies within the form, pass the touch event on.
-                        if (point.x >= 0 && point.x <= size.x &&
-                            point.y >= 0 && point.y <= size.y)
-                        {
-                            form->touchEvent(evt, point.x, size.y - point.y, contactIndex);
-                        }
+                        // Pass the touch event on.
+                        form->touchEvent(evt, point.x, size.y - point.y, contactIndex);
                     }
                 }
             }

gameplay/src/ParticleEmitter.cpp

@@ -764,7 +764,9 @@ ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlendingFromString(c
 void ParticleEmitter::update(long elapsedTime)
 {
     if (!isActive())
+    {
         return;
+    }
 
     // Calculate the time passed since last update.
     float elapsedSecs = (float)elapsedTime / 1000.0f;
@@ -873,7 +875,9 @@ void ParticleEmitter::update(long elapsedTime)
 void ParticleEmitter::draw()
 {
     if (!isActive())
+    {
         return;
+    }
 
     if (_particleCount > 0)
     {

gameplay/src/PlatformQNX.cpp

@@ -940,12 +940,12 @@ int Platform::enterMessagePump()
                         // Suppress key repeats
                         if ((flags & KEY_REPEAT) == 0)
                         {
-                            Game::getInstance()->keyEvent(evt, getKey(value));
+                            keyEventInternal(evt, getKey(value));
                             if (evt == gameplay::Keyboard::KEY_PRESS && flags & KEY_SYM_VALID)
                             {
                                 int unicode = getUnicode(value);
                                 if (unicode)
-                                    Game::getInstance()->keyEvent(gameplay::Keyboard::KEY_CHAR, unicode);
+                                    keyEventInternal(gameplay::Keyboard::KEY_CHAR, unicode);
                             }
                         }
                         break;

gameplay/src/Ray.cpp

@@ -107,8 +107,8 @@ float Ray::intersects(const Plane& plane) const
 {
     const Vector3& normal = plane.getNormal();
     // If the origin of the ray is on the plane then the distance is zero.
-    float m = (normal.dot(_origin) + plane.getDistance());
-    if (fabs(m) < MATH_EPSILON)
+    float alpha = (normal.dot(_origin) + plane.getDistance());
+    if (fabs(alpha) < MATH_EPSILON)
     {
         return 0.0f;
     }
@@ -124,8 +124,8 @@ float Ray::intersects(const Plane& plane) const
     
     // Calculate the distance along the ray's direction vector to the point where
     // the ray intersects the plane (if it is negative the plane is behind the ray).
-    float d = -m / dot;
-    if ( d < 0.0f )
+    float d = -alpha / dot;
+    if (d < 0.0f)
     {
         return INTERSECTS_NONE;
     }

gameplay/src/Slider.h

@@ -13,10 +13,6 @@ namespace gameplay
 class Slider : public Button
 {
 public:
-
-    Slider();
-    ~Slider();
-
     static Slider* create(Theme::Style* style, Properties* properties);
     static Slider* create(const char* id, float min, float max, float defaultPosition = 0.0f, float step = 1.0f);
     static Slider* getSlider(const char* id);
@@ -29,8 +25,11 @@ public:
     void setValue(float value);
     float getValue();
 
-private:
+protected:
+    Slider();
+    ~Slider();
 
+private:
     float _min;
     float _max;
     float _step;

gameplay/src/TextBox.cpp

@@ -1,4 +1,5 @@
 #include "TextBox.h"
+#include "Game.h"
 
 namespace gameplay
 {
@@ -70,6 +71,7 @@ void TextBox::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int conta
             if (_state == STATE_NORMAL)
             {
                 _state = STATE_ACTIVE;
+                Game::getInstance()->displayKeyboard(true);
             }
             break;
         case Touch::TOUCH_MOVE:
@@ -92,6 +94,7 @@ void TextBox::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int conta
             else
             {
                 _state = STATE_NORMAL;
+                Game::getInstance()->displayKeyboard(false);
             }
             break;
         }