# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1350603957 -10800
# Node ID a27528035e2082ee1fe8103459062143a1afff6c
# Parent  e198e94435c87723fcbb8268c954d4503c9875b5
- re-organized the renderer classes a bit wrt final render-target
- implemented identity color-grading palette for now
- broke particle systems....
- removed multipass renderer

diff -r e198e94435c8 -r a27528035e20 prototype/sdr/post.p.glsl
--- a/prototype/sdr/post.p.glsl	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/sdr/post.p.glsl	Fri Oct 19 02:45:57 2012 +0300
@@ -1,6 +1,10 @@
 uniform sampler2D fbtex;
+uniform sampler3D paltex;
 
 void main()
 {
-	gl_FragColor = texture2D(fbtex, gl_TexCoord[0].st);
+	// lookup the render output color for this pixel
+	vec4 color = texture2D(fbtex, gl_TexCoord[0].st);
+	// use that color as an index into the palette
+	gl_FragColor = vec4(texture3D(paltex, color.xyz).xyz, color.a);
 }
diff -r e198e94435c8 -r a27528035e20 prototype/src/colgrade.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prototype/src/colgrade.cc	Fri Oct 19 02:45:57 2012 +0300
@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include "opengl.h"
+#include "colgrade.h"
+
+GradePalette::GradePalette()
+{
+	tex = 0;
+}
+
+GradePalette::~GradePalette()
+{
+	destroy();
+}
+
+bool GradePalette::create(int sz)
+{
+	unsigned int clamp = GLEW_ARB_texture_border_clamp ? GL_CLAMP_TO_EDGE : GL_CLAMP;
+
+	destroy();
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_3D, tex);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, clamp);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, clamp);
+	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, clamp);
+	glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, sz, sz, sz, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
+
+	unsigned char *scanline = new unsigned char[sz * 3];
+
+	size = sz;
+	for(int i=0; i<sz; i++) {	// for each slice...
+		int b = 255 * i / (sz - 1);
+		for(int j=0; j<sz; j++) {	// for each scanline...
+			int g = 255 * j / (sz - 1);
+
+			for(int k=0; k<sz; k++) {
+				int r = 255 * k / (sz - 1);
+
+				scanline[k * 3] = r;
+				scanline[k * 3 + 1] = g;
+				scanline[k * 3 + 2] = b;
+			}
+			glTexSubImage3D(GL_TEXTURE_3D, 0, 0, j, i, sz, 1, 1, GL_RGB,
+					GL_UNSIGNED_BYTE, scanline);
+		}
+	}
+
+	delete [] scanline;
+	return true;
+}
+
+void GradePalette::destroy()
+{
+	if(tex) {
+		glDeleteTextures(1, &tex);
+	}
+}
+
+bool GradePalette::save_shot(const char *fname) const
+{
+	return false;	// TODO
+}
+
+bool GradePalette::load_shot(const char *fname)
+{
+	return false;	// TODO
+}
+
+unsigned int GradePalette::get_texture() const
+{
+	return tex;
+}
diff -r e198e94435c8 -r a27528035e20 prototype/src/colgrade.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prototype/src/colgrade.h	Fri Oct 19 02:45:57 2012 +0300
@@ -0,0 +1,22 @@
+#ifndef COLGRADE_H_
+#define COLGRADE_H_
+
+class GradePalette {
+private:
+	unsigned int tex;
+	int size;
+
+public:
+	GradePalette();
+	~GradePalette();
+
+	bool create(int sz = 16);
+	void destroy();
+
+	bool save_shot(const char *fname) const;
+	bool load_shot(const char *fname);
+
+	unsigned int get_texture() const;
+};
+
+#endif	// COLGRADE_H_
diff -r e198e94435c8 -r a27528035e20 prototype/src/main.cc
--- a/prototype/src/main.cc	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/src/main.cc	Fri Oct 19 02:45:57 2012 +0300
@@ -10,7 +10,6 @@
 #include "tileset.h"
 #include "renderer.h"
 #include "renderer_deferred.h"
-#include "renderer_multipass.h"
 #include "cmdcon.h"
 #include "cfg.h"
 #include "timer.h"
@@ -127,15 +126,6 @@
 		}
 		break;
 
-	case Config::Renderer::multipass:
-		rend = new MultipassRenderer;
-		if(!rend->init(xsz, ysz)) {
-			fprintf(stderr, "failed to initialize multipass deferred renderer\n");
-			delete rend;
-			return false;
-		}
-		break;
-
 	case Config::Renderer::fwd:
 		rend = new FwdRenderer;
 		if(!rend->init(xsz, ysz)) {
@@ -152,15 +142,10 @@
 			printf("falling back to multipass renderer...\n");
 
 			delete rend;
-			rend = new MultipassRenderer();
+			rend = new FwdRenderer();
 			if(!rend->init(xsz, ysz)) {
-				printf("falling back to crappy renderer...\n");
-
-				rend = new FwdRenderer();
-				if(!rend->init(xsz, ysz)) {
-					fprintf(stderr, "failed to create renderer\n");
-					return false;
-				}
+				fprintf(stderr, "failed to create renderer\n");
+				return false;
 			}
 		}
 	}
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer.cc
--- a/prototype/src/renderer.cc	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/src/renderer.cc	Fri Oct 19 02:45:57 2012 +0300
@@ -6,17 +6,34 @@
 #include "datapath.h"
 
 static unsigned int load_sdr(const char *vfname, const char *pfname);
+static int round_pow2(int x);
 
 Renderer *rend;
 
 
 Renderer::Renderer()
 {
+	fbo = 0;
+	rend_tex = rend_depth = 0;
 	width = height = 0;
+	tex_xsz = tex_ysz = 0;
+	post_sdr = 0;
 }
 
 Renderer::~Renderer()
 {
+	if(post_sdr) {
+		free_program(post_sdr);
+	}
+	if(rend_tex) {
+		glDeleteTextures(1, &rend_tex);
+	}
+	if(rend_depth) {
+		glDeleteRenderbuffersEXT(1, &rend_depth);
+	}
+	if(fbo) {
+		glDeleteFramebuffersEXT(1, &fbo);
+	}
 }
 
 bool Renderer::init(int xsz, int ysz)
@@ -24,6 +41,18 @@
 	width = xsz;
 	height = ysz;
 
+	if(!create_rtarg()) {
+		return false;
+	}
+
+	if(!(post_sdr = load_sdr("post.v.glsl", "post.p.glsl"))) {
+		return false;
+	}
+
+	if(!gradepal.create()) {
+		return false;
+	}
+
 	rend = this;
 	return true;
 }
@@ -42,6 +71,20 @@
 {
 	width = xsz;
 	height = ysz;
+
+	// if we need a bigger rendertarget ...
+	if(xsz > tex_xsz || ysz > tex_ysz) {
+		tex_xsz = round_pow2(xsz);
+		tex_ysz = round_pow2(ysz);
+
+		// ... resize the render target
+		glBindTexture(GL_TEXTURE_2D, rend_tex);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+
+		// ... resize the depth buffer
+		glBindRenderbufferEXT(GL_RENDERBUFFER, rend_depth);
+		glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, tex_xsz, tex_ysz);
+	}
 }
 
 void Renderer::render_pre(const Level *level) const
@@ -51,11 +94,106 @@
 	glFogf(GL_FOG_START, 3.0f);
 	glFogf(GL_FOG_END, 6.0f);
 	// TODO level->draw_pre();
+
+	// bind the render target
+	glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
+	glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rend_tex, 0);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	CHECKGLERR;
 }
 
 void Renderer::render_post(const Level *level) const
 {
 	level->draw_post();
+	CHECKGLERR;
+
+	glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
+
+	// draw the rendered output
+	glActiveTextureARB(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, rend_tex);
+	glEnable(GL_TEXTURE_2D);
+
+	// use the color-grading palette
+	glActiveTextureARB(GL_TEXTURE1);
+	glBindTexture(GL_TEXTURE_3D, gradepal.get_texture());
+	glEnable(GL_TEXTURE_3D);
+
+	glUseProgram(post_sdr);
+	set_uniform_int(post_sdr, "fbtex", 0);
+	set_uniform_int(post_sdr, "paltex", 1);
+
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 0);
+	glVertex2f(-1, -1);
+	glTexCoord2f((float)width / tex_xsz, 0);
+	glVertex2f(1, -1);
+	glTexCoord2f((float)width / tex_xsz, (float)height / tex_ysz);
+	glVertex2f(1, 1);
+	glTexCoord2f(0, (float)height / tex_ysz);
+	glVertex2f(-1, 1);
+	glEnd();
+	glUseProgram(0);
+
+	glActiveTextureARB(GL_TEXTURE0);
+
+	CHECKGLERR;
+}
+
+static const char *fbstname[] = {
+	"GL_FRAMEBUFFER_COMPLETE",
+	"GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT",
+	"GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT",
+	"no such fbo error",
+	"GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS",
+	"GL_FRAMEBUFFER_INCOMPLETE_FORMATS",
+	"GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER",
+	"GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER",
+	"GL_FRAMEBUFFER_UNSUPPORTED"
+};
+
+bool Renderer::create_rtarg()
+{
+	unsigned int clamp = GLEW_ARB_texture_border_clamp ? GL_CLAMP_TO_EDGE : GL_CLAMP;
+
+	tex_xsz = round_pow2(width);
+	tex_ysz = round_pow2(height);
+
+	if(!glGenFramebuffersEXT) {
+		fprintf(stderr, "FBO support missing!\n");
+		return false;
+	}
+	glGenFramebuffersEXT(1, &fbo);
+	glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
+
+	// create the render target
+	glGenTextures(1, &rend_tex);
+	glBindTexture(GL_TEXTURE_2D, rend_tex);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clamp);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clamp);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+
+	glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rend_tex, 0);
+
+	// create depth buffer
+	glGenRenderbuffersEXT(1, &rend_depth);
+	glBindRenderbufferEXT(GL_RENDERBUFFER, rend_depth);
+	glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, tex_xsz, tex_ysz);
+
+	glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rend_depth);
+
+	int fbst = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
+	if(fbst != GL_FRAMEBUFFER_COMPLETE) {
+		fprintf(stderr, "incomplete fbo: %u (%s)\n", fbo, fbstname[fbst - GL_FRAMEBUFFER_COMPLETE]);
+		return false;
+	}
+	CHECKGLERR;
+
+	glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
+	return true;
 }
 
 
@@ -75,8 +213,9 @@
 
 bool FwdRenderer::init(int xsz, int ysz)
 {
-	width = xsz;
-	height = ysz;
+	if(!Renderer::init(xsz, ysz)) {
+		return false;
+	}
 
 	if(glUseProgram && (sdrprog = load_sdr("fallback.v.glsl", "fallback.p.glsl"))) {
 		tang_attr = get_attrib_loc(sdrprog, "attr_tangent");
@@ -128,3 +267,15 @@
 	}
 	return prog;
 }
+
+static int round_pow2(int x)
+{
+	x--;
+	x = (x >> 1) | x;
+	x = (x >> 2) | x;
+	x = (x >> 4) | x;
+	x = (x >> 8) | x;
+	x = (x >> 16) | x;
+	return x + 1;
+}
+
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer.h
--- a/prototype/src/renderer.h	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/src/renderer.h	Fri Oct 19 02:45:57 2012 +0300
@@ -1,11 +1,22 @@
 #ifndef RENDERER_H_
 #define RENDERER_H_
 
+#include "colgrade.h"
+
 class Level;
 
 class Renderer {
 protected:
+	// render target
+	unsigned int fbo;
+	unsigned int rend_tex, rend_depth;
 	int width, height;
+	int tex_xsz, tex_ysz;
+
+	GradePalette gradepal;
+	unsigned int post_sdr;
+
+	virtual bool create_rtarg();
 
 public:
 	Renderer();
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer_deferred.cc
--- a/prototype/src/renderer_deferred.cc	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/src/renderer_deferred.cc	Fri Oct 19 02:45:57 2012 +0300
@@ -10,17 +10,14 @@
 
 static unsigned int load_sdr(const char *vfname, const char *pfname);
 static void attach_color_buffer(unsigned int fbo, int count, const unsigned int *tex);
-static int round_pow2(int x);
 
 DeferredRenderer::DeferredRenderer()
 {
-	fbo = rbuf_depth = rend_tex = 0;
+	fbo = 0;
 	for(int i=0; i<MRT_COUNT; i++) {
 		mrt_tex[i] = 0;
 	}
-	tex_xsz = tex_ysz = 0;
-
-	mrt_prog = deferred_debug = deferred_omni = post_sdr = 0;
+	mrt_prog = deferred_debug = deferred_omni = 0;
 
 	curr_prog = 0;
 	num_draw_bufs = 1;
@@ -37,28 +34,17 @@
 	if(deferred_debug) {
 		free_program(deferred_debug);
 	}
-	if(post_sdr) {
-		free_program(post_sdr);
-	}
 
 	if(mrt_tex[0]) {
 		glDeleteTextures(MRT_COUNT, mrt_tex);
 	}
-	if(rend_tex) {
-		glDeleteTextures(1, &rend_tex);
-	}
-	if(rbuf_depth) {
-		glDeleteRenderbuffersEXT(1, &rbuf_depth);
-	}
-	if(fbo) {
-		glDeleteFramebuffersEXT(1, &fbo);
-	}
 }
 
 bool DeferredRenderer::init(int xsz, int ysz)
 {
-	width = xsz;
-	height = ysz;
+	if(!Renderer::init(xsz, ysz)) {
+		return false;
+	}
 
 	if(!GLEW_ARB_texture_float) {
 		fprintf(stderr, "%s: error: no floating point texture support\n", __FUNCTION__);
@@ -78,10 +64,6 @@
 	}
 	num_draw_bufs = MRT_COUNT;
 
-	if(!create_fbo()) {
-		return false;
-	}
-
 	if(!(mrt_prog = load_sdr("mrt.v.glsl", "mrt.p.glsl"))) {
 		return false;
 	}
@@ -97,11 +79,6 @@
 		set_uniform_int(deferred_omni, uname, i);
 	}
 
-	if(!(post_sdr = load_sdr("post.v.glsl", "post.p.glsl"))) {
-		return false;
-	}
-
-	rend = this;
 	return true;
 }
 
@@ -117,27 +94,20 @@
 
 void DeferredRenderer::resize(int xsz, int ysz)
 {
-	width = xsz;
-	height = ysz;
+	// keep a copy of the previous texture size because Renderer::resize may change it
+
+	int prev_tex_xsz = tex_xsz;
+	int prev_tex_ysz = tex_ysz;
+
+	Renderer::resize(xsz, ysz);
 
 	// if we need a bigger rendertarget ...
-	if(xsz > tex_xsz || ysz > tex_ysz) {
-		tex_xsz = round_pow2(xsz);
-		tex_ysz = round_pow2(ysz);
-
+	if(xsz > prev_tex_xsz || ysz > prev_tex_ysz) {
 		// ... resize all the color buffers
 		for(int i=0; i<MRT_COUNT; i++) {
 			glBindTexture(GL_TEXTURE_2D, mrt_tex[i]);
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, tex_xsz, tex_ysz, 0, GL_RGBA, GL_FLOAT, 0);
 		}
-
-		// ... resize the render texture
-		glBindTexture(GL_TEXTURE_2D, rend_tex);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_FLOAT, 0);
-
-		// ... resize the depth buffer
-		glBindRenderbufferEXT(GL_RENDERBUFFER, rbuf_depth);
-		glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, tex_xsz, tex_ysz);
 	}
 
 	// update the texture coordinate scaling factors
@@ -174,23 +144,6 @@
 	render_post(level);
 
 	glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
-
-	// XXX this should be moved to render_post
-	glBindTexture(GL_TEXTURE_2D, rend_tex);
-	glEnable(GL_TEXTURE_2D);
-
-	glUseProgram(post_sdr);
-	glBegin(GL_QUADS);
-	glTexCoord2f(0, 0);
-	glVertex2f(-1, -1);
-	glTexCoord2f((float)width / tex_xsz, 0);
-	glVertex2f(1, -1);
-	glTexCoord2f((float)width / tex_xsz, (float)height / tex_ysz);
-	glVertex2f(1, 1);
-	glTexCoord2f(0, (float)height / tex_ysz);
-	glVertex2f(-1, 1);
-	glEnd();
-	glUseProgram(0);
 }
 
 void DeferredRenderer::light_pass(const Level *level) const
@@ -237,30 +190,16 @@
 	"GL_FRAMEBUFFER_UNSUPPORTED"
 };
 
-bool DeferredRenderer::create_fbo()
+bool DeferredRenderer::create_rtarg()
 {
+	if(!Renderer::create_rtarg()) {
+		return false;
+	}
+
 	unsigned int clamp = GLEW_ARB_texture_border_clamp ? GL_CLAMP_TO_EDGE : GL_CLAMP;
 
-	// round the texture size up to the next power of 2
-	tex_xsz = round_pow2(width);
-	tex_ysz = round_pow2(height);
-
-	if(!glGenFramebuffersEXT) {
-		fprintf(stderr, "FBO support missing\n");
-		return false;
-	}
-	glGenFramebuffersEXT(1, &fbo);
 	glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
 
-	// create the result render target
-	glGenTextures(1, &rend_tex);
-	glBindTexture(GL_TEXTURE_2D, rend_tex);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clamp);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clamp);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_FLOAT, 0);
-
 	glGenTextures(MRT_COUNT, mrt_tex);
 	for(int i=0; i<MRT_COUNT; i++) {
 		glBindTexture(GL_TEXTURE_2D, mrt_tex[i]);
@@ -276,11 +215,6 @@
 		CHECKGLERR;
 	}
 
-	glGenRenderbuffersEXT(1, &rbuf_depth);
-	glBindRenderbufferEXT(GL_RENDERBUFFER, rbuf_depth);
-	glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, tex_xsz, tex_ysz);
-	glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rbuf_depth);
-
 	int fbst = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
 	if(fbst != GL_FRAMEBUFFER_COMPLETE) {
 		fprintf(stderr, "incomplete fbo: %u (%s)\n", fbo, fbstname[fbst - GL_FRAMEBUFFER_COMPLETE]);
@@ -328,17 +262,6 @@
 	glDrawBuffersARB(count, draw_bufs);
 }
 
-static int round_pow2(int x)
-{
-	x--;
-	x = (x >> 1) | x;
-	x = (x >> 2) | x;
-	x = (x >> 4) | x;
-	x = (x >> 8) | x;
-	x = (x >> 16) | x;
-	return x + 1;
-}
-
 #ifdef DBG_VIS_MRT
 // visualize the MRT buffers
 static void draw_deferred_debug()
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer_deferred.h
--- a/prototype/src/renderer_deferred.h	Tue Oct 16 04:08:35 2012 +0300
+++ b/prototype/src/renderer_deferred.h	Fri Oct 19 02:45:57 2012 +0300
@@ -8,20 +8,17 @@
 class DeferredRenderer : public Renderer {
 protected:
 	// render targets
-	unsigned int fbo, rend_tex, rbuf_depth;
 	unsigned int mrt_tex[MRT_COUNT];
-	int tex_xsz, tex_ysz;
 
 	// shaders
 	unsigned int mrt_prog;
 	unsigned int deferred_omni, deferred_debug;
-	unsigned int post_sdr;
 
 	mutable unsigned int curr_prog;
 
 	int num_draw_bufs;
 
-	virtual bool create_fbo();
+	virtual bool create_rtarg();
 
 public:
 	DeferredRenderer();
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer_multipass.cc
--- a/prototype/src/renderer_multipass.cc	Tue Oct 16 04:08:35 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "opengl.h"
-#include "renderer_multipass.h"
-#include "level.h"
-#include "sdr.h"
-#include "datapath.h"
-
-static unsigned int load_sdr(const char *vfname, const char *pfname);
-
-
-MultipassRenderer::MultipassRenderer()
-{
-	for(int i=0; i<MRT_COUNT; i++) {
-		rt_prog[i] = 0;
-	}
-}
-
-MultipassRenderer::~MultipassRenderer()
-{
-	for(int i=0; i<MRT_COUNT; i++) {
-		if(rt_prog[i]) {
-			free_program(rt_prog[i]);
-		}
-	}
-}
-
-bool MultipassRenderer::init(int xsz, int ysz)
-{
-	width = xsz;
-	height = ysz;
-
-	if(!GLEW_ARB_texture_float) {
-		fprintf(stderr, "%s: error: no floating point texture support\n", __FUNCTION__);
-		return false;
-	}
-
-	if(!create_fbo()) {
-		return false;
-	}
-
-	for(int i=0; i<MRT_COUNT; i++) {
-		char fname[128];
-		sprintf(fname, "multi%d.p.glsl", i);
-
-		if(!(rt_prog[i] = load_sdr("mrt.v.glsl", fname))) {
-			return false;
-		}
-		set_uniform_int(rt_prog[i], "tex_dif", 0);
-		set_uniform_int(rt_prog[i], "tex_norm", 1);
-	}
-
-	if(!(deferred_omni = load_sdr("deferred_omni.v.glsl", "deferred_omni.p.glsl"))) {
-		return false;
-	}
-	for(int i=0; i<MRT_COUNT; i++) {
-		char uname[32];
-		sprintf(uname, "mrt%d", i);
-		set_uniform_int(deferred_omni, uname, i);
-	}
-
-	rend = this;
-	return true;
-}
-
-int MultipassRenderer::get_tangent_location() const
-{
-	if(!curr_prog) {
-		return -1;
-	}
-	return get_attrib_loc(curr_prog, "attr_tangent");
-}
-
-void MultipassRenderer::render(const Level *level) const
-{
-	render_pre(level);
-
-	// render into the MRT buffers
-	glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
-
-	for(int i=0; i<MRT_COUNT; i++) {
-		glUseProgram(rt_prog[i]);
-		curr_prog = rt_prog[i];
-
-		glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-				mrt_tex[i], 0);
-
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		level->draw();
-	}
-	glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
-
-	// post-process lighting
-	light_pass(level);
-
-	glUseProgram(0);
-	curr_prog = 0;
-
-	render_post(level);
-}
-
-static unsigned int load_sdr(const char *vfname, const char *pfname)
-{
-	unsigned int prog;
-
-	std::string vsfile = datafile_path(vfname);
-	std::string psfile = datafile_path(pfname);
-
-	const char *vs = vsfile.empty() ? 0 : vsfile.c_str();
-	const char *ps = psfile.empty() ? 0 : psfile.c_str();
-
-	if(!(prog = create_program_load(vs, ps))) {
-		fprintf(stderr, "failed to load shader program (%s, %s)\n", vs, ps);
-		return 0;
-	}
-	return prog;
-}
diff -r e198e94435c8 -r a27528035e20 prototype/src/renderer_multipass.h
--- a/prototype/src/renderer_multipass.h	Tue Oct 16 04:08:35 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#ifndef RENDERER_MULTIPASS_H_
-#define RENDERER_MULTIPASS_H_
-
-#include "renderer_deferred.h"
-
-class MultipassRenderer : public DeferredRenderer {
-private:
-	unsigned int rt_prog[MRT_COUNT];
-
-public:
-	MultipassRenderer();
-	virtual ~MultipassRenderer();
-
-	virtual bool init(int xsz, int ysz);
-
-	virtual int get_tangent_location() const;
-
-	virtual void render(const Level *level) const;
-};
-
-#endif	// RENDERER_MULTIPASS_H_