Skip to content

Commit a27669a

Browse files
authored
Merge pull request #92 from YGNI-RType/docs/vcpkg-version
Docs/vcpkg version
2 parents 9bee741 + 2f93656 commit a27669a

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

cmake/automate-vcpkg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endmacro()
3939
macro(_install_or_update_vcpkg)
4040
if(NOT EXISTS ${VCPKG_ROOT})
4141
message(STATUS "Cloning vcpkg in ${VCPKG_ROOT}")
42-
execute_process(COMMAND git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
42+
execute_process(COMMAND git clone --depth 1 --branch 2024.10.21 https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
4343
else()
4444
message(STATUS "Auto-updating vcpkg in ${VCPKG_ROOT}")
4545
execute_process(COMMAND git pull WORKING_DIRECTORY ${VCPKG_ROOT})

install/cmake/automate-vcpkg-gengine.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endmacro()
3939
macro(_install_or_update_vcpkg)
4040
if(NOT EXISTS ${VCPKG_ROOT})
4141
message(STATUS "Cloning vcpkg in ${VCPKG_ROOT}")
42-
execute_process(COMMAND git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
42+
execute_process(COMMAND git clone --depth 1 --branch 2024.10.21 https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
4343
else()
4444
message(STATUS "Auto-updating vcpkg in ${VCPKG_ROOT}")
4545
execute_process(COMMAND git pull WORKING_DIRECTORY ${VCPKG_ROOT})

install/overlay-ports/gengine/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO YGNI-RType/GEngine
6-
REF v0.5.0
7-
SHA512 e2080f9d406a9e33ef23517bc0f9bf6434778453ceec55a90d1b62acdb99c7b3ab3e0208416cc0982c2b11eba7e53ab233047d323197fd6a79b4f92392f4a172
6+
REF v0.6.1
7+
SHA512 a6e4db4e12f9cb8c81aa226d9ae873c55c598d374dc9fbdb9d811c8295cc8bb7e68eafe0b062f917bad5b3868e2d52025f23358030c0927d4fe3a5d03f25f542
88
)
99

1010
set(ENV{NOT_INSTALL_VCPKG} true)

source/GEngine/libdev/systems/driver/output/Draw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,11 @@ void DrawModel::onStartEngine(gengine::system::event::StartEngine &e) {
139139

140140
shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos");
141141
int ambientLoc = GetShaderLocation(shader, "ambient");
142-
float ambiantValue[4] = {0.2f, 0.2f, 0.2f, 1.0f};
142+
float ambiantValue[4] = {0.1f, 0.1f, 0.1f, 1.0f};
143143
SetShaderValue(shader, ambientLoc, ambiantValue, SHADER_UNIFORM_VEC4);
144144

145145
lights[0] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader);
146-
lights[1] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader);
147-
lights[2] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader);
146+
lights[1] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader);
148147
}
149148

150149
void DrawModel::onStopEngine(gengine::system::event::StopEngine &e) {

0 commit comments

Comments
 (0)