Skip to content

Fix BSGeometry virtual overrides and SkinAttach bone fallback #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ousnius merged 1 commit into from
May 14, 2026
Merged

Fix BSGeometry virtual overrides and SkinAttach bone fallback #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions include/Geometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,20 @@ class BSGeometry : public NiCloneableStreamable<BSGeometry, NiShape> {
bool GetTriangles(std::vector<Triangle>& tris) const override;
void SetTriangles(const std::vector<Triangle>& tris) override;

bool IsSkinned() const override { return !skinInstanceRef.IsEmpty(); }

bool HasSkinInstance() const override { return !skinInstanceRef.IsEmpty(); }
NiBlockRef<NiBoneContainer>* SkinInstanceRef() override { return &skinInstanceRef; }
const NiBlockRef<NiBoneContainer>* SkinInstanceRef() const override { return &skinInstanceRef; }

bool HasShaderProperty() const override { return !shaderPropertyRef.IsEmpty(); }
NiBlockRef<NiShader>* ShaderPropertyRef() override { return &shaderPropertyRef; }
const NiBlockRef<NiShader>* ShaderPropertyRef() const override { return &shaderPropertyRef; }

bool HasAlphaProperty() const override { return !alphaPropertyRef.IsEmpty(); }
NiBlockRef<NiAlphaProperty>* AlphaPropertyRef() override { return &alphaPropertyRef; }
const NiBlockRef<NiAlphaProperty>* AlphaPropertyRef() const override { return &alphaPropertyRef; }

uint8_t MeshCount() { return (uint8_t) meshes.size(); }

// Flag 0x200 (512) on BSGeometry controls whether mesh data is embedded inline
Expand Down
23 changes: 17 additions & 6 deletions src/NifFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,13 +2445,24 @@ uint32_t NifFile::GetShapeBoneList(NiShape* shape, std::vector<std::string>& out
return 0;

auto skinInst = hdr.GetBlock<NiBoneContainer>(shape->SkinInstanceRef());
if (!skinInst)
return 0;
if (skinInst) {
for (auto& bone : skinInst->boneRefs) {
auto node = hdr.GetBlock(bone);
if (node)
outList.push_back(node->name.get());
}
}

for (auto& bone : skinInst->boneRefs) {
auto node = hdr.GetBlock(bone);
if (node)
outList.push_back(node->name.get());
// SF NIFs store bone names in SkinAttach extra data instead of NiNode refs
if (outList.empty()) {
for (auto& extraDataRef : shape->extraDataRefs) {
auto skinAttach = hdr.GetBlock<SkinAttach>(extraDataRef);
if (skinAttach) {
for (auto& bone : skinAttach->bones)
outList.push_back(bone.get());
break;
}
}
}

return static_cast<uint32_t>(outList.size());
Expand Down
Loading