Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next

README.md

@@ -11,12 +11,11 @@ GamePlay3D is an open-source, cross-platform 3D native C++ game framework making
 - [Development Guide](https://github.com/blackberry/GamePlay/wiki#wiki-Development_Guide)
 
 ## Supported Platforms
-- [Microsoft Windows](https://github.com/blackberry/GamePlay/wiki/Visual-Studio-Setup) (using Microsoft Visual Studio)
-- [Apple MacOS X](https://github.com/blackberry/GamePlay/wiki/Apple-Xcode-Setup) (using Apple XCode)
-- [Linux](https://github.com/blackberry/GamePlay/wiki/Linux-Setup) (using CMake)
-- [Apple iOS](https://github.com/blackberry/GamePlay/wiki/Apple-Xcode-Setup) (using Apple XCode)
-- [Google Android](https://github.com/blackberry/GamePlay/wiki/Android-NDK-Setup) (using Google Android NDK)
-- [BlackBerry](https://github.com/blackberry/GamePlay/wiki/BlackBerry-Setup) (using BlackBerry Native SDK)
+- [Linux](https://github.com/blackberry/GamePlay/wiki/CMake Setup - Linux)
+- [Windows](https://github.com/blackberry/GamePlay/wiki/Visual-Studio-Setup) 
+- [MacOS X](https://github.com/blackberry/GamePlay/wiki/Apple-Xcode-Setup)
+- [iOS](https://github.com/blackberry/GamePlay/wiki/Apple-Xcode-Setup)
+- [Android/BlackBerry](https://github.com/blackberry/GamePlay/wiki/Android-NDK-Setup)
 
 ## Roadmap for 'next' branch
 - [3.0.0](https://github.com/blackberry/GamePlay/issues?milestone=7&page=1&state=open)

gameplay/src/Form.cpp

@@ -1025,7 +1025,7 @@ bool Form::projectPoint(int x, int y, Vector3* point)
 
         // To get the plane's distance from the origin, we project a point on the
         // plane onto the plane's normal vector.
-        const float distance = fabs(Vector3::dot(pointOnPlane, normal));
+        const float distance = Vector3::dot(pointOnPlane, normal);
         Plane plane(normal, -distance);
 
         // Check for collision with plane.

gameplay/src/Image.cpp

@@ -66,7 +66,7 @@ Image* Image::create(const char* path)
     png_set_sig_bytes(png, 8);
 
     // Read the entire image into memory.
-    png_read_png(png, info, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND, NULL);
+    png_read_png(png, info, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND | PNG_TRANSFORM_GRAY_TO_RGB, NULL);
 
     Image* image = new Image();
     image->_width = png_get_image_width(png, info);

gameplay/src/PlatformAndroid.cpp

@@ -736,6 +736,7 @@ Gamepad::ButtonMapping getGamepadButtonMapping(jint keycode)
     case AKEYCODE_DPAD_RIGHT:
         return Gamepad::BUTTON_RIGHT;
     case AKEYCODE_BUTTON_SELECT:
+    case AKEYCODE_BACK:
         return Gamepad::BUTTON_MENU1;
     case AKEYCODE_BUTTON_START:
         return Gamepad::BUTTON_MENU2;