Make it work !

Author: kunitoki

CMakeLists.txt

@@ -50,16 +50,16 @@ endif()
 # Targets
 if (YUP_BUILD_EXAMPLES)
     message (STATUS "YUP -- Building examples")
-    #add_subdirectory (examples/app)
-    #add_subdirectory (examples/console)
+    add_subdirectory (examples/app)
+    add_subdirectory (examples/console)
     add_subdirectory (examples/graphics)
-    #add_subdirectory (examples/render)
-    if (NOT "${yup_platform}" STREQUAL "emscripten")
-        #add_subdirectory (examples/plugin)
+    add_subdirectory (examples/render)
+    if (NOT "${yup_platform}" MATCHES "^(emscripten|android)$" AND NOT YUP_TARGET_ANDROID)
+        add_subdirectory (examples/plugin)
     endif()
 endif()
 
-if (YUP_BUILD_TESTS)
-    #message (STATUS "YUP -- Building tests")
-    #add_subdirectory (tests)
+if (YUP_BUILD_TESTS AND NOT YUP_TARGET_ANDROID)
+    message (STATUS "YUP -- Building tests")
+    add_subdirectory (tests)
 endif()

cmake/platforms/android/app/src/main/AndroidManifest.xml.in

@@ -8,6 +8,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/Theme.Application"
         android:fullBackupContent="@xml/backup_rules"
+        android:screenOrientation="portrait"
     -->
 
     <application

cmake/yup.cmake

@@ -758,6 +758,7 @@ function (yup_add_module module_path)
         list (APPEND module_dependencies ${module_android_dependencies})
         list (APPEND module_libs ${module_android_libs})
         list (APPEND module_defines ${module_android_defines})
+        list (APPEND module_include_paths "${ANDROID_NDK}/sources/android/native_app_glue")
     elseif ("${yup_platform}" MATCHES "^(win32|uwp)$")
         list (APPEND module_dependencies ${module_windows_dependencies})
         list (APPEND module_defines ${module_windows_defines})
@@ -1075,6 +1076,7 @@ function (yup_add_embedded_binary_resources library_name)
 
     set (binary_path "${CMAKE_CURRENT_BINARY_DIR}/${YUP_ARG_OUT_DIR}")
     set (binary_header_path "${binary_path}/${YUP_ARG_HEADER}")
+    set (binary_sources "")
 
     add_library (${library_name} OBJECT)
 
@@ -1103,7 +1105,7 @@ function (yup_add_embedded_binary_resources library_name)
 
         # Add symbol to header
         file (APPEND "${binary_header_path}"
-            "extern const uint8_t ${resource_name}[];\n"
+            "extern const uint8_t ${resource_name}_data[];\n"
             "extern const std::size_t ${resource_name}_size;\n"
             "\n")
 
@@ -1136,11 +1138,10 @@ function (yup_add_embedded_binary_resources library_name)
                 "} // namespace ${YUP_ARG_NAMESPACE}\n")
         endif()
 
-        target_sources (${library_name} PRIVATE "${full_resource_unit_path}")
-
         _yup_file_to_byte_array (${resource} resource_byte_array)
         file (WRITE "${full_resource_hex_path}" "${resource_byte_array}")
 
+        list (APPEND binary_sources "${full_resource_unit_path}")
         list (APPEND resources_hex_files "${full_resource_hex_path}")
     endforeach()
 
@@ -1149,7 +1150,10 @@ function (yup_add_embedded_binary_resources library_name)
             "} // namespace ${YUP_ARG_NAMESPACE}\n")
     endif()
 
-    target_sources (${library_name} PUBLIC "${binary_header_path}")
+    target_sources (${library_name}
+        PUBLIC "${binary_header_path}"
+        PRIVATE "${binary_sources}")
+
     target_include_directories (${library_name} PUBLIC "${binary_path}")
 
     add_custom_target ("${library_name}_content" DEPENDS "${resources_hex_files}")

examples/console/CMakeLists.txt

@@ -23,6 +23,15 @@ cmake_minimum_required(VERSION 3.28)
 set (target_name example_console)
 set (target_version "1.0.0")
 
+# ==== Prepare Android build
+if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+    # project (${target_name} VERSION ${target_version})
+    include (../../cmake/yup.cmake)
+    _yup_setup_platform()
+    _yup_add_default_modules ("${CMAKE_CURRENT_LIST_DIR}/../..")
+endif()
+
+# ==== Prepare target
 yup_standalone_app (
     TARGET_NAME ${target_name}
     TARGET_VERSION ${target_version}
@@ -38,6 +47,8 @@ yup_standalone_app (
 )
 
 # ==== Prepare sources
-file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
-source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
-target_sources (${target_name} PRIVATE ${sources})
+if (NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+    file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
+    source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
+    target_sources (${target_name} PRIVATE ${sources})
+endif()

examples/render/CMakeLists.txt

@@ -29,11 +29,24 @@ if ("${yup_platform}" MATCHES "^(emscripten)$")
 endif()
 
 # ==== Prepare Android build
+set (link_libraries "")
 if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
     # project (${target_name} VERSION ${target_version})
     include (../../cmake/yup.cmake)
     _yup_setup_platform()
     _yup_add_default_modules ("${CMAKE_CURRENT_LIST_DIR}/../..")
+
+    yup_add_embedded_binary_resources (
+        BinaryData
+        OUT_DIR BinaryData
+        HEADER BinaryData.h
+        NAMESPACE yup
+        RESOURCE_NAMES
+            RiveFile
+        RESOURCES
+            ${CMAKE_CURRENT_LIST_DIR}/data/alien.riv
+    )
+    set (link_libraries BinaryData)
 endif()
 
 # ==== Prepare target
@@ -56,6 +69,7 @@ yup_standalone_app (
         sheenbidi
         rive
         rive_renderer
+        ${link_libraries}
 )
 
 # ==== Prepare sources

examples/render/source/main.cpp

@@ -26,6 +26,10 @@
 
 #include <memory>
 
+#if JUCE_ANDROID
+#include <BinaryData.h>
+#endif
+
 //==============================================================================
 
 class CustomWindow
@@ -54,7 +58,12 @@ class CustomWindow
             auto art = artboards.add (std::make_unique<yup::Artboard> (yup::String ("art") + yup::String (i)));
             addAndMakeVisible (art);
 
+#if JUCE_ANDROID
+            yup::MemoryInputStream is(yup::RiveFile_data, yup::RiveFile_size, false);
+            art->loadFromStream (is, 0, false);
+#else
             art->loadFromFile (riveFilePath, 0, false);
+#endif
         }
 
         // Grab focus

modules/yup_gui/artboard/yup_Artboard.cpp

@@ -31,23 +31,28 @@ Artboard::Artboard (StringRef componentID)
 
 //==============================================================================
 
-Result Artboard::loadFromFile (const juce::File& file, int defaultArtboardIndex, bool shouldUseStateMachines)
+Result Artboard::loadFromFile (const File& file, int defaultArtboardIndex, bool shouldUseStateMachines)
 {
-    jassert (getNativeComponent() != nullptr); // Must be added to a NativeComponent !
-
-    rive::Factory* factory = getNativeComponent()->getFactory();
-    if (factory == nullptr)
-        return Result::fail ("Failed to create a graphics context");
-
     if (! file.existsAsFile())
         return Result::fail ("Failed to find file to load");
 
     auto is = file.createInputStream();
     if (is == nullptr || ! is->openedOk())
         return Result::fail ("Failed to open file for reading");
 
+    return loadFromStream (*is, defaultArtboardIndex, shouldUseStateMachines);
+}
+
+Result Artboard::loadFromStream (InputStream& is, int defaultArtboardIndex, bool shouldUseStateMachines)
+{
+    jassert (getNativeComponent() != nullptr); // Must be added to a NativeComponent !
+
+    rive::Factory* factory = getNativeComponent()->getFactory();
+    if (factory == nullptr)
+        return Result::fail ("Failed to create a graphics context");
+
     yup::MemoryBlock mb;
-    is->readIntoMemoryBlock (mb);
+    is.readIntoMemoryBlock (mb);
 
     rivFile = rive::File::import ({ static_cast<const uint8_t*> (mb.getData()), mb.getSize() }, factory);
     artboardIndex = jlimit (-1, static_cast<int> (rivFile->artboardCount()) - 1, defaultArtboardIndex);

modules/yup_gui/artboard/yup_Artboard.h

@@ -30,7 +30,8 @@ class JUCE_API Artboard : public Component
     Artboard (StringRef componentID);
 
     //==============================================================================
-    Result loadFromFile (const juce::File& file, int defaultArtboardIndex = -1, bool shouldUseStateMachines = true);
+    Result loadFromFile (const File& file, int defaultArtboardIndex = -1, bool shouldUseStateMachines = true);
+    Result loadFromStream (InputStream& is, int defaultArtboardIndex = -1, bool shouldUseStateMachines = true);
 
     //==============================================================================
     bool isPaused() const;

modules/yup_gui/native/yup_Windowing_glfw.cpp

@@ -912,6 +912,9 @@ void* GLFWComponentNative::getNativeHandle() const
 #elif JUCE_LINUX
     return reinterpret_cast<void*> (glfwGetX11Window (window));
 
+#elif JUCE_ANDROID
+    return reinterpret_cast<void*> (glfwGetAndroidApp (window)->window);
+
 #else
     return nullptr;
 
@@ -997,6 +1000,9 @@ void GLFWComponentNative::renderContext()
     jassert (context != nullptr);
 
     auto [contentWidth, contentHeight] = getContentSize();
+    if (contentWidth == 0 || contentHeight == 0)
+        return;
+
     auto renderContinuous = shouldRenderContinuous.load (std::memory_order_relaxed);
 
     if (forceSizeChange || currentContentWidth != contentWidth || currentContentHeight != contentHeight)

modules/yup_gui/yup_gui.cpp

@@ -79,7 +79,7 @@
 
 #elif JUCE_ANDROID
 #define GLFW_INCLUDE_NONE
-//#define GLFW_EXPOSE_NATIVE_ANDROID
+#define GLFW_EXPOSE_NATIVE_ANDROID
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>