From 237a628e2a40a126c9d9b2a1825c0831628f8f9b Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Sun, 19 Apr 2026 15:20:34 +0800 Subject: [PATCH] refactor(srp): rename camera request context surface --- .../Scripting/Mono/MonoScriptRuntime.h | 6 +- .../src/Scripting/Mono/MonoScriptRuntime.cpp | 110 +++++++++--------- managed/CMakeLists.txt | 4 +- managed/GameScripts/RenderPipelineApiProbe.cs | 2 +- .../ScriptableRenderContextApiSurfaceProbe.cs | 36 +++--- managed/XCEngine.ScriptCore/InternalCalls.cs | 8 +- ...ntext.cs => CameraRenderRequestContext.cs} | 8 +- .../Core/ScriptableRenderPipelineAsset.cs | 2 +- ...> CameraRenderRequestContextExtensions.cs} | 10 +- ...DisableDirectionalShadowRendererFeature.cs | 2 +- .../RendererBackedRenderPipelineAsset.cs | 2 +- .../Universal/ScriptableRendererData.cs | 4 +- .../Universal/ScriptableRendererFeature.cs | 2 +- tests/scripting/test_mono_script_runtime.cpp | 32 ++--- 14 files changed, 114 insertions(+), 114 deletions(-) rename managed/XCEngine.ScriptCore/Rendering/Core/{ScriptableRenderPipelineCameraRequestContext.cs => CameraRenderRequestContext.cs} (56%) rename managed/XCEngine.ScriptCore/Rendering/Universal/{ScriptableRenderPipelineCameraRequestContextExtensions.cs => CameraRenderRequestContextExtensions.cs} (55%) diff --git a/engine/include/XCEngine/Scripting/Mono/MonoScriptRuntime.h b/engine/include/XCEngine/Scripting/Mono/MonoScriptRuntime.h index 269e81ea..747fce24 100644 --- a/engine/include/XCEngine/Scripting/Mono/MonoScriptRuntime.h +++ b/engine/include/XCEngine/Scripting/Mono/MonoScriptRuntime.h @@ -264,7 +264,7 @@ private: uint32_t RetainExternalManagedObject(MonoObject* instance); void DestroyExternalManagedObject(uint32_t gcHandle); MonoObject* CreateManagedScriptableRenderContext(uint64_t nativeHandle); - MonoObject* CreateManagedScriptableRenderPipelineCameraRequestContext( + MonoObject* CreateManagedCameraRenderRequestContext( uint64_t nativeHandle); MonoObject* GetManagedObject(uint32_t gcHandle) const; MonoMethod* ResolveManagedMethod( @@ -305,11 +305,11 @@ private: MonoClass* m_scriptableRenderPipelineAssetClass = nullptr; MonoClass* m_scriptableRenderPipelineClass = nullptr; MonoClass* m_scriptableRenderContextClass = nullptr; - MonoClass* m_scriptableRenderPipelineCameraRequestContextClass = nullptr; + MonoClass* m_cameraRenderRequestContextClass = nullptr; MonoClass* m_serializeFieldAttributeClass = nullptr; MonoMethod* m_gameObjectConstructor = nullptr; MonoMethod* m_scriptableRenderContextConstructor = nullptr; - MonoMethod* m_scriptableRenderPipelineCameraRequestContextConstructor = + MonoMethod* m_cameraRenderRequestContextConstructor = nullptr; MonoClassField* m_managedGameObjectUUIDField = nullptr; MonoClassField* m_gameObjectUUIDField = nullptr; diff --git a/engine/src/Scripting/Mono/MonoScriptRuntime.cpp b/engine/src/Scripting/Mono/MonoScriptRuntime.cpp index e91cc391..d9391404 100644 --- a/engine/src/Scripting/Mono/MonoScriptRuntime.cpp +++ b/engine/src/Scripting/Mono/MonoScriptRuntime.cpp @@ -104,7 +104,7 @@ struct ManagedScriptableRenderContextState { std::vector queuedFullscreenPasses = {}; }; -struct ManagedScriptableRenderPipelineCameraRequestContextState { +struct ManagedCameraRenderRequestContextState { uint64_t handle = 0; Rendering::CameraRenderRequest* request = nullptr; size_t renderedBaseCameraCount = 0u; @@ -228,50 +228,50 @@ ResolveManagedScriptableRenderContextDirectionalShadowPlan( return kDefaultDirectionalShadowPlan; } -uint64_t& GetManagedScriptableRenderPipelineCameraRequestContextNextHandle() { +uint64_t& GetManagedCameraRenderRequestContextNextHandle() { static uint64_t nextHandle = 1; return nextHandle; } -std::unordered_map& -GetManagedScriptableRenderPipelineCameraRequestContextRegistry() { - static std::unordered_map +std::unordered_map& +GetManagedCameraRenderRequestContextRegistry() { + static std::unordered_map registry; return registry; } -ManagedScriptableRenderPipelineCameraRequestContextState* -FindManagedScriptableRenderPipelineCameraRequestContextState( +ManagedCameraRenderRequestContextState* +FindManagedCameraRenderRequestContextState( uint64_t handle) { const auto it = - GetManagedScriptableRenderPipelineCameraRequestContextRegistry().find(handle); - return it != GetManagedScriptableRenderPipelineCameraRequestContextRegistry().end() + GetManagedCameraRenderRequestContextRegistry().find(handle); + return it != GetManagedCameraRenderRequestContextRegistry().end() ? it->second : nullptr; } -uint64_t RegisterManagedScriptableRenderPipelineCameraRequestContextState( - ManagedScriptableRenderPipelineCameraRequestContextState& state) { +uint64_t RegisterManagedCameraRenderRequestContextState( + ManagedCameraRenderRequestContextState& state) { uint64_t handle = - GetManagedScriptableRenderPipelineCameraRequestContextNextHandle()++; + GetManagedCameraRenderRequestContextNextHandle()++; if (handle == 0) { handle = - GetManagedScriptableRenderPipelineCameraRequestContextNextHandle()++; + GetManagedCameraRenderRequestContextNextHandle()++; } state.handle = handle; - GetManagedScriptableRenderPipelineCameraRequestContextRegistry()[handle] = + GetManagedCameraRenderRequestContextRegistry()[handle] = &state; return handle; } -void UnregisterManagedScriptableRenderPipelineCameraRequestContextState( +void UnregisterManagedCameraRenderRequestContextState( uint64_t handle) { if (handle == 0) { return; } - GetManagedScriptableRenderPipelineCameraRequestContextRegistry().erase(handle); + GetManagedCameraRenderRequestContextRegistry().erase(handle); } void CleanupMonoRootDomainAtExit() { @@ -1000,19 +1000,19 @@ void MonoManagedRenderPipelineAssetRuntime::ConfigureCameraRenderRequest( return; } - ManagedScriptableRenderPipelineCameraRequestContextState requestContextState = + ManagedCameraRenderRequestContextState requestContextState = {}; requestContextState.request = &request; requestContextState.renderedBaseCameraCount = renderedBaseCameraCount; requestContextState.renderedRequestCount = renderedRequestCount; const uint64_t requestContextHandle = - RegisterManagedScriptableRenderPipelineCameraRequestContextState( + RegisterManagedCameraRenderRequestContextState( requestContextState); MonoObject* const requestContextObject = - m_runtime->CreateManagedScriptableRenderPipelineCameraRequestContext( + m_runtime->CreateManagedCameraRenderRequestContext( requestContextHandle); if (requestContextObject == nullptr) { - UnregisterManagedScriptableRenderPipelineCameraRequestContextState( + UnregisterManagedCameraRenderRequestContextState( requestContextHandle); return; } @@ -1023,7 +1023,7 @@ void MonoManagedRenderPipelineAssetRuntime::ConfigureCameraRenderRequest( method, args, nullptr); - UnregisterManagedScriptableRenderPipelineCameraRequestContextState( + UnregisterManagedCameraRenderRequestContextState( requestContextHandle); } @@ -3599,30 +3599,30 @@ InternalCall_Rendering_ScriptableRenderContext_RecordFullscreenPass( } int32_t -InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedBaseCameraCount( +InternalCall_Rendering_CameraRenderRequestContext_GetRenderedBaseCameraCount( uint64_t nativeHandle) { - const ManagedScriptableRenderPipelineCameraRequestContextState* const state = - FindManagedScriptableRenderPipelineCameraRequestContextState(nativeHandle); + const ManagedCameraRenderRequestContextState* const state = + FindManagedCameraRenderRequestContextState(nativeHandle); return state != nullptr ? static_cast(state->renderedBaseCameraCount) : 0; } int32_t -InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedRequestCount( +InternalCall_Rendering_CameraRenderRequestContext_GetRenderedRequestCount( uint64_t nativeHandle) { - const ManagedScriptableRenderPipelineCameraRequestContextState* const state = - FindManagedScriptableRenderPipelineCameraRequestContextState(nativeHandle); + const ManagedCameraRenderRequestContextState* const state = + FindManagedCameraRenderRequestContextState(nativeHandle); return state != nullptr ? static_cast(state->renderedRequestCount) : 0; } mono_bool -InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirectionalShadow( +InternalCall_Rendering_CameraRenderRequestContext_GetHasDirectionalShadow( uint64_t nativeHandle) { - const ManagedScriptableRenderPipelineCameraRequestContextState* const state = - FindManagedScriptableRenderPipelineCameraRequestContextState(nativeHandle); + const ManagedCameraRenderRequestContextState* const state = + FindManagedCameraRenderRequestContextState(nativeHandle); return state != nullptr && state->request != nullptr && state->request->directionalShadow.IsValid() @@ -3630,10 +3630,10 @@ InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirect : 0; } -void InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_ClearDirectionalShadow( +void InternalCall_Rendering_CameraRenderRequestContext_ClearDirectionalShadow( uint64_t nativeHandle) { - ManagedScriptableRenderPipelineCameraRequestContextState* const state = - FindManagedScriptableRenderPipelineCameraRequestContextState(nativeHandle); + ManagedCameraRenderRequestContextState* const state = + FindManagedCameraRenderRequestContextState(nativeHandle); if (state == nullptr || state->request == nullptr) { return; } @@ -3824,10 +3824,10 @@ void RegisterInternalCalls() { mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderContext_RecordScenePhase", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderContext_RecordScenePhase)); mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderContext_RecordSceneInjectionPoint", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderContext_RecordSceneInjectionPoint)); mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderContext_RecordFullscreenPass", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderContext_RecordFullscreenPass)); - mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedBaseCameraCount", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedBaseCameraCount)); - mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedRequestCount", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedRequestCount)); - mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirectionalShadow", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirectionalShadow)); - mono_add_internal_call("XCEngine.InternalCalls::Rendering_ScriptableRenderPipelineCameraRequestContext_ClearDirectionalShadow", reinterpret_cast(&InternalCall_Rendering_ScriptableRenderPipelineCameraRequestContext_ClearDirectionalShadow)); + mono_add_internal_call("XCEngine.InternalCalls::Rendering_CameraRenderRequestContext_GetRenderedBaseCameraCount", reinterpret_cast(&InternalCall_Rendering_CameraRenderRequestContext_GetRenderedBaseCameraCount)); + mono_add_internal_call("XCEngine.InternalCalls::Rendering_CameraRenderRequestContext_GetRenderedRequestCount", reinterpret_cast(&InternalCall_Rendering_CameraRenderRequestContext_GetRenderedRequestCount)); + mono_add_internal_call("XCEngine.InternalCalls::Rendering_CameraRenderRequestContext_GetHasDirectionalShadow", reinterpret_cast(&InternalCall_Rendering_CameraRenderRequestContext_GetHasDirectionalShadow)); + mono_add_internal_call("XCEngine.InternalCalls::Rendering_CameraRenderRequestContext_ClearDirectionalShadow", reinterpret_cast(&InternalCall_Rendering_CameraRenderRequestContext_ClearDirectionalShadow)); GetInternalCallRegistrationState() = true; } @@ -3885,8 +3885,8 @@ void MonoScriptRuntime::Shutdown() { ClearManagedRenderPipelineSelection(this); GetManagedScriptableRenderContextRegistry().clear(); GetManagedScriptableRenderContextNextHandle() = 1; - GetManagedScriptableRenderPipelineCameraRequestContextRegistry().clear(); - GetManagedScriptableRenderPipelineCameraRequestContextNextHandle() = 1; + GetManagedCameraRenderRequestContextRegistry().clear(); + GetManagedCameraRenderRequestContextNextHandle() = 1; ClearManagedInstances(); ClearExternalManagedObjects(); ClearClassCache(); @@ -3903,11 +3903,11 @@ void MonoScriptRuntime::Shutdown() { m_scriptableRenderPipelineAssetClass = nullptr; m_scriptableRenderPipelineClass = nullptr; m_scriptableRenderContextClass = nullptr; - m_scriptableRenderPipelineCameraRequestContextClass = nullptr; + m_cameraRenderRequestContextClass = nullptr; m_serializeFieldAttributeClass = nullptr; m_gameObjectConstructor = nullptr; m_scriptableRenderContextConstructor = nullptr; - m_scriptableRenderPipelineCameraRequestContextConstructor = nullptr; + m_cameraRenderRequestContextConstructor = nullptr; m_managedGameObjectUUIDField = nullptr; m_gameObjectUUIDField = nullptr; m_scriptComponentUUIDField = nullptr; @@ -4680,24 +4680,24 @@ bool MonoScriptRuntime::DiscoverScriptClasses() { return false; } - m_scriptableRenderPipelineCameraRequestContextClass = mono_class_from_name( + m_cameraRenderRequestContextClass = mono_class_from_name( m_coreImage, kManagedRenderingNamespace, - "ScriptableRenderPipelineCameraRequestContext"); - if (!m_scriptableRenderPipelineCameraRequestContextClass) { + "CameraRenderRequestContext"); + if (!m_cameraRenderRequestContextClass) { SetError( - "Failed to locate the managed ScriptableRenderPipelineCameraRequestContext type."); + "Failed to locate the managed CameraRenderRequestContext type."); return false; } - m_scriptableRenderPipelineCameraRequestContextConstructor = + m_cameraRenderRequestContextConstructor = mono_class_get_method_from_name( - m_scriptableRenderPipelineCameraRequestContextClass, + m_cameraRenderRequestContextClass, ".ctor", 1); - if (!m_scriptableRenderPipelineCameraRequestContextConstructor) { + if (!m_cameraRenderRequestContextConstructor) { SetError( - "Failed to locate the managed ScriptableRenderPipelineCameraRequestContext constructor."); + "Failed to locate the managed CameraRenderRequestContext constructor."); return false; } @@ -5257,12 +5257,12 @@ MonoObject* MonoScriptRuntime::CreateManagedScriptableRenderContext( } MonoObject* -MonoScriptRuntime::CreateManagedScriptableRenderPipelineCameraRequestContext( +MonoScriptRuntime::CreateManagedCameraRenderRequestContext( uint64_t nativeHandle) { if (!m_initialized || nativeHandle == 0 || - m_scriptableRenderPipelineCameraRequestContextClass == nullptr || - m_scriptableRenderPipelineCameraRequestContextConstructor == nullptr) { + m_cameraRenderRequestContextClass == nullptr || + m_cameraRenderRequestContextConstructor == nullptr) { return nullptr; } @@ -5271,10 +5271,10 @@ MonoScriptRuntime::CreateManagedScriptableRenderPipelineCameraRequestContext( MonoObject* const contextObject = mono_object_new( m_appDomain, - m_scriptableRenderPipelineCameraRequestContextClass); + m_cameraRenderRequestContextClass); if (contextObject == nullptr) { SetError( - "Mono failed to allocate a managed ScriptableRenderPipelineCameraRequestContext."); + "Mono failed to allocate a managed CameraRenderRequestContext."); return nullptr; } @@ -5284,7 +5284,7 @@ MonoScriptRuntime::CreateManagedScriptableRenderPipelineCameraRequestContext( MonoObject* exception = nullptr; mono_runtime_invoke( - m_scriptableRenderPipelineCameraRequestContextConstructor, + m_cameraRenderRequestContextConstructor, contextObject, args, &exception); diff --git a/managed/CMakeLists.txt b/managed/CMakeLists.txt index dba75f54..2eb8ed34 100644 --- a/managed/CMakeLists.txt +++ b/managed/CMakeLists.txt @@ -182,7 +182,7 @@ set(XCENGINE_SCRIPT_CORE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderContext.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipeline.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineAsset.cs - ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineCameraRequestContext.cs + ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Core/CameraRenderRequestContext.cs ) set(XCENGINE_RENDER_PIPELINES_UNIVERSAL_SOURCES @@ -209,7 +209,7 @@ set(XCENGINE_RENDER_PIPELINES_UNIVERSAL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/ScriptableRenderer.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererData.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererFeature.cs - ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/ScriptableRenderPipelineCameraRequestContextExtensions.cs + ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/CameraRenderRequestContextExtensions.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/StageColorData.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/UniversalRenderer.cs ${CMAKE_CURRENT_SOURCE_DIR}/XCEngine.ScriptCore/Rendering/Universal/UniversalRendererData.cs diff --git a/managed/GameScripts/RenderPipelineApiProbe.cs b/managed/GameScripts/RenderPipelineApiProbe.cs index ac6d2ca5..ddd0a25a 100644 --- a/managed/GameScripts/RenderPipelineApiProbe.cs +++ b/managed/GameScripts/RenderPipelineApiProbe.cs @@ -786,7 +786,7 @@ namespace Gameplay } protected override void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { if (context != null && context.HasDirectionalShadow()) diff --git a/managed/GameScripts/ScriptableRenderContextApiSurfaceProbe.cs b/managed/GameScripts/ScriptableRenderContextApiSurfaceProbe.cs index c893c18d..8ebe7b7e 100644 --- a/managed/GameScripts/ScriptableRenderContextApiSurfaceProbe.cs +++ b/managed/GameScripts/ScriptableRenderContextApiSurfaceProbe.cs @@ -18,14 +18,14 @@ namespace Gameplay public bool HasPublicContextEnvironmentData; public bool HasPublicContextFinalColorData; public bool HasPublicContextStageColorData; - public bool HasPublicCameraRequestContextHasDirectionalShadow; - public bool HasPublicCameraRequestContextClearDirectionalShadow; + public bool HasPublicRequestContextHasDirectionalShadow; + public bool HasPublicRequestContextClearDirectionalShadow; public bool HasUniversalContextRecordSceneExtension; public bool HasUniversalContextRecordOpaqueScenePhaseExtension; public bool HasUniversalContextRecordBeforeOpaqueInjectionExtension; public bool HasUniversalContextRecordShaderVectorFullscreenPassExtension; - public bool HasUniversalCameraRequestContextHasDirectionalShadowExtension; - public bool HasUniversalCameraRequestContextClearDirectionalShadowExtension; + public bool HasUniversalRequestContextHasDirectionalShadowExtension; + public bool HasUniversalRequestContextClearDirectionalShadowExtension; public bool HasPublicPipelineAssetConfigureCameraFramePlan; public bool HasPlanningContextType; public bool HasRendererFeatureConfigureCameraFramePlan; @@ -38,8 +38,8 @@ namespace Gameplay BindingFlags.Instance | BindingFlags.Public; System.Type contextType = typeof(ScriptableRenderContext); - System.Type cameraRequestContextType = - typeof(ScriptableRenderPipelineCameraRequestContext); + System.Type requestContextType = + typeof(CameraRenderRequestContext); System.Type pipelineAssetType = typeof(ScriptableRenderPipelineAsset); System.Type rendererFeatureType = @@ -51,9 +51,9 @@ namespace Gameplay System.Type renderContextExtensionsType = universalAssembly.GetType( "XCEngine.Rendering.Universal.ScriptableRenderContextExtensions"); - System.Type cameraRequestContextExtensionsType = + System.Type requestContextExtensionsType = universalAssembly.GetType( - "XCEngine.Rendering.Universal.ScriptableRenderPipelineCameraRequestContextExtensions"); + "XCEngine.Rendering.Universal.CameraRenderRequestContextExtensions"); HasPublicContextRecordScene = contextType.GetMethod( @@ -95,12 +95,12 @@ namespace Gameplay contextType.GetProperty( "stageColorData", PublicInstanceMethodFlags) != null; - HasPublicCameraRequestContextHasDirectionalShadow = - cameraRequestContextType.GetProperty( + HasPublicRequestContextHasDirectionalShadow = + requestContextType.GetProperty( "hasDirectionalShadow", PublicInstanceMethodFlags) != null; - HasPublicCameraRequestContextClearDirectionalShadow = - cameraRequestContextType.GetMethod( + HasPublicRequestContextClearDirectionalShadow = + requestContextType.GetMethod( "ClearDirectionalShadow", PublicInstanceMethodFlags) != null; HasUniversalContextRecordSceneExtension = @@ -123,14 +123,14 @@ namespace Gameplay renderContextExtensionsType.GetMethod( "RecordShaderVectorFullscreenPass", BindingFlags.Static | BindingFlags.Public) != null; - HasUniversalCameraRequestContextHasDirectionalShadowExtension = - cameraRequestContextExtensionsType != null && - cameraRequestContextExtensionsType.GetMethod( + HasUniversalRequestContextHasDirectionalShadowExtension = + requestContextExtensionsType != null && + requestContextExtensionsType.GetMethod( "HasDirectionalShadow", BindingFlags.Static | BindingFlags.Public) != null; - HasUniversalCameraRequestContextClearDirectionalShadowExtension = - cameraRequestContextExtensionsType != null && - cameraRequestContextExtensionsType.GetMethod( + HasUniversalRequestContextClearDirectionalShadowExtension = + requestContextExtensionsType != null && + requestContextExtensionsType.GetMethod( "ClearDirectionalShadow", BindingFlags.Static | BindingFlags.Public) != null; HasPublicPipelineAssetConfigureCameraFramePlan = diff --git a/managed/XCEngine.ScriptCore/InternalCalls.cs b/managed/XCEngine.ScriptCore/InternalCalls.cs index b012faa1..cd7db4be 100644 --- a/managed/XCEngine.ScriptCore/InternalCalls.cs +++ b/managed/XCEngine.ScriptCore/InternalCalls.cs @@ -682,22 +682,22 @@ namespace XCEngine [MethodImpl(MethodImplOptions.InternalCall)] internal static extern int - Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedBaseCameraCount( + Rendering_CameraRenderRequestContext_GetRenderedBaseCameraCount( ulong nativeHandle); [MethodImpl(MethodImplOptions.InternalCall)] internal static extern int - Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedRequestCount( + Rendering_CameraRenderRequestContext_GetRenderedRequestCount( ulong nativeHandle); [MethodImpl(MethodImplOptions.InternalCall)] internal static extern bool - Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirectionalShadow( + Rendering_CameraRenderRequestContext_GetHasDirectionalShadow( ulong nativeHandle); [MethodImpl(MethodImplOptions.InternalCall)] internal static extern void - Rendering_ScriptableRenderPipelineCameraRequestContext_ClearDirectionalShadow( + Rendering_CameraRenderRequestContext_ClearDirectionalShadow( ulong nativeHandle); } diff --git a/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineCameraRequestContext.cs b/managed/XCEngine.ScriptCore/Rendering/Core/CameraRenderRequestContext.cs similarity index 56% rename from managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineCameraRequestContext.cs rename to managed/XCEngine.ScriptCore/Rendering/Core/CameraRenderRequestContext.cs index 9a0c918f..85232bac 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineCameraRequestContext.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Core/CameraRenderRequestContext.cs @@ -2,23 +2,23 @@ using XCEngine; namespace XCEngine.Rendering { - public sealed class ScriptableRenderPipelineCameraRequestContext + public sealed class CameraRenderRequestContext { private readonly ulong m_nativeHandle; - internal ScriptableRenderPipelineCameraRequestContext(ulong nativeHandle) + internal CameraRenderRequestContext(ulong nativeHandle) { m_nativeHandle = nativeHandle; } public int renderedBaseCameraCount => InternalCalls - .Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedBaseCameraCount( + .Rendering_CameraRenderRequestContext_GetRenderedBaseCameraCount( m_nativeHandle); public int renderedRequestCount => InternalCalls - .Rendering_ScriptableRenderPipelineCameraRequestContext_GetRenderedRequestCount( + .Rendering_CameraRenderRequestContext_GetRenderedRequestCount( m_nativeHandle); internal ulong nativeHandle => diff --git a/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineAsset.cs b/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineAsset.cs index 6774060c..215d4d41 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineAsset.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Core/ScriptableRenderPipelineAsset.cs @@ -14,7 +14,7 @@ namespace XCEngine.Rendering } protected virtual void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { } diff --git a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRenderPipelineCameraRequestContextExtensions.cs b/managed/XCEngine.ScriptCore/Rendering/Universal/CameraRenderRequestContextExtensions.cs similarity index 55% rename from managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRenderPipelineCameraRequestContextExtensions.cs rename to managed/XCEngine.ScriptCore/Rendering/Universal/CameraRenderRequestContextExtensions.cs index 1396846d..a5942cb8 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRenderPipelineCameraRequestContextExtensions.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Universal/CameraRenderRequestContextExtensions.cs @@ -3,19 +3,19 @@ using XCEngine.Rendering; namespace XCEngine.Rendering.Universal { - public static class ScriptableRenderPipelineCameraRequestContextExtensions + public static class CameraRenderRequestContextExtensions { public static bool HasDirectionalShadow( - this ScriptableRenderPipelineCameraRequestContext context) + this CameraRenderRequestContext context) { return context != null && InternalCalls - .Rendering_ScriptableRenderPipelineCameraRequestContext_GetHasDirectionalShadow( + .Rendering_CameraRenderRequestContext_GetHasDirectionalShadow( context.nativeHandle); } public static void ClearDirectionalShadow( - this ScriptableRenderPipelineCameraRequestContext context) + this CameraRenderRequestContext context) { if (context == null) { @@ -23,7 +23,7 @@ namespace XCEngine.Rendering.Universal } InternalCalls - .Rendering_ScriptableRenderPipelineCameraRequestContext_ClearDirectionalShadow( + .Rendering_CameraRenderRequestContext_ClearDirectionalShadow( context.nativeHandle); } } diff --git a/managed/XCEngine.ScriptCore/Rendering/Universal/DisableDirectionalShadowRendererFeature.cs b/managed/XCEngine.ScriptCore/Rendering/Universal/DisableDirectionalShadowRendererFeature.cs index c10c4c9b..f4e51efa 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Universal/DisableDirectionalShadowRendererFeature.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Universal/DisableDirectionalShadowRendererFeature.cs @@ -7,7 +7,7 @@ namespace XCEngine.Rendering.Universal : ScriptableRendererFeature { public override void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { if (context != null && context.HasDirectionalShadow()) diff --git a/managed/XCEngine.ScriptCore/Rendering/Universal/RendererBackedRenderPipelineAsset.cs b/managed/XCEngine.ScriptCore/Rendering/Universal/RendererBackedRenderPipelineAsset.cs index 5cfd62ed..c969f663 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Universal/RendererBackedRenderPipelineAsset.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Universal/RendererBackedRenderPipelineAsset.cs @@ -20,7 +20,7 @@ namespace XCEngine.Rendering.Universal } protected override void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { ScriptableRendererData rendererData = ResolveRendererData(); diff --git a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererData.cs b/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererData.cs index 76dee664..4e838011 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererData.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererData.cs @@ -23,7 +23,7 @@ namespace XCEngine.Rendering.Universal } internal void ConfigureCameraRenderRequestInstance( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { ConfigureCameraRenderRequest(context); @@ -50,7 +50,7 @@ namespace XCEngine.Rendering.Universal } protected virtual void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { } diff --git a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererFeature.cs b/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererFeature.cs index fbd22d85..e7aeaa0e 100644 --- a/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererFeature.cs +++ b/managed/XCEngine.ScriptCore/Rendering/Universal/ScriptableRendererFeature.cs @@ -16,7 +16,7 @@ namespace XCEngine.Rendering.Universal } public virtual void ConfigureCameraRenderRequest( - ScriptableRenderPipelineCameraRequestContext context) + CameraRenderRequestContext context) { } diff --git a/tests/scripting/test_mono_script_runtime.cpp b/tests/scripting/test_mono_script_runtime.cpp index c15fd249..79060312 100644 --- a/tests/scripting/test_mono_script_runtime.cpp +++ b/tests/scripting/test_mono_script_runtime.cpp @@ -1161,14 +1161,14 @@ TEST_F( bool hasPublicContextEnvironmentData = false; bool hasPublicContextFinalColorData = false; bool hasPublicContextStageColorData = false; - bool hasPublicCameraRequestContextHasDirectionalShadow = false; - bool hasPublicCameraRequestContextClearDirectionalShadow = false; + bool hasPublicRequestContextHasDirectionalShadow = false; + bool hasPublicRequestContextClearDirectionalShadow = false; bool hasUniversalContextRecordSceneExtension = false; bool hasUniversalContextRecordOpaqueScenePhaseExtension = false; bool hasUniversalContextRecordBeforeOpaqueInjectionExtension = false; bool hasUniversalContextRecordShaderVectorFullscreenPassExtension = false; - bool hasUniversalCameraRequestContextHasDirectionalShadowExtension = false; - bool hasUniversalCameraRequestContextClearDirectionalShadowExtension = false; + bool hasUniversalRequestContextHasDirectionalShadowExtension = false; + bool hasUniversalRequestContextClearDirectionalShadowExtension = false; bool hasPublicPipelineAssetConfigureCameraFramePlan = false; bool hasPlanningContextType = false; bool hasRendererFeatureConfigureCameraFramePlan = false; @@ -1217,12 +1217,12 @@ TEST_F( hasPublicContextStageColorData)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, - "HasPublicCameraRequestContextHasDirectionalShadow", - hasPublicCameraRequestContextHasDirectionalShadow)); + "HasPublicRequestContextHasDirectionalShadow", + hasPublicRequestContextHasDirectionalShadow)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, - "HasPublicCameraRequestContextClearDirectionalShadow", - hasPublicCameraRequestContextClearDirectionalShadow)); + "HasPublicRequestContextClearDirectionalShadow", + hasPublicRequestContextClearDirectionalShadow)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, "HasUniversalContextRecordSceneExtension", @@ -1241,12 +1241,12 @@ TEST_F( hasUniversalContextRecordShaderVectorFullscreenPassExtension)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, - "HasUniversalCameraRequestContextHasDirectionalShadowExtension", - hasUniversalCameraRequestContextHasDirectionalShadowExtension)); + "HasUniversalRequestContextHasDirectionalShadowExtension", + hasUniversalRequestContextHasDirectionalShadowExtension)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, - "HasUniversalCameraRequestContextClearDirectionalShadowExtension", - hasUniversalCameraRequestContextClearDirectionalShadowExtension)); + "HasUniversalRequestContextClearDirectionalShadowExtension", + hasUniversalRequestContextClearDirectionalShadowExtension)); EXPECT_TRUE(runtime->TryGetFieldValue( selectionScript, "HasPublicPipelineAssetConfigureCameraFramePlan", @@ -1278,14 +1278,14 @@ TEST_F( EXPECT_FALSE(hasPublicContextEnvironmentData); EXPECT_FALSE(hasPublicContextFinalColorData); EXPECT_FALSE(hasPublicContextStageColorData); - EXPECT_FALSE(hasPublicCameraRequestContextHasDirectionalShadow); - EXPECT_FALSE(hasPublicCameraRequestContextClearDirectionalShadow); + EXPECT_FALSE(hasPublicRequestContextHasDirectionalShadow); + EXPECT_FALSE(hasPublicRequestContextClearDirectionalShadow); EXPECT_TRUE(hasUniversalContextRecordSceneExtension); EXPECT_TRUE(hasUniversalContextRecordOpaqueScenePhaseExtension); EXPECT_TRUE(hasUniversalContextRecordBeforeOpaqueInjectionExtension); EXPECT_TRUE(hasUniversalContextRecordShaderVectorFullscreenPassExtension); - EXPECT_TRUE(hasUniversalCameraRequestContextHasDirectionalShadowExtension); - EXPECT_TRUE(hasUniversalCameraRequestContextClearDirectionalShadowExtension); + EXPECT_TRUE(hasUniversalRequestContextHasDirectionalShadowExtension); + EXPECT_TRUE(hasUniversalRequestContextClearDirectionalShadowExtension); EXPECT_FALSE(hasPublicPipelineAssetConfigureCameraFramePlan); EXPECT_FALSE(hasPlanningContextType); EXPECT_FALSE(hasRendererFeatureConfigureCameraFramePlan);