8 Commits

8 changed files with 27 additions and 6 deletions

View File

@ -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

View File

@ -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?

View File

@ -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);