# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1393726800 -7200
# Node ID 3ba80928b530f9862f6180c0213fc3cb0d6a7a8c
# Parent  07c08d970cb42f7acd48d86427e8673359bb7653
fixed the build

diff -r 07c08d970cb4 -r 3ba80928b530 src/rtarg.cc
--- a/src/rtarg.cc	Sun Mar 02 03:56:47 2014 +0200
+++ b/src/rtarg.cc	Sun Mar 02 04:20:00 2014 +0200
@@ -41,7 +41,7 @@
 
 	CHECKGLERR;
 	color_tex = new Texture;
-	color_tex->create(tex_width, tex_height, fmt);
+	color_tex->create(tex_width, tex_height, TEX_2D, fmt);
 	CHECKGLERR;
 	tex_face = 0;
 
@@ -69,7 +69,7 @@
 			tex->get_size(1), face);
 
 	tex_targ = GL_TEXTURE_2D;
-	if(dynamic_cast<TextureCube*>(tex)) {
+	if(tex->get_type() == TEX_CUBE) {
 		if(face >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) {
 			tex_targ = face;
 		} else if(face >= 0 && face < 6) {
@@ -134,7 +134,7 @@
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 
-	color_tex->create(tex_width, tex_height, color_tex->get_format());
+	color_tex->create(tex_width, tex_height, TEX_2D, color_tex->get_format());
 	color_tex->bind();
 	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex_targ, color_tex->get_id(), 0);
 	glBindTexture(tex_targ, 0);
diff -r 07c08d970cb4 -r 3ba80928b530 src/scene.h
--- a/src/scene.h	Sun Mar 02 03:56:47 2014 +0200
+++ b/src/scene.h	Sun Mar 02 04:20:00 2014 +0200
@@ -3,6 +3,8 @@
 
 #include <vector>
 #include "object.h"
+#include "light.h"
+#include "camera.h"
 #include "curve.h"
 
 namespace goatgfx {
diff -r 07c08d970cb4 -r 3ba80928b530 src/shader.cc
--- a/src/shader.cc	Sun Mar 02 03:56:47 2014 +0200
+++ b/src/shader.cc	Sun Mar 02 04:20:00 2014 +0200
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include "opengl.h"
 #include "shader.h"
+#include "mesh.h"
 #include "logger.h"
 #include "unistate.h"
 
@@ -21,6 +22,7 @@
 #endif
 
 static std::string read_source(const char *fname);
+static void bind_standard_attr(const ShaderProg *prog);
 
 ShaderProg *ShaderProg::current;