From e83c55f0e42eaa96ede83c8605f9e44ddad475b4 Mon Sep 17 00:00:00 2001 From: Chewico Date: Mon, 23 Jun 2025 16:30:31 +0200 Subject: [PATCH] Update GitHub Actions workflow to fix OpenGL dependencies --- .clang-format | 1 + .../ServiceScript/ServiceScriptGenericFunction.cpp | 6 +++++- .../ServiceScript/ServiceScriptGenericFunction.h | 5 ----- .../EditorEngine/ServiceScript/ServiceScriptObject.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.clang-format b/.clang-format index cdb31aa..9212806 100644 --- a/.clang-format +++ b/.clang-format @@ -16,3 +16,4 @@ BraceWrapping: AllowShortIfStatementsOnASingleLine: false BreakBeforeBraces: Attach NamespaceIndentation: All +PointerAlignment: Left diff --git a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.cpp b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.cpp index 4ad3734..492058b 100644 --- a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.cpp +++ b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.cpp @@ -1,10 +1,14 @@ #include "ServiceScriptGenericFunction.h" #include "Deer/Log.h" + #include "angelscript.h" namespace Deer { - void EditorEngine::apiFunction(asIScriptGeneric *func) { + void EditorEngine::apiFunction(asIScriptGeneric* func) { DEER_CORE_TRACE("Called function {0}", func->GetFunction()->GetDeclaration()); + + asIScriptFunction* aux_funx = (asIScriptFunction*)func->GetAuxiliary(); + DEER_CORE_TRACE("Real function {0}", aux_funx->GetDeclaration()); } } // namespace Deer \ No newline at end of file diff --git a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.h b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.h index 84db117..b2ba2df 100644 --- a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.h +++ b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptGenericFunction.h @@ -7,10 +7,5 @@ namespace Deer { struct ServiceScriptObject; void apiFunction(asIScriptGeneric *gen); - - struct ApiFunctionData { - uint16_t serviceContextId; - uint16_t serviceObjectId; - }; } // namespace EditorEngine } // namespace Deer \ No newline at end of file diff --git a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptObject.cpp b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptObject.cpp index 0378e04..cb8c09c 100644 --- a/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptObject.cpp +++ b/DeerStudio/src/DeerStudio/EditorEngine/ServiceScript/ServiceScriptObject.cpp @@ -173,7 +173,7 @@ namespace Deer { AS_CHECK(scriptEngine->RegisterGlobalFunction( ext_dec.str().c_str(), asFUNCTION(apiFunction), - asCALL_GENERIC)); + asCALL_GENERIC, func)); } } } // namespace EditorEngine