diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e7f99b..04b44d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,10 +23,10 @@ add_library(PuzGame SHARED ${sources_game}) set_property(TARGET PuzGame PROPERTY CXX_STANDARD 17) SET(BGFX_BUILD_TOOLS ON) -SET(BGFX_BUILD_EXAMPLES OFF) -SET(BGFX_CONFIG_MULTITHREADED OFF) +SET(BGFX_BUILD_EXAMPLES ON) +#SET(BGFX_CONFIG_MULTITHREADED OFF) add_subdirectory("${CMAKE_SOURCE_DIR}/dependency/bgfx.cmake") target_link_libraries(PuzGame bx bimg bgfx) -target_link_libraries(PuzGameEngine bx bimg bgfx) +target_link_libraries(PuzGameEngine bx) set_target_properties(PuzGame PROPERTIES OUTPUT_NAME "PuzGame2") diff --git a/src/engine/main.cpp b/src/engine/main.cpp index 36f675d..5a111cc 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -5,7 +5,6 @@ #include #include -#include #define VISUAL_STUDIO diff --git a/src/game/compiled-shaders/glsl/vert.bin b/src/game/compiled-shaders/glsl/vert.bin index 9eed011..b679ca4 100644 Binary files a/src/game/compiled-shaders/glsl/vert.bin and b/src/game/compiled-shaders/glsl/vert.bin differ diff --git a/src/game/rendering/Rendering.cpp b/src/game/rendering/Rendering.cpp index 4b355ff..718e253 100644 --- a/src/game/rendering/Rendering.cpp +++ b/src/game/rendering/Rendering.cpp @@ -94,8 +94,8 @@ namespace Game { bgfx::Init init; init.type = bgfx::RendererType::OpenGL; - init.debug = true; - init.callback = &Callback; + //init.debug = true; + //init.callback = &Callback; init.platformData.nwh = (void*)window; init.platformData.ndt = nullptr; init.platformData.type = bgfx::NativeWindowHandleType::Default; @@ -112,7 +112,7 @@ namespace Game } bgfx::setDebug(BGFX_DEBUG_TEXT); bgfx::setViewClear(0, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x303030ff, 1.0f, 0); - + VertLayout.begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) @@ -152,7 +152,7 @@ namespace Game | BGFX_STATE_WRITE_A | BGFX_STATE_WRITE_Z | BGFX_STATE_DEPTH_TEST_LESS - | BGFX_STATE_CULL_CW + | BGFX_STATE_CULL_CW | BGFX_STATE_MSAA ; diff --git a/src/game/shaders/frag.sc b/src/game/shaders/frag.sc index ee704a3..656e683 100644 --- a/src/game/shaders/frag.sc +++ b/src/game/shaders/frag.sc @@ -1,4 +1,5 @@ $input v_color0 + #include "common.sh" void main() diff --git a/src/game/shaders/vert.sc b/src/game/shaders/vert.sc index c5b7667..2d5f540 100644 --- a/src/game/shaders/vert.sc +++ b/src/game/shaders/vert.sc @@ -5,6 +5,6 @@ $output v_color0 void main() { - gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0) ); + gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0)); v_color0 = a_color0; }