From f5f5ce0d33467b01e7830c580dc06e34739259c2 Mon Sep 17 00:00:00 2001 From: victorfisac Date: Wed, 8 Jun 2016 17:27:13 +0200 Subject: [PATCH 1/3] Fix default android project game with new functions --- templates/android_project/jni/basic_game.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/android_project/jni/basic_game.c b/templates/android_project/jni/basic_game.c index 8a0413c3f..a1adb2873 100644 --- a/templates/android_project/jni/basic_game.c +++ b/templates/android_project/jni/basic_game.c @@ -43,7 +43,7 @@ void android_main(struct android_app *app) int framesCounter = 0; // Used to count frames - PlayMusicStream("ambient.ogg"); + PlayMusicStream(0, "ambient.ogg"); SetTargetFPS(60); // Not required on Android, already locked to 60 fps //-------------------------------------------------------------------------------------- @@ -53,7 +53,7 @@ void android_main(struct android_app *app) { // Update //---------------------------------------------------------------------------------- - UpdateMusicStream(); + UpdateMusicStream(0); switch(currentScreen) { @@ -74,7 +74,7 @@ void android_main(struct android_app *app) // TODO: Update TITLE screen variables here! // Press enter to change to GAMEPLAY screen - if (GetGestureType() == GESTURE_TAP) + if (IsGestureDetected(GESTURE_TAP)) { PlaySound(fx); currentScreen = GAMEPLAY; @@ -85,7 +85,7 @@ void android_main(struct android_app *app) // TODO: Update GAMEPLAY screen variables here! // Press enter to change to ENDING screen - if (GetGestureType() == GESTURE_TAP) + if (IsGestureDetected(GESTURE_TAP)) { PlaySound(fx); currentScreen = ENDING; @@ -96,7 +96,7 @@ void android_main(struct android_app *app) // TODO: Update ENDING screen variables here! // Press enter to return to TITLE screen - if (GetGestureType() == GESTURE_TAP) + if (IsGestureDetected(GESTURE_TAP)) { PlaySound(fx); currentScreen = TITLE; From 8323f81ab598d9a9e6720e55eb7269e410f10d2e Mon Sep 17 00:00:00 2001 From: victorfisac Date: Wed, 8 Jun 2016 17:27:55 +0200 Subject: [PATCH 2/3] Add physac module to android compile instructions... ... and switch from debug build to release --- src/android/jni/Android.mk | 1 + templates/android_project/jni/Android.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/android/jni/Android.mk b/src/android/jni/Android.mk index 66851d088..819ca79dc 100644 --- a/src/android/jni/Android.mk +++ b/src/android/jni/Android.mk @@ -47,6 +47,7 @@ LOCAL_SRC_FILES :=\ ../../utils.c \ ../../audio.c \ ../../external/stb_vorbis.c \ + ../../physac.c \ # Required includes paths (.h) LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../.. diff --git a/templates/android_project/jni/Android.mk b/templates/android_project/jni/Android.mk index fe4ba813b..15a21695d 100644 --- a/templates/android_project/jni/Android.mk +++ b/templates/android_project/jni/Android.mk @@ -83,7 +83,7 @@ LOCAL_SRC_FILES := basic_game.c LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include # Required flags for compilation: defines PLATFORM_ANDROID -LOCAL_CFLAGS := -Wall -std=c99 -g -DPLATFORM_ANDROID +LOCAL_CFLAGS := -Wall -std=c99 -DPLATFORM_ANDROID # Linker required libraries (not many...) LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2 -lOpenSLES From cbda329bfde0cadc5a1608f8c30c6b7778dec2df Mon Sep 17 00:00:00 2001 From: victorfisac Date: Thu, 9 Jun 2016 22:12:46 +0200 Subject: [PATCH 3/3] Removed physac old module from Android MK file --- src/android/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/src/android/jni/Android.mk b/src/android/jni/Android.mk index 819ca79dc..66851d088 100644 --- a/src/android/jni/Android.mk +++ b/src/android/jni/Android.mk @@ -47,7 +47,6 @@ LOCAL_SRC_FILES :=\ ../../utils.c \ ../../audio.c \ ../../external/stb_vorbis.c \ - ../../physac.c \ # Required includes paths (.h) LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../..