diff options
| -rw-r--r-- | .vscode/launch.json | 19 | ||||
| -rw-r--r-- | .vscode/settings.json | 24 | ||||
| -rw-r--r-- | assimp-vc142-mt.dll | bin | 0 -> 6668288 bytes | |||
| -rw-r--r-- | bin/imgui-SFML.obj | bin | 0 -> 132594 bytes | |||
| -rw-r--r-- | bin/imgui.obj | bin | 0 -> 571659 bytes | |||
| -rw-r--r-- | bin/imgui_demo.obj | bin | 0 -> 385868 bytes | |||
| -rw-r--r-- | bin/imgui_draw.obj | bin | 0 -> 367002 bytes | |||
| -rw-r--r-- | bin/imgui_widgets.obj | bin | 0 -> 455445 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | build.sh | 0 | ||||
| -rw-r--r-- | glew32.dll | bin | 0 -> 422912 bytes | |||
| -rw-r--r-- | imgui.ini | 15 | ||||
| -rw-r--r-- | main.exe | bin | 0 -> 2304512 bytes | |||
| -rw-r--r-- | main.ilk | bin | 0 -> 7872400 bytes | |||
| -rw-r--r-- | main.obj | bin | 0 -> 727333 bytes | |||
| -rw-r--r-- | main.pdb | bin | 0 -> 29134848 bytes | |||
| -rw-r--r-- | sfml-graphics-2.dll | bin | 0 -> 787456 bytes | |||
| -rw-r--r-- | sfml-system-2.dll | bin | 0 -> 48128 bytes | |||
| -rw-r--r-- | sfml-window-2.dll | bin | 0 -> 115200 bytes | |||
| -rw-r--r-- | shaders/fbo_frag.glsl | 37 | ||||
| -rw-r--r-- | shaders/fbo_vert.glsl | 11 | ||||
| -rw-r--r-- | shaders/frag_irradiance.glsl (renamed from shaders/frag.glsl) | 13 | ||||
| -rw-r--r-- | shaders/frag_shadowmap.glsl | 14 | ||||
| -rw-r--r-- | shaders/vert.glsl | 2 | ||||
| -rw-r--r-- | src/main.cpp | 245 | ||||
| -rw-r--r-- | vc140.pdb | bin | 0 -> 790528 bytes |
25 files changed, 353 insertions, 27 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..0abb9ae --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,19 @@ +{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "(Windows) Starten",
+ "type": "cppvsdbg",
+ "request": "launch",
+ "program": "${workspaceFolder}/main.exe",
+ "args": [],
+ "stopAtEntry": false,
+ "cwd": "${workspaceFolder}",
+ "environment": [],
+ "externalConsole": false
+ }
+ ]
+}
\ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1a8d6c8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,24 @@ +{ + "C_Cpp.default.includePath": [ + "C:/prg/cpp/libs/glm", + "C:/prg/cpp/libs/glew-2.1.0/include", + "C:/prg/cpp/libs/SFML-2.5.1/include", + "C:/prg/cpp/libs/imgui", + "C:/prg/cpp/libs/imgui-sfml", + "C:/prg/cpp/libs/assimp-5.0.1/include", + "C:/prg/cpp/libs/assimp-5.0.1/build/include", + ], + "files.associations": { + "*.t": "lua", + "cmath": "cpp", + "istream": "cpp", + "array": "cpp", + "initializer_list": "cpp", + "type_traits": "cpp", + "vector": "cpp", + "xstring": "cpp", + "xtree": "cpp", + "xutility": "cpp", + "*.glsl": "c" + } +}
\ No newline at end of file diff --git a/assimp-vc142-mt.dll b/assimp-vc142-mt.dll Binary files differnew file mode 100644 index 0000000..5aed174 --- /dev/null +++ b/assimp-vc142-mt.dll diff --git a/bin/imgui-SFML.obj b/bin/imgui-SFML.obj Binary files differnew file mode 100644 index 0000000..1d7867b --- /dev/null +++ b/bin/imgui-SFML.obj diff --git a/bin/imgui.obj b/bin/imgui.obj Binary files differnew file mode 100644 index 0000000..de0af0d --- /dev/null +++ b/bin/imgui.obj diff --git a/bin/imgui_demo.obj b/bin/imgui_demo.obj Binary files differnew file mode 100644 index 0000000..e47365d --- /dev/null +++ b/bin/imgui_demo.obj diff --git a/bin/imgui_draw.obj b/bin/imgui_draw.obj Binary files differnew file mode 100644 index 0000000..f4899f6 --- /dev/null +++ b/bin/imgui_draw.obj diff --git a/bin/imgui_widgets.obj b/bin/imgui_widgets.obj Binary files differnew file mode 100644 index 0000000..4770f02 --- /dev/null +++ b/bin/imgui_widgets.obj diff --git a/glew32.dll b/glew32.dll Binary files differnew file mode 100644 index 0000000..04f9381 --- /dev/null +++ b/glew32.dll diff --git a/imgui.ini b/imgui.ini new file mode 100644 index 0000000..cf5b5fe --- /dev/null +++ b/imgui.ini @@ -0,0 +1,15 @@ +[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][w]
+Pos=60,60
+Size=447,349
+Collapsed=0
+
+[Window][Options]
+Pos=17,16
+Size=452,298
+Collapsed=0
+
diff --git a/main.exe b/main.exe Binary files differnew file mode 100644 index 0000000..feb0787 --- /dev/null +++ b/main.exe diff --git a/main.ilk b/main.ilk Binary files differnew file mode 100644 index 0000000..61cd5ff --- /dev/null +++ b/main.ilk diff --git a/main.obj b/main.obj Binary files differnew file mode 100644 index 0000000..f2350dd --- /dev/null +++ b/main.obj diff --git a/main.pdb b/main.pdb Binary files differnew file mode 100644 index 0000000..5aa106e --- /dev/null +++ b/main.pdb diff --git a/sfml-graphics-2.dll b/sfml-graphics-2.dll Binary files differnew file mode 100644 index 0000000..e6d3e1c --- /dev/null +++ b/sfml-graphics-2.dll diff --git a/sfml-system-2.dll b/sfml-system-2.dll Binary files differnew file mode 100644 index 0000000..ef86fea --- /dev/null +++ b/sfml-system-2.dll diff --git a/sfml-window-2.dll b/sfml-window-2.dll Binary files differnew file mode 100644 index 0000000..269822c --- /dev/null +++ b/sfml-window-2.dll diff --git a/shaders/fbo_frag.glsl b/shaders/fbo_frag.glsl new file mode 100644 index 0000000..e199245 --- /dev/null +++ b/shaders/fbo_frag.glsl @@ -0,0 +1,37 @@ +#version 330 core
+out vec4 FragColor;
+
+in vec2 TexCoords;
+
+uniform sampler2D shadowmapTexture;
+uniform sampler2D irradianceTexture;
+uniform int screenWidth;
+uniform int screenHeight;
+uniform int renderState;
+uniform vec2 samplePositions[13];
+uniform vec3 sampleWeights[13];
+
+void main()
+{
+ if (renderState == 0) {
+ FragColor = texture(shadowmapTexture, TexCoords);
+ }
+ // stencil buffer
+ else if (renderState == 1 || texture(irradianceTexture, TexCoords).rgb == vec3(0, 0, 0)) {
+ FragColor = texture(irradianceTexture, TexCoords);
+ }
+ else if (renderState == 2) {
+ FragColor = texture(shadowmapTexture, TexCoords) * texture(irradianceTexture, TexCoords);
+ }
+ else if (renderState == 3) {
+ vec4 result = vec4(0, 0, 0, 1);
+ for (int i = 0; i < 13; i++) {
+ float oneX = 1.0/screenWidth;
+ float oneY = 1.0/screenHeight;
+ vec4 sample = texture(irradianceTexture, TexCoords + samplePositions[i] * vec2(oneX, oneY));
+ vec4 weight = vec4(sampleWeights[i], 1);
+ result += sample * weight;
+ }
+ FragColor = result;
+ }
+}
diff --git a/shaders/fbo_vert.glsl b/shaders/fbo_vert.glsl new file mode 100644 index 0000000..fb80df5 --- /dev/null +++ b/shaders/fbo_vert.glsl @@ -0,0 +1,11 @@ +#version 330 core
+layout (location = 0) in vec2 aPos;
+layout (location = 1) in vec2 aTexCoords;
+
+out vec2 TexCoords;
+
+void main()
+{
+ gl_Position = vec4(aPos.x, aPos.y, 0.0, 1.0);
+ TexCoords = aTexCoords;
+}
diff --git a/shaders/frag.glsl b/shaders/frag_irradiance.glsl index a92699c..9e14ebe 100644 --- a/shaders/frag.glsl +++ b/shaders/frag_irradiance.glsl @@ -5,9 +5,12 @@ in vec3 Normal; out vec4 FragColor;
+uniform sampler2D shadowmapTexture;
+
uniform vec3 objectColor;
uniform vec3 lightColor;
uniform vec3 lightPos;
+uniform vec3 viewPos;
void main()
{
@@ -20,6 +23,12 @@ void main() float ambientStrength = 0.1;
vec3 ambient = ambientStrength * lightColor;
- vec3 result = (ambient + diffuse) * objectColor;
+ float specularStrength = 0.5;
+ vec3 viewDir = normalize(viewPos - FragPos);
+ vec3 reflectDir = reflect(-lightDir, norm);
+ float spec = pow(max(dot(viewDir, reflectDir), 0.0), 32);
+ vec3 specular = specularStrength * spec * lightColor;
+
+ vec3 result = (ambient + diffuse + specular) * objectColor;
FragColor = vec4(result, 1.0f);
-}
\ No newline at end of file +}
diff --git a/shaders/frag_shadowmap.glsl b/shaders/frag_shadowmap.glsl new file mode 100644 index 0000000..6d6dab6 --- /dev/null +++ b/shaders/frag_shadowmap.glsl @@ -0,0 +1,14 @@ +
+#version 330 core
+
+in vec3 FragPos;
+
+out vec4 FragColor;
+
+uniform vec3 lightPos;
+
+void main()
+{
+ float lightDist = 1 - (length(lightPos - FragPos) - 5.5);
+ FragColor = vec4(vec3(lightDist), 1);
+}
diff --git a/shaders/vert.glsl b/shaders/vert.glsl index fc3721a..6f48573 100644 --- a/shaders/vert.glsl +++ b/shaders/vert.glsl @@ -15,4 +15,4 @@ void main() gl_Position = projection * view * model * vec4(pos, 1.0);
FragPos = vec3(model * vec4(pos, 1));
Normal = normal;
-}
\ No newline at end of file +}
diff --git a/src/main.cpp b/src/main.cpp index b95cc97..dde29ec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,46 @@ #include <assimp/postprocess.h>
#include <assimp/scene.h>
+/*
+
+TODO:
+- ShadowMap to fbo
+- Save Depth to fbo
+
+*/
+
+float samplePositions[] = {
+ 0.000000f, 0.000000f,
+ 1.633992f, 0.036795f,
+ 0.177801f, 1.717593f,
+ -0.194906f, 0.091094f,
+ -0.239737f, -0.220217f,
+ -0.003530f, -0.118219f,
+ 1.320107f, -0.181542f,
+ 5.970690f, 0.253378f,
+ -1.089250f, 4.958349f,
+ -4.015465f, 4.156699f,
+ -4.063099f, -4.110150f,
+ -0.638605f, -6.297663f,
+ 2.542348f, -3.245901f
+};
+
+float sampleWeights[] = {
+ 0.220441f, 0.487000f, 0.635000f,
+ 0.076356f, 0.064487f, 0.039097f,
+ 0.116515f, 0.103222f, 0.064912f,
+ 0.064844f, 0.086388f, 0.062272f,
+ 0.131798f, 0.151695f, 0.103676f,
+ 0.025690f, 0.042728f, 0.033003f,
+ 0.048593f, 0.064740f, 0.046131f,
+ 0.048092f, 0.003042f, 0.000400f,
+ 0.048845f, 0.005406f, 0.001222f,
+ 0.051322f, 0.006034f, 0.001420f,
+ 0.061428f, 0.009152f, 0.002511f,
+ 0.030936f, 0.002868f, 0.000652f,
+ 0.073580f, 0.023239f, 0.009703f
+};
+
struct model {
std::vector<float> vertices;
std::vector<GLuint> indices;
@@ -51,10 +91,10 @@ private: glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indices.size(),
indices.data(), GL_STATIC_DRAW);
- glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(0));
glEnableVertexAttribArray(0);
- glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(sizeof(float) * 3));
+ glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(0));
glEnableVertexAttribArray(1);
+ glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(sizeof(float) * 3));
glBindVertexArray(0);
}
@@ -142,6 +182,16 @@ struct arccam { rot.y = glm::radians(minY) * angleFactor;
}
+ glm::vec3 getPos() {
+ float angle = rot.y / angleFactor;
+
+ float camY = sin(angle) * exp(radius);
+ float camZ = cos(angle) * exp(radius);
+
+ glm::vec3 result(0.0, camY, camZ);
+ return glm::rotate(result, -rot.x / angleFactor, glm::vec3(0, 1, 0));
+ }
+
glm::mat4 getViewMatrix() {
float angle = rot.y / angleFactor;
@@ -160,14 +210,10 @@ private: std::string readFile(std::string filename) {
std::ifstream ifs(filename, std::ios::binary);
- ifs.seekg(0, ifs.end);
- long length = ifs.tellg();
- ifs.seekg(0, ifs.beg);
- char *buffer = (char*)malloc(length);
- ifs.read(buffer, length);
- ifs.close();
- std::string result(buffer);
- free(buffer);
+ std::string result, line;
+ while (std::getline(ifs, line))
+ result += line + "\n";
+
return result;
}
@@ -213,7 +259,7 @@ GLuint compileShaders(const char *vertFilename, const char *fragFilename) { glGetShaderiv(vertShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(vertShader, 512, NULL, infoLog);
- printf("Error compiling vertex shader: %s\n", infoLog);
+ printf("Error compiling vertex shader(%s): %s\n", vertFilename, infoLog);
}
GLuint fragShader = glCreateShader(GL_FRAGMENT_SHADER);
@@ -225,7 +271,7 @@ GLuint compileShaders(const char *vertFilename, const char *fragFilename) { glGetShaderiv(fragShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(fragShader, 512, NULL, infoLog);
- printf("Error compiling fragment shader: %s\n", infoLog);
+ printf("Error compiling fragment shader(%s): %s\n", fragFilename, infoLog);
}
// Link Shader Program
@@ -248,9 +294,82 @@ GLuint compileShaders(const char *vertFilename, const char *fragFilename) { }
+struct framebuffer {
+ framebuffer(const char *vertFilename, const char *fragFilename, int width, int height) {
+ glGenFramebuffers(1, &fbo);
+ glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+ glGenTextures(1, &renderTexture);
+ glBindTexture(GL_TEXTURE_2D, renderTexture);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ //glBindTexture(GL_TEXTURE_2D, 0);
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, renderTexture, 0);
+
+ glGenRenderbuffers(1, &rbo);
+ glBindRenderbuffer(GL_RENDERBUFFER, rbo);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
+ //glBindRenderbuffer(GL_RENDERBUFFER, 0);
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rbo);
+
+ if (glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE) {
+ printf("Successfully created framebuffer\n");
+ }
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+ screenShaderProgram = compileShaders(vertFilename, fragFilename);
+ glUseProgram(screenShaderProgram);
+ glUniform1i(glGetUniformLocation(screenShaderProgram, "screenTexture"), 0);
+
+ // Screen VAO
+
+ glGenBuffers(1, &screenVBO);
+
+ glGenVertexArrays(1, &screenVAO);
+
+ glBindVertexArray(screenVAO);
+
+ float screenVerts[] = {
+ -1.0f, +1.0f, +0.0f, +1.0f,
+ -1.0f, -1.0f, +0.0f, +0.0f,
+ +1.0f, -1.0f, +1.0f, +0.0f,
+
+ -1.0f, +1.0f, +0.0f, +1.0f,
+ +1.0f, -1.0f, +1.0f, +0.0f,
+ +1.0f, +1.0f, +1.0f, +1.0f,
+ };
+
+ glBindBuffer(GL_ARRAY_BUFFER, screenVBO);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 6 * 4,
+ screenVerts, GL_STATIC_DRAW);
+
+ glEnableVertexAttribArray(0);
+ glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)(0));
+ glEnableVertexAttribArray(1);
+ glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)(sizeof(float) * 2));
+
+ glBindVertexArray(0);
+ }
+ ~framebuffer() {
+ glDeleteFramebuffers(1, &fbo);
+ }
+
+ GLuint fbo;
+ GLuint renderTexture;
+ GLuint rbo;
+ GLuint screenShaderProgram;
+ GLuint screenVBO;
+ GLuint screenVAO;
+};
+
int main() {
// Window Setup
+ const int width = 1600, height = 900;
+
sf::ContextSettings settings;
settings.depthBits = 24;
settings.antialiasingLevel = 0;
@@ -268,7 +387,8 @@ int main() { if (glewInit() != GLEW_OK) {
}
- GLuint shaderProgram = compileShaders("shaders/vert.glsl", "shaders/frag.glsl");
+ GLuint shaderProgramShadowmap = compileShaders("shaders/vert.glsl", "shaders/frag_shadowmap.glsl");
+ GLuint shaderProgramIrradiance = compileShaders("shaders/vert.glsl", "shaders/frag_irradiance.glsl");
model m = loadModel("models/Isotrop-upperjaw.ply");
@@ -285,9 +405,17 @@ int main() { glm::mat4 proj = glm::perspective(glm::radians(45.0f), (float)window.getSize().x / window.getSize().y, 0.001f, 1000.0f);
+ // Framebuffer
+ framebuffer fb_shadowmap("shaders/fbo_vert.glsl", "shaders/fbo_frag.glsl", width, height);
+ framebuffer fb_irradiance("shaders/fbo_vert.glsl", "shaders/fbo_frag.glsl", width, height);
+
+ // Config
+
struct {
bool wireframe = false;
bool freecam = false;
+ int renderState = 0;
+ float color[3] = { 0.7f, 0.4f, 0.4f };
} options;
sf::Clock deltaClock;
@@ -343,10 +471,46 @@ int main() { prevMouse = sf::Mouse::isButtonPressed(sf::Mouse::Right);
- // Render
+ // Render Shadowmap
+ glBindFramebuffer(GL_FRAMEBUFFER, fb_shadowmap.fbo);
+ glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glEnable(GL_DEPTH_TEST);
+
+ if (options.wireframe)
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ else
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
+ glUseProgram(shaderProgramShadowmap);
+
+ if (options.freecam)
+ view = freeCam.getViewMatrix();
+ else
+ view = arcCam.getViewMatrix();
+
+ glUniformMatrix4fv(
+ glGetUniformLocation(shaderProgramShadowmap, "model"),
+ 1, GL_FALSE, glm::value_ptr(model));
+ glUniformMatrix4fv(
+ glGetUniformLocation(shaderProgramShadowmap, "view"),
+ 1, GL_FALSE, glm::value_ptr(view));
+ glUniformMatrix4fv(
+ glGetUniformLocation(shaderProgramShadowmap, "projection"),
+ 1, GL_FALSE, glm::value_ptr(proj));
+
+ glUniform3fv(
+ glGetUniformLocation(shaderProgramShadowmap, "lightPos"),
+ 1, glm::value_ptr(lightPos));
+
+ m.draw();
+ // Render irradiance
+
+ glBindFramebuffer(GL_FRAMEBUFFER, fb_irradiance.fbo);
+ glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glEnable(GL_DEPTH_TEST);
if (options.wireframe)
@@ -354,7 +518,7 @@ int main() { else
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
- glUseProgram(shaderProgram);
+ glUseProgram(shaderProgramIrradiance);
if (options.freecam)
view = freeCam.getViewMatrix();
@@ -362,34 +526,67 @@ int main() { view = arcCam.getViewMatrix();
glUniformMatrix4fv(
- glGetUniformLocation(shaderProgram, "model"),
+ glGetUniformLocation(shaderProgramIrradiance, "model"),
1, GL_FALSE, glm::value_ptr(model));
glUniformMatrix4fv(
- glGetUniformLocation(shaderProgram, "view"),
+ glGetUniformLocation(shaderProgramIrradiance, "view"),
1, GL_FALSE, glm::value_ptr(view));
glUniformMatrix4fv(
- glGetUniformLocation(shaderProgram, "projection"),
+ glGetUniformLocation(shaderProgramIrradiance, "projection"),
1, GL_FALSE, glm::value_ptr(proj));
+ glUniform3fv(
+ glGetUniformLocation(shaderProgramIrradiance, "objectColor"),
+ 1, options.color);
glUniform3f(
- glGetUniformLocation(shaderProgram, "objectColor"),
- 1.0f, 0.5f, 0.31f);
- glUniform3f(
- glGetUniformLocation(shaderProgram, "lightColor"),
+ glGetUniformLocation(shaderProgramIrradiance, "lightColor"),
1.0f, 1.0f, 1.0f);
glUniform3fv(
- glGetUniformLocation(shaderProgram, "lightPos"),
+ glGetUniformLocation(shaderProgramIrradiance, "lightPos"),
1, glm::value_ptr(lightPos));
+ glUniform3fv(
+ glGetUniformLocation(shaderProgramIrradiance, "viewPos"),
+ 1, glm::value_ptr(options.freecam ? freeCam.pos : arcCam.getPos()));
+
+ glUniform1i(glGetUniformLocation(shaderProgramIrradiance, "shadowmapTexture"), 0);
+ glActiveTexture(GL_TEXTURE0 + 0);
+ glBindTexture(GL_TEXTURE_2D, fb_shadowmap.renderTexture);
m.draw();
+
+ // Render fbo to screen
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ glDisable(GL_DEPTH_TEST);
+ glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glUseProgram(fb_irradiance.screenShaderProgram);
+
+ glUniform1i(glGetUniformLocation(fb_irradiance.screenShaderProgram, "screenWidth"), window.getSize().x);
+ glUniform1i(glGetUniformLocation(fb_irradiance.screenShaderProgram, "screenHeight"), window.getSize().y);
+ glUniform1i(glGetUniformLocation(fb_irradiance.screenShaderProgram, "renderState"), options.renderState);
+ glUniform2fv(glGetUniformLocation(fb_irradiance.screenShaderProgram, "samplePositions"), 13, samplePositions);
+ glUniform3fv(glGetUniformLocation(fb_irradiance.screenShaderProgram, "sampleWeights"), 13, sampleWeights);
+
+ glBindVertexArray(fb_irradiance.screenVAO);
+ glUniform1i(glGetUniformLocation(fb_irradiance.screenShaderProgram, "shadowmapTexture"), 0);
+ glUniform1i(glGetUniformLocation(fb_irradiance.screenShaderProgram, "irradianceTexture"), 1);
+ glActiveTexture(GL_TEXTURE0 + 0);
+ glBindTexture(GL_TEXTURE_2D, fb_shadowmap.renderTexture);
+ glActiveTexture(GL_TEXTURE0 + 1);
+ glBindTexture(GL_TEXTURE_2D, fb_irradiance.renderTexture);
+ glDrawArrays(GL_TRIANGLES, 0, 6);
+ glBindVertexArray(0);
+
ImGui::SFML::Update(window, deltaClock.restart());
ImGui::Begin("Options");
ImGui::Checkbox("Wireframe", &options.wireframe);
ImGui::Checkbox("Free Cam", &options.freecam);
+ ImGui::InputInt("Render State", &options.renderState);
+ ImGui::InputFloat3("Color", options.color, 2);
if (options.freecam) {
ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z);
ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y);
@@ -399,7 +596,7 @@ int main() { }
} else {
ImGui::LabelText("Rotation", "%f %f", arcCam.rot.x, arcCam.rot.y);
- ImGui::InputFloat("Radius", &arcCam.radius);
+ ImGui::DragFloat("Radius", &arcCam.radius, 0.01f, -1.0f, 1.0f);
if (ImGui::Button("Reset")) {
arcCam.rot = glm::vec2(0);
arcCam.radius = 1;
diff --git a/vc140.pdb b/vc140.pdb Binary files differnew file mode 100644 index 0000000..5bcb5e5 --- /dev/null +++ b/vc140.pdb |