Skip to content
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

Adjust IW4 xmodel bones for shield hits #63

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Adjust IW4 xmodel bones for shield hits #63

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
16 changes: 15 additions & 1 deletion src/IW4/Assets/Xmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,23 @@ namespace ZoneTool

if (data->partClassification)
{
char *shieldAdjustedPartClassification = new char[data->numBones];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to point out that ZoneMemory class utilitiy is provided inside src\ZoneUtils\Zone.

You could:
auto shieldAdjustedPartClassification = this->ManualAlloc<char>(data->numBones);

This has the advantage that the buffer is set to 0 using memset, then it will be automatically disposed of without you explicitly using the delete operator when the ZoneMemory object is deleted.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback! I'd like to fix this at some point, but don't have the time to get into C++ as a language enough even. Especially as I'm not even sure if this should be part of zonetool in the place where it is. Might make this a bit nicer at some point, but can't right now.

Feel free to edit any of it if you are interested.


for (int i = 0; i < data->numBones; i++)
{
uint16_t boneNameIndex = data->boneNames[i];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use std::uint16_t like it's done throughout the repo or auto I guess

std::string boneNameString = buf->get_scriptstring(boneNameIndex);
if (boneNameString == "tag_shield_back" || boneNameString == "tag_weapon_left")
shieldAdjustedPartClassification[i] = 0x13;
else
shieldAdjustedPartClassification[i] = data->partClassification[i];
}

buf->align(0);
buf->write(data->partClassification, data->numBones);
buf->write(shieldAdjustedPartClassification, data->numBones);

ZoneBuffer::clear_pointer(&dest->partClassification);
delete[] shieldAdjustedPartClassification;
}

if (data->animMatrix)
Expand Down