diff --git a/build-unix.sh b/build-unix.sh index 7831785..bf4df07 100755 --- a/build-unix.sh +++ b/build-unix.sh @@ -1,6 +1,9 @@ #!/bin/sh -cc main.c src/glad.c -o glsltester\ +# 使い方:./build-unix.sh [ソースファイル](省略するとmain.c) +SRC=${1:-main.c} + +cc "$SRC" src/glad.c -o glsltester\ -I./include -I/usr/include -I/usr/X11R6/include -I/usr/X11R7/include\ -I/usr/local/include\ -L/usr/lib -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/local/lib\ diff --git a/main.c b/main-ambient.c old mode 100755 new mode 100644 similarity index 69% copy from main.c copy to main-ambient.c index 01fde0b..fabd813 --- a/main.c +++ b/main-ambient.c @@ -159,14 +159,17 @@ int main(int argc, char **argv) { #ifdef __APPLE__ char *vertexShaderSource = readShaderFile("shader/vertex.mac.glsl"); char *fragmentShaderSource = readShaderFile("shader/fragment.mac.glsl"); + char *fragmentAmbientSource = readShaderFile("shader/frag_ambient.mac.glsl"); #else char *vertexShaderSource = readShaderFile("shader/vertex.glsl"); char *fragmentShaderSource = readShaderFile("shader/fragment.glsl"); + char *fragmentAmbientSource = readShaderFile("shader/frag_ambient.glsl"); #endif - if (!vertexShaderSource || !fragmentShaderSource) { + if (!vertexShaderSource || !fragmentShaderSource || !fragmentAmbientSource) { puts("シェーダーファイルの読み込みに失敗しました"); if (vertexShaderSource) free(vertexShaderSource); if (fragmentShaderSource) free(fragmentShaderSource); + if (fragmentAmbientSource) free(fragmentAmbientSource); glfwDestroyWindow(window); glfwTerminate(); return -1; @@ -183,27 +186,48 @@ int main(int argc, char **argv) { glCompileShader(fragmentShader); checkShaderCompile(fragmentShader); - // シェーダープログラムをリンク + GLuint fragmentAmbientShader = glCreateShader(GL_FRAGMENT_SHADER); + glShaderSource(fragmentAmbientShader, 1, (const char **)&fragmentAmbientSource, NULL); + glCompileShader(fragmentAmbientShader); + checkShaderCompile(fragmentAmbientShader); + + // 三角形のシェーダープログラムをリンク GLuint shaderProgram = glCreateProgram(); glAttachShader(shaderProgram, vertexShader); glAttachShader(shaderProgram, fragmentShader); glLinkProgram(shaderProgram); checkProgramLink(shaderProgram); + // アンビエントシェーダープログラムをリンク(頂点シェーダーは同じ物を使う) + GLuint ambientShaderProgram = glCreateProgram(); + glAttachShader(ambientShaderProgram, vertexShader); + glAttachShader(ambientShaderProgram, fragmentAmbientShader); + glLinkProgram(ambientShaderProgram); + checkProgramLink(ambientShaderProgram); + glDeleteShader(vertexShader); glDeleteShader(fragmentShader); + glDeleteShader(fragmentAmbientShader); free(vertexShaderSource); free(fragmentShaderSource); + free(fragmentAmbientSource); - // 頂点データ(フルスクリーンクアッド)を設定 + // 頂点データ(三角形)を設定:グラデーション用(左にオフセット) float vertices[] = { - -1.0f, -1.0f, 0.0f, 0.0f, // 左下(位置、UV) - 1.0f, -1.0f, 1.0f, 0.0f, // 右下 - 1.0f, 1.0f, 1.0f, 1.0f, // 右上 - -1.0f, 1.0f, 0.0f, 1.0f // 左上 + -0.8f, -0.5f, 0.0f, 0.0f, // 左下(位置、UV) + -0.3f, -0.5f, 1.0f, 0.0f, // 右下 + -0.55f, 0.5f, 0.5f, 1.0f // 上 + }; + GLuint indices[] = { 0, 1, 2 }; + + // 頂点データ(三角形)を設定:アンビエント用(右にオフセット) + float verticesAmbient[] = { + 0.3f, -0.5f, 0.0f, 0.0f, // 左下(位置、UV) + 0.8f, -0.5f, 1.0f, 0.0f, // 右下 + 0.55f, 0.5f, 0.5f, 1.0f // 上 }; - GLuint indices[] = { 0, 1, 2, 2, 3, 0 }; + // VAO、VBO、EBOをグラデーション用に設定 GLuint VAO, VBO, EBO; glGenVertexArrays(1, &VAO); glGenBuffers(1, &VBO); @@ -222,6 +246,24 @@ int main(int argc, char **argv) { glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)offset); glEnableVertexAttribArray(1); + // VAO、VBO、EBOをアンビエント用に設定 + GLuint VAOAmbient, VBOAmbient, EBOAmbient; + glGenVertexArrays(1, &VAOAmbient); + glGenBuffers(1, &VBOAmbient); + glGenBuffers(1, &EBOAmbient); + + glBindVertexArray(VAOAmbient); + glBindBuffer(GL_ARRAY_BUFFER, VBOAmbient); + glBufferData(GL_ARRAY_BUFFER, sizeof(verticesAmbient), verticesAmbient, GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBOAmbient); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW); + + // 頂点属性はVAO毎に保存されるので、此方でも設定する + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)0); + glEnableVertexAttribArray(0); + glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)offset); + glEnableVertexAttribArray(1); + // メインレンダリングループ while (!glfwWindowShouldClose(window)) { // 画面をクリア @@ -259,9 +301,24 @@ int main(int argc, char **argv) { glUniform3f(glGetUniformLocation(shaderProgram, "uColorB"), colorB.r, colorB.g, colorB.b); // 緑 glUniform3f(glGetUniformLocation(shaderProgram, "uColorC"), colorC.r, colorC.g, colorC.b); // 青 - // クアッドを描画 + // 左の三角形を描画(グラデーションシェーダー) glBindVertexArray(VAO); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); + glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, 0); + + // アンビエントシェーダープログラムを使用(右の三角形) + glUseProgram(ambientShaderProgram); + + // ユニフォームを設定(アンビエントシェーダー) + Vector3 materialColor = { 0.8f, 0.2f, 0.3f }; // 赤みがかった色 + float ambientIntensity = 0.6f; // アンビエント光の強さ(0.0~1.0) + + glUniform3f(glGetUniformLocation(ambientShaderProgram, "materialColor"), + materialColor.r, materialColor.g, materialColor.b); + glUniform1f(glGetUniformLocation(ambientShaderProgram, "ambientIntensity"), ambientIntensity); + + // 右の三角形を描画(アンビエントシェーダー) + glBindVertexArray(VAOAmbient); + glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, 0); // バッファをスワップし、イベントを処理 glfwSwapBuffers(window); @@ -272,7 +329,11 @@ int main(int argc, char **argv) { glDeleteVertexArrays(1, &VAO); glDeleteBuffers(1, &VBO); glDeleteBuffers(1, &EBO); + glDeleteVertexArrays(1, &VAOAmbient); + glDeleteBuffers(1, &VBOAmbient); + glDeleteBuffers(1, &EBOAmbient); glDeleteProgram(shaderProgram); + glDeleteProgram(ambientShaderProgram); glfwDestroyWindow(window); glfwTerminate(); diff --git a/main.c b/main-directional.c old mode 100755 new mode 100644 similarity index 62% copy from main.c copy to main-directional.c index 01fde0b..04769eb --- a/main.c +++ b/main-directional.c @@ -158,15 +158,21 @@ int main(int argc, char **argv) { // シェーダーファイルを読み込む #ifdef __APPLE__ char *vertexShaderSource = readShaderFile("shader/vertex.mac.glsl"); + char *vertexDirectionalSource = readShaderFile("shader/vertex_directional.mac.glsl"); char *fragmentShaderSource = readShaderFile("shader/fragment.mac.glsl"); + char *fragmentDirectionalSource = readShaderFile("shader/frag_directional.mac.glsl"); #else char *vertexShaderSource = readShaderFile("shader/vertex.glsl"); + char *vertexDirectionalSource = readShaderFile("shader/vertex_directional.glsl"); char *fragmentShaderSource = readShaderFile("shader/fragment.glsl"); + char *fragmentDirectionalSource = readShaderFile("shader/frag_directional.glsl"); #endif - if (!vertexShaderSource || !fragmentShaderSource) { + if (!vertexShaderSource || !vertexDirectionalSource || !fragmentShaderSource || !fragmentDirectionalSource) { puts("シェーダーファイルの読み込みに失敗しました"); if (vertexShaderSource) free(vertexShaderSource); + if (vertexDirectionalSource) free(vertexDirectionalSource); if (fragmentShaderSource) free(fragmentShaderSource); + if (fragmentDirectionalSource) free(fragmentDirectionalSource); glfwDestroyWindow(window); glfwTerminate(); return -1; @@ -178,32 +184,61 @@ int main(int argc, char **argv) { glCompileShader(vertexShader); checkShaderCompile(vertexShader); + GLuint vertexDirectionalShader = glCreateShader(GL_VERTEX_SHADER); + glShaderSource(vertexDirectionalShader, 1, (const char **)&vertexDirectionalSource, NULL); + glCompileShader(vertexDirectionalShader); + checkShaderCompile(vertexDirectionalShader); + GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER); glShaderSource(fragmentShader, 1, (const char **)&fragmentShaderSource, NULL); glCompileShader(fragmentShader); checkShaderCompile(fragmentShader); - // シェーダープログラムをリンク + GLuint fragmentDirectionalShader = glCreateShader(GL_FRAGMENT_SHADER); + glShaderSource(fragmentDirectionalShader, 1, (const char **)&fragmentDirectionalSource, NULL); + glCompileShader(fragmentDirectionalShader); + checkShaderCompile(fragmentDirectionalShader); + + // 三角形のシェーダープログラムをリンク GLuint shaderProgram = glCreateProgram(); glAttachShader(shaderProgram, vertexShader); glAttachShader(shaderProgram, fragmentShader); glLinkProgram(shaderProgram); checkProgramLink(shaderProgram); + // ディレクショナルシェーダープログラムをリンク + GLuint directionalShaderProgram = glCreateProgram(); + glAttachShader(directionalShaderProgram, vertexDirectionalShader); + glAttachShader(directionalShaderProgram, fragmentDirectionalShader); + glLinkProgram(directionalShaderProgram); + checkProgramLink(directionalShaderProgram); + glDeleteShader(vertexShader); + glDeleteShader(vertexDirectionalShader); glDeleteShader(fragmentShader); + glDeleteShader(fragmentDirectionalShader); free(vertexShaderSource); + free(vertexDirectionalSource); free(fragmentShaderSource); + free(fragmentDirectionalSource); - // 頂点データ(フルスクリーンクアッド)を設定 + // 頂点データ(三角形)を設定:グラデーション用(左にオフセット) float vertices[] = { - -1.0f, -1.0f, 0.0f, 0.0f, // 左下(位置、UV) - 1.0f, -1.0f, 1.0f, 0.0f, // 右下 - 1.0f, 1.0f, 1.0f, 1.0f, // 右上 - -1.0f, 1.0f, 0.0f, 1.0f // 左上 + -0.8f, -0.5f, 0.0f, 0.0f, // 左下(位置、UV) + -0.3f, -0.5f, 1.0f, 0.0f, // 右下 + -0.55f, 0.5f, 0.5f, 1.0f // 上 + }; + GLuint indices[] = { 0, 1, 2 }; + + // 頂点データ(三角形)を設定:ディレクショナル用(右にオフセット) + float verticesDirectional[] = { + // 位置 UV 法線 + 0.3f, -0.5f, 0.0f, 0.0f, -0.5f, -0.5f, 0.707f, // 左下 + 0.8f, -0.5f, 1.0f, 0.0f, 0.5f, -0.5f, 0.707f, // 右下 + 0.55f, 0.5f, 0.5f, 1.0f, 0.0f, 0.5f, 0.707f // 上 }; - GLuint indices[] = { 0, 1, 2, 2, 3, 0 }; + // VAO、VBO、EBOをグラデーション用に設定 GLuint VAO, VBO, EBO; glGenVertexArrays(1, &VAO); glGenBuffers(1, &VBO); @@ -222,6 +257,26 @@ int main(int argc, char **argv) { glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)offset); glEnableVertexAttribArray(1); + // VAO、VBO、EBOをディレクショナル用に設定 + GLuint VAODirectional, VBODirectional, EBODirectional; + glGenVertexArrays(1, &VAODirectional); + glGenBuffers(1, &VBODirectional); + glGenBuffers(1, &EBODirectional); + + glBindVertexArray(VAODirectional); + glBindBuffer(GL_ARRAY_BUFFER, VBODirectional); + glBufferData(GL_ARRAY_BUFFER, sizeof(verticesDirectional), verticesDirectional, GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBODirectional); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW); + + // 頂点属性:位置(location 0)、UV(location 1)、法線(location 2)、1頂点 = 7個のfloat + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 7 * sizeof(float), (void *)0); + glEnableVertexAttribArray(0); + glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 7 * sizeof(float), (void *)(2 * sizeof(float))); + glEnableVertexAttribArray(1); + glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, 7 * sizeof(float), (void *)(4 * sizeof(float))); + glEnableVertexAttribArray(2); + // メインレンダリングループ while (!glfwWindowShouldClose(window)) { // 画面をクリア @@ -259,9 +314,27 @@ int main(int argc, char **argv) { glUniform3f(glGetUniformLocation(shaderProgram, "uColorB"), colorB.r, colorB.g, colorB.b); // 緑 glUniform3f(glGetUniformLocation(shaderProgram, "uColorC"), colorC.r, colorC.g, colorC.b); // 青 - // クアッドを描画 + // 左の三角形を描画(グラデーションシェーダー) glBindVertexArray(VAO); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); + glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, 0); + + // ディレクショナルシェーダープログラムを使用(右の三角形) + glUseProgram(directionalShaderProgram); + + // ユニフォームを設定(ディレクショナルシェーダー) + Vector3 materialColor = { 0.8f, 0.2f, 0.3f }; // 赤みがかった色 + Vector3 lightDirection = { -0.5f, -0.5f, -0.707f }; // 光が進む向き(右上手前から左下奥へ) + float lightIntensity = 1.0f; // ライトの強さ(0.0~1.0) + + glUniform3f(glGetUniformLocation(directionalShaderProgram, "materialColor"), + materialColor.r, materialColor.g, materialColor.b); + glUniform3f(glGetUniformLocation(directionalShaderProgram, "lightDirection"), + lightDirection.x, lightDirection.y, lightDirection.z); + glUniform1f(glGetUniformLocation(directionalShaderProgram, "lightIntensity"), lightIntensity); + + // 右の三角形を描画(ディレクショナルシェーダー) + glBindVertexArray(VAODirectional); + glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, 0); // バッファをスワップし、イベントを処理 glfwSwapBuffers(window); @@ -272,7 +345,11 @@ int main(int argc, char **argv) { glDeleteVertexArrays(1, &VAO); glDeleteBuffers(1, &VBO); glDeleteBuffers(1, &EBO); + glDeleteVertexArrays(1, &VAODirectional); + glDeleteBuffers(1, &VBODirectional); + glDeleteBuffers(1, &EBODirectional); glDeleteProgram(shaderProgram); + glDeleteProgram(directionalShaderProgram); glfwDestroyWindow(window); glfwTerminate(); diff --git a/shader/frag_ambient.glsl b/shader/frag_ambient.glsl new file mode 100644 index 0000000..2e4408c --- /dev/null +++ b/shader/frag_ambient.glsl @@ -0,0 +1,12 @@ +#version 450 core + +in vec2 vUv; +out vec4 out_color; + +uniform vec3 materialColor; +uniform float ambientIntensity; + +void main() { + vec3 ambient = materialColor * ambientIntensity; + out_color = vec4(ambient, 1.0); +} diff --git a/shader/frag_ambient.mac.glsl b/shader/frag_ambient.mac.glsl new file mode 100644 index 0000000..aa83027 --- /dev/null +++ b/shader/frag_ambient.mac.glsl @@ -0,0 +1,12 @@ +#version 410 core + +in vec2 vUv; +out vec4 out_color; + +uniform vec3 materialColor; +uniform float ambientIntensity; + +void main() { + vec3 ambient = materialColor * ambientIntensity; + out_color = vec4(ambient, 1.0); +} diff --git a/shader/frag_directional.glsl b/shader/frag_directional.glsl new file mode 100644 index 0000000..e3f4d2b --- /dev/null +++ b/shader/frag_directional.glsl @@ -0,0 +1,20 @@ +#version 450 core + +in vec2 vUv; +in vec3 vNormal; +out vec4 out_color; + +uniform vec3 materialColor; +uniform vec3 lightDirection; // 光が進む向き(光源から表面へ) +uniform float lightIntensity; + +void main() { + // 補間された法線は短くなるので、正規化し直す + vec3 normal = normalize(vNormal); + // 表面から光源への向き(光が進む向きの逆) + vec3 toLight = -normalize(lightDirection); + + float diffuseFactor = max(dot(normal, toLight), 0.0); + vec3 diffuse = materialColor * diffuseFactor * lightIntensity; + out_color = vec4(diffuse, 1.0); +} diff --git a/shader/frag_directional.mac.glsl b/shader/frag_directional.mac.glsl new file mode 100644 index 0000000..055df9c --- /dev/null +++ b/shader/frag_directional.mac.glsl @@ -0,0 +1,20 @@ +#version 410 core + +in vec2 vUv; +in vec3 vNormal; +out vec4 out_color; + +uniform vec3 materialColor; +uniform vec3 lightDirection; // 光が進む向き(光源から表面へ) +uniform float lightIntensity; + +void main() { + // 補間された法線は短くなるので、正規化し直す + vec3 normal = normalize(vNormal); + // 表面から光源への向き(光が進む向きの逆) + vec3 toLight = -normalize(lightDirection); + + float diffuseFactor = max(dot(normal, toLight), 0.0); + vec3 diffuse = materialColor * diffuseFactor * lightIntensity; + out_color = vec4(diffuse, 1.0); +} diff --git a/shader/vertex.glsl b/shader/vertex_directional.glsl old mode 100755 new mode 100644 similarity index 65% copy from shader/vertex.glsl copy to shader/vertex_directional.glsl index 870baec..7609f48 --- a/shader/vertex.glsl +++ b/shader/vertex_directional.glsl @@ -2,9 +2,13 @@ layout(location = 0) in vec2 aPosition; layout(location = 1) in vec2 aUv; +layout(location = 2) in vec3 aNormal; + out vec2 vUv; +out vec3 vNormal; void main() { vUv = aUv; + vNormal = aNormal; gl_Position = vec4(aPosition, 0.0, 1.0); -} \ No newline at end of file +} diff --git a/shader/vertex.mac.glsl b/shader/vertex_directional.mac.glsl old mode 100755 new mode 100644 similarity index 66% copy from shader/vertex.mac.glsl copy to shader/vertex_directional.mac.glsl index 5d9c899..7f330f6 --- a/shader/vertex.mac.glsl +++ b/shader/vertex_directional.mac.glsl @@ -2,9 +2,13 @@ layout(location = 0) in vec2 aPosition; layout(location = 1) in vec2 aUv; +layout(location = 2) in vec3 aNormal; + out vec2 vUv; +out vec3 vNormal; void main() { vUv = aUv; + vNormal = aNormal; gl_Position = vec4(aPosition, 0.0, 1.0); }