From 0e5bcd029f5e3afbf3aa9ba9c612b5ffab4245a8 Mon Sep 17 00:00:00 2001
From: awtterpip <awtterpip@gmail.com>
Date: Fri, 3 May 2024 16:46:32 -0500
Subject: [PATCH] added android example

---
 Cargo.toml                                    |   2 +-
 crates/bevy_openxr/Cargo.toml                 |   1 +
 .../bevy_openxr/examples/android/.gitignore   |   1 +
 .../bevy_openxr/examples/android/Cargo.toml   |  63 ++++++++++++++++
 .../examples/android/hotham_examples.keystore | Bin 0 -> 2726 bytes
 .../examples/android/manifest.yaml            |  39 ++++++++++
 .../bevy_openxr/examples/android/src/lib.rs   |  43 +++++++++++
 flake.lock                                    |  71 ++++--------------
 flake.nix                                     |  40 +++++++---
 9 files changed, 192 insertions(+), 68 deletions(-)
 create mode 100644 crates/bevy_openxr/examples/android/.gitignore
 create mode 100644 crates/bevy_openxr/examples/android/Cargo.toml
 create mode 100644 crates/bevy_openxr/examples/android/hotham_examples.keystore
 create mode 100644 crates/bevy_openxr/examples/android/manifest.yaml
 create mode 100644 crates/bevy_openxr/examples/android/src/lib.rs

diff --git a/Cargo.toml b/Cargo.toml
index 77d1402..f2f2a8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ bevy_xr.path = "./crates/bevy_xr"
 bevy = "0.13.0"
 
 [workspace]
-members = ["crates/*"]
+members = ["crates/*", "crates/bevy_openxr/examples/android"]
 
 [workspace.dependencies]
 bevy = "0.13.0"
diff --git a/crates/bevy_openxr/Cargo.toml b/crates/bevy_openxr/Cargo.toml
index 350f251..6093bfc 100644
--- a/crates/bevy_openxr/Cargo.toml
+++ b/crates/bevy_openxr/Cargo.toml
@@ -14,6 +14,7 @@ bevy.workspace = true
 
 # all other dependencies are placed under this since on wasm, this crate is completely empty
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
+openxr = "0.18.0"
 thiserror = "1.0.57"
 wgpu = "0.19.3"
 wgpu-hal = "0.19.3"
diff --git a/crates/bevy_openxr/examples/android/.gitignore b/crates/bevy_openxr/examples/android/.gitignore
new file mode 100644
index 0000000..d83bd60
--- /dev/null
+++ b/crates/bevy_openxr/examples/android/.gitignore
@@ -0,0 +1 @@
+/runtime_libs
\ No newline at end of file
diff --git a/crates/bevy_openxr/examples/android/Cargo.toml b/crates/bevy_openxr/examples/android/Cargo.toml
new file mode 100644
index 0000000..10e5235
--- /dev/null
+++ b/crates/bevy_openxr/examples/android/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name = "bevy_openxr_android"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bevy_openxr.path = "../.."
+bevy.workspace = true
+
+
+[lib]
+name = "bevy_openxr_android"
+crate-type = ["rlib", "cdylib"]
+
+
+# This metadata is used by `cargo-apk` - `xbuild` uses the `manifest.yaml` instead.
+[package.metadata.android]
+package = "org.bevyengine.example_openxr_android"
+build_targets = ["aarch64-linux-android"]
+runtime_libs = "runtime_libs"
+apk_name = "bevyopenxr"
+# assets = "assets"
+# res = "assets/android-res"
+icon = "@mipmap/ic_launcher"
+label = "Bevy Openxr Android"
+strip = "strip"
+
+# [package.metadata.android.application]
+# icon = "@mipmap/ic_launcher"
+# label = "Bevy Example"
+
+[package.metadata.android.sdk]
+target_sdk_version = 32
+
+[package.metadata.android.application.activity]
+theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"
+config_changes = "density|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|uiMode"
+launch_mode = "singleTask"
+orientation = "landscape"
+resizeable_activity = false
+
+[[package.metadata.android.application.activity.intent_filter]]
+actions = ["android.intent.action.MAIN"]
+categories = [
+    "com.oculus.intent.category.VR",
+    "android.intent.category.LAUNCHER",
+]
+
+# !! IMPORTANT !!
+#
+# When creating your own apps, make sure to generate your own keystore, rather than using our example one!
+# You can use `keytool` like so:
+# keytool -genkey -v -keystore my-release-key.keystore -keyalg RSA -keysize 2048 -validity 10000
+#
+# For more information on key signing and why it's so important, check out this article:
+# https://developer.android.com/studio/publish/app-signing
+#
+# !! IMPORTANT !!
+[package.metadata.android.signing.release]
+path = "./hotham_examples.keystore"
+keystore_password = "chomsky-vigilant-spa"
diff --git a/crates/bevy_openxr/examples/android/hotham_examples.keystore b/crates/bevy_openxr/examples/android/hotham_examples.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..62623c4d30c143b63d33e39fb5b742e403ab5dbe
GIT binary patch
literal 2726
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
I{)M2w0sbZFJpcdz

literal 0
HcmV?d00001

diff --git a/crates/bevy_openxr/examples/android/manifest.yaml b/crates/bevy_openxr/examples/android/manifest.yaml
new file mode 100644
index 0000000..55b45d9
--- /dev/null
+++ b/crates/bevy_openxr/examples/android/manifest.yaml
@@ -0,0 +1,39 @@
+android:
+  runtime_libs:
+    - "runtime_libs"
+  manifest:
+    package: "org.bevyengine.example_openxr_android"
+    uses_feature:
+      - name: "android.hardware.vr.headtracking"
+        required: true
+      - name: "oculus.software.handtracking"
+        required: true
+      - name: "com.oculus.feature.PASSTHROUGH"
+        required: true
+      - name: "com.oculus.experimental.enabled"
+        required: true
+    uses_permission:
+      - name: "com.oculus.permission.HAND_TRACKING"
+    application:
+      label: "Bevy Openxr Android"
+      theme: "@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen"
+      meta_data:
+        - name: "com.oculus.intent.category.VR"
+          value: "vr_only"
+        - name: "com.samsung.android.vr.application.mode"
+          value: "vr_only"
+        - name: "com.oculus.supportedDevices"
+          value: "quest|quest2|quest3|questpro"
+      activities:
+        - config_changes: "density|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|uiMode|screenLayout"
+          launch_mode: "singleTask"
+          orientation: "landscape"
+          intent_filters:
+            - actions:
+                - "android.intent.action.MAIN"
+              categories:
+                - "com.oculus.intent.category.VR"
+                - "android.intent.category.LAUNCHER"
+                - "org.khronos.openxr.intent.category.IMMERSIVE_HMD"
+    sdk:
+      target_sdk_version: 32
\ No newline at end of file
diff --git a/crates/bevy_openxr/examples/android/src/lib.rs b/crates/bevy_openxr/examples/android/src/lib.rs
new file mode 100644
index 0000000..c9a7190
--- /dev/null
+++ b/crates/bevy_openxr/examples/android/src/lib.rs
@@ -0,0 +1,43 @@
+//! A simple 3D scene with light shining over a cube sitting on a plane.
+
+use bevy::prelude::*;
+use bevy_openxr::add_xr_plugins;
+
+#[bevy_main]
+fn main() {
+    App::new()
+        .add_plugins(add_xr_plugins(DefaultPlugins))
+        .add_systems(Startup, setup)
+        .run();
+}
+
+/// set up a simple 3D scene
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    // circular base
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Circle::new(4.0)),
+        material: materials.add(Color::WHITE),
+        transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
+        ..default()
+    });
+    // cube
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb_u8(124, 144, 255)),
+        transform: Transform::from_xyz(0.0, 0.5, 0.0),
+        ..default()
+    });
+    // light
+    commands.spawn(PointLightBundle {
+        point_light: PointLight {
+            shadows_enabled: true,
+            ..default()
+        },
+        transform: Transform::from_xyz(4.0, 8.0, 4.0),
+        ..default()
+    });
+}
diff --git a/flake.lock b/flake.lock
index 05fdd44..21ef2ee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,15 +2,17 @@
   "nodes": {
     "fenix": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1711088506,
-        "narHash": "sha256-USdlY7Tx2oJWqFBpp10+03+h7eVhpkQ4s9t1ERjeIJE=",
+        "lastModified": 1714631076,
+        "narHash": "sha256-at4+1R9gx3CGvX0ZJo9GwDZyt3RzOft7qDCTsYHjI4M=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "85f4139f3c092cf4afd9f9906d7ed218ef262c97",
+        "rev": "22a9eb3f20dd340d084cee4426f386a90b1351ca",
         "type": "github"
       },
       "original": {
@@ -37,59 +39,13 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1698420672,
-        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712963716,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
-        "path": "/nix/store/450afzqlzzgw6wnyc3dwysf3i5yxyqkr-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1713128889,
-        "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=",
+        "lastModified": 1714656196,
+        "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa",
+        "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc",
         "type": "github"
       },
       "original": {
@@ -103,18 +59,17 @@
       "inputs": {
         "fenix": "fenix",
         "flake-utils": "flake-utils",
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1711052942,
-        "narHash": "sha256-lLsAhLgm/Nbin41wdfGKU7Rgd6ONBxYCUAMv53NXPjo=",
+        "lastModified": 1714572655,
+        "narHash": "sha256-xjD8vmit0Nz1qaSSSpeXOK3saSvAZtOGHS2SHZE75Ek=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "7ef7f442fc34b5eadb1c6ad6433bd6d0c51b056b",
+        "rev": "cfce2bb46da62950a8b70ddb0b2a12332da1b1e1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 58749d8..ddf372a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,21 +1,31 @@
 {
   inputs = {
-    fenix.url = "github:nix-community/fenix";
-    flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {
     self,
+    nixpkgs,
     fenix,
     flake-utils,
-    naersk,
-    nixpkgs,
   }:
     flake-utils.lib.eachDefaultSystem (
       system: let
-        pkgs = nixpkgs.legacyPackages.${system};
+        # setup pkgs
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [fenix.overlays.default];
+          config = {
+            android_sdk.accept_license = true;
+            allowUnfree = true;
+          };
+        };
+        # the entire rust toolchain with required targets
         rustToolchain = with fenix.packages.${system};
           combine [
             (stable.withComponents [
@@ -27,15 +37,23 @@
             ])
 
             targets.wasm32-unknown-unknown.stable.rust-std
+            targets.aarch64-linux-android.stable.rust-std
           ];
-        rustPlatform = pkgs.makeRustPlatform {
-          inherit (rustToolchain) cargo rustc;
+        androidComposition = pkgs.androidenv.composeAndroidPackages {
+          abiVersions = ["arm64-v8a"];
+          includeNDK = true;
+          platformVersions = ["32"];
         };
       in {
         devShells.default = pkgs.mkShell rec {
           # build dependencies
           nativeBuildInputs = with pkgs; [
+            # the entire rust toolchain
             rustToolchain
+            # tool for cross compiling
+            cargo-apk
+            # xbuild
+
             pkg-config
 
             # Common cargo tools we often use
@@ -51,6 +69,7 @@
           buildInputs =
             [
               pkgs.zstd
+              pkgs.libxml2
             ]
             ++ pkgs.lib.optionals pkgs.stdenv.isLinux (with pkgs; [
               # bevy dependencies
@@ -75,12 +94,15 @@
             ])
             ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
               pkgs.darwin.apple_sdk.frameworks.Cocoa
-              rustPlatform.bindgenHook
               # # This is missing on mac m1 nix, for some reason.
               # # see https://stackoverflow.com/a/69732679
               pkgs.libiconv
             ];
 
+          # android vars
+          ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
+          ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+
           LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
           # this is most likely not needed. for some reason shadows flicker without it.
           AMD_VULKAN_ICD = "RADV";