diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 8ad94fe..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/editor.xml b/.idea/editor.xml
new file mode 100644
index 0000000..ebda570
--- /dev/null
+++ b/.idea/editor.xml
@@ -0,0 +1,346 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 53624c9..ce52bcf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,4 +15,5 @@
+
\ No newline at end of file
diff --git a/.idea/modeler.iml b/.idea/modeler.iml
deleted file mode 100644
index 7fb9afb..0000000
--- a/.idea/modeler.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2a284c4..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..5fa7779
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "lastFilter": {
+ "state": "OPEN",
+ "assignee": "chapatt"
+ }
+}
+ {
+ "selectedUrlAndAccountId": {
+ "url": "git@github.com:chapatt/modeler.git",
+ "accountId": "2985e6c7-a2cc-4147-a551-f05898efe2fe"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 5,
+ "fromUser": false
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1780247400911
+
+
+ 1780247400911
+
+
+
+
+
+
+
+ 1780972061912
+
+
+
+ 1780972061912
+
+
+
+ 1780972108913
+
+
+
+ 1780972108913
+
+
+
+ 1780972127971
+
+
+
+ 1780972127971
+
+
+
+ 1780972157681
+
+
+
+ 1780972157681
+
+
+
+ 1780972174549
+
+
+
+ 1780972174549
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
deleted file mode 100644
index 659f1a6..0000000
--- a/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "configurations": [
- {
- "name": "Win32",
- "includePath": [
- "${workspaceFolder}/**",
- "C:\\VulkanSDK\\1.3.250.0\\Include",
- "/Users/chase/VulkanSDK/1.3.250.0/macOS/include"
- ],
- "defines": [
- "_DEBUG",
- "UNICODE",
- "_UNICODE"
- ],
- "compilerPath": "C:\\msys64\\ucrt64\\bin\\gcc.exe",
- "cStandard": "c99",
- "cppStandard": "gnu++17",
- "intelliSenseMode": "windows-gcc-x64",
- "configurationProvider": "ms-vscode.makefile-tools"
- }
- ],
- "version": 4
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 6d55d5f..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "files.associations": {
- "vulkan.h": "c",
- "vulkan_metal.h": "c"
-}
-}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 01a2e40..0000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "tasks": [
- {
- "label": "make build",
- "type": "shell",
- "command": "",
- "args": [
- "make",
- "--directory=${workspaceFolder};"
- ],
- "problemMatcher": [
- "$gcc"
- ],
- "group": "build"
- },
- {
- "type": "cppbuild",
- "label": "C/C++: gcc.exe build active file",
- "command": "C:\\msys64\\ucrt64\\bin\\gcc.exe",
- "args": [
- "-fdiagnostics-color=always",
- "-g",
- "${file}",
- "-o",
- "${fileDirname}\\${fileBasenameNoExtension}.exe"
- ],
- "options": {
- "cwd": "${fileDirname}"
- },
- "problemMatcher": [
- "$gcc"
- ],
- "group": {
- "kind": "build",
- "isDefault": true
- },
- "detail": "Task generated by Debugger."
- }
- ],
- "version": "2.0.0"
-}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 656e346..e0dbe70 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ifeq ($(OS),Windows_NT)
SED=sed
ANDROID_NDK=/Users/chapa/AppData/Local/Android/Sdk/ndk/28.0.12674087
ANDROID_TOOLCHAIN=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64
- VULKAN_SDK=/VulkanSDK/1.4.328.1
+ VULKAN_SDK=/VulkanSDK/1.4.350.0
GLSLC=$(VULKAN_SDK)/Bin/glslc
else
UNAME_S := $(shell uname -s)
@@ -38,7 +38,10 @@ ifdef ANDROID
TARGET=aarch64-linux-android
API=21
LDLIBS+=-lvulkan
- ALL_TARGET=modeler_android.a imgui.a
+ ALL_TARGET=modeler_android.a
+ifdef ENABLE_IMGUI
+ ALL_TARGET+=imgui.a
+endif
CFLAGS+=--target=$(TARGET)$(API)
CFLAGS+=-I$(ANDROID_TOOLCHAIN)/sysroot/usr/include
CFLAGS+=-DVK_USE_PLATFORM_ANDROID_KHR
@@ -51,8 +54,6 @@ else ifdef IOS
CFLAGS+=-DVK_USE_PLATFORM_METAL_EXT
CFLAGS+=--target=arm64-apple-ios
else ifeq ($(OS),Windows_NT)
- CC=/msys64/mingw64/bin/gcc
- CXX=/msys64/mingw64/bin/g++
CFLAGS+=-I$(VULKAN_SDK)/Include -mwindows -municode
LDFLAGS+=-L$(VULKAN_SDK)/Lib
LDLIBS+=-lvulkan-1 -ldwmapi
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index f7260c5..144502e 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -4,17 +4,21 @@ plugins {
}
android {
- namespace = "io.abalog.modeler"
+ namespace = "io.abalog.chess"
compileSdk = 35
defaultConfig {
- applicationId = "io.abalog.modeler"
+ applicationId = "io.abalog.chess"
minSdk = 30
targetSdk = 35
- versionCode = 1
- versionName = "1.0"
+ versionCode = 3
+ versionName = "1.0.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+ ndk {
+ abiFilters.add("arm64-v8a")
+ }
}
buildTypes {
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..e084865
Binary files /dev/null and b/android/app/src/main/ic_launcher-playstore.png differ
diff --git a/android/app/src/main/java/io/abalog/modeler/MainActivity.kt b/android/app/src/main/java/io/abalog/modeler/MainActivity.kt
index 330f9ba..3526c72 100644
--- a/android/app/src/main/java/io/abalog/modeler/MainActivity.kt
+++ b/android/app/src/main/java/io/abalog/modeler/MainActivity.kt
@@ -1,4 +1,4 @@
-package io.abalog.modeler
+package io.abalog.chess
import com.google.androidgamesdk.GameActivity
import android.view.WindowInsets
diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/android/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-