From 2a229dfefda2ff6c2b8dfef2b7dd82039a82aef6 Mon Sep 17 00:00:00 2001 From: Fabian Klemp Date: Mon, 9 Mar 2015 14:59:22 +0100 Subject: [PATCH 1/4] Fixing waterPlane not being rendered last, leading to incorrect alpha. --- level.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/level.cc b/level.cc index f9abdcb..ec7eaf7 100644 --- a/level.cc +++ b/level.cc @@ -19,8 +19,8 @@ Level::~Level() { } for(unsigned int i = 0; irender(shader, lightingPass, true, viewProjectionMatrix, shadowVPs); - waterPlane->render(shader, lightingPass, true, viewProjectionMatrix, shadowVPs); } else { objects.at(i)->render(shader, lightingPass, false, viewProjectionMatrix, shadowVPs); } } + if (lightingPass) { + waterPlane->render(shader, lightingPass, true, viewProjectionMatrix, shadowVPs); + } } void Level::update(float runTimeSinceLastUpdate, float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPressed, bool sPressed, bool dPressed,bool kPressed, bool lPressed) { From 6a06f777737a4dfffbf1961ab3de8f65d34deb15 Mon Sep 17 00:00:00 2001 From: Fabian Klemp Date: Mon, 9 Mar 2015 15:16:18 +0100 Subject: [PATCH 2/4] Chaging executable name to game name. --- CMakeLists.txt | 6 +++--- run.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caf8bbb..0ccb164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.6) add_subdirectory(converter) # project/binary name: -PROJECT(MarbleRaceGroupC) +PROJECT(saxum) # ACGL setup SET(ACGL_OPENGL_SUPPORT CORE_32) @@ -146,5 +146,5 @@ SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_LUA_BRIDGE}) SET (LIBRARIES ${LIBRARIES} ${CMAKE_SOURCE_DIR}/extern/lua/src/liblua.a) -ADD_EXECUTABLE(MarbleRaceGroupC ${SOURCE_FILES} ${HEADER_FILES} ${SHADER_FILES} ${README_FILES}) -TARGET_LINK_LIBRARIES(MarbleRaceGroupC ${LIBRARIES} ${CMAKE_DL_LIBS}) +ADD_EXECUTABLE(saxum ${SOURCE_FILES} ${HEADER_FILES} ${SHADER_FILES} ${README_FILES}) +TARGET_LINK_LIBRARIES(saxum ${LIBRARIES} ${CMAKE_DL_LIBS}) diff --git a/run.sh b/run.sh index 8bd84f1..43fe41a 100755 --- a/run.sh +++ b/run.sh @@ -2,5 +2,5 @@ if ./build.sh then - cd binaries; ./MarbleRaceGroupC + cd binaries; ./saxum fi From 330ce60564724b7d52a26c97208ee2e9e730677f Mon Sep 17 00:00:00 2001 From: Fabian Klemp Date: Mon, 9 Mar 2015 15:43:12 +0100 Subject: [PATCH 3/4] Changed a few parameters corresponding with the sunrise. --- data/levels/Level1.xml | 18 +++++++++--------- data/shader/phong.fsh | 6 +++--- data/shader/skydome.fsh | 4 ++-- graphics.cc | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml index 01de205..09f77db 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -13057,23 +13057,23 @@ - 0.10 - 0.14 - 0.14 + 0.57 + 0.80 + 0.98 1.0 - 0.60 - 0.14 - 0.14 + 0.88 + 0.38 + 0.38 1.0 - 0.05 - 0.07 - 0.34 + 0.09 + 0.1 + 0.24 1.0 diff --git a/data/shader/phong.fsh b/data/shader/phong.fsh index 507e19a..7562e38 100644 --- a/data/shader/phong.fsh +++ b/data/shader/phong.fsh @@ -92,11 +92,11 @@ vec4 fogColor(float dot) { if(dot<0.0) { dayFactor = 0.0; } - else if(dot>0.51) { + else if(dot>1.0) { dayFactor = 1.0; } else { - dayFactor = sin(3*dot); + dayFactor = sin(1.5*dot); } if (dot <0.0) { return mix(fogColorNight, fogColorRise, riseFactor); @@ -155,7 +155,7 @@ void main() if(length(directionalLightVector)>0.0f) { vec3 directionalVector = normalize(directionalLightVector); sunAngle = dot(vec3(0.0, 1.0, 0.0), directionalVector); - if ( sunAngle > -0.5) { + if ( sunAngle > -0.7) { float directionalVisibility = 1.0f; if (distanceToBorder(shadowCoord1.xy) <= 0.5 && distanceToBorder(shadowCoord1.xy) > 0.2) { if (distanceToBorder(shadowCoord0.xy) <= 0.5 && distanceToBorder(shadowCoord0.xy) > 0.2) { diff --git a/data/shader/skydome.fsh b/data/shader/skydome.fsh index ce5174e..45f2e81 100644 --- a/data/shader/skydome.fsh +++ b/data/shader/skydome.fsh @@ -35,11 +35,11 @@ vec4 fogColor(float dot) { if(dot<0.0) { dayFactor = 0.0; } - else if(dot>0.77) { + else if(dot>1.0) { dayFactor = 1.0; } else { - dayFactor = sin(2*dot); + dayFactor = sin(1.5*dot); } if (dot <0.0) { return mix(fogColorNight, fogColorRise, riseFactor); diff --git a/graphics.cc b/graphics.cc index acf473f..f860c90 100644 --- a/graphics.cc +++ b/graphics.cc @@ -348,7 +348,7 @@ void Graphics::render(double time) for (unsigned int i = 0; ibind(); glClear(GL_DEPTH_BUFFER_BIT); - if (sunAngle > -0.5f) { + if (sunAngle > -0.7f) { float projection_size = 0.0f; switch(i) { case 0: From 4881b11f4112a975e59f902acfb5930297da7177 Mon Sep 17 00:00:00 2001 From: Fabian Klemp Date: Mon, 9 Mar 2015 15:43:44 +0100 Subject: [PATCH 4/4] Made sunrise last longer. --- data/levels/scripts/sunUpdate.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/levels/scripts/sunUpdate.lua b/data/levels/scripts/sunUpdate.lua index 4bddcd1..ef7b2d2 100644 --- a/data/levels/scripts/sunUpdate.lua +++ b/data/levels/scripts/sunUpdate.lua @@ -7,7 +7,7 @@ function trigger(objectToChange) return end - local maxTimeDiff = 20 + local maxTimeDiff = 30 local timeDiff = os.clock()- global.sunStartTime if(timeDiff > maxTimeDiff)then timeDiff = maxTimeDiff