niansa-misc/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-03-06 20:48:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing bounding box for upright_sprite

Browse source 
(also simplifies the mesh building)
fixes #15616
This commit is contained in:
sfan5 2025-01-02 13:48:39 +01:00
parent 0614b175b5
commit 5bcb7983ec
1 changed files with 27 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/client/content_cao.cpp
View file

@ -656,25 +656,33 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
} }
} else if (m_prop.visual == "upright_sprite") { } else if (m_prop.visual == "upright_sprite") {
grabMatrixNode(); grabMatrixNode();
scene::SMesh *mesh = new scene::SMesh(); auto mesh = make_irr<scene::SMesh>();
double dx = BS * m_prop.visual_size.X / 2; f32 dx = BS * m_prop.visual_size.X / 2;
double dy = BS * m_prop.visual_size.Y / 2; f32 dy = BS * m_prop.visual_size.Y / 2;
video::SColor c(0xFFFFFFFF); video::SColor c(0xFFFFFFFF);
{ // Front video::S3DVertex vertices[4] = {
scene::IMeshBuffer *buf = new scene::SMeshBuffer(); video::S3DVertex(-dx, -dy, 0, 0,0,1, c, 1,1),
video::S3DVertex vertices[4] = { video::S3DVertex( dx, -dy, 0, 0,0,1, c, 0,1),
video::S3DVertex(-dx, -dy, 0, 0,0,1, c, 1,1), video::S3DVertex( dx, dy, 0, 0,0,1, c, 0,0),
video::S3DVertex( dx, -dy, 0, 0,0,1, c, 0,1), video::S3DVertex(-dx, dy, 0, 0,0,1, c, 1,0),
video::S3DVertex( dx, dy, 0, 0,0,1, c, 0,0), };
video::S3DVertex(-dx, dy, 0, 0,0,1, c, 1,0), if (m_is_player) {
}; // Move minimal Y position to 0 (feet position)
if (m_is_player) { for (auto &vertex : vertices)
// Move minimal Y position to 0 (feet position) vertex.Pos.Y += dy;
for (video::S3DVertex &vertex : vertices) }
vertex.Pos.Y += dy; const u16 indices[] = {0,1,2,2,3,0};
for (int face : {0, 1}) {
auto buf = make_irr<scene::SMeshBuffer>();
// Front (0) or Back (1)
if (face == 1) {
for (auto &v : vertices)
v.Normal *= -1;
for (int i : {0, 2})
std::swap(vertices[i].Pos, vertices[i+1].Pos);
} }
u16 indices[] = {0,1,2,2,3,0};
buf->append(vertices, 4, indices, 6); buf->append(vertices, 4, indices, 6);
// Set material // Set material
@ -682,36 +690,12 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
buf->getMaterial().ColorParam = c; buf->getMaterial().ColorParam = c;
// Add to mesh // Add to mesh
mesh->addMeshBuffer(buf); mesh->addMeshBuffer(buf.get());
buf->drop();
} }
{ // Back
scene::IMeshBuffer *buf = new scene::SMeshBuffer();
video::S3DVertex vertices[4] = {
video::S3DVertex( dx,-dy, 0, 0,0,-1, c, 1,1),
video::S3DVertex(-dx,-dy, 0, 0,0,-1, c, 0,1),
video::S3DVertex(-dx, dy, 0, 0,0,-1, c, 0,0),
video::S3DVertex( dx, dy, 0, 0,0,-1, c, 1,0),
};
if (m_is_player) {
// Move minimal Y position to 0 (feet position)
for (video::S3DVertex &vertex : vertices)
vertex.Pos.Y += dy;
}
u16 indices[] = {0,1,2,2,3,0};
buf->append(vertices, 4, indices, 6);
// Set material mesh->recalculateBoundingBox();
setMaterial(buf->getMaterial()); m_meshnode = m_smgr->addMeshSceneNode(mesh.get(), m_matrixnode);
buf->getMaterial().ColorParam = c;
// Add to mesh
mesh->addMeshBuffer(buf);
buf->drop();
}
m_meshnode = m_smgr->addMeshSceneNode(mesh, m_matrixnode);
m_meshnode->grab(); m_meshnode->grab();
mesh->drop();
} else if (m_prop.visual == "cube") { } else if (m_prop.visual == "cube") {
grabMatrixNode(); grabMatrixNode();
scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS)); scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));