summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-05-17 01:22:56 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-05-17 01:22:56 +0200
commit33c2afafa0c6b936dace4b2b6203f03a89823049 (patch)
tree4124060cb020b821ced20a385f9f7db41afb79f5 /main.cpp
parent4aeeed5a6f88cd6d34b1b6f8584f880c9a84070a (diff)
Added colorization to fragment shader.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 9b9311e..65a3b9e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -133,7 +133,7 @@ int main(int, char**) {
create_bullets();
TextureSDL texture1("foo.png");
- TextureSDL texture2("foo2.png");
+ TextureSDL texture2("foo4.png");
GLFragmentShader shader1("bullet_fragment.glsl");
GLVertexShader shader2("bullet_vertex.glsl");
@@ -237,7 +237,9 @@ int main(int, char**) {
b.pos.y += b.direction.y * step;
b.pos.z += b.direction.z * step;
}
-
+
+ glColor4f(0, 1, 0, 1);
+
glVertex4f(b.pos.x, b.pos.y, b.direction.x, b.direction.y);
//glColor3f(b.color.r, b.color.g, b.color.b);
/*glTexCoord2f(0, 0);
@@ -261,6 +263,8 @@ int main(int, char**) {
glUseProgram(0);
+ glColor4f(1, 1, 1, 1);
+
char s[0xff];
snprintf(s, 0xff, "Bullets: %d", (int)bullets.size());