[Performous-commit] Lasse Karkkainen : Shader cleanup

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: opengl2
Commit: b435c61451da2e66cf01899f9cbe82389a679e0c

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Feb  8 02:01:45 2011 +0100

Shader cleanup

---

 themes/CMakeLists.txt                 |    2 +-
 themes/default/shaders/core.frag      |    1 +
 themes/default/shaders/core.vert      |   10 ++++++----
 themes/default/shaders/dancenote.vert |    2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
index 800a5f9..d22be10 100644
--- a/themes/CMakeLists.txt
+++ b/themes/CMakeLists.txt
@@ -1,6 +1,6 @@
 FILE(GLOB THEME_FILES "default/*.ogg" "default/*.svg" "default/*.png" "default/*.bmp" "default/*.obj")
 install(FILES ${THEME_FILES} DESTINATION ${SHARE_INSTALL}/themes/default/)
 
-FILE(GLOB SHADER_FILES "default/shaders/*.vert" "default/shaders/*.frag")
+FILE(GLOB SHADER_FILES "default/shaders/*")
 install(FILES ${SHADER_FILES} DESTINATION ${SHARE_INSTALL}/themes/default/shaders)
 
diff --git a/themes/default/shaders/core.frag b/themes/default/shaders/core.frag
index fff5a2e..872ac36 100644
--- a/themes/default/shaders/core.frag
+++ b/themes/default/shaders/core.frag
@@ -1,3 +1,4 @@
+#version 120
 #extension GL_ARB_texture_rectangle : require
 
 //DEFINES
diff --git a/themes/default/shaders/core.vert b/themes/default/shaders/core.vert
index 48bf7e9..d448a12 100644
--- a/themes/default/shaders/core.vert
+++ b/themes/default/shaders/core.vert
@@ -1,7 +1,9 @@
-void main()
-{
+#version 120
+
+in vec4 vertex;
+
+void main() {
 	gl_FrontColor = gl_Color;
-	gl_BackColor = gl_Color;
 	gl_TexCoord[0] = gl_MultiTexCoord0;
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	gl_Position = gl_ModelViewProjectionMatrix * vertex;
 }
diff --git a/themes/default/shaders/dancenote.vert b/themes/default/shaders/dancenote.vert
index 3573391..6c3de9a 100644
--- a/themes/default/shaders/dancenote.vert
+++ b/themes/default/shaders/dancenote.vert
@@ -46,7 +46,7 @@ void main()
 	// Mines
 	} else if (noteType == 3) {
 		trans *= scaleMat(1.0 + hitAnim);
-		float r = float(mod(int(clock*360.0), 360)) * deg2rad; // They rotate!
+		float r = mod(clock*360.0, 360.0) * deg2rad; // They rotate!
 		trans *= rotMat(r);
 	}