mirror of
https://github.com/MadeOfJelly/MushMachine.git
synced 2025-07-13 04:26:47 +02:00
Compare commits
8 Commits
vulkan_hea
...
v0.8.1
Author | SHA1 | Date | |
---|---|---|---|
3d03881002 | |||
3b2cd5c62b | |||
ee16ca5356 | |||
4b707a7adb | |||
e1bf5fefc0 | |||
e65878509e | |||
5ed74d956d | |||
989e3f7dda |
19
.github/workflows/cmake.yml
vendored
19
.github/workflows/cmake.yml
vendored
@ -62,6 +62,25 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||||
|
|
||||||
|
linux_tracy:
|
||||||
|
timeout-minutes: 10
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: sudo apt update && sudo apt -y install libsdl2-dev
|
||||||
|
|
||||||
|
- name: Configure CMake
|
||||||
|
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTRACY_ENABLE=ON
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
|
|
||||||
|
2
external/googletest
vendored
2
external/googletest
vendored
Submodule external/googletest updated: 705b9c1af2...58d77fa807
2
external/imgui/CMakeLists.txt
vendored
2
external/imgui/CMakeLists.txt
vendored
@ -39,6 +39,8 @@ set(HPP_FILES
|
|||||||
|
|
||||||
add_library(imgui ${CPP_FILES} ${HPP_FILES})
|
add_library(imgui ${CPP_FILES} ${HPP_FILES})
|
||||||
|
|
||||||
|
target_compile_features(imgui PUBLIC cxx_std_11)
|
||||||
|
|
||||||
if(MM_OPENGL_3_GLES)
|
if(MM_OPENGL_3_GLES)
|
||||||
target_compile_definitions(imgui PUBLIC IMGUI_IMPL_OPENGL_ES3)
|
target_compile_definitions(imgui PUBLIC IMGUI_IMPL_OPENGL_ES3)
|
||||||
target_compile_definitions(imgui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM) # bug?
|
target_compile_definitions(imgui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM) # bug?
|
||||||
|
2
external/imgui/imgui
vendored
2
external/imgui/imgui
vendored
Submodule external/imgui/imgui updated: c71a50deb5...9aae45eb4a
2
external/physfs/physfs
vendored
2
external/physfs/physfs
vendored
Submodule external/physfs/physfs updated: a0dfe220ff...0d4e9aac45
2
external/soloud/soloud
vendored
2
external/soloud/soloud
vendored
Submodule external/soloud/soloud updated: 4d72336a88...1157475881
2
external/tracy/tracy
vendored
2
external/tracy/tracy
vendored
Submodule external/tracy/tracy updated: 9ba7171c3d...f493d4aa8b
@ -30,7 +30,7 @@ namespace MM::OpenGL::RenderTasks {
|
|||||||
std::string color_tex {"hdr_color"};
|
std::string color_tex {"hdr_color"};
|
||||||
std::string bloom_tex {"bloom"};
|
std::string bloom_tex {"bloom"};
|
||||||
|
|
||||||
float bloom_factor {1.f};
|
float bloom_factor {0.8f};
|
||||||
|
|
||||||
void reloadShaders(MM::Engine& engine);
|
void reloadShaders(MM::Engine& engine);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user