Edit .onedev-buildspec.yml

.onedev-buildspec.yml

@@ -9,6 +9,7 @@ jobs:
     force: false
     condition: SUCCESSFUL
     optional: false
+  jobExecutor: terra-executor
   triggers:
   - type: BranchUpdateTrigger
     branches: main
@@ -23,6 +24,15 @@ jobs:
   timeout: 14400
 - name: Compile for Linux
   steps:
+  - type: SetupCacheStep
+    name: conan-cache
+    key: conan-cache-@file:conanfile.txt@
+    paths:
+    - /root/.conan2
+    uploadStrategy: UPLOAD_IF_CHANGED
+    changeDetectionExcludes: /root/.conan2/p/*/dl /root/.conan2/logs
+    condition: SUCCESSFUL
+    optional: true
   - type: CheckoutStep
     name: Checkout
     cloneCredential:
@@ -34,23 +44,25 @@ jobs:
   - type: CommandStep
     name: Compile for Linux
     runInContainer: true
-    image: erriss/erris-build_tools:V0.4
+    image: erriss/erris-build_tools:V0.7
     interpreter:
       type: DefaultInterpreter
       commands: |
-        conan profile detect --force
+        #git clone --depth 1 https://github.com/dotnet/runtime.git
+        #cd runtime
+        #./build.sh -c Release -subset host
+
+        #cp artifacts/bin/native/net10.0-linux-Release-x64/nethost/libnethost.a /onedev-build/workspace/lib/
+
         git submodule update --init --recursive
-        conan install . --output-folder=. --build=missing -s build_type=${BUILD_TYPE}
+
+        conan profile detect --force
+        conan install . -c tools.system.package_manager:mode=install --output-folder=build --build=missing -s build_type=${BUILD_TYPE}
+
         cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
 
         echo ====== Building =============================
         cmake --build build --config ${BUILD_TYPE}
-
-        echo ====== ls ===================================
-        ls -la
-
-        echo ====== ls build =============================
-        ls build -la
     envVars:
     - name: BUILD_TYPE
       value: Debug
@@ -67,6 +79,57 @@ jobs:
     artifacts: editor/* open_engine/*
     condition: SUCCESSFUL
     optional: false
+  jobExecutor: luna-executor
+  triggers:
+  - type: BranchUpdateTrigger
+    branches: main
+    userMatch: anyone
+    projects: OpenEngine
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400
+- name: Release to Gitea
+  steps:
+  - type: CommandStep
+    name: Release to Gitea
+    runInContainer: true
+    image: erriss/erris-build_tools:V0.8
+    interpreter:
+      type: DefaultInterpreter
+      commands: |
+        # 1. Create the Release metadata
+        RELEASE_JSON=$(printf '{"tag_name":"v1.0.%s","target_commitish":"main","name":"Release v1.0.%s","body":"Automated build from OneDev","draft":false,"prerelease":false}' "$ONEDEV_BUILD_NUMBER" "$ONEDEV_BUILD_NUMBER")
+
+        curl -X 'POST' \
+          "https://gitea.anfer.fr/api/v1/repos/anfer/OpenEngine/releases" \
+          -H "Authorization: token @secret:Gitea@" \
+          -H "Content-Type: application/json" \
+          -d "$RELEASE_JSON" > release_info.json
+
+        # 2. Extract the Release ID (using jq)
+        RELEASE_ID=$(jq '.id' release_info.json)
+
+        # 3. Upload your binary (oe_editor)
+        curl -X 'POST' \
+          "https://gitea.anfer.fr/api/v1/repos/anfer/OpenEngine/releases/$RELEASE_ID/assets?name=oe_editor" \
+          -H "Authorization: token @secret:Gitea@" \
+          -H "Content-Type: application/octet-stream" \
+          --data-binary=build/editor/oe_editor
+    envVars:
+    - name: ONEDEV_BUILD_NUMBER
+      value: '1'
+    useTTY: true
+    condition: SUCCESSFUL
+    optional: false
+  jobExecutor: terra-executor
+  triggers:
+  - type: DependencyFinishedTrigger
+    projects: OpenEngine
+  jobDependencies:
+  - jobName: Compile for Linux
+    requireSuccessful: true
+    artifacts: '**'
   retryCondition: never
   maxRetries: 3
   retryDelay: 30

conanfile.txt

@@ -5,6 +5,10 @@ entt/3.16.0
 yaml-cpp/0.8.0
 joltphysics/5.2.0
 fastgltf/0.9.0
+glm/1.0.1
+glfw/3.4
+shaderc/2025.3
+spirv-cross/1.4.321.0
 
 [generators]
 CMakeDeps

editor/CMakeLists.txt

@@ -19,10 +19,25 @@ add_executable(${PROJECT_EXECUTABLE_NAME}
     ${SRC_FILES}
 )
 
+file(GLOB NETHOST_DIR_CANDIDATES
+    "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.*-x64/*/runtimes/linux-x64/native"
+    "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.*-x64/*/runtimes/arch-x64/native"
+)
+
+# Pick the first match
+list(GET NETHOST_DIR_CANDIDATES 0 NETHOST_DIR)
+
+if(NOT NETHOST_DIR)
+    message(FATAL_ERROR "Could not find NETCore native directory")
+else()
+    message(STATUS "Found nethost dir: ${NETHOST_DIR}")
+endif()
+
 target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
     "${PROJECT_SOURCE_DIR}/include"
     "${PROJECT_SOURCE_DIR}/editor/include"
     "/usr/include/freetype2/"
+    "${NETHOST_DIR}"
 )
 
 target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE
@@ -30,12 +45,12 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE
     imgui::imgui
     open_engine
     dl
-    nethost
     freetype
     EnTT::EnTT
+    nethost
 )
 
 target_link_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
-    ${PROJECT_SOURCE_DIR}/lib
-    /usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native
+    ${CMAKE_SOURCE_DIR}/lib
+    ${NETHOST_DIR}
 )

editor/include/modding.hpp

@@ -5,9 +5,9 @@
 #include <open_engine.hpp>
 #include <unistd.h>
 
-#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/nethost.h"
-#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/hostfxr.h"
-#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/coreclr_delegates.h"
+#include <nethost.h>
+#include <hostfxr.h>
+#include <coreclr_delegates.h>
 
 class Modding : public OpenEngine::Layer
 {

open_engine/CMakeLists.txt

@@ -16,6 +16,10 @@ find_package(yaml-cpp REQUIRED)
 find_package(Jolt REQUIRED)
 find_package(fastgltf REQUIRED)
 find_package(spdlog REQUIRED)
+find_package(glm REQUIRED)
+find_package(glfw3 REQUIRED)
+find_package(shaderc REQUIRED)
+find_package(spirv-cross REQUIRED)
 
 file(GLOB_RECURSE SRC_FILES "src/*.cpp")
 file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
@@ -36,7 +40,7 @@ target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
 
 target_include_directories(${PROJECT_EXECUTABLE_NAME} PUBLIC
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "/home/erris/.conan2/p/b/imguic69fe98538919/p/include"
+    #"/home/erris/.conan2/p/b/imguic69fe98538919/p/include"
     "vendor/nativefiledialog-extended/src/include"
     "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo"
 )
@@ -49,13 +53,13 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
     spdlog::spdlog
     glad
     glfw
-    glm
+    glm::glm
     dl
     EnTT::EnTT
     X11
     yaml-cpp::yaml-cpp
     nfd
-    shaderc_combined
+    shaderc::shaderc
     glslang
     glslang-default-resource-limits
     SPIRV

open_engine/include/open_engine/instrumentor.hpp

@@ -3,6 +3,7 @@
 
 #include "open_engine/logging.hpp"
 
+#include <iomanip>
 #include <mutex>
 #include <sstream>
 #include <string>

open_engine/include/open_engine/pch.hpp

@@ -1,7 +1,8 @@
 #ifndef PCH_HPP
 #define PCH_HPP
 
-#include "open_engine/logging.hpp"
+#include <open_engine/logging.hpp>
+#include <shaderc/shaderc.hpp>
 
 #include <functional>
 

open_engine/include/open_engine/renderer/shader.hpp

@@ -2,6 +2,7 @@
 #define SHADER_HPP
 
 #include <open_engine/ref_scope.hpp>
+
 #include <glm/glm.hpp>
 #include <string>
 

open_engine/src/open_engine/opengl/opengl_shader.cpp

@@ -6,14 +6,12 @@
 #include <core/time.hpp>
 #include <logging.hpp>
 
-#include <shaderc/shaderc.hpp>
 #include <spirv_cross/spirv_cross.hpp>
 #include <spirv_cross/spirv_glsl.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/glm.hpp>
 #include <filesystem>
 #include <glad/glad.h>
-//#include <alloca.h>
 
 namespace OpenEngine {
     
@@ -30,7 +28,7 @@ namespace OpenEngine {
             return 0;
         }
 
-        static shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
+        static ::shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
         {
             switch (stage)
             {