From 041e306bfadb6482323b8305956623997b9ca8a6 Mon Sep 17 00:00:00 2001 From: Arcod7 Date: Tue, 26 Nov 2024 22:46:25 +0100 Subject: [PATCH 1/3] fix: lights --- source/GEngine/libdev/systems/driver/output/Draw.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/GEngine/libdev/systems/driver/output/Draw.cpp b/source/GEngine/libdev/systems/driver/output/Draw.cpp index b2ee961..624de84 100644 --- a/source/GEngine/libdev/systems/driver/output/Draw.cpp +++ b/source/GEngine/libdev/systems/driver/output/Draw.cpp @@ -139,12 +139,13 @@ void DrawModel::onStartEngine(gengine::system::event::StartEngine &e) { shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos"); int ambientLoc = GetShaderLocation(shader, "ambient"); - float ambiantValue[4] = {0.2f, 0.2f, 0.2f, 1.0f}; + float ambiantValue[4] = {0.1f, 0.1f, 0.1f, 1.0f}; SetShaderValue(shader, ambientLoc, ambiantValue, SHADER_UNIFORM_VEC4); lights[0] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader); - lights[1] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader); - lights[2] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader); + lights[1] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader); + // lights[1] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader); + // lights[2] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader); } void DrawModel::onStopEngine(gengine::system::event::StopEngine &e) { From 56129697b71ccd20d72b5fcc51f6c77efc5f5030 Mon Sep 17 00:00:00 2001 From: Arcod7 Date: Tue, 26 Nov 2024 23:07:54 +0100 Subject: [PATCH 2/3] fix: vcpkg version --- cmake/automate-vcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/automate-vcpkg.cmake b/cmake/automate-vcpkg.cmake index 1f340ef..3da9e3c 100644 --- a/cmake/automate-vcpkg.cmake +++ b/cmake/automate-vcpkg.cmake @@ -39,7 +39,7 @@ endmacro() macro(_install_or_update_vcpkg) if(NOT EXISTS ${VCPKG_ROOT}) message(STATUS "Cloning vcpkg in ${VCPKG_ROOT}") - execute_process(COMMAND git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT}) + execute_process(COMMAND git clone --depth 1 --branch 2024.10.21 https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT}) else() message(STATUS "Auto-updating vcpkg in ${VCPKG_ROOT}") execute_process(COMMAND git pull WORKING_DIRECTORY ${VCPKG_ROOT}) From b3eb38dac2e8cc64e1bb883b20672d95195b8dd1 Mon Sep 17 00:00:00 2001 From: Antoine ESMAN Date: Wed, 27 Nov 2024 14:03:34 +0100 Subject: [PATCH 3/3] fixed lights: remove useless comments --- source/GEngine/libdev/systems/driver/output/Draw.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/GEngine/libdev/systems/driver/output/Draw.cpp b/source/GEngine/libdev/systems/driver/output/Draw.cpp index 624de84..532c3c0 100644 --- a/source/GEngine/libdev/systems/driver/output/Draw.cpp +++ b/source/GEngine/libdev/systems/driver/output/Draw.cpp @@ -144,8 +144,6 @@ void DrawModel::onStartEngine(gengine::system::event::StartEngine &e) { lights[0] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader); lights[1] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader); - // lights[1] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader); - // lights[2] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader); } void DrawModel::onStopEngine(gengine::system::event::StopEngine &e) {