Merge pull request #1269 from dgough/next

Fixed memory leak and bug

gameplay/src/Form.cpp

@@ -136,6 +136,8 @@ Form* Form::create(const char* url)
 
     __forms.push_back(form);
 
+    SAFE_DELETE(properties);
+
     return form;
 }
 
@@ -601,7 +603,7 @@ Control* Form::handlePointerPressRelease(int* x, int* y, bool pressed)
             // originally pressed, fire a click event
             if (active->_absoluteClipBounds.contains(newX, newY))
             {
-				if (!active->_parent || !active->_parent->isScrolling())
+                if (!active->_parent || !active->_parent->isScrolling())
                 {
                     active->notifyListeners(Control::Listener::CLICK);
                 }

gameplay/src/Properties.cpp

@@ -97,6 +97,7 @@ Properties* Properties::create(const char* url)
     if (!p)
     {
         GP_WARN("Failed to load properties from url '%s'.", url);
+        SAFE_DELETE(properties);
         return NULL;
     }
 

samples/browser/src/InputSample.cpp

@@ -71,6 +71,7 @@ void InputSample::initialize()
     _formNodeParent->setTranslation(_formNodeRestPosition);
     _formNode->setTranslation(-0.2f, -0.2f, 0);
     _formNode->setForm(form);
+    form->release();
 }
 
 void InputSample::finalize()

samples/browser/src/LightSample.cpp

@@ -47,6 +47,7 @@ void LightSample::initialize()
 
 	// Load the scene
 	_scene = Scene::load("res/common/lightBrickWall.gpb");
+    _scene->getActiveCamera()->setAspectRatio(getAspectRatio());
 
 	// Get the wall model node
 	_modelNode = _scene->findNode("wall"); 

samples/browser/src/PostProcessSample.cpp

@@ -83,6 +83,7 @@ void PostProcessSample::initialize()
 
     // Load game scene from file
     _scene = Scene::load("res/common/duck.gpb");
+    _scene->getActiveCamera()->setAspectRatio(getAspectRatio());
 
     // Initialize box model
     _modelNode = _scene->findNode("duck");

samples/character/android/build.xml

@@ -68,7 +68,7 @@
         <copy file="../res/design/book.png" tofile="assets/res/png/book.png"/>
         <copy file="../res/design/bookshelf.png" tofile="assets/res/png/bookshelf.png"/>
         <copy file="../res/common/boy.animation" tofile="assets/res/common/boy.animation"/>
-        <copy file="../res/design/character.png" tofile="assets/res/png/character.png"/>
+        <copy file="../res/design/boy.png" tofile="assets/res/png/boy.png"/>
         <copy file="../res/design/decals.png" tofile="assets/res/png/decals.png"/>
         <copy file="../res/design/door.png" tofile="assets/res/png/door.png"/>
         <copy file="../res/design/doorframe.png" tofile="assets/res/png/doorframe.png"/>

samples/character/bar-descriptor.xml

@@ -51,7 +51,7 @@
     <asset path="res/design/basketballnet.png">res/png/basketballnet.png</asset>
     <asset path="res/design/book.png">res/png/book.png</asset>
     <asset path="res/design/bookshelf.png">res/png/bookshelf.png</asset>
-    <asset path="res/design/character.png">res/png/character.png</asset>
+    <asset path="res/design/boy.png">res/png/boy.png</asset>
     <asset path="res/design/decals.png">res/png/decals.png</asset>
     <asset path="res/design/door.png">res/png/door.png</asset>
     <asset path="res/design/doorframe.png">res/png/doorframe.png</asset>

samples/character/game.atc.config

@@ -5,7 +5,7 @@ basketball = res/atc/basketball.dds
 basketballnet = res/atc/basketballnet.dds
 book = res/atc/book.dds
 bookshelf = res/atc/bookshelf.dds
-character = res/atc/character.dds
+character = res/atc/boy.dds
 decals = res/atc/decals.dds
 door = res/atc/door.dds
 doorframe = res/atc/doorframe.dds

samples/character/game.dxt.config

@@ -14,7 +14,7 @@ aliases
     basketballnet = res/dxt/basketballnet.dds
     book = res/dxt/book.dds
     bookshelf = res/dxt/bookshelf.dds
-    character = res/dxt/character.dds
+    character = res/dxt/boy.dds
     decals = res/dxt/decals.dds
     door = res/dxt/door.dds
     doorframe = res/dxt/doorframe.dds

samples/character/game.png.config

@@ -5,7 +5,7 @@ aliases
     basketballnet = res/png/basketballnet.png
     book = res/png/book.png
     bookshelf = res/png/bookshelf.png
-    character = res/png/character.png
+    character = res/png/boy.png
     decals = res/png/decals.png
     door = res/png/door.png
     doorframe = res/png/doorframe.png

samples/character/game.pvrtc.config

@@ -5,7 +5,7 @@ aliases
     basketballnet = res/pvrtc/basketballnet.pvr
     book = res/pvrtc/book.pvr
     bookshelf = res/pvrtc/bookshelf.pvr
-    character = res/pvrtc/character.pvr
+    character = res/pvrtc/boy.pvr
     decals = res/pvrtc/decals.pvr
     door = res/pvrtc/door.pvr
     doorframe = res/pvrtc/doorframe.pvr

samples/lua/bar-descriptor.xml

@@ -45,7 +45,13 @@
     <asset path="game.config">game.config</asset>
    	<asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="res">res</asset>
+    <asset path="res/ai.lua">res/ai.lua</asset>
+    <asset path="res/game.lua">res/game.lua</asset>
+    <asset path="res/arial.gpb">res/arial.gpb</asset>
+    <asset path="res/lua.gpb">res/lua.gpb</asset>
+    <asset path="res/lua.material">res/lua.material</asset>
+    <asset path="res/lua.scene">res/lua.scene</asset>
+    <asset path="res/lua-logo.png">res/lua-logo.png</asset>
 
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>

samples/mesh/android/build.xml

@@ -62,12 +62,11 @@
        -->
     <target name="-post-compile">
         <copy file="../game.config" tofile="assets/game.config"/>
-        <copy file="../res/arial40.gpb" tofile="assets/res/arial40.gpb"/>
-        <copy file="../res/sample.scene" tofile="assets/res/sample.scene"/>
-        <copy file="../res/duck.gpb" tofile="assets/res/duck.gpb"/>
-        <copy file="../res/duck.material" tofile="assets/res/duck.material"/>
-        <copy file="../res/duck-diffuse.png" tofile="assets/res/duck-diffuse.png"/>
-        <copy file="../res/grid.material" tofile="assets/res/grid.material"/>
+        <copy file="../res/arial.gpb" tofile="assets/res/arial.gpb"/>
+        <copy file="../res/mesh.scene" tofile="assets/res/mesh.scene"/>
+        <copy file="../res/mesh.gpb" tofile="assets/res/mesh.gpb"/>
+        <copy file="../res/mesh.material" tofile="assets/res/mesh.material"/>
+        <copy file="../res/duck.png" tofile="assets/res/duck.png"/>
         <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
         <copy todir="assets/res/shaders">
             <fileset dir="../../../gameplay/res/shaders"/>

samples/mesh/bar-descriptor.xml

@@ -43,11 +43,10 @@
     
     <asset path="icon.png">icon.png</asset>
     <asset path="res/arial.gpb">res/arial.gpb</asset>
-    <asset path="res/duck-diffuse.png">res/duck-diffuse.png</asset>
-    <asset path="res/sample.scene">res/sample.scene</asset>
-    <asset path="res/duck.gpb">res/duck.gpb</asset>
-    <asset path="res/duck.material">res/duck.material</asset>
-    <asset path="res/grid.material">res/grid.material</asset>
+    <asset path="res/duck.png">res/duck.png</asset>
+    <asset path="res/mesh.scene">res/mesh.scene</asset>
+    <asset path="res/mesh.gpb">res/mesh.gpb</asset>
+    <asset path="res/mesh.material">res/mesh.material</asset>
     <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
     <asset path="game.config">game.config</asset>