commit 3d921b9005d67438f71884181cf4059fb4b07551
parent e2df3fd0957bb1c8c1763e68bdb1863dc1510cf1
Author: Brian Swetland <swetland@frotz.net>
Date: Sun, 20 Jan 2013 09:38:06 -0800
test5: start fiddling with lighting and multiple models in scene
Diffstat:
| M | Makefile | | | 10 | +++++++--- |
| A | test5.c | | | 156 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | test5.fs | | | 10 | ++++++++++ |
| A | test5.vs | | | 29 | +++++++++++++++++++++++++++++ |
4 files changed, 202 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -5,12 +5,12 @@ SDLCFG := sdl-config
SDLFLAGS := $(shell $(SDLCFG) --cflags)
SDLLIBS := $(shell $(SDLCFG) --libs)
-CFLAGS := $(SDLFLAGS) -DWITH_SDL2=0 -Wall
+CFLAGS := $(SDLFLAGS) -DWITH_SDL2=0 -Wall -g
LIBS := $(SDLLIBS) -lGL -lm -lpng
COMMONOBJS := util.o sdlglue.o loadpng.o loadfile.o loadobj.o
-all: test1 test2 test3 test4 mksdf
+all: test1 test2 test3 test4 test5 mksdf
mksdf: mksdf.c loadpng.c savepng.c
gcc -g -Wall -o mksdf mksdf.c loadpng.c savepng.c -lm -lpng
@@ -31,5 +31,9 @@ TEST4OBJS := test4.o $(COMMONOBJS)
test4: $(TEST4OBJS)
$(CC) -o test4 $(TEST4OBJS) $(LIBS)
+TEST5OBJS := test5.o $(COMMONOBJS)
+test5: $(TEST5OBJS)
+ $(CC) -o test5 $(TEST5OBJS) $(LIBS)
+
clean::
- rm -f test1 test2 test3 test4 mksdf *.o
+ rm -f test1 test2 test3 test4 test5 mksdf *.o
diff --git a/test5.c b/test5.c
@@ -0,0 +1,156 @@
+/* Copyright 2013 Brian Swetland <swetland@frotz.net>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "util.h"
+#include "glue.h"
+
+#include <math.h>
+
+void *texdata;
+unsigned texw, texh;
+
+const char *vert_src, *frag_src;
+
+GLuint pgm, vshd, fshd, tex0;
+GLuint aVertex, aNormal, aTexCoord;
+GLuint uMV, uMVP, uLight, uTexture;
+
+mat4 Projection;
+
+float a = 0.0;
+
+struct model *m;
+
+int scene_init(struct ctxt *c) {
+ float aspect = ((float) c->width) / ((float) c->height);
+
+ if (!(texdata = load_png_rgba("cube-texture.png", &texw, &texh, 1)))
+ return -1;
+ if (!(vert_src = load_file("test5.vs", 0)))
+ return -1;
+ if (!(frag_src = load_file("test5.fs", 0)))
+ return -1;
+
+ if (!(m = load_wavefront_obj("cube.obj")))
+ return -1;
+
+ glViewport(0, 0, c->width, c->height);
+ glClearColor(0, 0, 0, 0);
+ glClearDepth(1.0f);
+
+ if (shader_compile(vert_src, frag_src, &pgm, &vshd, &fshd))
+ return -1;
+
+ aVertex = glGetAttribLocation(pgm, "aVertex");
+ aNormal = glGetAttribLocation(pgm, "aNormal");
+ aTexCoord = glGetAttribLocation(pgm, "aTexCoord");
+ uMVP = glGetUniformLocation(pgm, "uMVP");
+ uMV = glGetUniformLocation(pgm, "uMV");
+ uLight = glGetUniformLocation(pgm, "uLight");
+ uTexture = glGetUniformLocation(pgm, "uTexture");
+
+ if(glGetError() != GL_NO_ERROR) fprintf(stderr,"OOPS!\n");
+
+ glEnable(GL_TEXTURE_2D);
+ glEnable(GL_DEPTH_TEST);
+ glEnable(GL_CULL_FACE);
+ glFrontFace(GL_CCW);
+// glEnable(GL_BLEND);
+// glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+ glGenTextures(1, &tex0);
+
+ glBindTexture(GL_TEXTURE_2D, tex0);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texw, texh, 0, GL_RGBA,
+ GL_UNSIGNED_BYTE, texdata);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ mtx_perspective(Projection, 60.0, aspect, 1.0, 100.0);
+
+ return 0;
+}
+
+int scene_draw(struct ctxt *c) {
+ mat4 MVP;
+ mat4 MV;
+ mat4 Model;
+ mat4 View;
+ vec4 light = { 0.0, 0.0, 0.0, 1.0 };
+
+ mtx_identity(View);
+ mtx_translate(View, 0, 0, -7.0);
+ //mtx_rotate_y(View, a);
+ mtx_rotate_x(View, -15.0);
+
+ a += 1.0;
+ if (a > 360.0) a = 0.0;
+
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glUseProgram(pgm);
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, tex0);
+
+ glUniform1i(uTexture, 0);
+
+ glVertexAttribPointer(aVertex, 3, GL_FLOAT, GL_FALSE, 8*4, m->vdata);
+ glEnableVertexAttribArray(aVertex);
+ glVertexAttribPointer(aNormal, 3, GL_FLOAT, GL_FALSE, 8*4, m->vdata + 3);
+ glEnableVertexAttribArray(aNormal);
+ glVertexAttribPointer(aTexCoord, 2, GL_FLOAT, GL_FALSE, 8*4, m->vdata + 6);
+ glEnableVertexAttribArray(aTexCoord);
+
+ mtx_identity(Model);
+ mtx_translate(Model, 20, 40, 30);
+ mtx_mul_vec4(light, Model, light);
+ mtx_mul_vec4(light, View, light);
+ glUniform4fv(uLight, 1, light);
+
+ mtx_identity(Model);
+ mtx_mul_unsafe(MV, Model, View);
+ mtx_mul_unsafe(MVP, MV, Projection);
+
+ glUniformMatrix4fv(uMV, 1, GL_FALSE, (void*) MV);
+ glUniformMatrix4fv(uMVP, 1, GL_FALSE, (void*) MVP);
+ glDrawElements(GL_TRIANGLES, m->icount, GL_UNSIGNED_SHORT, m->idx);
+
+ mtx_identity(Model);
+ mtx_translate(Model, -3, 0, 0);
+ mtx_mul_unsafe(MV, Model, View);
+ mtx_mul_unsafe(MVP, MV, Projection);
+
+ glUniformMatrix4fv(uMV, 1, GL_FALSE, (void*) MV);
+ glUniformMatrix4fv(uMVP, 1, GL_FALSE, (void*) MVP);
+ glDrawElements(GL_TRIANGLES, m->icount, GL_UNSIGNED_SHORT, m->idx);
+
+ mtx_identity(Model);
+ mtx_translate(Model, 3, 0, 0);
+ mtx_rotate_y(Model, a);
+ mtx_mul_unsafe(MV, Model, View);
+ mtx_mul_unsafe(MVP, MV, Projection);
+
+ glUniformMatrix4fv(uMV, 1, GL_FALSE, (void*) MV);
+ glUniformMatrix4fv(uMVP, 1, GL_FALSE, (void*) MVP);
+ glDrawElements(GL_TRIANGLES, m->icount, GL_UNSIGNED_SHORT, m->idx);
+
+ return 0;
+}
+
diff --git a/test5.fs b/test5.fs
@@ -0,0 +1,10 @@
+
+uniform sampler2D uTexture;
+varying vec2 vTexCoord;
+varying float vDiffuse;
+
+void main() {
+ //vec4 c = vec4(1.0, 0.0, 0.0, 1.0);
+ vec4 c = texture2D(uTexture, vTexCoord);
+ gl_FragColor = c * 0.25 + c * vDiffuse;
+}
diff --git a/test5.vs b/test5.vs
@@ -0,0 +1,29 @@
+uniform mat4 uMVP;
+uniform mat4 uMV;
+uniform vec4 uLight;
+
+attribute vec4 aVertex;
+attribute vec4 aNormal;
+attribute vec2 aTexCoord;
+
+varying vec2 vTexCoord;
+varying float vDiffuse;
+
+void main() {
+ vec3 mvVertex = vec3(uMV * aVertex);
+
+ // this is cheating, as you should use the inverse transpose of the MV
+ // matrix, but if there's no nonuniform scaling going on, it works
+ vec3 mvNormal = vec3(uMV * vec4(aNormal.xyz, 0));
+
+ vec3 lightVector = normalize(vec3(uLight) - mvVertex);
+ float lightDistance = length(vec3(uLight) - mvVertex);
+
+ float diffuse = max(dot(mvNormal, lightVector), 0.0);
+
+ vTexCoord = aTexCoord;
+ vDiffuse = diffuse;
+
+ gl_Position = uMVP * aVertex;
+}
+
