X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=45ed6af7b579e2071209590864535d474b1ae7f6;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=9ee79d4bb464340e438945c5aba50d843ed1ed0d;hpb=72790b3aba8ddc1a6d020646fb7312959729777b;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 9ee79d4b..45ed6af7 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -6,7 +6,6 @@
 #include "program.h"
 #include "programdata.h"
 #include "renderer.h"
-#include "texenv.h"
 #include "texture.h"
 #include "texture2d.h"
 #include "texturing.h"
@@ -20,7 +19,8 @@ RenderPass::RenderPass():
 	shprog(0),
 	shdata(0),
 	material(0),
-	texturing(0)
+	texturing(0),
+	back_faces(false)
 { }
 
 RenderPass::RenderPass(const RenderPass &other):
@@ -28,7 +28,8 @@ RenderPass::RenderPass(const RenderPass &other):
 	shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
 	material(other.material),
 	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
-	tex_names(other.tex_names)
+	tex_names(other.tex_names),
+	back_faces(other.back_faces)
 { }
 
 RenderPass::~RenderPass()
@@ -70,6 +71,7 @@ void RenderPass::apply(Renderer &renderer) const
 	renderer.set_texturing(texturing);
 	renderer.set_material(material.get());
 	renderer.set_shader_program(shprog, shdata.get());
+	renderer.set_reverse_winding(back_faces);
 }
 
 
@@ -90,6 +92,7 @@ void RenderPass::Loader::init()
 	add("shader",   &RenderPass::shprog);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
+	add("back_faces",&RenderPass::back_faces);
 	add("texunit",  &Loader::texunit);
 	add("texunit",  &Loader::texunit_named);
 	add("uniforms", &Loader::uniforms);
@@ -98,7 +101,10 @@ void RenderPass::Loader::init()
 void RenderPass::Loader::material_inline()
 {
 	RefPtr<Material> mat = new Material;
-	load_sub(*mat);
+	if(coll)
+		load_sub(*mat, get_collection());
+	else
+		load_sub(*mat);
 	obj.material = mat;
 }
 
@@ -144,22 +150,11 @@ void RenderPass::TextureLoader::finish()
 {
 	if(tex)
 	{
-		if(env)
-			obj.attach(index, *tex, *env);
-		else
-			obj.attach(index, *tex);
+		obj.attach(index, *tex);
 		tex.release();
-		env.release();
 	}
 }
 
-void RenderPass::TextureLoader::texenv()
-{
-	throw runtime_error("TexEnvs can't be loaded yet");
-	/*env = new TexEnv;
-	load_sub(*env);*/
-}
-
 void RenderPass::TextureLoader::texture(const string &name)
 {
 	tex = &get_collection().get<Texture>(name);
@@ -169,7 +164,10 @@ void RenderPass::TextureLoader::texture(const string &name)
 void RenderPass::TextureLoader::texture2d()
 {
 	tex = new Texture2D;
-	load_sub(static_cast<Texture2D &>(*tex));
+	if(coll)
+		load_sub(static_cast<Texture2D &>(*tex), get_collection());
+	else
+		load_sub(static_cast<Texture2D &>(*tex));
 }
 
 } // namespace GL