Browse Source

Fixed project files for BB and Android because some of the res file names changed.
Also fixed the aspect ratio of some of the samples.

Darryl Gough 12 years ago
parent
commit
b71d230274

+ 1 - 0
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"); 

+ 1 - 0
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");

+ 1 - 1
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"/>

+ 1 - 1
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>

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 0 - 0
samples/character/res/atc/character.dds → samples/character/res/atc/boy.dds


+ 0 - 0
samples/character/res/dxt/character.dds → samples/character/res/dxt/boy.dds


+ 0 - 0
samples/character/res/pvrtc/character.pvr → samples/character/res/pvrtc/boy.pvr