-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <cmath>
#include "capsule.h"
#include "primitivebuilder.h"
{
float u_scale = 1.0/segments;
float v_scale = 1/(length+radius*M_PI);
- if(tex_fit!=STRETCH)
- {
- float l1 = radius*M_PI*2;
- float l2 = length+radius*M_PI;
- if((l1<l2)==(tex_fit==CUT))
- u_scale *= l1/l2;
- else
- v_scale *= l2/l1;
- }
+ adjust_texture_scale(u_scale, v_scale, radius*M_PI*2, length+radius*M_PI);
builder.normal(0, 0, -1);
builder.texcoord(0.5, 0);
- builder.vertex(0, 0, -length/2+radius);
+ builder.vertex(0, 0, -length/2-radius);
for(unsigned i=1; i<rings; ++i)
{
float cz = length*(i>rings/2 ? 0.5 : -0.5);
- float v = (i*radius*M_PI/rings+(i>rings/2 ? length : 0))*v_scale;
+ float v = ((i>rings/2 ? i-1 : i)*radius*M_PI/(rings-1)+(i>rings/2 ? length : 0))*v_scale;
float ra = (i>rings/2 ? i-1 : i)*M_PI/(rings-1);
float rc = cos(ra);
float rs = sin(ra);
float sc = cos(sa);
float ss = sin(sa);
builder.normal(rs*sc, rs*ss, -rc);
- if(tangent_attr)
+ if(generate_tbn)
{
- builder.attrib(tangent_attr, -ss, sc, 0);
- builder.attrib(binormal_attr, rc*sc, rc*ss, rs);
+ 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);
}
builder.normal(0, 0, 1);
builder.texcoord(0.5, (length+radius*M_PI)*v_scale);
- builder.vertex(0, 0, length/2-radius);
+ builder.vertex(0, 0, length/2+radius);
for(unsigned i=0; i<segments; ++i)
{