Skip to content

Commit

Permalink
Minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@voldien
voldien committed Nov 5, 2024
1 parent fc8c1ec commit 4d163b5
Show file tree
Hide file tree
Showing 36 changed files with 165 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Configure dependencies
run: |
sudo apt-get update
sudo apt-get install pkg-config libsdl2-dev libfreeimage-dev libfreetype6-dev libfmt-dev libglm-dev libglew-dev libgtest-dev googletest mesa-common-dev mesa-utils libopenal-dev
sudo apt-get install pkg-config libsdl2-dev libfreeimage-dev libfreetype6-dev libfmt-dev libglm-dev libglew-dev libgtest-dev googletest mesa-common-dev mesa-utils libopenal-dev libalut-dev
sudo apt-get install glslang-tools libassimp-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libglfw3-dev binutils-dev libeigen3-dev libglu1-mesa-dev libbz2-dev \
libzip-dev libogg-dev libopus-dev libvorbis-dev
Expand Down
17 changes: 13 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,26 @@ ELSE()
MESSAGE(STATUS "Compile for debug.")
ADD_DEFINITIONS(-g3 -O0)
SET(CMAKE_DEBUG TRUE)
ADD_DEFINITIONS(-D_GLIBCXX_ASSERTIONS)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_RELEASE} -s ${OpenMP_CXX_FLAGS}")
SET(SIMD_FLAGS "-ftree-vectorize -ftree-slp-vectorize -ftree-vectorizer-verbose=10")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_RELEASE} ${OpenMP_CXX_FLAGS}")

# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
# SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=address")

# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
# SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=address")

# SET(BUILD_WITH_UBSAN ON)
# SET(BUILD_WITH_ASAN ON)
ENDIF()

# ###########################################
# Backend libraries
# ###########################################
SET(MIMI_VULKAN_SUPPORT OFF)
ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/extern/nekomimi EXCLUDE_FROM_ALL)
#
# Fragcore specific libraries
ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/extern/nekomimi/extern/fragcore/modules/image/imageloader EXCLUDE_FROM_ALL)
ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/extern/nekomimi/extern/fragcore/modules/taskscheduler/TaskSch EXCLUDE_FROM_ALL)
ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/extern/nekomimi/extern/fragcore/modules/geometryutil EXCLUDE_FROM_ALL)
Expand Down
11 changes: 8 additions & 3 deletions Samples/AmbientOcclusion/AmbientOcclusion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ namespace glsample {
glm::mat4 modelViewProjection;

/* Light source. */
glm::vec4 direction;
glm::vec4 lightColor;
DirectionalLight directional_light;
glm::vec4 specularColor;
glm::vec4 ambientColor;
glm::vec4 viewDir;
Expand Down Expand Up @@ -120,6 +119,12 @@ namespace glsample {
ImGui::Checkbox("DownSample", &this->downScale);
ImGui::Checkbox("Use Depth Only", &this->useDepthOnly);

ImGui::TextUnformatted("Light Settings");
ImGui::ColorEdit4("Light", &this->getRefSample().uniformStageBlock.directional_light.lightColor[0],
ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction",
&this->getRefSample().uniformStageBlock.directional_light.lightDirection[0]);

ImGui::TextUnformatted("Debugging");
ImGui::Checkbox("Show Only AO", &this->showAOOnly);
ImGui::Checkbox("Show GBuffer", &this->showGBuffers);
Expand Down Expand Up @@ -265,7 +270,7 @@ namespace glsample {
glUniform1iARB(glGetUniformLocation(this->multipass_program, "DiffuseTexture"), 0);
glUniform1iARB(glGetUniformLocation(this->multipass_program, "NormalTexture"), 1);
glUniform1iARB(glGetUniformLocation(this->multipass_program, "AlphaMaskedTexture"), 2);

glUniformBlockBinding(this->multipass_program, uniform_buffer_index, this->uniform_buffer_binding);
glUseProgram(0);

Expand Down
6 changes: 3 additions & 3 deletions Samples/Fog/Fog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ namespace glsample {

void draw() override {
ImGui::TextUnformatted("Light Settings");
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);

ImGui::TextUnformatted("Fog Settings");
ImGui::DragInt("Fog Type", (int *)&this->uniform.fogType);
ImGui::ColorEdit4("Fog Color", &this->uniform.fogColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Fog Color", &this->uniform.fogColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat("Fog Density", &this->uniform.fogDensity);
ImGui::DragFloat("Fog Intensity", &this->uniform.fogIntensity);
ImGui::DragFloat("Fog Start", &this->uniform.fogStart);
Expand Down
4 changes: 2 additions & 2 deletions Samples/FrustumCulling/CullingFrustum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ namespace glsample {
void draw() override {

ImGui::TextUnformatted("Light Settings");
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);

ImGui::TextUnformatted("Debug Settings");
Expand Down
4 changes: 2 additions & 2 deletions Samples/FrustumCullingCompute/FrustumCullingCompute.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ namespace glsample {
ImGui::TextUnformatted("Frustum Culling Settings");
ImGui::DragFloat("Shadow Strength", &this->uniform.shadowStrength, 1, 0.0f, 1.0f);
ImGui::DragFloat("Shadow Bias", &this->uniform.bias, 1, 0.0f, 1.0f);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::DragFloat("Distance", &this->distance);
ImGui::Checkbox("WireFrame", &this->showWireFrame);
Expand Down
6 changes: 3 additions & 3 deletions Samples/Gouraud/Gouraud.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ namespace glsample {
}
void draw() override {
ImGui::TextUnformatted("Light");
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);

ImGui::TextUnformatted("Material");
ImGui::ColorEdit4("Tint", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Tint", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);

ImGui::TextUnformatted("Tessellation");
ImGui::DragFloat("Levels", &this->uniform.tessLevel, 1, 0.0f, 6.0f);
Expand Down
9 changes: 6 additions & 3 deletions Samples/Instance/instance.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ namespace glsample {

void draw() override {
ImGui::TextUnformatted("Light Setting");
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Specular", &this->uniform.specularColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0],
ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0],
ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Specular", &this->uniform.specularColor[0],
ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::TextUnformatted("Debug Setting");
ImGui::Checkbox("WireFrame", &this->showWireFrame);
Expand Down
2 changes: 1 addition & 1 deletion Samples/MarchingCube/MarchingCube.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace glsample {
/* */
ImGui::TextUnformatted("Fog Settings");
ImGui::DragInt("Fog Type", (int *)&this->uniform.fogSettings.fogType);
ImGui::ColorEdit4("Fog Color", &this->uniform.fogSettings.fogColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Fog Color", &this->uniform.fogSettings.fogColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat("Fog Density", &this->uniform.fogSettings.fogDensity);
ImGui::DragFloat("Fog Intensity", &this->uniform.fogSettings.fogIntensity);
ImGui::DragFloat("Fog Start", &this->uniform.fogSettings.fogStart);
Expand Down
2 changes: 1 addition & 1 deletion Samples/ModelViewer/ModelViewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
int uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* Setup graphic pipeline. */
Expand Down
2 changes: 1 addition & 1 deletion Samples/ModelViewer/ModelViewer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ namespace glsample {
}

ImGui::TextUnformatted("Light");
ImGui::ColorEdit4("Color", &this->uniform.lightsettings.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Color", &this->uniform.lightsettings.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient Color", &this->uniform.lightsettings.ambientColor[0],
ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_Float);
ImGui::DragFloat3("Direction", &this->uniform.lightsettings.direction[0]);
Expand Down
2 changes: 1 addition & 1 deletion Samples/MultiPass/multipass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* load Textures */
Expand Down
2 changes: 1 addition & 1 deletion Samples/Ocean/Ocean.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* Compute uniform size that is aligned with the requried for the hardware. */
Expand Down
6 changes: 3 additions & 3 deletions Samples/Panoramic/Panoramic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ namespace glsample {
void draw() override {

ImGui::TextUnformatted("Lightning");
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::TextUnformatted("Material");
ImGui::ColorEdit4("Ambient", &this->uniform.ambientColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::TextUnformatted("Debug");
ImGui::Checkbox("WireFrame", &this->showWireFrame);
ImGui::TextUnformatted("Depth Texture");
Expand Down Expand Up @@ -185,7 +185,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
int uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* Setup graphic pipeline. */
Expand Down
2 changes: 1 addition & 1 deletion Samples/PhysicalBasedRendering/PhysicalBasedRendering.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* load Textures */
Expand Down
4 changes: 2 additions & 2 deletions Samples/RayTracing/RayTracing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ namespace glsample {
void draw() override {

ImGui::TextUnformatted("Direction Light Settings");
// ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
// ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
// ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
// ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
// ImGui::DragFloat3("Direction", &this->uniform.direction[0]);

int tmp;
Expand Down
4 changes: 2 additions & 2 deletions Samples/Rigidbody/Rigidbody.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ namespace glsample {
void draw() override {

ImGui::TextUnformatted("Light Settings");
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);

ImGui::TextUnformatted("Material Settings");
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);

ImGui::TextUnformatted("Physic Settings");
ImGui::DragFloat("Speed", &this->speed);
Expand Down
6 changes: 3 additions & 3 deletions Samples/SVM/SVM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ namespace glsample {

void draw() override {
ImGui::TextUnformatted("Light Setting");
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Specular", &this->uniform.specularColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Specular", &this->uniform.specularColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::TextUnformatted("Debug Setting");
ImGui::Checkbox("WireFrame", &this->showWireFrame);
Expand Down
2 changes: 1 addition & 1 deletion Samples/ShadowPointLight/PointLightShadow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ namespace glsample {
}
void draw() override {

ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);

ImGui::TextUnformatted("Shadow");
ImGui::Checkbox("PCF Shadow", &this->use_pcf);
Expand Down
4 changes: 2 additions & 2 deletions Samples/ShadowVariance/VarianceShadow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ namespace glsample {

ImGui::DragFloat("Shadow Strength", &this->uniform.shadowStrength, 1, 0.0f, 1.0f);
ImGui::DragFloat("Shadow Bias", &this->uniform.bias, 1, 0.0f, 1.0f);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Light", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientLight[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::DragFloat("Distance", &this->distance);
ImGui::Checkbox("WireFrame", &this->showWireFrame);
Expand Down
6 changes: 3 additions & 3 deletions Samples/ShadowVolume/VolumeShadow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ namespace glsample {
}
void draw() override {
ImGui::TextUnformatted("Light Setting");
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientColor[0], ImGuiColorEditFlags_Float);
ImGui::ColorEdit4("Color", &this->uniform.lightColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::ColorEdit4("Ambient", &this->uniform.ambientColor[0], ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat3("Direction", &this->uniform.direction[0]);
ImGui::Checkbox("Use Shadow", &this->useShadow);
ImGui::Checkbox("Show Graphic", &this->showGraphic);
Expand Down Expand Up @@ -193,7 +193,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* Align uniform buffer in respect to driver requirement. */
Expand Down
2 changes: 1 addition & 1 deletion Samples/SimpleOcean/SimpleOcean.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* load Textures */
Expand Down
2 changes: 1 addition & 1 deletion Samples/SimpleReflection/SimpleReflection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* load Textures */
Expand Down
2 changes: 1 addition & 1 deletion Samples/Skybox/skybox-panoramic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ namespace glsample {
glUseProgram(this->skybox_program);
unsigned int uniform_buffer_index = glGetUniformBlockIndex(this->skybox_program, "UniformBufferBlock");
glUniformBlockBinding(this->skybox_program, uniform_buffer_index, 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "panorama"), 0);
glUniform1i(glGetUniformLocation(this->skybox_program, "PanoramaTexture"), 0);
glUseProgram(0);

/* Load panoramic texture. */
Expand Down
4 changes: 2 additions & 2 deletions Samples/Terrain/Terrain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace glsample {
ImGui::TextUnformatted("Light Setting");
{
ImGui::ColorEdit4("Color", &this->stage_uniform.terrain.lightColor[0],
ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_Float);
ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
if (ImGui::DragFloat3("Light Direction", &this->stage_uniform.terrain.lightDirection[0])) {
}
}
Expand All @@ -167,7 +167,7 @@ namespace glsample {
ImGui::TextUnformatted("Fog Setting");
ImGui::DragInt("Fog Type", (int *)&this->stage_uniform.terrain.fogSettings.fogType);
ImGui::ColorEdit4("Fog Color", &this->stage_uniform.terrain.fogSettings.fogColor[0],
ImGuiColorEditFlags_Float);
ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR);
ImGui::DragFloat("Fog Density", &this->stage_uniform.terrain.fogSettings.fogDensity);
ImGui::DragFloat("Fog Intensity", &this->stage_uniform.terrain.fogSettings.fogIntensity);
ImGui::DragFloat("Fog Start", &this->stage_uniform.terrain.fogSettings.fogStart);
Expand Down
Loading

0 comments on commit 4d163b5

Please sign in to comment.