Merge pull request #7 from andresoviedo/develop

project moved to gradle

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -1,34 +1,43 @@
-Android 3DModel Viewer
-======================
+Android 3D Model Viewer
+=======================
 
-This is a demo of OpenGL ES 2.0. 
+![codeship badge](https://codeship.com/projects/52cf9560-deb2-0134-4203-2aaddef843aa/status?branch=master)
+
+
+This is a demo of OpenGL ES 2.0.
 
 It is basically an android application with a 3D renderer (OpenGL ES 2.0) that can load 3D models.
 
 The purpose of this application is to learn and share how to draw using OpenGL language
 
 
-News (06/04/2016)
+News (27/02/2017)
 =================
 
-* Implemented selection of objects (click on Demo and touch the different objects)
-* Light rendering implemented
-* Toggle textures & lights
-* Released app on android market :) https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
+* Fixed loading of external resources
+* Project moved to gradle
+* /¡\ The app in the market is not up-to-date: I lost the keystore to sign the updates :(
+* /¡\ Latest version: [app-debug.apk](app/build/outputs/apk/app-debug.apk)
+
+
+Android Market
+==============
+
+https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
 
 
 About
 =====
 
 Load 3D models and see how to do it with this open source code application.
 
-The main purpose of this app is to show how to draw in android using the OpenGL 2.0 by sharing the source code. 
-So please, don't expect this application to be much richer or nicer than the ones already published in the app store, 
-but at least it's unique in the sense it's opened to anyone who wants to contribute or don't want to start a similar 
+The main purpose of this app is to show how to draw in android using the OpenGL 2.0 by sharing the source code.
+So please, don't expect this application to be much richer or nicer than the ones already published in the app store,
+but at least it's unique in the sense it's opened to anyone who wants to contribute or don't want to start a similar
 project from scratch.
 
-As this is my first android app and Im still learning the OpenGL 2.0 language, it is highly probable that there are bugs; 
-but I will try to continue improving the app and adding more features. So please send me your comments, suggestions or 
+As this is my first android app and Im still learning the OpenGL 2.0 language, it is highly probable that there are bugs;
+but I will try to continue improving the app and adding more features. So please send me your comments, suggestions or
 complains to [email protected].
 
 The app comes with some included 3D models that were taken for free from Internet (http://www.turbosquid.com).
@@ -38,13 +47,13 @@ Whats next
 ==========
 
 * Choose different texture
-* Many more... 
+* Many more...
 
 
 Future
 ======
 
-* Integrate app with assimp library to load more file formats (http://www.assimp.org/) 
+* Integrate app with assimp library to load more file formats (http://www.assimp.org/)
 
 
 Features
@@ -56,49 +65,59 @@ Features
   - colors
   - lighting
   - display of normals
-  - display of bounding box 
+  - display of bounding box
   - scaling, rotation
   - object selection
   - touch support!
-    - tap to select object 
+    - tap to select object
     - drag to move camera
     - rotate to rotate camera
     - pinch & spread to zoom in/out the camera
   - moving of objects (not yet!)
-  - primitive collision detection (not yet!) 
+  - primitive collision detection (not yet!)
   - animation of sprites (not yet!)
 
 
 Try it
 ======
 
-  1. Install app from google play https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
-  1. Or download the apk to your device and install it https://github.com/andresoviedo/android-3DModel/raw/master/android-3DModel.apk
-  1. Or clone source, compile project from your android IDE, connect your android device and run application 
+  1. Play Store:  https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
+  1. APK: [app-debug.apk](app/build/outputs/apk/app-debug.apk)
+  1. Gradle: clone the repository, compile with gradle and install with adb
   2. Open the application. You should see a menu. From there you can load some demos or load your own model
-  3. Once the scenario is loaded, pinch and rotate to see the 3D scene from another perspective. 
+  3. Once the scenario is loaded, pinch and rotate to see the 3D scene from another perspective.
 
 
 Screenshot
 ==========
 
-![Screenshot1](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot1.png)
-![Screenshot2](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot2.png)
-![Screenshot3](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot3.png)
-![Screenshot4](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot4.png)
-![Screenshot5](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot5.png)
-![Screenshot6](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot6.png)
-![Screenshot7](https://raw.github.com/andresoviedo/android-3D-model-viewer/master/screenshots/screenshot7.png)
+![Screenshot1](screenshots/screenshot1.png)
+![Screenshot2](screenshots/screenshot2.png)
+![Screenshot3](screenshots/screenshot3.png)
+![Screenshot4](screenshots/screenshot4.png)
+![Screenshot5](screenshots/screenshot5.png)
+![Screenshot6](screenshots/screenshot6.png)
+![Screenshot7](screenshots/screenshot7.png)
 
 
 Tests
 =====
 
+  - Tested on Alcatel Flash Plus 2 (android 6)
   - Tested on Nexus 7 3G 2012 (android 4.4.2)
   - Tested on BQ Aquaris 5 (android 4.2.1)
   - Tested on Samsung GT-S5280 (android 4.1.2)
 
 
+Build
+=====
+
+    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.dddmodel/org.andresoviedo.app.model3D.MainActivity
+
+
 Final Notes
 ===========
 
@@ -111,6 +130,10 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 2.0.0 (27/02/2017)
+ - (f) Fixed loading external files issue #6
+ - (i) Project moved to gradle
+
 - 1.2.0 (06/04/2016)
  - (n) Implemented selection of objects
 

app/build.gradle

@@ -0,0 +1,25 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        applicationId "org.andresoviedo.dddmodel"
+        minSdkVersion 8
+        targetSdkVersion 19
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:19.1.0'
+    compile 'commons-io:commons-io:2.5'
+    compile 'org.apache.commons:commons-lang3:3.5'
+}