[pull] main from processing:main

.gitignore

@@ -1,20 +1,5 @@
-mode/processing-core.zip
-mode/mode/AndroidMode.jar
-mode/mode/gradle-tooling-api*
-mode/mode/slf4j*
-
-mode/mode/percent.jar
-mode/mode/recyclerview-v7.jar
-mode/mode/support-*
-mode/mode/wearable.jar
-
-mode/libraries/vr/library
-mode/libraries/ar/library
-mode/tools/SDKUpdater/tool
-mode/tools/SDKUpdater/lib
-
-debug/.gradle
-debug/.idea
+.gradle
+.idea
 
 **/examples/**/AndroidManifest.xml
 

apps/armarkers/build.gradle

@@ -0,0 +1,36 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdkVersion 33
+    defaultConfig {
+        applicationId "processing.tests.armarkers"
+        minSdkVersion 23
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    productFlavors {
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    namespace 'armarkers'
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.13.2'
+    implementation project(':libs:processing-core')
+    implementation project(':libs:processing-ar')
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'com.google.ar:core:1.35.0'
+}

debug/apps/arscene/src/main/AndroidManifest.xml → apps/armarkers/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
           android:versionCode="1" 
           android:versionName="1.0">
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
     <application android:icon="@mipmap/ic_launcher" 

apps/armarkers/src/main/java/armarkers/MainActivity.java

@@ -0,0 +1,111 @@
+package armarkers;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.content.Intent;
+import android.provider.Settings;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import processing.android.PFragment;
+import processing.android.CompatUtils;
+import processing.core.PApplet;
+
+public class MainActivity extends AppCompatActivity {
+  private static final int CAMERA_PERMISSION_CODE = 0;
+  private static boolean CAMERA_PERMISSION_REQUESTED = false;
+  private static final String CAMERA_PERMISSION = Manifest.permission.CAMERA;
+  private static final String CAMERA_PERMISSION_MESSAGE = "Camera permission is needed to use AR";
+
+  private PApplet sketch;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    FrameLayout frame = new FrameLayout(this);
+    frame.setId(CompatUtils.getUniqueViewId());
+    setContentView(frame, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.MATCH_PARENT));
+
+    sketch = new Sketch();
+    PFragment fragment = new PFragment(sketch);
+    fragment.setView(frame, this);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    if (!hasCameraPermission()) requestCameraPermission();
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    if (!hasCameraPermission()) {
+      Toast.makeText(this, CAMERA_PERMISSION_MESSAGE, Toast.LENGTH_LONG).show();
+      if (!shouldShowRequestPermissionRationale()) {
+        launchPermissionSettings();
+      }
+      finish();
+    }
+
+    if (sketch != null) {
+      sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    CAMERA_PERMISSION_REQUESTED = false;
+  }
+
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    if (sketch != null) {
+      sketch.onNewIntent(intent);
+    }
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+    if (sketch != null) {
+      sketch.onActivityResult(requestCode, resultCode, data);
+    }
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (sketch != null) {
+      sketch.onBackPressed();
+    }
+  }
+
+  private boolean hasCameraPermission() {
+    int res = ContextCompat.checkSelfPermission(this, CAMERA_PERMISSION);
+    return res == PackageManager.PERMISSION_GRANTED;
+  }
+
+  private void requestCameraPermission() {
+    if (!CAMERA_PERMISSION_REQUESTED) {
+      CAMERA_PERMISSION_REQUESTED = true;
+      ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, CAMERA_PERMISSION_CODE);
+    }
+  }
+
+  private boolean shouldShowRequestPermissionRationale() {
+    return ActivityCompat.shouldShowRequestPermissionRationale(this, CAMERA_PERMISSION);
+  }
+
+  private void launchPermissionSettings() {
+    Intent intent = new Intent();
+    intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+    intent.setData(Uri.fromParts("package", this.getPackageName(), null));
+    this.startActivity(intent);
+  }
+}

apps/armarkers/src/main/java/armarkers/Sketch.java

@@ -0,0 +1,51 @@
+package armarkers;
+
+import java.util.ArrayList;
+
+import processing.ar.*;
+import processing.core.PApplet;
+import processing.core.PImage;
+import processing.core.PShape;
+
+public class Sketch extends PApplet {
+  ARTracker tracker;
+  ARAnchor anchor;
+  PShape earth;
+
+  public void settings() {
+    fullScreen(AR);
+  }
+
+  public void setup() {
+    fullScreen(AR);
+
+    tracker = new ARTracker(this);
+
+    PImage earthImg = loadImage("earth.jpg");
+    tracker.start();
+    tracker.addImage("earth", earthImg);
+
+    earth = createShape(SPHERE, 0.15f);
+  }
+
+  public void draw() {
+    lights();
+
+    if (mousePressed) {
+      // Create new anchor at the current touch point
+      if (anchor != null) anchor.dispose();
+      ARTrackable hit = tracker.get(mouseX, mouseY);
+      if (hit != null && hit.isImage() && hit.getName().equals("earth")) {
+        anchor = new ARAnchor(hit);
+      }
+      else anchor = null;
+    }
+
+    if (anchor != null) {
+      anchor.attach();
+      shape(earth);
+      anchor.detach();
+    }
+  }
+
+}

debug/apps/arscene/build.gradle → apps/arscene/build.gradle

@@ -1,7 +1,8 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.arscene"
         minSdkVersion 23

apps/arscene/src/main/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+          xmlns:tools="http://schemas.android.com/tools" 
+          android:versionCode="1" 
+          android:versionName="1.0">
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
+    <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+    <application android:icon="@mipmap/ic_launcher" 
+                 android:label="@string/app_name"
+                 android:theme="@style/ArActivityTheme" 
+                 android:allowBackup="false" 
+                 android:usesCleartextTraffic="false" 
+                 tools:ignore="GoogleAppIndexingWarning">
+        <activity android:configChanges="orientation|screenSize" 
+                  android:exported="true" 
+                  android:name=".MainActivity" 
+                  android:screenOrientation="locked" 
+                  android:theme="@style/Theme.AppCompat.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <meta-data android:name="com.google.ar.core" android:value="required"/>
+    </application>
+</manifest>

apps/arscene/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">AR Test</string>
+</resources>

apps/arscene/src/main/res/values/styles.xml

@@ -0,0 +1,9 @@
+<resources>
+<style name="ArActivityTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <item name="android:windowFullscreen">true</item>
+    <item name="android:windowAnimationStyle">@null</item>
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowDisablePreview">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+</style>
+</resources>

debug/apps/fast2d/build.gradle → apps/fast2d/build.gradle

@@ -1,7 +1,8 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.fast2d"
         minSdkVersion 17

debug/apps/simple/build.gradle → apps/simple/build.gradle

@@ -1,32 +1,35 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
+    namespace 'processing.tests.simple'
     compileSdkVersion 33
+
     defaultConfig {
         applicationId "processing.tests.simple"
         minSdkVersion 17
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
-    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    namespace 'simple'
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+
     implementation project(':libs:processing-core')
-    implementation 'androidx.appcompat:appcompat:1.6.0'
 }

apps/simple/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

debug/apps/simple/src/main/AndroidManifest.xml → apps/simple/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:theme="@style/AppTheme"
         android:hardwareAccelerated="true"
         android:largeHeap="true">
-        <activity android:name=".MainActivity"
+        <activity android:name="simple.MainActivity"
                   android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

debug/apps/vrcube/build.gradle → apps/vrcube/build.gradle

@@ -1,7 +1,8 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.vrcube"
         minSdkVersion 19

debug/apps/vrcube/src/main/AndroidManifest.xml → apps/vrcube/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:theme="@style/VrActivityTheme">
         <activity android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:name=".MainActivity"
+                  android:name="vrcube.MainActivity"
                   android:resizeableActivity="false"
                   android:screenOrientation="landscape"
                   android:exported="true">

apps/vrcube/src/main/res/layout/main.xml

@@ -0,0 +1,7 @@
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment"
+    android:name=".Cube"
+    tools:layout="@layout/fragment_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />