Fun with shaders

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@48 84d2e878-0bd5-11dd-ad15-13eda11d74c5

1 files changed, 19 insertions, 10 deletions

diff --git a/src/types.h b/src/types.h
index 6d772f5..ebf1f82 100644
--- a/src/types.h
+++ b/src/types.h
@@ -34,6 +34,7 @@ typedef enum {
 	ATTRIB_PULSE	= 1<<1,		/* Pulsating colour */
 	ATTRIB_RADIUS	= 1<<2,		/* Radius is set */
 	ATTRIB_SHINY	= 1<<3,		/* Primitive is shiny */
+	ATTRIB_SWIRLY	= 1<<4,		/* Primitive is texture with swirlyness */
 } PrimitiveAttrib;
 
 typedef enum {
@@ -114,20 +115,28 @@ typedef struct {
 	GLhandleARB	lighting_vert;
 	GLhandleARB	lighting_frag;
 	GLhandleARB	lighting_program;
-	
+
 	/* Textures */
 	Texture		textures[MAX_TEXTURES];
 	unsigned int	num_textures;
+
+	GLuint		fbo;
+	GLuint		fbotex;
+	GLuint		fbodepth;
 	
-        GLuint          fbo;
-        GLuint          fbotex;
-        GLuint          fbodepth;
-        GLfloat         aspect;
-        int             width;
-        int             height;
-        
-        GLfloat		*hemisphere_v;
-        GLfloat		*hemisphere_n;
+	/* Swirlyness stuff */
+	GLhandleARB	swirly_vert;
+	GLhandleARB	swirly_frag;
+	GLhandleARB	swirly_program;
+	GLuint		swirly_fbo;
+        GLuint		swirly_texture;
+	
+	GLfloat         aspect;
+	int             width;
+	int             height;
+
+	GLfloat		*hemisphere_v;
+	GLfloat		*hemisphere_n;
 
 } RenderContext;