minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-29 14:50:30 +02:00
Code Issues Projects Releases Wiki Activity

Add default UV's for CGeometryCreator::createConeMesh

Browse Source 
Thanks @randomMesh for reporting that they were missing: https://irrlicht.sourceforge.io/forum/viewtopic.php?p=307308
Also simplified that code a bit (same could probably also be done for createCylinderMesh, but too lazy right now)
Changed also UV's for top/bottom center vertex in CGeometryCreator::createCylinderMesh to use center for X (slight improvement, but would have to copy vertices to make it better)



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6580 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-12-31 16:48:36 +00:00
parent 8372a70f21
commit 245dd395cb
3 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/Irrlicht/CGeometryCreator.cpp
View File

@ -841,7 +841,7 @@ IMesh* CGeometryCreator::createCylinderMesh(f32 radius, f32 length,
v.Normal.X = 0.f;
v.Normal.Y = -1.f;
v.Normal.Z = 0.f;
v.TCoords.X = 1.f;
v.TCoords.X = 0.5f;
v.TCoords.Y = 1.f;
buffer->Vertices.push_back(v);
@ -867,7 +867,7 @@ IMesh* CGeometryCreator::createCylinderMesh(f32 radius, f32 length,
v.Normal.X = 0.f;
v.Normal.Y = 1.f;
v.Normal.Z = 0.f;
v.TCoords.X = 0.f;
v.TCoords.X = 0.5f;
v.TCoords.Y = 0.f;
buffer->Vertices.push_back(v);
@ -903,32 +903,34 @@ IMesh* CGeometryCreator::createConeMesh(f32 radius, f32 length, u32 tessellation
{
SMeshBuffer* buffer = new SMeshBuffer();
// TODO: For backward compatibility tessellation is per semi-circle
// We probably need another parameter to allow odd numbered tesselation without breaking existing code :-(
if ( tessellation > 0 )
tessellation = 2*tessellation;
if ( tessellation < 2 )
tessellation = 2;
const f32 angleStep = (core::PI * 2.f ) / tessellation;
const f32 angleStepHalf = angleStep*0.5f;
video::S3DVertex v;
u32 i;
v.Pos.Y = 0.f;
v.Color = colorTop;
for ( i = 0; i != tessellation; ++i )
for (u32 i = 0; i != tessellation; ++i )
{
f32 angle = angleStep * f32(i);
const f32 angle = angleStep * f32(i);
const f32 cosAngle = cosf(angle);
const f32 sinAngle = sinf(angle);
v.Pos.X = radius * cosf(angle);
v.Pos.Y = 0.f;
v.Pos.Z = radius * sinf(angle);
v.Normal = v.Pos;
v.Normal.normalize();
buffer->Vertices.push_back(v);
angle += angleStepHalf;
v.Pos.X = radius * cosf(angle);
v.Pos.Y = 0.f;
v.Pos.Z = radius * sinf(angle);
v.TCoords.X = (1.f+cosAngle)*0.5f;
v.TCoords.Y = (1.f+sinAngle)*0.5f;
v.Pos.X = radius * cosAngle;
v.Pos.Z = radius * sinAngle;
v.Normal = v.Pos;
v.Normal.normalize();
buffer->Vertices.push_back(v);
}
const u32 nonWrappedSize = buffer->Vertices.size() - 1;
// close top
@ -938,18 +940,20 @@ IMesh* CGeometryCreator::createConeMesh(f32 radius, f32 length, u32 tessellation
v.Normal.X = 0.f;
v.Normal.Y = 1.f;
v.Normal.Z = 0.f;
v.TCoords.X = 0.5f;
v.TCoords.Y = 0.5f;
buffer->Vertices.push_back(v);
u32 index = buffer->Vertices.size() - 1;
for ( i = 0; i != nonWrappedSize; i += 1 )
for (u32 i = 0; i != nonWrappedSize; ++i)
{
buffer->Indices.push_back(i + 0);
buffer->Indices.push_back(index);
buffer->Indices.push_back(i + 1);
}
buffer->Indices.push_back(i + 0);
buffer->Indices.push_back(nonWrappedSize);
buffer->Indices.push_back(index);
buffer->Indices.push_back(0);
@ -961,11 +965,13 @@ IMesh* CGeometryCreator::createConeMesh(f32 radius, f32 length, u32 tessellation
v.Normal.X = 0.f;
v.Normal.Y = -1.f;
v.Normal.Z = 0.f;
v.TCoords.X = 0.5f;
v.TCoords.Y = 0.5f;
buffer->Vertices.push_back(v);
index = buffer->Vertices.size() - 1;
for ( i = 0; i != nonWrappedSize; i += 1 )
for (u32 i = 0; i != nonWrappedSize; i += 1 )
{
buffer->Indices.push_back(index);
buffer->Indices.push_back(i + 0);
@ -973,7 +979,7 @@ IMesh* CGeometryCreator::createConeMesh(f32 radius, f32 length, u32 tessellation
}
buffer->Indices.push_back(index);
buffer->Indices.push_back(i + 0);
buffer->Indices.push_back(nonWrappedSize);
buffer->Indices.push_back(0);
buffer->recalculateBoundingBox();