X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fshaders.cpp;h=5a268fec0bc94b581d61d5cb2fc9636bc2a751ee;hb=c44e9005200af76266ef44c158688e112ad4bb32;hp=73ae1b721321696ddc3114bfbb97676df16e00bd;hpb=9034e81679eeeaa3d1d5d643d3f924d9edb45a68;p=libs%2Fgl.git

diff --git a/demos/shaders.cpp b/demos/shaders.cpp
index 73ae1b72..5a268fec 100644
--- a/demos/shaders.cpp
+++ b/demos/shaders.cpp
@@ -56,10 +56,10 @@ int main()
 	tex2.image(0, GL::RGB, GL::UNSIGNED_BYTE, data);
 	delete[] data;
 
-	GL::Mesh mesh((GL::VERTEX3, GL::NORMAL3, GL::TEXCOORD2, GL::COLOR4_UBYTE, GL::ATTRIB3,4, GL::ATTRIB3,5));
+	GL::Mesh mesh((GL::VERTEX3, GL::NORMAL3, GL::TEXCOORD2, GL::COLOR4_UBYTE, GL::TANGENT3, GL::BINORMAL3));
 	GL::MeshBuilder bld(mesh);
 	bld.color(0.5f, 1.0f, 0.0f);
-	GL::CapsuleBuilder(1, 0.72498, 32, 17).texture_fit(GL::GeometryBuilder::WRAP).tangent(4).binormal(5).build(bld);
+	GL::CapsuleBuilder(1, 0.72498, 32, 17).texture_fit(GL::GeometryBuilder::WRAP).tbn().build(bld);
 	GL::Material mat;
 	mat.set_diffuse(GL::Color(0.5, 1.0, 0.0));
 	mat.set_specular(GL::Color(0.45, 0.5, 0.4));
@@ -74,12 +74,6 @@ int main()
 		feat.normalmap = i%4>1;
 		feat.specular = i%4>2;
 		programs.push_back(new GL::Program(feat));
-		if(feat.normalmap)
-		{
-			programs.back()->bind_attribute(4, "tangent");
-			programs.back()->bind_attribute(5, "binormal");
-			programs.back()->link();
-		}
 	}
 
 	GL::ProgramData progdata;
@@ -88,11 +82,9 @@ int main()
 
 	GL::Lighting lighting;
 	GL::Light light;
-	light.set_position(GL::Vector4(0, 2, 3, 0));
+	light.set_position(GL::Vector4(0, -0.781, 0.625, 0));
 	lighting.attach(0, light);
 
-	GL::Bind bind_light(lighting);
-
 	GL::Texturing texturing;
 	texturing.attach(0, tex1);
 	texturing.attach(1, tex2);
@@ -111,6 +103,7 @@ int main()
 		{
 			GL::Bind bind_depth(GL::DepthTest::lequal());
 			GL::Renderer renderer(0);
+			renderer.set_lighting(&lighting);
 			renderer.set_material(&mat);
 			renderer.set_texturing(&texturing);
 			renderer.add_shader_data(progdata);