fix android laggy camera bug

julesgrc0 · Mar 2, 2024 · 30c54df · 30c54df
1 parent 9555944
commit 30c54df
Show file tree

Hide file tree

Showing 42 changed files with 342 additions and 329 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,7 @@ if(ANDROID)
   add_definitions(-D__ANDROID__)
 
   add_library(${PROJECT_NAME} SHARED ${SOURCES})
-  target_link_libraries(${PROJECT_NAME} raylib zlibstatic android log)
+  target_link_libraries(${PROJECT_NAME} raylib zlibstatic json-c android log)
 elseif(UNIX AND NOT ANDROID)
   add_executable(${PROJECT_NAME} ${SOURCES})
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -144,42 +144,49 @@
     },
     {
       "name": "x64-release-windows",
+      "displayName": "x64 Release Windows",
       "configurePreset": "x64-release-windows",
       "inherits": ["base-build"]
     },
     {
       "name": "x86-release-windows",
+      "displayName": "x86 Release Windows",
       "configurePreset": "x86-release-windows",
       "inherits": ["base-build"]
     },
     {
       "name": "x64-release-linux",
+      "displayName": "x64 Release Linux",
       "configurePreset": "x64-release-linux",
       "inherits": ["base-build"]
     },
     {
       "name": "x86-release-linux",
+      "displayName": "x86 Release Linux",
       "configurePreset": "x86-release-linux",
       "inherits": ["base-build"]
     },
-
     {
       "name": "x64-debug-windows",
+      "displayName": "x64 Debug Windows",
       "configurePreset": "x64-debug-windows",
       "inherits": ["base-build"]
     },
     {
       "name": "x86-debug-windows",
+      "displayName": "x86 Debug Windows",
       "configurePreset": "x86-debug-windows",
       "inherits": ["base-build"]
     },
     {
       "name": "x64-debug-linux",
+      "displayName": "x64 Debug Linux",
       "configurePreset": "x64-debug-linux",
       "inherits": ["base-build"]
     },
     {
       "name": "x86-debug-linux",
+      "displayName": "x86 Debug Linux",
       "configurePreset": "x86-debug-linux",
       "inherits": ["base-build"]
     }

diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -3,28 +3,24 @@ plugins {
 }
 
 android {
-    signingConfigs {
-        create("release") {
-        }
-    }
     namespace = "com.julesgrc0.wispy"
     compileSdk = 34
-
     defaultConfig {
         applicationId = "com.julesgrc0.wispy"
-        minSdk = 34
+        minSdk = 21
+        targetSdk = 34
+
+
         versionCode = 1
         versionName = "alpha-0.0.5"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
             isJniDebuggable = false
             isMinifyEnabled = true
-            //isShrinkResources = true
-            //multiDexEnabled = true
+            isShrinkResources = true
+
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
@@ -40,23 +36,10 @@ android {
             path = file("../../CMakeLists.txt")
         }
     }
-    buildFeatures {
-        viewBinding = true
-    }
-    ndkVersion = "26.2.11394342"
     dependenciesInfo {
         includeInApk = false
         includeInBundle = false
     }
+    ndkVersion = "26.2.11394342"
     buildToolsVersion = "35.0.0 rc1"
-}
-
-dependencies {
-
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
diff --git a/src/core/bridge.h b/src/core/bridge.h
diff --git a/src/core/config.c b/src/core/config.c
@@ -5,7 +5,6 @@ w_config *load_config() {
   if (cfg == NULL)
     return NULL;
 
-#ifndef __ANDROID__
   char *config_path = malloc(MAX_PATH * 2);
   if (config_path == NULL)
     return NULL;
@@ -52,32 +51,21 @@ w_config *load_config() {
     json_object_put(root);
     free(data);
   } else {
-#endif // !__ANDROID__
-
+    memset(cfg, 0, sizeof(w_config));
     cfg->fullscreen = 1;
-    cfg->vsync = 0;
     cfg->msaa4x = 1;
 
-    cfg->max_fps = 0;
-    cfg->height = 0;
-    cfg->width = 0;
-
-#if defined(_DEBUG) && !defined(__ANDROID__)
-    cfg->fullscreen = 0;
-    cfg->height = RENDER_H;
+#if defined(_DEBUG) && !defined(PLATFORM_ANDROID)
     cfg->width = RENDER_W;
-#endif // _DEBUG
-
-#ifndef __ANDROID__
+    cfg->height = RENDER_H;
+    cfg->fullscreen = 0;
+#endif
   }
   free(config_path);
-#endif // !__ANDROID__
-
   return cfg;
 }
 
 void save_config(w_config *config) {
-#if !defined(_DEBUG) && !defined(__ANDROID__)
   char *config_path = malloc(MAX_PATH * 2);
   if (config_path == NULL)
     return;
@@ -112,5 +100,4 @@ void save_config(w_config *config) {
   json_object_put(root);
 
   free(config_path);
-#endif // !_DEBUG
 }
diff --git a/src/core/config.h b/src/core/config.h
@@ -12,6 +12,7 @@ typedef struct w_config {
   unsigned int height : 12;
 
   unsigned int max_fps : 10;
+
 } w_config;
 
 w_config *load_config();

diff --git a/src/core/controls.c b/src/core/controls.c
@@ -14,7 +14,7 @@ void destroy_controls(w_controls *kb) {
 }
 
 void update_controls(w_controls *kb) {
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   kb->jump = kb->is_jumping;
   if (!kb->is_breaking) {
     kb->left = kb->joystick.x < -0.5;
@@ -28,11 +28,11 @@ void update_controls(w_controls *kb) {
   kb->jump = IsKeyDown(KEY_SPACE);
   kb->inventory = IsKeyDown(KEY_RIGHT_ALT) || IsKeyDown(KEY_LEFT_SHIFT);
   kb->shift = IsKeyDown(KEY_RIGHT_SHIFT) || IsKeyDown(KEY_LEFT_SHIFT);
-#endif // __ANDROID__
+#endif
 }
 
 void clear_controls(w_controls *kb) {
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   kb->is_jumping = false;
   kb->is_breaking = false;
   kb->joystick = VEC_ZERO;
@@ -41,7 +41,7 @@ void clear_controls(w_controls *kb) {
   kb->key = 0;
 }
 
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
 bool check_collision_touch(Vector2 position, float size) {
   return !Vector2Equals(get_collision_touch(position, size), VEC_ZERO);
 }

diff --git a/src/core/controls.h b/src/core/controls.h
@@ -17,7 +17,7 @@ typedef struct w_controls {
     uint8_t key;
   };
 
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   Vector2 joystick;
   bool is_jumping;
   bool is_breaking;
@@ -31,7 +31,7 @@ void destroy_controls(w_controls *kb);
 void update_controls(w_controls *kb);
 void clear_controls(w_controls *kb);
 
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
 bool check_collision_touch(Vector2 position, float size);
 Vector2 get_nearest_touch(Vector2 position);
 Vector2 get_collision_touch(Vector2 position, float size);

diff --git a/src/core/mainframe.c b/src/core/mainframe.c
@@ -5,7 +5,7 @@ w_state *init_mainframe() {
   if (state == NULL)
     return NULL;
 
-#ifdef _DEBUG
+#if defined(_DEBUG)
   SetTraceLogLevel(LOG_ALL);
   SetRandomSeed(0);
   srand(0);

diff --git a/src/core/mainframe.h b/src/core/mainframe.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../screen/game.h"
-#include "../screen/loading.h"
-#include "../screen/menu.h"
+#include "../screens/game/game.h"
+#include "../screens/loading/loading.h"
+#include "../screens/menu/menu.h"
 #include "../stdafx.h"
 #include "state.h"
 

diff --git a/src/core/state.h b/src/core/state.h
@@ -29,9 +29,9 @@ typedef struct w_state {
 
   w_config *config;
 
-#ifdef _WIN32
+#if defined(PLATFORM_WINDOWS)
   HINSTANCE hInstance;
-#endif // _WIN32
+#endif
 
 } w_state;
 

diff --git a/src/core/utils/camera.h b/src/core/utils/camera.h
@@ -6,6 +6,7 @@
 
 typedef struct w_camera {
   float *matrix;
+  Vector2 target_position;
 } w_camera;
 
 w_camera *create_camera(float x, float y);

diff --git a/src/gui/action.c b/src/gui/action.c
@@ -15,7 +15,7 @@ w_guiaction *create_action(w_guicontext *ctx, Vector2 position, float size,
 }
 
 bool update_action(w_guiaction *act) {
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   bool clicked = check_collision_touch(act->position, act->size);
 #else
   bool clicked =

diff --git a/src/gui/button.c b/src/gui/button.c
@@ -32,7 +32,7 @@ void move_button(w_guibutton *button, Vector2 position) {
 }
 
 bool update_button(w_guibutton *button) {
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   bool is_hover = has_touch() && check_collision_touch_rect(button->rect);
 #else
   bool is_hover = CheckCollisionRecs(
@@ -46,7 +46,7 @@ bool update_button(w_guibutton *button) {
   DrawText(button->text, (int)button->position.x, (int)button->position.y,
            (int)button->ctx->font_size, color);
 
-#ifdef __ANDROID__
+#if defined(PLATFORM_ANDROID)
   return is_hover;
 #else
   return IsMouseButtonDown(MOUSE_LEFT_BUTTON) && is_hover;