From 22b52f5fccf07256cb435c89fe8d938261d50857 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sat, 8 Sep 2012 00:15:41 -0400
Subject: [PATCH] add scale factor to obj shader and scale tank object up

---
 assets/fs/shaders/obj_v.glsl | 4 +++-
 src/client/Client.cc         | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/assets/fs/shaders/obj_v.glsl b/assets/fs/shaders/obj_v.glsl
index 7d88a5f..a4af541 100644
--- a/assets/fs/shaders/obj_v.glsl
+++ b/assets/fs/shaders/obj_v.glsl
@@ -1,4 +1,6 @@
 
+uniform float scale;
+
 attribute vec3 pos;
 attribute vec3 normal;
 
@@ -7,7 +9,7 @@ varying vec3 normal_i;
 
 void main(void)
 {
-    gl_Position = gl_ModelViewProjectionMatrix * vec4(pos, 1);
+    gl_Position = gl_ModelViewProjectionMatrix * vec4(scale * pos, 1);
     pos_i = gl_Position.xyz;
     normal_i = gl_NormalMatrix * normal;
 }
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 3ece858..336918e 100755
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -183,9 +183,9 @@ void Client::update(double elapsed_time)
 
 void Client::draw_players()
 {
-    GLint uniform_locations[4];
-    const char *uniforms[] = { "ambient", "diffuse", "specular", "shininess" };
-    m_obj_program.get_uniform_locations(uniforms, 4, uniform_locations);
+    GLint uniform_locations[5];
+    const char *uniforms[] = { "ambient", "diffuse", "specular", "shininess", "scale" };
+    m_obj_program.get_uniform_locations(uniforms, 5, uniform_locations);
     glPushMatrix();
     glTranslatef(m_player->x, m_player->y, 40);
     glRotatef(m_player->direction * 180.0 / M_PI, 0, 0, 1);
@@ -198,6 +198,7 @@ void Client::draw_players()
             stride, (GLvoid *) m_tank_obj.getVertexOffset());
     glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
             stride, (GLvoid *) m_tank_obj.getNormalOffset());
+    glUniform1f(uniform_locations[4], 20.0f);
     for (map<string, WFObj::Material>::iterator it =
             m_tank_obj.getMaterials().begin();
             it != m_tank_obj.getMaterials().end();