monorepo + git subtree

CMakeLists.txt

@@ -6,17 +6,27 @@ endif()
 
 include(FetchContent)
 
+# Resolve Babylon Native's imported dependency subtrees through the normal
+# FetchContent declarations, including declarations made by nested consumers.
+# Cache entries preserve explicit user-provided source-directory overrides.
+set(FETCHCONTENT_SOURCE_DIR_CMAKEEXTENSIONS "${CMAKE_CURRENT_LIST_DIR}/Dependencies/CMakeExtensions" CACHE PATH "Location of the in-tree CMakeExtensions sources.")
+set(FETCHCONTENT_SOURCE_DIR_ANDROIDEXTENSIONS "${CMAKE_CURRENT_LIST_DIR}/Dependencies/AndroidExtensions" CACHE PATH "Location of the in-tree AndroidExtensions sources.")
+set(FETCHCONTENT_SOURCE_DIR_BGFX.CMAKE "${CMAKE_CURRENT_LIST_DIR}/Dependencies/bgfx.cmake" CACHE PATH "Location of the in-tree bgfx.cmake sources.")
+set(FETCHCONTENT_SOURCE_DIR_GLSLANG "${CMAKE_CURRENT_LIST_DIR}/Dependencies/glslang" CACHE PATH "Location of the in-tree glslang sources.")
+set(FETCHCONTENT_SOURCE_DIR_JSRUNTIMEHOST "${CMAKE_CURRENT_LIST_DIR}/Dependencies/JsRuntimeHost" CACHE PATH "Location of the in-tree JsRuntimeHost sources.")
+set(FETCHCONTENT_SOURCE_DIR_SPIRV-CROSS "${CMAKE_CURRENT_LIST_DIR}/Dependencies/SPIRV-Cross" CACHE PATH "Location of the in-tree SPIRV-Cross sources.")
+set(FETCHCONTENT_SOURCE_DIR_URLLIB "${CMAKE_CURRENT_LIST_DIR}/Dependencies/UrlLib" CACHE PATH "Location of the in-tree UrlLib sources.")
+
+# bgfx.cmake owns these as git submodules upstream. Babylon Native supplies
+# the corresponding sibling subtrees instead, without initializing gitlinks.
+set(BGFX_DIR "${CMAKE_CURRENT_LIST_DIR}/Dependencies/bgfx" CACHE PATH "Location of the in-tree bgfx sources.")
+set(BIMG_DIR "${CMAKE_CURRENT_LIST_DIR}/Dependencies/bimg" CACHE PATH "Location of the in-tree bimg sources.")
+set(BX_DIR "${CMAKE_CURRENT_LIST_DIR}/Dependencies/bx" CACHE PATH "Location of the in-tree bx sources.")
+
 # --------------------------------------------------
 # Declarations
 # --------------------------------------------------
 
-# EXCLUDE_FROM_ALL is used to prevent FetchContent from automatically adding
-# targets to the ALL_BUILD target.  We do this for all dependencies except
-# JsRuntimeHost because JsRuntimeHost has top-level targets (e.g., AppRuntime)
-# that are part of the Babylon Native contract. When adding dependencies using
-# FetchContent, add the EXCLUDE_FROM_ALL option except where there are top-level
-# targets that are part of the Babylon Native contract.
-
 FetchContent_Declare(AndroidExtensions
     GIT_REPOSITORY https://github.com/BabylonJS/AndroidExtensions.git
     GIT_TAG 2e85a8d43b89246c460112c9e5546ad54b6e87b4
@@ -41,14 +51,14 @@ FetchContent_Declare(CMakeExtensions
     GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
     GIT_TAG 631780e42886e5f12bfd1a5568c7395f1d657f43
     EXCLUDE_FROM_ALL)
-FetchContent_Declare(glslang
-    GIT_REPOSITORY https://github.com/BabylonJS/glslang.git
-    GIT_TAG 284e4301e5a6b44b279635276588db7cdd942624
-    EXCLUDE_FROM_ALL)
 FetchContent_Declare(draco
     GIT_REPOSITORY https://github.com/google/draco.git
     GIT_TAG 1.5.7
     EXCLUDE_FROM_ALL)
+FetchContent_Declare(glslang
+    GIT_REPOSITORY https://github.com/BabylonJS/glslang.git
+    GIT_TAG 284e4301e5a6b44b279635276588db7cdd942624
+    EXCLUDE_FROM_ALL)
 FetchContent_Declare(meshoptimizer
     GIT_REPOSITORY https://github.com/zeux/meshoptimizer.git
     GIT_TAG v0.22
@@ -71,7 +81,6 @@ FetchContent_Declare(SPIRV-Cross
     GIT_REPOSITORY https://github.com/BabylonJS/SPIRV-Cross.git
     GIT_TAG 7c8705749fc1e234119c20695f82179b30d90914
     EXCLUDE_FROM_ALL)
-
 # --------------------------------------------------
 
 FetchContent_MakeAvailable(CMakeExtensions)

Dependencies/AndroidExtensions/.gitignore

@@ -0,0 +1 @@
+Build

Dependencies/AndroidExtensions/CMakeLists.txt

@@ -0,0 +1,50 @@
+cmake_minimum_required(VERSION 3.18)
+
+include(FetchContent)
+
+# --------------------------------------------------
+# Declarations
+# --------------------------------------------------
+FetchContent_Declare(arcana.cpp
+    GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
+    GIT_TAG        f2757396e80bc4169f2ddb938ce25367a98ffdd0)
+FetchContent_Declare(CMakeExtensions
+    GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
+    GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419)
+# --------------------------------------------------
+
+FetchContent_MakeAvailable(CMakeExtensions)
+
+project(AndroidExtensions)
+
+if(NOT ANDROID AND NOT BABYLON_NATIVE_BUILD_SOURCETREE)
+    message(FATAL_ERROR "This project can only build for Android")
+endif()
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+FetchContent_MakeAvailable_With_Message(arcana.cpp)
+
+set(SOURCES
+    "Include/AndroidExtensions/Globals.h"
+    "Include/AndroidExtensions/JavaWrappers.h"
+    "Include/AndroidExtensions/OpenGLHelpers.h"
+    "Include/AndroidExtensions/Permissions.h"
+    "Include/AndroidExtensions/StdoutLogger.h"
+    "Source/Globals.cpp"
+    "Source/JavaWrappers.cpp"
+    "Source/OpenGLHelpers.cpp"
+    "Source/Permissions.cpp"
+    "Source/StdoutLogger.cpp")
+
+add_library(AndroidExtensions ${SOURCES})
+
+target_link_libraries(AndroidExtensions
+    PUBLIC arcana)
+
+target_include_directories(AndroidExtensions PUBLIC "Include")
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})

Dependencies/AndroidExtensions/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Contributing
+
+This project welcomes contributions and suggestions. Most contributions require you to
+agree to a Contributor License Agreement (CLA) declaring that you have the right to,
+and actually do, grant us the rights to use your contribution. For details, visit
+https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need
+to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the
+instructions provided by the bot. You will only need to do this once across all repositories using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

Dependencies/AndroidExtensions/Dependencies/WebSocket.java

@@ -0,0 +1,40 @@
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class WebSocket extends WebSocketClient {
+    public WebSocket(String url) throws URISyntaxException
+    {
+        super(new URI(url));
+    }
+
+    @Override
+    public void onOpen(ServerHandshake handshakedata)
+    {
+        this.openCallback();
+    }
+
+    @Override
+    public void onMessage(String message)
+    {
+        this.messageCallback(message);
+    }
+
+    @Override
+    public void onClose(int code, String reason, boolean remote)
+    {
+        this.closeCallback(code, reason);
+    }
+
+    @Override
+    public void onError(Exception ex)
+    {
+        this.errorCallback(ex.getMessage());
+    }
+
+    public native void openCallback();
+    public native void closeCallback(int code, String reason);
+    public native void messageCallback(String message);
+    public native void errorCallback(String message);
+}

Dependencies/AndroidExtensions/Include/AndroidExtensions/Globals.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <jni.h>
+#include <android/asset_manager_jni.h>
+#include <arcana/containers/ticketed_collection.h>
+#include "JavaWrappers.h"
+
+namespace android::global
+{
+    void Initialize(JavaVM* javaVM, jobject appContext);
+    // Overload supporting headless scenarios without a Context.
+    // Safe to call multiple times (e.g., hot reloads).
+    void Initialize(JavaVM* javaVM, jobject appContext, jobject assetManager);
+
+    JNIEnv* GetEnvForCurrentThread();
+
+    android::content::Context GetAppContext();
+
+    void SetAssetManager(jobject assetManager);
+    AAssetManager* GetAssetManager();
+
+    android::app::Activity GetCurrentActivity();
+    void SetCurrentActivity(jobject currentActivity);
+    using AppStateChangedCallback = std::function<void()>;
+    using AppStateChangedCallbackTicket = arcana::ticketed_collection<AppStateChangedCallback>::ticket;
+
+    void Pause();
+    AppStateChangedCallbackTicket AddPauseCallback(std::function<void()>&&);
+
+    void Resume();
+    AppStateChangedCallbackTicket AddResumeCallback(std::function<void()>&&);
+
+    using RequestPermissionsResultCallback = std::function<void(int32_t, const std::vector<std::string>&, const std::vector<int32_t>&)>;
+    using RequestPermissionsResultCallbackTicket = arcana::ticketed_collection<RequestPermissionsResultCallback>::ticket;
+
+    void RequestPermissionsResult(int32_t, const std::vector<std::string>&, const std::vector<int32_t>&);
+    RequestPermissionsResultCallbackTicket AddRequestPermissionsResultCallback(RequestPermissionsResultCallback&&);
+}