X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcapsule.cpp;h=2576f40d99eb66aeda40cf400a2e872654b0a99b;hb=4fe225bf15048fcb7a678370f87d09f2de37031a;hp=9553edd36cd3e907449d52425fb0342c07584d8c;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git diff --git a/source/capsule.cpp b/source/capsule.cpp index 9553edd3..2576f40d 100644 --- a/source/capsule.cpp +++ b/source/capsule.cpp @@ -1,3 +1,4 @@ +#define _USE_MATH_DEFINES #include #include "capsule.h" #include "primitivebuilder.h" @@ -42,10 +43,11 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const float sc = cos(sa); float ss = sin(sa); builder.normal(rs*sc, rs*ss, -rc); - if(tangent_attr>=0) - builder.attrib(tangent_attr, -ss, sc, 0); - if(binormal_attr>=0) - builder.attrib(binormal_attr, rc*sc, rc*ss, rs); + if(generate_tbn) + { + builder.tangent(-ss, sc, 0); + builder.binormal(rc*sc, rc*ss, rs); + } builder.texcoord(j*u_scale, v); builder.vertex(rs*sc*radius, rs*ss*radius, cz-rc*radius); }