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

diff --git a/demos/shaders.cpp b/demos/shaders.cpp
index 73ae1b72..872c3c16 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;