anfer/OpenEngine
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

trying to get everything to work

Browse Source
This commit is contained in:
Erris
2026-03-10 14:47:54 +01:00
parent d654c99a8e
commit e3678118b4
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conanfile.txt
View File

@@ -7,6 +7,7 @@ joltphysics/5.2.0
fastgltf/0.9.0 fastgltf/0.9.0
glm/1.0.1 glm/1.0.1
glfw/3.4 glfw/3.4
shaderc/2025.3
[generators] [generators]
CMakeDeps CMakeDeps

2
editor/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
"/usr/include/freetype2/" "/usr/include/freetype2/"
) )
target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.linux-x64/10.0.3/runtimes/linux-x64/native") target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/")
#target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/libnethost.a") #target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/libnethost.a")
target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE

3
open_engine/CMakeLists.txt
View File

@@ -18,6 +18,7 @@ find_package(fastgltf REQUIRED)
find_package(spdlog REQUIRED) find_package(spdlog REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(shaderc REQUIRED)
file(GLOB_RECURSE SRC_FILES "src/*.cpp") file(GLOB_RECURSE SRC_FILES "src/*.cpp")
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp") file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
@@ -57,7 +58,7 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
X11 X11
yaml-cpp::yaml-cpp yaml-cpp::yaml-cpp
nfd nfd
shaderc_combined shaderc::shaderc
glslang glslang
glslang-default-resource-limits glslang-default-resource-limits
SPIRV SPIRV

3
open_engine/include/open_engine/pch.hpp
View File

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

1
open_engine/include/open_engine/renderer/shader.hpp
View File

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

4
open_engine/src/open_engine/opengl/opengl_shader.cpp
View File

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