Skip to content

Commit f1eaa28

Browse files
authored
Merge pull request #90 from YGNI-RType/fix/lights
Fix/lights
2 parents 9bee741 + 5612969 commit f1eaa28

2 files changed

Lines changed: 5 additions & 4 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})

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,13 @@ 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);
147+
// lights[1] = CreateLight(LIGHT_POINT, {1.16, 1.40, 4.76}, {0, 0, 0}, RED, shader);
148+
// lights[2] = CreateLight(LIGHT_POINT, {6.8, 1.4, 4.5}, {0, 0, 0}, BLUE, shader);
148149
}
149150

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

0 commit comments

Comments
 (0)