Merge branch 'android-0273-v4.1.0-beta2' into master

Author: codeanticode

.gitignore

@@ -1,7 +1,10 @@
 mode/processing-core.zip
-mode/mode/*.jar
+mode/mode/AndroidMode.jar
+mode/mode/gradle-tooling-api*
+mode/mode/slf4j*
 
 mode/libraries/vr/library
+mode/libraries/ar/library
 mode/tools/SDKUpdated/tool
 
 studio/.gradle

README.md

@@ -3,11 +3,13 @@ Processing for Android
 
 This is the main repository for Processing for Android. It includes the core library inside the core folder, and the mode itself in the root. See the [wiki](https://github.com/processing/processing-android/wiki) for build instructions.
 
-The core and VR libraries are available on JCentral, so they can be easily imported
+The core, VR, and AR libraries are available on JCentral, so they can be easily imported
 into Gradle projects:
 
 [processing-core](https://bintray.com/p5android/processing-android/processing-core)
 
 [processing-vr](https://bintray.com/p5android/processing-android/processing-vr)
 
+[processing-ar](https://bintray.com/p5android/processing-android/processing-ar)
+
 

build.gradle

@@ -27,11 +27,13 @@ allprojects {
     ext.supportLibsVersion = '26.0.2'
     ext.wearVersion = '2.1.0'
     ext.gvrVersion = '1.150.0'
+    ext.garVersion = '1.2.0'
     ext.processingVersion = '3.3.7'
     ext.toolingVersion = '4.3'
     ext.slf4jVersion = '1.7.10'
     ext.gradlewVersion = '4.4.1'
     ext.toolsLibVersion = '26.0.0-dev'
+    ext.jdtVersion = '3.11.100'
 
     Properties modeProperties = new Properties()
     modeProperties.load(project.rootProject.file("mode/mode.properties").newDataInputStream())
@@ -41,6 +43,10 @@ allprojects {
     vrProperties.load(project.rootProject.file("mode/libraries/vr/library.properties").newDataInputStream())
     ext.vrLibVersion = vrProperties.getProperty("prettyVersion")
 
+    Properties arProperties = new Properties()
+    arProperties.load(project.rootProject.file("mode/libraries/ar/library.properties").newDataInputStream())
+    ext.arLibVersion = arProperties.getProperty("prettyVersion")
+
 
     def fn = project.rootProject.file("local.properties")
     if (!fn.exists()) {
@@ -93,9 +99,11 @@ task dist {
         // Copy assets to build dir
         FileUtils.copyDirectory(file("mode/templates"), file("${root}/templates"))
         FileUtils.copyDirectory(file("mode/examples"), file("${root}/examples"))
-        FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))
-        FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+        FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))        
         FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
+        FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+        delete "${root}/mode/jdi.jar"
+        delete "${root}/mode/jdimodel.jar"
 
         Files.copy(file("mode/processing-core.zip").toPath(),
                    file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING);
@@ -115,7 +123,16 @@ task dist {
         FileUtils.copyDirectory(file("mode/libraries/vr/src"), 
                                 file("${root}/libraries/vr/src"))
         Files.copy(file("mode/libraries/vr/library.properties").toPath(),
-                   file("${root}/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);                             
+                   file("${root}/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);   
+
+        FileUtils.copyDirectory(file("mode/libraries/ar/examples"), 
+                                file("${root}/libraries/ar/examples"))
+        FileUtils.copyDirectory(file("mode/libraries/ar/library"), 
+                                file("${root}/libraries/ar/library"))
+        FileUtils.copyDirectory(file("mode/libraries/ar/src"), 
+                                file("${root}/libraries/ar/src"))
+        Files.copy(file("mode/libraries/ar/library.properties").toPath(),
+                   file("${root}/libraries/ar/library.properties").toPath(), REPLACE_EXISTING); 
 
         File distFolder = file("dist");
         distFolder.mkdirs();

core/src/assets/grid.png

@@ -0,0 +1,34 @@
+precision mediump float;
+
+uniform sampler2D u_Texture;
+
+uniform vec4 u_LightingParameters;
+uniform vec4 u_MaterialParameters;
+
+varying vec3 v_ViewPosition;
+varying vec3 v_ViewNormal;
+varying vec2 v_TexCoord;
+
+void main() {
+    const float kGamma = 0.4545454;
+    const float kInverseGamma = 2.2;
+    vec3 viewLightDirection = u_LightingParameters.xyz;
+    float lightIntensity = u_LightingParameters.w;
+    float materialAmbient = u_MaterialParameters.x;
+    float materialDiffuse = u_MaterialParameters.y;
+    float materialSpecular = u_MaterialParameters.z;
+    float materialSpecularPower = u_MaterialParameters.w;
+    vec3 viewFragmentDirection = normalize(v_ViewPosition);
+    vec3 viewNormal = normalize(v_ViewNormal);
+    vec4 objectColor = texture2D(u_Texture, vec2(v_TexCoord.x, 1.0 - v_TexCoord.y));
+    objectColor.rgb = pow(objectColor.rgb, vec3(kInverseGamma));
+    float ambient = materialAmbient;
+    float diffuse = lightIntensity * materialDiffuse *
+            0.5 * (dot(viewNormal, viewLightDirection) + 1.0);
+    vec3 reflectedLightDirection = reflect(viewLightDirection, viewNormal);
+    float specularStrength = max(0.0, dot(viewFragmentDirection, reflectedLightDirection));
+    float specular = lightIntensity * materialSpecular *
+            pow(specularStrength, materialSpecularPower);
+    gl_FragColor.a = objectColor.a;
+    gl_FragColor.rgb = pow(objectColor.rgb * (ambient + diffuse) + specular, vec3(kGamma));
+}

core/src/assets/shaders/obj_fragment.glsl

@@ -0,0 +1,17 @@
+uniform mat4 u_ModelView;
+uniform mat4 u_ModelViewProjection;
+
+attribute vec4 a_Position;
+attribute vec3 a_Normal;
+attribute vec2 a_TexCoord;
+
+varying vec3 v_ViewPosition;
+varying vec3 v_ViewNormal;
+varying vec2 v_TexCoord;
+
+void main() {
+    v_ViewPosition = (u_ModelView * a_Position).xyz;
+    v_ViewNormal = normalize((u_ModelView * vec4(a_Normal, 0.0)).xyz);
+    v_TexCoord = a_TexCoord;
+    gl_Position = u_ModelViewProjection * a_Position;
+}

core/src/assets/shaders/obj_vertex.glsl

@@ -0,0 +1,16 @@
+precision highp float;
+uniform sampler2D u_Texture;
+uniform vec4 u_dotColor;
+uniform vec4 u_lineColor;
+uniform vec4 u_gridControl;
+varying vec3 v_TexCoordAlpha;
+
+void main() {
+  vec4 control = texture2D(u_Texture, v_TexCoordAlpha.xy);
+  float dotScale = v_TexCoordAlpha.z;
+  float lineFade = max(0.0, u_gridControl.z * v_TexCoordAlpha.z - (u_gridControl.z - 1.0));
+  vec3 color = (control.r * dotScale > u_gridControl.x) ? u_dotColor.rgb
+             : (control.g > u_gridControl.y)            ? u_lineColor.rgb * lineFade
+                                                        : (u_lineColor.rgb * 0.25 * lineFade) ;
+  gl_FragColor = vec4(color, v_TexCoordAlpha.z * u_gridControl.w);
+}

core/src/assets/shaders/plane_fragment.glsl

@@ -0,0 +1,13 @@
+uniform mat4 u_Model;
+uniform mat4 u_ModelViewProjection;
+uniform mat2 u_PlaneUvMatrix;
+
+attribute vec3 a_XZPositionAlpha;
+
+varying vec3 v_TexCoordAlpha;
+
+void main() {
+   vec4 position = vec4(a_XZPositionAlpha.x, 0.0, a_XZPositionAlpha.y, 1.0);
+   v_TexCoordAlpha = vec3(u_PlaneUvMatrix * (u_Model * position).xz, a_XZPositionAlpha.z);
+   gl_Position = u_ModelViewProjection * position;
+}

core/src/assets/shaders/plane_vertex.glsl

@@ -0,0 +1,6 @@
+precision mediump float;
+varying vec4 v_Color;
+
+void main() {
+    gl_FragColor = v_Color;
+}

core/src/assets/shaders/pointcloud_fragment.glsl

@@ -0,0 +1,13 @@
+uniform mat4 u_ModelViewProjection;
+uniform vec4 u_Color;
+uniform float u_PointSize;
+
+attribute vec4 a_Position;
+
+varying vec4 v_Color;
+
+void main() {
+   v_Color = u_Color;
+   gl_Position = u_ModelViewProjection * vec4(a_Position.xyz, 1.0);
+   gl_PointSize = u_PointSize;
+}