depth-prepass #1

Merged
KJ16609 merged 22 commits from depth-prepass into master 2025-12-15 19:59:49 -05:00
6 changed files with 9 additions and 50 deletions
Showing only changes of commit 82519b43c1 - Show all commits

View File

@@ -1,2 +0,0 @@
add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/blurhash)
set_target_properties(BlurhashCXX PROPERTIES COMPILE_FLAGS ${FGL_FLAGS})

View File

@@ -3,18 +3,14 @@
set(GLFW_BUILD_X11 ON)
set(GLFW_BUILD_WAYLAND OFF)
#if (WIN32)
if (DEFINED ENV{GLFW_PATH})
message("-- GLFW_PATH defined as: $ENV{GLFW_PATH}.")
list(APPEND CMAKE_PREFIX_PATH $ENV{GLFW_PATH})
find_package(glfw3 REQUIRED)
else ()
message("-- GLFW_PATH not defined. Using submodule instead")
add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/glfw3)
endif ()
#else ()
# find_package(glfw3 REQUIRED)
#endif ()
if (DEFINED ENV{GLFW_PATH})
message("-- GLFW_PATH defined as: $ENV{GLFW_PATH}.")
list(APPEND CMAKE_PREFIX_PATH $ENV{GLFW_PATH})
find_package(glfw3 REQUIRED)
else ()
message("-- GLFW_PATH not defined. Using submodule instead")
add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/glfw3)
endif ()
set(GLFW_BUILD_X11 ON)
set(GLFW_BUILD_WAYLAND OFF)

View File

@@ -1,11 +0,0 @@
include(FetchContent)
include(FetchContent)
FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
)
# For Windows: Prevent overriding the parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)

View File

@@ -1,11 +0,0 @@
set(LZ4_DIR ${CMAKE_SOURCE_DIR}/dependencies/lz4/lib)
file(GLOB_RECURSE LZ4_SOURCES ${LZ4_DIR}/*.c)
add_library(lz4 STATIC ${LZ4_SOURCES})
target_include_directories(lz4 PUBLIC ${LZ4_DIR})
if (WIN32)
#target_compile_definitions(${CMAKE_SOURCE_DIR}/dependencies/lz4 PRIVATE UNICODE=1)
target_compile_definitions(lz4 PRIVATE LZ4_DEBUG=0)
endif ()

View File

@@ -1,13 +0,0 @@
#Verify after setting QT_PATH
if (DEFINED QT_PATH)
message("-- QT_PATH defined as ${QT_PATH}.")
list(APPEND CMAKE_PREFIX_PATH ${QT_PATH})
else ()
message("-- QT_PATH not defined.")
endif ()
find_package(Qt6 COMPONENTS Widgets Core Concurrent Network Test Charts REQUIRED)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

View File

@@ -14,4 +14,4 @@ AddFGLExecutable(TitorEditor ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(TitorEditor PRIVATE FGLEngine)
target_compile_definitions(TitorEditor PUBLIC TITOR_EDITOR)
target_compile_features(TitorEditor PRIVATE cxx_std_23)
target_link_libraries(TitorEditor PRIVATE glfw ImGui)
target_link_libraries(TitorEditor PRIVATE glfw ImGui X11)