Skip to content

Commit

Permalink
release 23.12.214
Browse files Browse the repository at this point in the history
  • Loading branch information
@azhirnov
azhirnov committed Dec 12, 2023
1 parent 62036e9 commit 49e3c9d
Show file tree
Hide file tree
Showing 1,259 changed files with 78,099 additions and 16,419 deletions.
21 changes: 19 additions & 2 deletions AE/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,26 @@

cmake_minimum_required( VERSION 3.10 FATAL_ERROR )

# CMAKE_BUILD_TYPE is not defined if used IDE
if (DEFINED CMAKE_BUILD_TYPE)
if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Develop") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Profile") OR
(${CMAKE_BUILD_TYPE} STREQUAL "Release") )
# ok
else()
message( STATUS "override unsupported CMAKE_BUILD_TYPE '${CMAKE_BUILD_TYPE}' by 'Release', see CMAKE_CONFIGURATION_TYPES in 'compilers.cmake'" )
set( CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "" FORCE )
endif()
endif()

#----------------------------------------------------------

project( "AE"
VERSION 23.10.199 # year, month, version
LANGUAGES C CXX )
VERSION 23.12.214 # year, month, version
LANGUAGES C CXX
DESCRIPTION "async game engine"
)
if (APPLE)
enable_language(OBJC)
endif()
Expand Down
1 change: 0 additions & 1 deletion AE/android/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
/local.properties
/build
/captures
/keystore
2 changes: 1 addition & 1 deletion AE/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.android.tools.build:gradle:8.1.4'
}
}

Expand Down
7 changes: 4 additions & 3 deletions AE/android/demo/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -11,14 +11,14 @@ android {
defaultConfig {
applicationId 'AE.Demo'
minSdkVersion 24 // for vulkan
targetSdkVersion 33
targetSdkVersion 34

ndk {
abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
}
externalNativeBuild {
cmake {
arguments '-DANDROID_STL=c++_static',
arguments '-DANDROID_STL=c++_static', // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
'-DANDROID_ARM_NEON=ON',
'-DAE_ENABLE_VULKAN=ON'
}
Expand All @@ -30,6 +30,7 @@ android {
//debuggable true // to enable logcat in release
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

Expand Down
45 changes: 21 additions & 24 deletions AE/android/demo/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,34 @@
<!-- min Vulkan API version: 1.0.82 -->
<uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
<uses-permission android:name="android.permission.INTERNET" android:required="true" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />

<application
android:name=".DemoApplication"
android:allowBackup="false"
android:fullBackupContent="false"
android:label="AE Demo"
android:hardwareAccelerated="true"
android:isGame="true">
android:name=".DemoApplication"
android:label="AE Demo"
android:hardwareAccelerated="true"
android:isGame="true">

<activity
android:name=".DemoActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="userLandscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<activity
android:name=".DemoActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="userLandscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- for profiling -->
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>

</application>
</manifest>
5 changes: 5 additions & 0 deletions AE/android/demo/src/main/java/AE/demo/DemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ public final class DemoActivity
Log.i(TAG, "onStop");
super.onStop();
}

@Override public void onBackPressed() {
super.onBackPressed();
this.finish();
}
}
7 changes: 4 additions & 3 deletions AE/android/engine/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 24 // 24+ for vulkan
targetSdkVersion 33
targetSdkVersion 34
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

Expand All @@ -20,7 +21,7 @@ android {
}

dependencies {
implementation 'androidx.core:core:1.10.1'
implementation 'androidx.core:core:1.12.0'
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}
6 changes: 3 additions & 3 deletions AE/android/engine/src/main/java/AE/engine/BaseActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class BaseActivity
View.OnTouchListener,
SensorEventListener
{
public static final String TAG = "AE";
public static final String TAG = "<<<< AE >>>>";

private int _wndID = 0;

Expand Down Expand Up @@ -291,15 +291,15 @@ public void Close ()
//-----------------------------------------------------------------------------
// native

private static native int native_OnCreate (Object wnd);
private static native int native_OnCreate (Object wnd);
private static native void native_OnDestroy (int id);
private static native void native_OnStart (int id);
private static native void native_OnStop (int id);
private static native void native_OnEnterForeground (int id);
private static native void native_OnEnterBackground (int id);
private static native void native_SurfaceChanged (int id, Object surface);
private static native void native_SurfaceDestroyed (int id);
private static native int native_Update (int id);
private static native int native_Update (int id);
private static native void native_OnKey (int id, int keycode, int action, int repeatCount);
private static native void native_OnTouch (int id, int action, int index, int count, float[] data);
private static native void native_OnOrientationChanged (int id, int newOrientation);
Expand Down
6 changes: 2 additions & 4 deletions AE/android/engine/src/main/java/AE/engine/BaseApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ private void _SendDirectories ()
File internalCache = getCacheDir();
File externalPath = getExternalFilesDir(null);
File externalCache = getExternalCacheDir();
File externalStorage = Environment.getExternalStorageDirectory();

native_SetDirectories(
(internalPath == null ? "" : internalPath.getAbsolutePath() ),
(internalCache == null ? "" : internalCache.getAbsolutePath() ),
(externalPath == null ? "" : externalPath.getAbsolutePath() ),
(externalCache == null ? "" : externalCache.getAbsolutePath() ),
(externalStorage == null ? "" : externalStorage.getAbsolutePath()) );
(externalCache == null ? "" : externalCache.getAbsolutePath() ));
}

private void _SendSystemInfo ()
Expand Down Expand Up @@ -111,7 +109,7 @@ public final boolean IsNetworkConnected ()
// native

private static native void native_OnCreate (Object app, Object assetMngr);
private static native void native_SetDirectories (String internal, String internalCache, String external, String externalCache, String externalStorage);
private static native void native_SetDirectories (String internal, String internalCache, String external, String externalCache);
private static native void native_SetSystemInfo (String iso3Lang0, String iso3Lang1);
private static native void native_SetDisplayInfo (int width, int height, float xdpi, float ydpi, int orientation);
}
14 changes: 10 additions & 4 deletions AE/android/test/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdk 34

defaultConfig {
applicationId 'AE.Test'
minSdkVersion 24 // for vulkan
targetSdkVersion 33
targetSdkVersion 34

ndk {
abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
}
externalNativeBuild {
cmake {
arguments '-DANDROID_STL=c++_static',
arguments '-DANDROID_STL=c++_static', // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
'-DANDROID_ARM_NEON=ON',
'-DAE_ENABLE_VULKAN=ON'
}
Expand All @@ -22,9 +22,10 @@ android {

buildTypes {
release {
//debuggable true // to enable logcat in release
debuggable true // to enable logcat in release
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

Expand All @@ -36,6 +37,11 @@ android {
path '../../CMakeLists.txt'
}
}
sourceSets {
main {
assets.srcDirs = ['../../../AE-Temp/engine/graphics/vk']
}
}
packagingOptions {
jniLibs {
excludes += ['lib/**/*.so']
Expand Down
45 changes: 21 additions & 24 deletions AE/android/test/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,34 @@
<!-- min Vulkan API version: 1.0.82 -->
<uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
<uses-permission android:name="android.permission.INTERNET" android:required="true" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />

<application
android:name=".TestApplication"
android:allowBackup="false"
android:fullBackupContent="false"
android:label="AE tests"
android:hardwareAccelerated="true"
android:isGame="true">
android:name=".TestApplication"
android:label="AE tests"
android:hardwareAccelerated="true"
android:isGame="true">

<activity
android:name=".TestActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="userLandscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<activity
android:name=".TestActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:resizeableActivity="true"
android:screenOrientation="userLandscape"
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- for profiling -->
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
</intent-filter>
</activity>

</application>
</manifest>
11 changes: 2 additions & 9 deletions AE/build_scripts/android/_build-debug.bat
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
cd ../../android
rmdir /Q /S ".gradle"
rmdir /Q /S ".idea"
rmdir /Q /S "build"
rmdir /Q /S "engine/build"
rmdir /Q /S "test/.cxx"
rmdir /Q /S "test/build"
rmdir /Q /S "demo/.cxx"
rmdir /Q /S "demo/build"

gradlew buildCMakeDebug[arm64-v8a]
gradlew assembleDebug
::gradlew buildCMakeDebug[arm64-v8a]
::gradlew buildCMakeDebug[armeabi-v7a]
5 changes: 5 additions & 0 deletions AE/build_scripts/android/_build-release.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cd ../../android

gradlew assembleRelease
::gradlew buildCMakeRelWithDebInfo[arm64-v8a]
::gradlew buildCMakeRelWithDebInfo[armeabi-v7a]
2 changes: 1 addition & 1 deletion AE/build_scripts/android/build-debug.bat
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"_build-debug.bat" && pause
"cleanup.bat" && "_build-debug.bat" && pause
1 change: 1 addition & 0 deletions AE/build_scripts/android/build-release.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"cleanup.bat" && "_build-release.bat" && pause
2 changes: 2 additions & 0 deletions AE/build_scripts/android/cleanup.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ rmdir /Q /S "engine\build"

rmdir /Q /S "test\.cxx"
rmdir /Q /S "test\build"

cd ../build_scripts/android
3 changes: 3 additions & 0 deletions AE/build_scripts/android/copy-graphics-test-result.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
adb pull "sdcard/Android/data/AE.Test/cache/tests_graphics_vulkan_refdump/Mali-G57 MC2" "C:\Projects\AllinOne\AE\engine\tests\graphics\Vulkan\ref"
adb pull "sdcard/Android/data/AE.Test/cache/tests_graphics_vulkan_refimg/Mali-G57 MC2" "C:\Projects\AllinOne\AE-Data\tests\graphics\vulkan"
pause
3 changes: 3 additions & 0 deletions AE/build_scripts/clone_3party.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ git clone --bare "https://github.com/google/hardware-perfcounter.git" "hardware-
rmdir /Q /S "hardware-perfcounter-envytools"
git clone --bare "https://github.com/freedreno/envytools.git" "hardware-perfcounter-envytools"

rmdir /Q /S "xxHash"
git clone --bare "https://github.com/Cyan4973/xxHash.git" "xxHash"

rmdir /Q /S "Abseil"
git clone --bare "https://github.com/abseil/abseil-cpp.git" "Abseil"

Expand Down
9 changes: 9 additions & 0 deletions AE/build_scripts/mac_arm64/init-vk.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
cd ../../..
rm -rf _build_arm64

mkdir _build_arm64
cd _build_arm64
cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 -DAE_ENABLE_VULKAN=ON "../AE"

read -p "open project?"
open ./AE.xcodeproj
5 changes: 4 additions & 1 deletion AE/build_scripts/mac_arm64/init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ rm -rf _build_arm64

mkdir _build_arm64
cd _build_arm64
cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 "../AE"
cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 -DAE_ENABLE_METAL=ON "../AE"

read -p "open project?"
open ./AE.xcodeproj
Loading

0 comments on commit 49e3c9d

Please sign in to comment.