rebranding fixes #221

Author: andresoviedo

CHANGELOG.md

@@ -3,8 +3,11 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 4.0.0 (04/09/2022)
+    - (i) rebranding to org.the3deer
+    - (i) master branch renamed to main
 - 3.5.0 (04/09/2022)
-    - (n) merged shadow + geometry demo into master branch
+    - (n) merged shadow + geometry demo into main branch
 - 3.4.1 (23/09/2022)
     - (f) bug fixing: lighting, textures, etc #176
     - (i) texture loading refactoring #61

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 The 3Deers
+Copyright (c) 2020 The 3Deer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 Android 3D Model Viewer
 =======================
 
-![travis-ci badge](https://travis-ci.org/the3deers/android-3D-model-viewer.svg?branch=master)
+![travis-ci badge](https://travis-ci.org/the3deer/android-3D-model-viewer.svg?branch=main)
 
 This is a demo of OpenGL ES 2.0.
 It is basically an android application with a 3D engine that can load Wavefront OBJ, STL, DAE & GLTF files.
@@ -13,12 +13,13 @@ 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 (17/09/2022)
+News (04/10/2022)
 =================
 
-* New version released 3.4.0
+* Preparing version 4.0.0...
 * New orthographic, isometric and free camera views
 * GLTF basic support :)
+* Rebranding to org.the3deer
 
 Demo
 ====
@@ -52,7 +53,7 @@ but at least it's opened to anyone who wants to contribute or don't want to star
 
 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 by opening an [issue](https://github.com/the3deers/android-3D-model-viewer/issues) or email me to [email protected].
+complains by opening an [issue](https://github.com/the3deer/android-3D-model-viewer/issues) or email me to [email protected].
 
 The app comes with some included 3D models that have different licenses.
 
@@ -118,7 +119,7 @@ You can install the application in either of these ways:
     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.andresoviedo.app.model3D.MainActivity
+    adb shell am start -n org.andresoviedo.dddmodel2/org.the3deer.app.model3D.MainActivity
 ```
 
 Open the application. You should see a menu. From there you can load models
@@ -156,8 +157,8 @@ Glases
 
 You may need one of this glasses to view models in 3D virtual reality.
 
-[<img src="https://raw.githubusercontent.com/the3deers/android-3D-model-viewer/master/market/glasses-3d.jpg">](https://amzn.to/2E8LhxC)
-[<img src="https://raw.githubusercontent.com/the3deers/android-3D-model-viewer/master/market/cardboard-3d.jpg">](https://amzn.to/2E8M1Tq)
+[<img src="https://raw.githubusercontent.com/the3deer/android-3D-model-viewer/main/market/glasses-3d.jpg">](https://amzn.to/2E8LhxC)
+[<img src="https://raw.githubusercontent.com/the3deer/android-3D-model-viewer/main/market/cardboard-3d.jpg">](https://amzn.to/2E8M1Tq)
 
 
 Dependencies
@@ -176,9 +177,9 @@ Acknowledgement
 ===============
 
 * For teaching how animation engine works: https://github.com/TheThinMatrix/OpenGL-Animation
-* To the lot of user's feedback: https://github.com/the3deers/android-3D-model-viewer/issues
-* To the many infinite educational resources found in Internet for free :)
+* 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 :)
 
 
 Licenses
@@ -188,10 +189,10 @@ The following copyright notice and this permission notice shall be included in a
 copies or substantial portions of the Software.
 
 
-    MIT License - Copyright (c) 2022 The 3Deers - https://github.com/the3deers
+    MIT License - Copyright (c) 2022 The 3Deer - https://github.com/the3deer
     GNU LGPL v2.1 Copyright (c) 2001, 2002 Dipl. Ing. P. Szawlowski - STL Parser
     MIT License - https://github.com/javagl/JglTF - GLTF Parser    
-    ISC License - Earcut - https://github.com/the3deers/earcut
+    ISC License - Earcut - https://github.com/the3deer/earcut
 
 
 Assets

app/build.gradle

@@ -9,6 +9,8 @@ android {
         applicationId "org.andresoviedo.dddmodel2"
         minSdk 16
         targetSdk 33
+
+        multiDexEnabled true
     }
 
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools"
     package="org.andresoviedo.dddmodel2"
     android:versionCode="33"
-    android:versionName="3.3.1">
+    android:versionName="4.0.0">
 
     <uses-sdk
         tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
@@ -23,7 +23,7 @@
 	    android:largeHeap="true"
         android:requestLegacyExternalStorage="true">
         <activity
-            android:name="org.andresoviedo.app.model3D.MainActivity"
+            android:name="org.the3deer.app.model3D.MainActivity"
 	        android:exported="true"
             android:label="@string/app_name">
             <intent-filter>
@@ -33,40 +33,40 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.andresoviedo.app.model3D.view.MenuActivity"
+            android:name="org.the3deer.app.model3D.view.MenuActivity"
             android:label="@string/title_activity_menu"
-            android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
+            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
         </activity>
         <activity
-            android:name="org.andresoviedo.util.view.TextActivity"
+            android:name="org.the3deer.util.view.TextActivity"
             android:label="@string/title_activity_text"
-            android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
+            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
         </activity>
         <activity
-            android:name="org.andresoviedo.app.model3D.view.ModelActivity"
+            android:name="org.the3deer.app.model3D.view.ModelActivity"
             android:label="@string/title_activity_model"
-            android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
+            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
 
             <!-- android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" -->
         </activity>
 
 
         <!-- Demos -->
         <activity
-            android:name="org.andresoviedo.app.model3D.demo.GlyphsDemoActivity"
+            android:name="org.the3deer.app.model3D.demo.GlyphsDemoActivity"
             android:label="@string/title_activity_model"
-            android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
+            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
         </activity>
         <activity
-            android:name="org.andresoviedo.app.model3D.demo.EarCutDemoActivity"
+            android:name="org.the3deer.app.model3D.demo.EarCutDemoActivity"
             android:label="@string/title_activity_model"
-            android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
+            android:parentActivityName="org.the3deer.app.model3D.MainActivity" >
         </activity>
 
 
         <!-- polybool -->
         <activity
-            android:name="org.the3deers.polybool.demo.WebActivity"
+            android:name="org.the3deer.polybool.demo.WebActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.AppCompat.NoActionBar">
 

app/src/main/java/org/andresoviedo/app/model3D/MainActivity.java renamed to app/src/main/java/org/the3deer/app/model3D/MainActivity.java

@@ -1,58 +1,58 @@
-package org.andresoviedo.app.model3D;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-
-import org.andresoviedo.app.model3D.view.MenuActivity;
-import org.andresoviedo.app.model3D.view.ModelActivity;
-import org.andresoviedo.dddmodel2.R;
-import org.andresoviedo.util.android.AndroidURLStreamHandlerFactory;
-
-import java.net.URL;
-
-/**
- * This is the main android activity. From here we launch the whole stuff.
- * 
- * Basically, this activity may serve to show a Splash screen and copy the assets (obj models) from the jar to external
- * directory.
- * 
- * @author andresoviedo
- *
- */
-public class MainActivity extends Activity {
-
-
-    // Custom handler: org/andresoviedo/util/android/assets/Handler.class
-    static {
-        System.setProperty("java.protocol.handler.pkgs", "org.andresoviedo.util.android");
-        URL.setURLStreamHandlerFactory(new AndroidURLStreamHandlerFactory());
-    }
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		// Set main layout controls.
-		// Basically, this is a screen with the app name just in the middle of the scree
-		setContentView(R.layout.activity_main);
-
-		// Start Model activity.
-		MainActivity.this.startActivity(new Intent(MainActivity.this.getApplicationContext(), MenuActivity.class));
-		MainActivity.this.finish();
-	}
-
-	@SuppressWarnings("unused")
-	private void init() {
-		MainActivity.this.startActivity(new Intent(MainActivity.this.getApplicationContext(), ModelActivity.class));
-		MainActivity.this.finish();
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
-	}
-}
+package org.the3deer.app.model3D;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+
+import org.andresoviedo.dddmodel2.R;
+import org.the3deer.app.model3D.view.MenuActivity;
+import org.the3deer.app.model3D.view.ModelActivity;
+import org.the3deer.util.android.AndroidURLStreamHandlerFactory;
+
+import java.net.URL;
+
+/**
+ * This is the main android activity. From here we launch the whole stuff.
+ * 
+ * Basically, this activity may serve to show a Splash screen and copy the assets (obj models) from the jar to external
+ * directory.
+ * 
+ * @author andresoviedo
+ *
+ */
+public class MainActivity extends Activity {
+
+
+    // Custom handler: org/the3deer/util/android/assets/Handler.class
+    static {
+        System.setProperty("java.protocol.handler.pkgs", "org.the3deer.util.android");
+        URL.setURLStreamHandlerFactory(new AndroidURLStreamHandlerFactory());
+    }
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Set main layout controls.
+		// Basically, this is a screen with the app name just in the middle of the scree
+		setContentView(R.layout.activity_main);
+
+		// Start Model activity.
+		MainActivity.this.startActivity(new Intent(MainActivity.this.getApplicationContext(), MenuActivity.class));
+		MainActivity.this.finish();
+	}
+
+	@SuppressWarnings("unused")
+	private void init() {
+		MainActivity.this.startActivity(new Intent(MainActivity.this.getApplicationContext(), ModelActivity.class));
+		MainActivity.this.finish();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.main, menu);
+		return true;
+	}
+}

app/src/main/java/org/andresoviedo/app/model3D/demo/DemoLoaderTask.java renamed to app/src/main/java/org/the3deer/app/model3D/demo/DemoLoaderTask.java

@@ -1,21 +1,20 @@
-package org.andresoviedo.app.model3D.demo;
+package org.the3deer.app.model3D.demo;
 
 import android.app.Activity;
 import android.opengl.GLES20;
 import android.util.Log;
 
-import org.andresoviedo.android_3d_model_engine.model.Object3DData;
-import org.andresoviedo.android_3d_model_engine.objects.Cube;
-import org.andresoviedo.android_3d_model_engine.services.LoadListener;
-import org.andresoviedo.android_3d_model_engine.services.LoadListenerAdapter;
-import org.andresoviedo.android_3d_model_engine.services.LoaderTask;
-import org.andresoviedo.android_3d_model_engine.services.SceneLoader;
-import org.andresoviedo.android_3d_model_engine.services.collada.ColladaLoader;
-import org.andresoviedo.android_3d_model_engine.services.wavefront.WavefrontLoader;
-import org.andresoviedo.android_3d_model_engine.util.Exploder;
-import org.andresoviedo.android_3d_model_engine.util.Rescaler;
-import org.andresoviedo.util.android.ContentUtils;
-import org.andresoviedo.util.io.IOUtils;
+import org.the3deer.android_3d_model_engine.model.Object3DData;
+import org.the3deer.android_3d_model_engine.objects.Cube;
+import org.the3deer.android_3d_model_engine.services.LoadListener;
+import org.the3deer.android_3d_model_engine.services.LoadListenerAdapter;
+import org.the3deer.android_3d_model_engine.services.LoaderTask;
+import org.the3deer.android_3d_model_engine.services.collada.ColladaLoader;
+import org.the3deer.android_3d_model_engine.services.wavefront.WavefrontLoader;
+import org.the3deer.android_3d_model_engine.util.Exploder;
+import org.the3deer.android_3d_model_engine.util.Rescaler;
+import org.the3deer.util.android.ContentUtils;
+import org.the3deer.util.io.IOUtils;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -120,7 +119,7 @@ public void onLoad(Object3DData obj53) {
                         Rescaler.rescale(obj53, 2f);
                         DemoLoaderTask.this.onLoad(obj53);
                     }
-                }).load(new URI("android://org.andresoviedo.dddmodel2/assets/models/teapot.obj")).get(0);
+                }).load(new URI("android://org.the3deer.dddmodel2/assets/models/teapot.obj")).get(0);
 
                 //obj51.setScale(2f,2f,2f);
                 //obj51.setSize(0.5f);
@@ -139,7 +138,7 @@ public void onLoad(Object3DData obj53) {
                         obj53.setColor(new float[] { 0.0f, 1.0f, 1f, 1.0f });
                         DemoLoaderTask.this.onLoad(obj53);
                     }
-                }).load(new URI("android://org.andresoviedo.dddmodel2/assets/models/cube.obj")).get(0);
+                }).load(new URI("android://org.the3deer.dddmodel2/assets/models/cube.obj")).get(0);
 
                 //obj52.setScale(0.5f, 0.5f, 0.5f);
                 //super.onLoad(obj52);
@@ -158,7 +157,7 @@ public void onLoad(Object3DData obj53) {
                         obj53.setLocation(new float[] { 2f, 0f, 0f });
                         DemoLoaderTask.this.onLoad(obj53);
                     }
-                }).load(new URI("android://org.andresoviedo.dddmodel2/assets/models/ToyPlane.obj")).get(0);
+                }).load(new URI("android://org.the3deer.dddmodel2/assets/models/ToyPlane.obj")).get(0);
 
                 //super.onLoad(obj53);
             } catch (Exception ex) {
@@ -168,7 +167,7 @@ public void onLoad(Object3DData obj53) {
             // test loading object made of polygonal faces
             try {
                 // this has heterogeneous faces
-                Object3DData obj53 = new ColladaLoader().load(new URI("android://org.andresoviedo.dddmodel2/assets/models/cowboy.dae"), new LoadListenerAdapter(){
+                Object3DData obj53 = new ColladaLoader().load(new URI("android://org.the3deer.dddmodel2/assets/models/cowboy.dae"), new LoadListenerAdapter(){
                     @Override
                     public void onLoad(Object3DData obj53) {
                         obj53.setColor(new float[] { 1.0f, 1.0f, 1f, 1.0f });