fixing compilation

.envrc

@@ -0,0 +1,4 @@
+export CC=clang
+export CXX=clang++
+export COMPILE_COMMANDS=ON
+export BUILD_TYPE=Debug

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vendor/ImGuizmo"]
+	path = vendor/ImGuizmo
+	url = https://github.com/CedricGuillemet/ImGuizmo
+[submodule "open_engine/vendor/nativefiledialog-extended"]
+	path = open_engine/vendor/nativefiledialog-extended
+	url = https://github.com/btzy/nativefiledialog-extended

.onedev-buildspec.yml

@@ -0,0 +1,73 @@
+version: 46
+jobs:
+- name: Push to Gitea
+  steps:
+  - type: PushRepository
+    name: Push to Gitea
+    remoteUrl: https://gitea.anfer.fr/anfer/OpenEngine
+    passwordSecret: Gitea
+    force: false
+    condition: SUCCESSFUL
+    optional: false
+  triggers:
+  - type: BranchUpdateTrigger
+    branches: main
+    userMatch: anyone
+    projects: OpenEngine
+  - type: TagCreateTrigger
+    branches: main
+    projects: OpenEngine
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400
+- name: Compile for Linux
+  steps:
+  - type: CheckoutStep
+    name: Checkout
+    cloneCredential:
+      type: DefaultCredential
+    withLfs: false
+    withSubmodules: false
+    condition: SUCCESSFUL
+    optional: false
+  - type: CommandStep
+    name: Compile for Linux
+    runInContainer: true
+    image: erriss/erris-build_tools:V0.7
+    interpreter:
+      type: DefaultInterpreter
+      commands: |
+        conan profile detect --force
+        git submodule update --init --recursive
+        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
+    - name: CC
+      value: clang
+    - name: CXX
+      value: clang++
+    useTTY: true
+    condition: SUCCESSFUL
+    optional: false
+  - type: PublishArtifactStep
+    name: Get build artifacts
+    sourcePath: build
+    artifacts: editor/* open_engine/*
+    condition: SUCCESSFUL
+    optional: false
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25.1)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 

README.md

@@ -0,0 +1 @@
+Readme

conanfile.txt

@@ -5,6 +5,8 @@ entt/3.16.0
 yaml-cpp/0.8.0
 joltphysics/5.2.0
 fastgltf/0.9.0
+glm/1.0.1
+glfw/3.4
 
 [generators]
 CMakeDeps

editor/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25.1)
 
 set(CMAKE_CXX_STANDARD 20)
 

editor/include/editor.hpp

@@ -146,8 +146,8 @@ namespace OpenEngine {
                 Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
 
                 cube3.AddComponent<ModelComponent>(model);
-                cube3.AddComponent<ModelComponent>(model2);
-                cube4.AddComponent<ModelComponent>(monkey);
+                cube4.AddComponent<ModelComponent>(model2);
+                cube5.AddComponent<ModelComponent>(monkey);
 
                 /*
                 auto view = scene->GetRegistry().view<TagComponent>();

editor/src/editor_component.cpp

@@ -304,9 +304,7 @@ namespace OpenEngine {
         bool opened = ImGui::TreeNodeEx(
                 (void*)(intptr_t)entity,
                 ImGuiTreeNodeFlags_None,
-                "Meshes",
-                nullptr
-                );
+                "Meshes");
 
         if (opened) {
             unsigned int i = 0;

open_engine/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25.1)
 
 set(CMAKE_CXX_STANDARD 23)
 
@@ -15,6 +15,9 @@ find_package(EnTT REQUIRED)
 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)
 
 file(GLOB_RECURSE SRC_FILES "src/*.cpp")
 file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
@@ -35,20 +38,28 @@ 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"
 )
 
+file(GLOB DOTNET_NETHOST_PATH "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.*/*/runtimes/arch-x64/native")
+
+if(DOTNET_NETHOST_PATH)
+    target_include_directories(${PROJECT_EXECUTABLE_NAME} PUBLIC ${DOTNET_NETHOST_PATH})
+else()
+    message(WARNING "nethost.h path not found automatically!")
+endif()
+
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
 #set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=address")
 
 target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
     imgui::imgui
-    spdlog
+    spdlog::spdlog
     glad
     glfw
-    glm
+    glm::glm
     dl
     EnTT::EnTT
     X11

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/renderer/.nvim_session

@@ -1,220 +0,0 @@
-let SessionLoad = 1
-let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1
-let v:this_session=expand("<sfile>:p")
-silent only
-silent tabonly
-cd ~/projects/open_engine/open_engine
-if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
-  let s:wipebuf = bufnr('%')
-endif
-let s:shortmess_save = &shortmess
-if &shortmess =~ 'A'
-  set shortmess=aoOA
-else
-  set shortmess=aoO
-endif
-badd +1 ~/projects/open_engine/open_engine
-badd +170 ~/projects/open_engine/open_engine/src/open_engine/imgui/imgui_layer.cpp
-badd +4 ~/projects/open_engine/open_engine/include/open_engine/opengl/imgui_glfw.h
-badd +35 ~/projects/open_engine/open_engine/include/open_engine/opengl/imgui_opengl.h
-badd +23 ~/projects/open_engine/open_engine/src/open_engine/application.cpp
-badd +47 ~/projects/open_engine/open_engine/CMakeLists.txt
-badd +12 ~/projects/open_engine/open_engine/include/open_engine/imgui/imgui_layer.hpp
-badd +123 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_opengl.cpp
-badd +89 ~/.conan2/p/b/imgui15e51a8fb5246/p/include/imgui.h
-badd +7 ~/projects/open_engine/open_engine/.envrc
-badd +5 ~/projects/open_engine/open_engine/include/open_engine/core.hpp
-badd +11 ~/.conan2/p/b/imgui15e51a8fb5246/p/include/imgui_export_headers.h
-badd +1 ~/projects/open_engine/open_engine/src/open_engine/opengl/build_opengl.cpp
-badd +4 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_build.cpp
-badd +1 ~/projects/open_engine/open_engine/conanfile.txt
-badd +1 ~/projects/open_engine/open_engine/build/imguiTargets.cmake
-badd +8 ~/projects/open_engine/open_engine/include/open_engine/logging.hpp
-badd +4 ~/projects/open_engine/open_engine/src/open_engine/logging.cpp
-badd +110 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_glfw.cpp
-badd +1 ~/projects/open_engine/open_engine/include/open_engine/application.hpp
-badd +21 ~/projects/open_engine/open_engine/src/open_engine/window/linux_window.cpp
-badd +24 ~/projects/open_engine/open_engine/include/open_engine/window/window.hpp
-badd +27 ~/projects/open_engine/open_engine/include/open_engine/window/linux_window.hpp
-badd +7 ~/projects/open_engine/open_engine/include/open_engine/renderer/GraphicsContext.hpp
-badd +12 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_context.hpp
-badd +10 ~/projects/open_engine/open_engine/src/open_engine/input/linux_input.cpp
-badd +17 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_context.cpp
-badd +3295 ~/projects/open_engine/open_engine/vendor/glad/include/glad/glad.h
-badd +148 ~/projects/open_engine/open_engine/vendor/glad/src/glad/glad.c
-badd +13 ~/projects/open_engine/open_engine/include/open_engine/renderer/graphics_context.hpp
-badd +80 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_shader.cpp
-badd +8 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_shader.hpp
-badd +8 ~/projects/open_engine/open_engine/include/open_engine/renderer/shader.hpp
-badd +1 ~/projects/open_engine/open_engine/src/open_engine/renderer/shader.cpp
-badd +1 ~/projects/open_engine/open_engine/include/open_engine/pch.hpp
-badd +3 ~/projects/open_engine/open_engine/assets/shaders/fragment.frag.old
-badd +1 ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
-badd +5 ~/projects/open_engine/open_engine/assets/shaders/vertex.vert
-badd +1 ~/projects/open_engine/open_engine/\'
-badd +66 ~/projects/open_engine/open_engine/include/open_engine/renderer/buffer.hpp
-badd +56 ~/projects/open_engine/open_engine/src/open_engine/renderer/buffer.cpp
-badd +18 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_buffer.hpp
-badd +34 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_buffer.cpp
-badd +2 ~/projects/open_engine/open_engine/src/open_engine/renderer/renderer.cpp
-badd +5 ~/projects/open_engine/open_engine/include/open_engine/renderer/renderer.hpp
-badd +1 ~/projects/open_engine/open_engine/src/open_engine/layer.cpp
-badd +12 ~/projects/open_engine/open_engine/include/open_engine/layer.hpp
-badd +21 ~/projects/open_engine/open_engine/include/open_engine/events/event.hpp
-badd +11 ~/projects/open_engine/open_engine/src/open_engine/renderer/vertex_array.cpp
-badd +8 ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
-badd +27 ~/projects/open_engine/open_engine/src/open_engine/layer_stack.cpp
-badd +1 ~/projects/open_engine/open_engine/include/open_engine/layer_stack.hpp
-argglobal
-%argdel
-$argadd ~/projects/open_engine/open_engine
-set stal=2
-tabnew +setlocal\ bufhidden=wipe
-tabrewind
-edit ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
-let s:save_splitbelow = &splitbelow
-let s:save_splitright = &splitright
-set splitbelow splitright
-wincmd _ | wincmd |
-vsplit
-1wincmd h
-wincmd w
-let &splitbelow = s:save_splitbelow
-let &splitright = s:save_splitright
-wincmd t
-let s:save_winminheight = &winminheight
-let s:save_winminwidth = &winminwidth
-set winminheight=0
-set winheight=1
-set winminwidth=0
-set winwidth=1
-exe 'vert 1resize ' . ((&columns * 127 + 127) / 255)
-exe 'vert 2resize ' . ((&columns * 127 + 127) / 255)
-argglobal
-setlocal foldmethod=manual
-setlocal foldexpr=0
-setlocal foldmarker={{{,}}}
-setlocal foldignore=#
-setlocal foldlevel=0
-setlocal foldminlines=1
-setlocal foldnestmax=20
-setlocal foldenable
-silent! normal! zE
-let &fdl = &fdl
-let s:l = 8 - ((7 * winheight(0) + 13) / 27)
-if s:l < 1 | let s:l = 1 | endif
-keepjumps exe s:l
-normal! zt
-keepjumps 8
-normal! 0
-lcd ~/projects/open_engine/open_engine
-wincmd w
-argglobal
-if bufexists(fnamemodify("~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp", ":p")) | buffer ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp | else | edit ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp | endif
-if &buftype ==# 'terminal'
-  silent file ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
-endif
-setlocal foldmethod=manual
-setlocal foldexpr=0
-setlocal foldmarker={{{,}}}
-setlocal foldignore=#
-setlocal foldlevel=0
-setlocal foldminlines=1
-setlocal foldnestmax=20
-setlocal foldenable
-silent! normal! zE
-let &fdl = &fdl
-let s:l = 1 - ((0 * winheight(0) + 13) / 27)
-if s:l < 1 | let s:l = 1 | endif
-keepjumps exe s:l
-normal! zt
-keepjumps 1
-normal! 0
-lcd ~/projects/open_engine/open_engine
-wincmd w
-exe 'vert 1resize ' . ((&columns * 127 + 127) / 255)
-exe 'vert 2resize ' . ((&columns * 127 + 127) / 255)
-tabnext
-edit ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
-let s:save_splitbelow = &splitbelow
-let s:save_splitright = &splitright
-set splitbelow splitright
-wincmd _ | wincmd |
-vsplit
-1wincmd h
-wincmd w
-let &splitbelow = s:save_splitbelow
-let &splitright = s:save_splitright
-wincmd t
-let s:save_winminheight = &winminheight
-let s:save_winminwidth = &winminwidth
-set winminheight=0
-set winheight=1
-set winminwidth=0
-set winwidth=1
-exe 'vert 1resize ' . ((&columns * 254 + 127) / 255)
-exe 'vert 2resize ' . ((&columns * 0 + 127) / 255)
-argglobal
-setlocal foldmethod=manual
-setlocal foldexpr=0
-setlocal foldmarker={{{,}}}
-setlocal foldignore=#
-setlocal foldlevel=0
-setlocal foldminlines=1
-setlocal foldnestmax=20
-setlocal foldenable
-silent! normal! zE
-let &fdl = &fdl
-let s:l = 11 - ((8 * winheight(0) + 13) / 27)
-if s:l < 1 | let s:l = 1 | endif
-keepjumps exe s:l
-normal! zt
-keepjumps 11
-normal! 020|
-lcd ~/projects/open_engine/open_engine
-wincmd w
-argglobal
-if bufexists(fnamemodify("~/projects/open_engine/open_engine/assets/shaders/vertex.vert", ":p")) | buffer ~/projects/open_engine/open_engine/assets/shaders/vertex.vert | else | edit ~/projects/open_engine/open_engine/assets/shaders/vertex.vert | endif
-if &buftype ==# 'terminal'
-  silent file ~/projects/open_engine/open_engine/assets/shaders/vertex.vert
-endif
-balt ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
-setlocal foldmethod=manual
-setlocal foldexpr=0
-setlocal foldmarker={{{,}}}
-setlocal foldignore=#
-setlocal foldlevel=0
-setlocal foldminlines=1
-setlocal foldnestmax=20
-setlocal foldenable
-silent! normal! zE
-let &fdl = &fdl
-let s:l = 12 - ((11 * winheight(0) + 13) / 27)
-if s:l < 1 | let s:l = 1 | endif
-keepjumps exe s:l
-normal! zt
-keepjumps 12
-normal! 022|
-lcd ~/projects/open_engine/open_engine
-wincmd w
-exe 'vert 1resize ' . ((&columns * 254 + 127) / 255)
-exe 'vert 2resize ' . ((&columns * 0 + 127) / 255)
-tabnext 1
-set stal=1
-if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
-  silent exe 'bwipe ' . s:wipebuf
-endif
-unlet! s:wipebuf
-set winheight=1 winwidth=20
-let &shortmess = s:shortmess_save
-let &winminheight = s:save_winminheight
-let &winminwidth = s:save_winminwidth
-let s:sx = expand("<sfile>:p:r")."x.vim"
-if filereadable(s:sx)
-  exe "source " . fnameescape(s:sx)
-endif
-let &g:so = s:so_save | let &g:siso = s:siso_save
-set hlsearch
-doautoall SessionLoadPost
-unlet SessionLoad
-" vim: set ft=vim :

open_engine/vendor/glad/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25.1)
 
 set(CMAKE_CXX_STANDARD 20)