gltf animations + refactoring

Author: andresoviedo

CHANGELOG.md

@@ -3,6 +3,12 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 4.1.0 (22/10/2024)
+    - (n) Gltf Animations
+    - (n) Android Preferences for Settings
+    - (n) Loader: Integrated Khronos repository
+    - (i) Android view using Fragments
+    - (i) Android SDK and dependencies updated
 - 4.0.0 (04/09/2022)
     - (i) rebranding to org.the3deer
     - (i) master branch renamed to main
@@ -24,7 +30,6 @@ ChangeLog
     - (n) New gui axis + gui info
     - (f) fixed FPS counter
     - (i) some user options are being saved (camera settings)
-
 - 3.2.0 (02/02/2022)
     - (i) repository explorer improved - multiple index files
     - (f) smoothing fixed
@@ -57,7 +62,7 @@ ChangeLog
     - (f) Fixed overall bugs
 - 2.7.0 (13/11/2019)
     - (n) new blending force mode to 50%
-    - (f) fixed light rendering issues on shaders #125 (diffuse + specular)
+    - (f) fixed light rendering issues on renderers #125 (diffuse + specular)
     - (f) fixed bugs when DAE had multiple geometries #125
     - (f) fixed textures not being linked issue
     - (f) fixed performance issues: now rendering below 5% cpu & no ram allocation
@@ -71,7 +76,7 @@ ChangeLog
 - 2.5.0 (19/05/2019)
     - (n) new blending toggle
     - (n) new color toggle
-    - (i) engine refactoring: externalized shaders
+    - (i) engine refactoring: externalized renderers
     - (i) engine improved: fixed bugs and removed classes
 - 2.4.0 (16/05/2019)
     - (n) stereoscopic rendering: anaglyph + cardboard

README.md

@@ -13,13 +13,14 @@ The purpose of this application is to learn and share how to draw using OpenGL l
 * GLTF format (gltf): https://www.khronos.org/gltf/
 
 
-News (04/10/2022)
+News (22/10/2024)
 =================
 
-* Preparing version 4.0.0 for Google Play release...
-* New orthographic, isometric and free camera views
-* GLTF basic support :)
-* Rebranding to org.the3deer
+* Gltf Animations :D
+* Android view using Fragments
+* Android Preferences for Settings
+* Android SDK and dependencies updated
+* Loader: Integrated Khronos repository
 
 Demo
 ====
@@ -84,16 +85,16 @@ Features
   - [x] Multiple Rendering Modes 
     - [x] triangles
     - [x] wireframe
-    - [x] point cloud
+    - [ ] point cloud
     - [x] skeleton
   - [x] camera support
     - [x] perspective
-    - [x] orthographic
-    - [x] isometric views
-    - [x] free
-  - [x] skeletal animations (collada dae)
+    - [ ] orthographic
+    - [ ] isometric views
+    - [ ] free
+  - [x] skeletal animations (collada dae, gltf)
   - [x] ray collision detection
-  - [x] stereoscopic 3D: anaglyph + cardboard
+  - [ ] stereoscopic 3D: anaglyph + cardboard
   - [x] other:
      - [x] Polygon with holes
      - [x] Smoothing
@@ -102,8 +103,7 @@ Features
      - [x] Object picking
      - [x] file explorer
      - [x] repository explorer
-     - [x] texture loader
-     - [x] lightweight: only 1.3 Megabyte (embedded models excluded)
+     - [x] lightweight: only 8 Megabyte (3d models excluded)
 
 
 Try it
@@ -116,7 +116,7 @@ You can install the application in either of these ways:
   * Source code: clone the repository, compile with gradle and install with adb
 
 ```
-    export ANDROID_HOME=/home/$USER/Android/Sdk
+    export ANDROID_HOME=/home/$USER/Android/Sdk
     ./gradlew assembleDebug
     adb install -r app/build/outputs/apk/app-debug.apk
     adb shell am start -n org.andresoviedo.dddmodel2/org.the3deer.app.model3D.MainActivity
@@ -164,8 +164,9 @@ You may need one of this glasses to view models in 3D virtual reality.
 Dependencies
 ============
 
-* git submodule add https://github.com/the3deer/android-3D-engine.git engine (3d engine)
-* implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4'  (gltf json parser)
+In order to compile the application you must include this git submodule
+
+    git submodule add https://github.com/the3deer/android-3D-engine.git engine
 
 
 Documentation
@@ -180,7 +181,7 @@ Acknowledgement
 * For teaching how animation engine works: https://github.com/TheThinMatrix/OpenGL-Animation
 * To the lot of user's feedback: https://github.com/the3deer/android-3D-model-viewer/issues
 * For the GLTF parser https://github.com/javagl/JglTF
-* To the many infinite educational resources found in Internet for free :)
+* To the many infinite educational resources found on Internet for free, thank you ! :)
 
 
 Licenses
@@ -199,9 +200,10 @@ copies or substantial portions of the Software.
 Assets
 
  * cowboy       : Unlicense License - https://github.com/TheThinMatrix/OpenGL-Animation
+ * fox          : CC0: Low poly fox by PixelMannen, CC-BY 4.0: Rigging and animation by @tomkranis on Sketchfab
  * stormtrooper : MIT License - https://github.com/hujiulong/vue-3d-model
  * toyplane     : Editorial Uses Only - https://blog.turbosquid.com/turbosquid-3d-model-license/#Editorial-Usage
  * skybox sea   : https://learnopengl.com/Advanced-OpenGL/Cubemaps
  * skybox sand  : Copyright 2012 Mobialia - https://github.com/mobialia/jmini3d
- * repository (parts)  : Community contribution (Professsor S)
+ * models (parts)  : Community contribution (Professor S)
 

app/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "org.andresoviedo.dddmodel2"
-        minSdk 16
-        targetSdk 33
+        minSdk 21
+        targetSdk 34
 
         multiDexEnabled true
     }
@@ -36,14 +36,17 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'org.andresoviedo.dddmodel2'
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.8.0'
-    implementation 'androidx.navigation:navigation-fragment:2.5.1'
+    implementation 'javax.inject:javax.inject:1'
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.fragment:fragment:1.8.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-android:2.8.6'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation project(':engine')
 }

app/debug/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "org.the3deer.dddmodel2",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 30,
+      "versionName": "3.1.1",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "org.the3deer.dddmodel2",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 30,
+      "versionName": "3.1.1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/main/AndroidManifest.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-    package="org.andresoviedo.dddmodel2"
-    android:versionCode="33"
-    android:versionName="4.0.0">
+    android:versionCode="34"
+    android:versionName="5.0.0">
 
     <uses-sdk
         tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
 
     <uses-feature
-        android:glEsVersion="0x00020000"
+        android:glEsVersion="0x00030002"
         android:required="true" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -28,49 +27,14 @@
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="org.the3deer.app.model3D.view.MenuActivity"
-            android:label="@string/title_activity_menu"
-            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
-        </activity>
         <activity
             android:name="org.the3deer.util.view.TextActivity"
             android:label="@string/title_activity_text"
             android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
         </activity>
-        <activity
-            android:name="org.the3deer.app.model3D.view.ModelActivity"
-            android:label="@string/title_activity_model"
-            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
-
-            <!-- android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" -->
-        </activity>
-
-
-        <!-- Demos -->
-        <activity
-            android:name="org.the3deer.app.model3D.demo.GlyphsDemoActivity"
-            android:label="@string/title_activity_model"
-            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
-        </activity>
-        <activity
-            android:name="org.the3deer.app.model3D.demo.EarCutDemoActivity"
-            android:label="@string/title_activity_model"
-            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
-        </activity>
-
-
-        <!-- polybool -->
-        <activity
-            android:name="org.the3deer.polybool.demo.WebActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.NoActionBar">
-
-        </activity>
 
     </application>