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}) diff --git a/install/cmake/automate-vcpkg-gengine.cmake b/install/cmake/automate-vcpkg-gengine.cmake index f77e42e..86bea3b 100644 --- a/install/cmake/automate-vcpkg-gengine.cmake +++ b/install/cmake/automate-vcpkg-gengine.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}) diff --git a/install/overlay-ports/gengine/portfile.cmake b/install/overlay-ports/gengine/portfile.cmake index 7aaf28a..cfc735a 100644 --- a/install/overlay-ports/gengine/portfile.cmake +++ b/install/overlay-ports/gengine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO YGNI-RType/GEngine - REF v0.5.0 - SHA512 e2080f9d406a9e33ef23517bc0f9bf6434778453ceec55a90d1b62acdb99c7b3ab3e0208416cc0982c2b11eba7e53ab233047d323197fd6a79b4f92392f4a172 + REF v0.6.1 + SHA512 a6e4db4e12f9cb8c81aa226d9ae873c55c598d374dc9fbdb9d811c8295cc8bb7e68eafe0b062f917bad5b3868e2d52025f23358030c0927d4fe3a5d03f25f542 ) set(ENV{NOT_INSTALL_VCPKG} true) diff --git a/source/GEngine/libdev/systems/driver/output/Draw.cpp b/source/GEngine/libdev/systems/driver/output/Draw.cpp index b2ee961..532c3c0 100644 --- a/source/GEngine/libdev/systems/driver/output/Draw.cpp +++ b/source/GEngine/libdev/systems/driver/output/Draw.cpp @@ -139,12 +139,11 @@ 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); } void DrawModel::onStopEngine(gengine::system::event::StopEngine &e) {