From a287cae76453df0f9231bb11155fb86fc116f081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Mon, 13 May 2024 16:38:19 +0200 Subject: [PATCH] feat: add visionOS examples --- examples/common/entry/entry_visionos.swift | 34 ++++ examples/common/entry/swift_adapter.cpp | 218 +++++++++++++++++++++ examples/common/entry/swift_adapter.h | 25 +++ examples/runtime/xros-info.plist | 33 ++++ scripts/example-common.lua | 12 ++ scripts/genie.lua | 15 +- 6 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 examples/common/entry/entry_visionos.swift create mode 100644 examples/common/entry/swift_adapter.cpp create mode 100644 examples/common/entry/swift_adapter.h create mode 100644 examples/runtime/xros-info.plist diff --git a/examples/common/entry/entry_visionos.swift b/examples/common/entry/entry_visionos.swift new file mode 100644 index 0000000000..3858035c74 --- /dev/null +++ b/examples/common/entry/entry_visionos.swift @@ -0,0 +1,34 @@ +import SwiftUI +import CompositorServices + +// Default configuration +struct ContentStageConfiguration: CompositorLayerConfiguration { + func makeConfiguration(capabilities: LayerRenderer.Capabilities, configuration: inout LayerRenderer.Configuration) { + configuration.depthFormat = .depth32Float + configuration.colorFormat = .bgra8Unorm_srgb + + let foveationEnabled = capabilities.supportsFoveation + configuration.isFoveationEnabled = foveationEnabled + + let options: LayerRenderer.Capabilities.SupportedLayoutsOptions = foveationEnabled ? [.foveationEnabled] : [] + let supportedLayouts = capabilities.supportedLayouts(options: options) + + configuration.layout = supportedLayouts.contains(.layered) ? .layered : .dedicated + } +} + +@main +struct ExampleApp: App { + var body: some Scene { + ImmersiveSpace { + CompositorLayer(configuration: ContentStageConfiguration()) { layerRenderer in + let renderThread = Thread { + var engine = BgfxAdapter(layerRenderer) + engine.renderLoop() + } + renderThread.name = "Render Thread" + renderThread.start() + } + } + } +} diff --git a/examples/common/entry/swift_adapter.cpp b/examples/common/entry/swift_adapter.cpp new file mode 100644 index 0000000000..501c9bb3d5 --- /dev/null +++ b/examples/common/entry/swift_adapter.cpp @@ -0,0 +1,218 @@ +#include "entry_p.h" + +#if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_VISIONOS + +#include "swift_adapter.h" + +#include +#include +#include + +namespace entry +{ + struct MainThreadEntry + { + int m_argc; + const char* const* m_argv; + + static int32_t threadFunc(bx::Thread* _thread, void* _userData); + }; + + static WindowHandle s_defaultWindow = { 0 }; + + struct Context + { + Context(uint32_t _width, uint32_t _height) + { + static const char* const argv[] = { "visionos" }; + m_mte.m_argc = BX_COUNTOF(argv); + m_mte.m_argv = argv; + + m_eventQueue.postSizeEvent(s_defaultWindow, _width, _height); + + + // Prevent render thread creation. + bgfx::renderFrame(); + + m_thread.init(MainThreadEntry::threadFunc, &m_mte); + } + + + ~Context() + { + m_thread.shutdown(); + } + + MainThreadEntry m_mte; + bx::Thread m_thread; + void* m_window; + + EventQueue m_eventQueue; + }; + + static Context* s_ctx; + + int32_t MainThreadEntry::threadFunc(bx::Thread* _thread, void* _userData) + { + BX_UNUSED(_thread); + + if (_thread != NULL) { + _thread->setThreadName("Main Thread BGFX"); + } + + CFBundleRef mainBundle = CFBundleGetMainBundle(); + if (mainBundle != nil) + { + CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle); + if (resourcesURL != nil) + { + char path[PATH_MAX]; + if (CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8*)path, PATH_MAX) ) + { + chdir(path); + } + + CFRelease(resourcesURL); + } + } + + MainThreadEntry* self = (MainThreadEntry*)_userData; + int32_t result = main(self->m_argc, self->m_argv); + return result; + } + + const Event* poll() + { + return s_ctx->m_eventQueue.poll(); + } + + const Event* poll(WindowHandle _handle) + { + return s_ctx->m_eventQueue.poll(_handle); + } + + void release(const Event* _event) + { + s_ctx->m_eventQueue.release(_event); + } + + WindowHandle createWindow(int32_t _x, int32_t _y, uint32_t _width, uint32_t _height, uint32_t _flags, const char* _title) + { + BX_UNUSED(_x, _y, _width, _height, _flags, _title); + WindowHandle handle = { UINT16_MAX }; + return handle; + } + + void destroyWindow(WindowHandle _handle) + { + BX_UNUSED(_handle); + } + + void setWindowPos(WindowHandle _handle, int32_t _x, int32_t _y) + { + BX_UNUSED(_handle, _x, _y); + } + + void setWindowSize(WindowHandle _handle, uint32_t _width, uint32_t _height) + { + BX_UNUSED(_handle, _width, _height); + } + + void setWindowTitle(WindowHandle _handle, const char* _title) + { + BX_UNUSED(_handle, _title); + } + + void setWindowFlags(WindowHandle _handle, uint32_t _flags, bool _enabled) + { + BX_UNUSED(_handle, _flags, _enabled); + } + + void toggleFullscreen(WindowHandle _handle) + { + BX_UNUSED(_handle); + } + + void setMouseLock(WindowHandle _handle, bool _lock) + { + BX_UNUSED(_handle, _lock); + } + + void* getNativeWindowHandle(WindowHandle _handle) + { + if (kDefaultWindowHandle.idx == _handle.idx) + { + return s_ctx->m_window; + } + + return NULL; + } + + void* getNativeDisplayHandle() + { + return NULL; + } + + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() + { + return bgfx::NativeWindowHandleType::Default; + } + +} // namespace entry + +using namespace entry; + +bool BgfxAdapter::initialize(void) { + if (!m_initialized) { + // Set context width and height to default visionOS resolution. It's different for the headset and device. +#if TARGET_OS_SIMULATOR + s_ctx = new Context(2732, 2048); +#else + s_ctx = new Context(1920, 1824); +#endif + s_ctx->m_window = m_layerRenderer; + m_initialized = true; + } + + return m_initialized; +} + +void BgfxAdapter::shutdown(void) { + if (m_initialized) { + s_ctx->m_eventQueue.postExitEvent(); + s_ctx = NULL; + } + + m_initialized = false; +} + +void BgfxAdapter::render() { + if (!m_initialized) { + return; + } + bgfx::renderFrame(); +} + +void BgfxAdapter::renderLoop() { + bool isRendering = true; + while (isRendering) { + switch (cp_layer_renderer_get_state(m_layerRenderer)) { + case cp_layer_renderer_state_paused: + cp_layer_renderer_wait_until_running(m_layerRenderer); + break; + + case cp_layer_renderer_state_running: + this->initialize(); + this->render(); + break; + + case cp_layer_renderer_state_invalidated: + isRendering = false; + break; + } + } + + this->shutdown(); +} + +#endif // BX_PLATFORM_VISIONOS diff --git a/examples/common/entry/swift_adapter.h b/examples/common/entry/swift_adapter.h new file mode 100644 index 0000000000..be3104685a --- /dev/null +++ b/examples/common/entry/swift_adapter.h @@ -0,0 +1,25 @@ +#ifndef SWIFT_ADAPTER_H_HEADER_GUARD +#define SWIFT_ADAPTER_H_HEADER_GUARD + +#include + +class BgfxAdapter { +private: + bool m_initialized = false; + cp_layer_renderer_t m_layerRenderer = NULL; + void render(void); + +public: + BgfxAdapter(cp_layer_renderer_t layerRenderer) : m_layerRenderer(layerRenderer) { + } + + ~BgfxAdapter() { + shutdown(); + } + + bool initialize(void); + void shutdown(void); + void renderLoop(void); +}; + +#endif diff --git a/examples/runtime/xros-info.plist b/examples/runtime/xros-info.plist new file mode 100644 index 0000000000..3e78258208 --- /dev/null +++ b/examples/runtime/xros-info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + Examples Debug + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + UIApplicationSceneManifest + + UIApplicationPreferredDefaultSceneSessionRole + CPSceneSessionRoleImmersiveSpaceApplication + UIApplicationSupportsMultipleScenes + + + + diff --git a/scripts/example-common.lua b/scripts/example-common.lua index 70c07579ee..f0a74e25f7 100644 --- a/scripts/example-common.lua +++ b/scripts/example-common.lua @@ -95,6 +95,18 @@ project ("example-common") path.join(BGFX_DIR, "examples/common/**.mm"), } + configuration { "xros*" } + files { + path.join(BGFX_DIR, "examples/common/**.swift"), + path.join(BGFX_DIR, "examples/common/**.hpp"), + path.join(BGFX_DIR, "examples/common/**.modulemap"), + } + xcodeprojectopts { + SWIFT_VERSION = "5.0", + SWIFT_OBJC_BRIDGING_HEADER = path.join(BGFX_DIR, "examples/common/entry/swift_adapter.h"), + SWIFT_OBJC_INTEROP_MODE = "objcxx", + } + configuration { "winstore* or durango"} files { path.join(BGFX_DIR, "examples/common/**.cx"), diff --git a/scripts/genie.lua b/scripts/genie.lua index 477f8f9bfd..364f8369da 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -408,8 +408,8 @@ function exampleProjectDefaults() "-weak_framework Metal", } - configuration { "ios* or tvos*" } - kind "ConsoleApp" + configuration { "ios* or tvos* or xros*" } + kind "WindowedApp" linkoptions { "-framework CoreFoundation", "-framework Foundation", @@ -419,6 +419,11 @@ function exampleProjectDefaults() "-framework UIKit", "-weak_framework Metal", } + xcodecopyresources { + { "shaders/metal", { + os.matchfiles(path.join(BGFX_DIR, "examples/runtime/shaders/metal/**.bin")) + }} + } configuration { "xcode*", "ios" } kind "WindowedApp" @@ -432,6 +437,12 @@ function exampleProjectDefaults() path.join(BGFX_DIR, "examples/runtime/tvOS-Info.plist"), } + configuration { "xcode*", "xros" } + kind "WindowedApp" + files { + path.join(BGFX_DIR, "examples/runtime/xros-info.plist"), + } + configuration {} strip()