Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-22 22:22:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore .x models to working state (#15550)

Browse Source 
* Add "lava flan" (.x model) smoke test

* Fix double finalize in `.x` mesh loader

* Use reserve instead of resize again

The weights are added indirectly via `AnimatedMesh->addWeight`
This commit is contained in:
Lars Müller 2024-12-18 20:29:35 +01:00 committed by GitHub
parent f99a1a7c7c
commit a37bdbf8b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 3535 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -5,3 +5,4 @@
*.h diff=cpp *.h diff=cpp
*.gltf binary *.gltf binary
*.x binary

8
games/devtest/mods/testentities/models/LICENSE.txt
View File

@ -1,3 +1,5 @@
"Minetest Sam":
Original model by MirceaKitsune (CC BY-SA 3.0). Original model by MirceaKitsune (CC BY-SA 3.0).
Various alterations and fixes by kilbith, sofar, xunto, Rogier-5, TeTpaAka, Desour, Various alterations and fixes by kilbith, sofar, xunto, Rogier-5, TeTpaAka, Desour,
stujones11, An0n3m0us (CC BY-SA 3.0): stujones11, An0n3m0us (CC BY-SA 3.0):
@ -5,3 +7,9 @@ stujones11, An0n3m0us (CC BY-SA 3.0):
Jordach (CC BY-SA 3.0): Jordach (CC BY-SA 3.0):
testentities_sam.png testentities_sam.png
"Lava Flan":
Zeg9 (CC BY-SA 3.0):
testentities_lava_flan.x
testentities_lava_flan.png

BIN
games/devtest/mods/testentities/models/testentities_lava_flan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

3506
games/devtest/mods/testentities/models/testentities_lava_flan.x Normal file
View File

File diff suppressed because it is too large Load Diff

14
games/devtest/mods/testentities/visuals.lua
View File

@ -79,6 +79,20 @@ core.register_entity("testentities:sam", {
end, end,
}) })
core.register_entity("testentities:lava_flan", {
initial_properties = {
infotext = "Lava Flan (smoke test .x)",
visual = "mesh",
mesh = "testentities_lava_flan.x",
textures = {
"testentities_lava_flan.png"
},
},
on_activate = function(self)
self.object:set_animation({x = 0, y = 28}, 15, 0, true)
end,
})
-- Advanced visual tests -- Advanced visual tests
-- An entity for testing animated and yaw-modulated sprites -- An entity for testing animated and yaw-modulated sprites

10
irr/src/CXMeshFileLoader.cpp
View File

@ -56,8 +56,9 @@ IAnimatedMesh *CXMeshFileLoader::createMesh(io::IReadFile *file)
AnimatedMesh = new SkinnedMeshBuilder(); AnimatedMesh = new SkinnedMeshBuilder();
SkinnedMesh *res = nullptr;
if (load(file)) { if (load(file)) {
AnimatedMesh->finalize(); res = AnimatedMesh->finalize();
} else { } else {
AnimatedMesh->drop(); AnimatedMesh->drop();
AnimatedMesh = 0; AnimatedMesh = 0;
@ -89,7 +90,7 @@ IAnimatedMesh *CXMeshFileLoader::createMesh(io::IReadFile *file)
delete Meshes[i]; delete Meshes[i];
Meshes.clear(); Meshes.clear();
return AnimatedMesh->finalize(); return res;
} }
bool CXMeshFileLoader::load(io::IReadFile *file) bool CXMeshFileLoader::load(io::IReadFile *file)
@ -962,15 +963,16 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
u32 i; u32 i;
const u32 jointStart = joint->Weights.size(); const u32 jointStart = joint->Weights.size();
joint->Weights.resize(jointStart + nWeights); joint->Weights.reserve(jointStart + nWeights);
mesh.WeightJoint.reallocate(mesh.WeightJoint.size() + nWeights); mesh.WeightJoint.reallocate(mesh.WeightJoint.size() + nWeights);
mesh.WeightNum.reallocate(mesh.WeightNum.size() + nWeights); mesh.WeightNum.reallocate(mesh.WeightNum.size() + nWeights);
for (i = 0; i < nWeights; ++i) { for (i = 0; i < nWeights; ++i) {
mesh.WeightJoint.push_back(*n); mesh.WeightJoint.push_back(*n);
mesh.WeightNum.push_back(joint->Weights.size()); mesh.WeightNum.push_back(joint->Weights.size()); // id of weight
// Note: This adds a weight to joint->Weights
SkinnedMesh::SWeight *weight = AnimatedMesh->addWeight(joint); SkinnedMesh::SWeight *weight = AnimatedMesh->addWeight(joint);
weight->buffer_id = 0; weight->buffer_id = 0;