X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsphere.cpp;h=7873d3a2132d1407cf8cfd78626b4dbd7ed6ebc3;hp=dd27fad40e28cc1608ad9699b121d1c4af0f0ffb;hb=b7ecc29c204faede028556d1942b2d61d5cda9ee;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266 diff --git a/source/builders/sphere.cpp b/source/builders/sphere.cpp index dd27fad4..7873d3a2 100644 --- a/source/builders/sphere.cpp +++ b/source/builders/sphere.cpp @@ -43,11 +43,8 @@ void UvSphereBuilder::build(PrimitiveBuilder &builder) const builder.normal(cv*cu, cv*su, sv); builder.texcoord(j*u_scale, i*v_scale); - if(generate_tbn) - { + if(generate_tan) builder.tangent(-su, cu, 0); - builder.binormal(-sv*cu, -sv*su, cv); - } builder.vertex(cv*cu*radius, cv*su*radius, sv*radius); } } @@ -83,7 +80,7 @@ void UvSphereBuilder::build(PrimitiveBuilder &builder) const // https://en.wikipedia.org/wiki/Regular_icosahedron#Cartesian_coordinates -float IcoSphereBuilder::base_vertices[12*3] = +const float IcoSphereBuilder::base_vertices[12*3] = { 0.0f, -0.5257311f, -0.8506508f, 0.0f, 0.5257311f, -0.8506508f, @@ -99,7 +96,7 @@ float IcoSphereBuilder::base_vertices[12*3] = 0.5257311f, 0.8506508f, 0.0f }; -unsigned IcoSphereBuilder::base_triangles[20*3] = +const unsigned IcoSphereBuilder::base_triangles[20*3] = { 0, 1, 6, 1, 0, 4,