Skip to content

Commit

Permalink
Load model from app repo + collision on demand
Browse files Browse the repository at this point in the history
  • Loading branch information
andresoviedo committed Sep 11, 2018
1 parent 9bee49a commit dc5c534
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ The purpose of this application is to learn and share how to draw using OpenGL l
* Collada format (DAE): https://en.wikipedia.org/wiki/COLLADA


News (07/09/2018)
News (11/09/2018)
=================

* New: Reduced app size to only 1 Mbyte
* New: Skeleton Animation
* New: File chooser to load files from any where
* New: Load models from app repository
* Fix: Collada Animator Performance improved
* Fix: Refactoring
* Fix: Several bugs fixed
Expand Down Expand Up @@ -156,6 +158,9 @@ ChangeLog

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

- 2.2.0 (11/09/2018)
- (n) Load models from app repository
- (i) Reduced app size to only 1 Megabyte
- 2.1.0 (07/09/2018)
- (n) Skeleton Animation
- (n) File chooser to load files from any where
Expand Down
Binary file added app/src/main/assets/models/ToyPlane.bmp
Binary file not shown.
20 changes: 20 additions & 0 deletions app/src/main/assets/models/triangle.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# triangle

#
# (3)------(2)
# | /
# | /
# | /
# | /
# (1)

v -0.5 -0.25 0
v 0.5 -0.25 0
v 0.0 0.5 0

v -0.5 0.25 0
v 0.5 0.25 0
v 0.0 -0.5 0

f 1 2 3
f 4 5 6
Binary file added app/src/main/assets/models/wolf.stl
Binary file not shown.

0 comments on commit dc5c534

Please sign in to comment.