Przeglądaj źródła

Fixed samples on Android. (Tested on Samsung Galaxy S4)

seanpaultaylor 12 lat temu
rodzic
commit
e81eb3eebf

+ 1 - 6
samples/character/android/build.xml

@@ -61,13 +61,11 @@
        -->
        -->
     <target name="-post-compile">
     <target name="-post-compile">
         <copy file="../game.png.config" tofile="assets/game.config"/>
         <copy file="../game.png.config" tofile="assets/game.config"/>
-        <copy file="../res/common/arial40.gpb" tofile="assets/res/common/arial40.gpb"/>
         <copy file="../res/design/backboard.png" tofile="assets/res/png/backboard.png"/>
         <copy file="../res/design/backboard.png" tofile="assets/res/png/backboard.png"/>
         <copy file="../res/design/basketball.png" tofile="assets/res/png/basketball.png"/>
         <copy file="../res/design/basketball.png" tofile="assets/res/png/basketball.png"/>
         <copy file="../res/design/basketballnet.png" tofile="assets/res/png/basketballnet.png"/>
         <copy file="../res/design/basketballnet.png" tofile="assets/res/png/basketballnet.png"/>
         <copy file="../res/design/book.png" tofile="assets/res/png/book.png"/>
         <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/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/boy.png" tofile="assets/res/png/boy.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/decals.png" tofile="assets/res/png/decals.png"/>
         <copy file="../res/design/door.png" tofile="assets/res/png/door.png"/>
         <copy file="../res/design/door.png" tofile="assets/res/png/door.png"/>
@@ -75,12 +73,9 @@
         <copy file="../res/design/easel.png" tofile="assets/res/png/easel.png"/>
         <copy file="../res/design/easel.png" tofile="assets/res/png/easel.png"/>
         <copy file="../res/design/floor.png" tofile="assets/res/png/floor.png"/>
         <copy file="../res/design/floor.png" tofile="assets/res/png/floor.png"/>
         <copy file="../res/design/floortiles.png" tofile="assets/res/png/floortiles.png"/>
         <copy file="../res/design/floortiles.png" tofile="assets/res/png/floortiles.png"/>
+        <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
         <copy file="../res/design/gamepad.png" tofile="assets/res/png/gamepad.png"/>
         <copy file="../res/design/gamepad.png" tofile="assets/res/png/gamepad.png"/>
         <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
         <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
-        <copy file="../res/common/scene.gpb" tofile="assets/res/common/scene.gpb"/>
-        <copy file="../res/common/scene.material" tofile="assets/res/common/scene.material"/>
-        <copy file="../res/common/scene.physics" tofile="assets/res/common/scene.physics"/>
-        <copy file="../res/common/scene.scene" tofile="assets/res/common/scene.scene"/>
         <copy file="../res/design/shadow.png" tofile="assets/res/png/shadow.png"/>
         <copy file="../res/design/shadow.png" tofile="assets/res/png/shadow.png"/>
         <copy file="../res/design/storageorganizer.png" tofile="assets/res/png/storageorganizer.png"/>
         <copy file="../res/design/storageorganizer.png" tofile="assets/res/png/storageorganizer.png"/>
         <copy file="../res/design/tableleg1.png" tofile="assets/res/png/tableleg1.png"/>
         <copy file="../res/design/tableleg1.png" tofile="assets/res/png/tableleg1.png"/>

+ 5 - 6
samples/lua/android/build.xml

@@ -60,14 +60,13 @@
        -->
        -->
     <target name="-post-compile">
     <target name="-post-compile">
         <copy file="../game.config" tofile="assets/game.config"/>
         <copy file="../game.config" tofile="assets/game.config"/>
-        <copy file="../res/lua.scene" tofile="assets/res/lua.scene"/>
-        <copy file="../res/box.gpb" tofile="assets/res/box.gpb"/>
-        <copy file="../res/box.material" tofile="assets/res/box.material"/>
-        <copy file="../res/grid.material" tofile="assets/res/grid.material"/>
-        <copy file="../res/box-diffuse.png" tofile="assets/res/box-diffuse.png"/>
-        <copy file="../res/arial40.gpb" tofile="assets/res/arial40.gpb"/>
         <copy file="../res/ai.lua" tofile="assets/res/ai.lua"/>
         <copy file="../res/ai.lua" tofile="assets/res/ai.lua"/>
+        <copy file="../res/arial.gpb" tofile="assets/res/arial.gpb"/>
         <copy file="../res/game.lua" tofile="assets/res/game.lua"/>
         <copy file="../res/game.lua" tofile="assets/res/game.lua"/>
+        <copy file="../res/lua.gpb" tofile="assets/res/lua.gpb"/>
+        <copy file="../res/lua.material" tofile="assets/res/lua.material"/>
+        <copy file="../res/lua.scene" tofile="assets/res/lua.scene"/>
+        <copy file="../res/lua-logo.png" tofile="assets/res/lua-logo.png"/>
         <copy todir="assets/res/shaders">
         <copy todir="assets/res/shaders">
             <fileset dir="../../../gameplay/res/shaders"/>
             <fileset dir="../../../gameplay/res/shaders"/>
         </copy>
         </copy>

+ 1 - 1
samples/mesh/android/jni/Android.mk

@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := libgameplay.a
 include $(PREBUILT_STATIC_LIBRARY)
 include $(PREBUILT_STATIC_LIBRARY)
 
 
 # libpng
 # libpng
-LOCAL_PATH := $(LIBPNG_PATH)
+LOCAL_PATH := $(PNG_PATH)
 include $(CLEAR_VARS)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libpng 
 LOCAL_MODULE    := libpng 
 LOCAL_SRC_FILES := libpng.a
 LOCAL_SRC_FILES := libpng.a

+ 1 - 0
samples/particles/android/build.xml

@@ -67,6 +67,7 @@
         <copy file="../res/explosion.png" tofile="assets/res/explosion.png"/>
         <copy file="../res/explosion.png" tofile="assets/res/explosion.png"/>
         <copy file="../res/fire.particle" tofile="assets/res/fire.particle"/>
         <copy file="../res/fire.particle" tofile="assets/res/fire.particle"/>
         <copy file="../res/fire.png" tofile="assets/res/fire.png"/>
         <copy file="../res/fire.png" tofile="assets/res/fire.png"/>
+        <copy file="../res/grid.material" tofile="assets/res/grid.material"/>
         <copy file="../res/smoke.particle" tofile="assets/res/smoke.particle"/>
         <copy file="../res/smoke.particle" tofile="assets/res/smoke.particle"/>
         <copy file="../res/smoke.png" tofile="assets/res/smoke.png"/>
         <copy file="../res/smoke.png" tofile="assets/res/smoke.png"/>
         <copy todir="assets/res/shaders">
         <copy todir="assets/res/shaders">