Skip to content

Commit f9c224c

Browse files
committed
- (n) Skeleton Animation
- (n) File chooser to load files from any where - (f) Collada Animator fixed (INV_BIND_MATRIX, bind_shape_matrix) - (f) Collada Animator Performance improved - (f) Application refactoring (ContentUtils, Loaders, etc) - (f) Several bugs fixed
1 parent 3585b07 commit f9c224c

File tree

73 files changed

+52914
-3620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+52914
-3620
lines changed

README.md

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ The purpose of this application is to learn and share how to draw using OpenGL l
1212
* Collada format (DAE): https://en.wikipedia.org/wiki/COLLADA
1313

1414

15-
News (22/12/2017)
15+
News (07/09/2018)
1616
=================
1717

18-
* Implemented collision detection algorithm: ray-aabb + ray-triangle + octree
19-
* Support for collada files with skeletal animations :)
20-
* Fixed #28: Load texture feature is now available
18+
* New: Skeleton Animation
19+
* New: File chooser to load files from any where
20+
* Fix: Collada Animator Performance improved
21+
* Fix: Refactoring
22+
* Fix: Several bugs fixed
2123

2224

2325
Android Market
@@ -26,6 +28,13 @@ Android Market
2628
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="323" height="125">](https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel2)
2729

2830

31+
Notice
32+
======
33+
34+
Collada support is limited. Collada renderer currently supports a maximum of 60 bones.
35+
If you have any issue in general,please open an issue and attach model if possible, specifying Android version and Device model.
36+
37+
2938
About
3039
=====
3140

@@ -39,22 +48,23 @@ As this is my first android app and Im still learning the OpenGL 2.0 language, i
3948
but I will try to continue improving the app and adding more features. So please send me your comments, suggestions or
4049
complains by opening an [issue](https://github.com/andresoviedo/android-3D-model-viewer/issues) or email me to andresoviedo@gmail.com.
4150

42-
The app comes with some included 3D models that were taken for free from Internet (http://www.turbosquid.com).
51+
The app comes with some included 3D models that were taken for free from Internet.
4352

4453

4554
Whats next
4655
==========
4756

4857
* Stabilize app performance
58+
* Collada: Show bind pose, key frames and variate speed
4959
* Code refactoring
50-
* Carboard support?
51-
* Chromecast support?
52-
* ...
60+
* Carboard support
61+
* Chromecast support
5362

5463

5564
Features
5665
========
5766

67+
- Supports >= Android 2.2 (Froyo - API Level 8)
5868
- OpenGL ES 2.0 API
5969
- Formats: OBJ (wavefront), STL (STereoLithography) & DAE (Collada-BETA)
6070
- calculation of normals
@@ -65,7 +75,7 @@ Features
6575
- wireframe & points mode
6676
- bounding box drawing
6777
- object selection
68-
- camera support!
78+
- camera support
6979
- tap to select object
7080
- drag to move camera
7181
- rotate with 2 fingers to rotate camera
@@ -88,8 +98,8 @@ Try it
8898
adb shell am start -n org.andresoviedo.dddmodel2/org.andresoviedo.app.model3D.MainActivity
8999
```
90100

91-
* Open the application. You should see a menu. From there you can load some demos or load your own model
92-
* Once the scenario is loaded, pinch and rotate to see the 3D scene from another perspective.
101+
* Open the application. You should see a menu. From there you can load models
102+
* Once the model is rendered, pinch and rotate to see the 3D scene from another perspective.
93103

94104

95105
Screenshot
@@ -106,6 +116,18 @@ Screenshot
106116
![stormtrooper.gif](screenshots/stormtrooper.gif)
107117

108118

119+
Emulator
120+
========
121+
122+
You can run application in an emulator
123+
124+
// install some file provider (i.e. es file explorer)
125+
adb devices -l
126+
adb -s emulator-5554 install .\com.estrongs.android.pop_4.0.3.4-250_minAPI8(armeabi,x86)(nodpi).apk
127+
// push some files to test file loading
128+
adb -s emulator-5554 push .\app\src\main\assets\models /sdcard/download
129+
130+
109131
Final Notes
110132
===========
111133

@@ -130,6 +152,13 @@ ChangeLog
130152

131153
(f) fixed, (i) improved, (n) new feature
132154

155+
- 2.1.0 (07/09/2018)
156+
- (n) Skeleton Animation
157+
- (n) File chooser to load files from any where
158+
- (f) Collada Animator fixed (INV_BIND_MATRIX, bind_shape_matrix)
159+
- (f) Collada Animator Performance improved
160+
- (f) Application refactoring (ContentUtils, Loaders, etc)
161+
- (f) Several bugs fixed
133162
- 2.0.4 (22/12/2017)
134163
- (n) Implemented face collision detection algorithm: ray-triangle + octree
135164
- 2.0.3 (21/12/2017)

app/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 27
65

76
defaultConfig {
87
applicationId "org.andresoviedo.dddmodel2"
98
minSdkVersion 8
10-
targetSdkVersion 19
9+
targetSdkVersion 27
1110
}
1211

1312
signingConfigs {
@@ -26,9 +25,12 @@ android {
2625
signingConfig signingConfigs.release
2726
}
2827
}
28+
compileOptions {
29+
targetCompatibility 1.8
30+
sourceCompatibility 1.8
31+
}
2932
}
3033

3134
dependencies {
32-
compile 'com.android.support:support-v4:19.1.0'
33-
compile 'commons-io:commons-io:2.5'
35+
implementation 'com.android.support:support-compat:27.1.1'
3436
}

app/src/main/AndroidManifest.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="org.andresoviedo.dddmodel2"
4-
android:versionCode="16"
5-
android:versionName="2.0.2" >
5+
android:versionCode="17"
6+
android:versionName="2.1.0" >
67

78
<uses-sdk
8-
android:minSdkVersion="8"
9-
android:targetSdkVersion="19" />
10-
11-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
9+
android:minSdkVersion=""
10+
android:targetSdkVersion="27"
11+
tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
1212

1313
<uses-feature
1414
android:glEsVersion="0x00020000"
1515
android:required="true" />
1616

17+
<uses-permission
18+
android:name="android.permission.READ_EXTERNAL_STORAGE"/>
19+
1720
<application
1821
android:allowBackup="true"
1922
android:icon="@drawable/ic_launcher"
@@ -33,11 +36,6 @@
3336
android:label="@string/title_activity_menu"
3437
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
3538
</activity>
36-
<activity
37-
android:name="org.andresoviedo.app.model3D.view.DemoActivity"
38-
android:label="@string/title_activity_menu"
39-
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
40-
</activity>
4139
<activity
4240
android:name="org.andresoviedo.app.util.view.TextActivity"
4341
android:label="@string/title_activity_text"
Loading

0 commit comments

Comments
 (0)