fix skybox fill mode bug / add jolt as a dependency
This commit is contained in:
@@ -44,3 +44,6 @@
|
|||||||
[submodule "destrum/third_party/imgui"]
|
[submodule "destrum/third_party/imgui"]
|
||||||
path = destrum/third_party/imgui
|
path = destrum/third_party/imgui
|
||||||
url = https://github.com/ocornut/imgui.git
|
url = https://github.com/ocornut/imgui.git
|
||||||
|
[submodule "destrum/third_party/jolt"]
|
||||||
|
path = destrum/third_party/jolt
|
||||||
|
url = https://github.com/jrouwe/JoltPhysics.git
|
||||||
|
|||||||
@@ -64,6 +64,9 @@ set_target_properties(destrum PROPERTIES
|
|||||||
#target_add_extra_warnings(destrum)
|
#target_add_extra_warnings(destrum)
|
||||||
|
|
||||||
target_include_directories(destrum PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include")
|
target_include_directories(destrum PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include")
|
||||||
|
target_include_directories(destrum PRIVATE
|
||||||
|
"${CMAKE_CURRENT_LIST_DIR}/third_party/jolt"
|
||||||
|
)
|
||||||
|
|
||||||
target_link_libraries(destrum
|
target_link_libraries(destrum
|
||||||
PUBLIC
|
PUBLIC
|
||||||
@@ -78,6 +81,7 @@ target_link_libraries(destrum
|
|||||||
tinygltf
|
tinygltf
|
||||||
assimp
|
assimp
|
||||||
imgui
|
imgui
|
||||||
|
Jolt
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
freetype::freetype
|
freetype::freetype
|
||||||
|
|||||||
@@ -10,6 +10,8 @@
|
|||||||
#include "glm/gtx/transform.hpp"
|
#include "glm/gtx/transform.hpp"
|
||||||
#include "spdlog/spdlog.h"
|
#include "spdlog/spdlog.h"
|
||||||
|
|
||||||
|
#include <Jolt/Jolt.h>
|
||||||
|
|
||||||
App::App() {
|
App::App() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ void CubeMap::RenderToCubemap(ImageID inputImage,
|
|||||||
vkCmdSetScissor(cmd, 0, 1, &scissor);
|
vkCmdSetScissor(cmd, 0, 1, &scissor);
|
||||||
|
|
||||||
m_cubemapPipeline->bind(cmd);
|
m_cubemapPipeline->bind(cmd);
|
||||||
|
vkCmdSetPolygonModeEXT(cmd, VK_POLYGON_MODE_FILL);
|
||||||
gfx.bindBindlessDescSet(cmd, m_cubemapPipelineLayout);
|
gfx.bindBindlessDescSet(cmd, m_cubemapPipelineLayout);
|
||||||
|
|
||||||
vkCmdPushConstants(
|
vkCmdPushConstants(
|
||||||
|
|||||||
Vendored
+28
@@ -94,3 +94,31 @@ target_link_libraries(imgui PUBLIC
|
|||||||
SDL2::SDL2
|
SDL2::SDL2
|
||||||
volk
|
volk
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Jolt Physics
|
||||||
|
set(DOUBLE_PRECISION OFF CACHE BOOL "" FORCE)
|
||||||
|
set(GENERATE_DEBUG_SYMBOLS ON CACHE BOOL "" FORCE)
|
||||||
|
set(OVERRIDE_CXX_FLAGS OFF CACHE BOOL "" FORCE)
|
||||||
|
set(CROSS_PLATFORM_DETERMINISTIC OFF CACHE BOOL "" FORCE)
|
||||||
|
set(INTERPROCEDURAL_OPTIMIZATION OFF CACHE BOOL "" FORCE)
|
||||||
|
set(FLOATING_POINT_EXCEPTIONS_ENABLED OFF CACHE BOOL "" FORCE)
|
||||||
|
set(CPP_EXCEPTIONS_ENABLED OFF CACHE BOOL "" FORCE)
|
||||||
|
set(CPP_RTTI_ENABLED OFF CACHE BOOL "" FORCE)
|
||||||
|
set(OBJECT_LAYER_BITS 16 CACHE STRING "" FORCE)
|
||||||
|
|
||||||
|
# Important for MSVC:
|
||||||
|
# OFF = use /MD or /MDd, matching your current project
|
||||||
|
# ON = use /MT or /MTd
|
||||||
|
set(USE_STATIC_MSVC_RUNTIME_LIBRARY OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
set(USE_SSE4_1 ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_SSE4_2 ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_AVX ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_AVX2 ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_AVX512 OFF CACHE BOOL "" FORCE)
|
||||||
|
set(USE_LZCNT ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_TZCNT ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_F16C ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_FMADD ON CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
add_subdirectory(jolt/Build)
|
||||||
|
|||||||
+1
Submodule destrum/third_party/jolt added at 33a8797521
Reference in New Issue
Block a user