Skip to content

v0.6.2 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Popochounet merged 4 commits into from
Nov 27, 2024
Merged

v0.6.2 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
041e306
fix: lights
Arcod7 Nov 26, 2024
5612969
fix: vcpkg version
Arcod7 Nov 26, 2024
f1eaa28
Merge pull request #90 from YGNI-RType/fix/lights
Popochounet Nov 27, 2024
b3eb38d
fixed lights: remove useless comments
Arcod7 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/automate-vcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
5 changes: 2 additions & 3 deletions source/GEngine/libdev/systems/driver/output/Draw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down