zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update models.cpp

Browse source 
- Removed an unnecessary bool
This commit is contained in:
Shiny Metagross 2022-08-15 14:44:41 -07:00 committed by Christoph Oelckers
parent 5670e6f54c
commit 5f0bf8eda6
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_data/models.cpp
View file

@ -354,7 +354,6 @@ void RenderFrameModels(FModelRenderer *renderer, FLevelLocals *Level, const FSpr
bool attachments = smf->flags & MDL_MODELSAREATTACHMENTS; bool attachments = smf->flags & MDL_MODELSAREATTACHMENTS;
bool nextFrame = smfNext && modelframe != modelframenext; bool nextFrame = smfNext && modelframe != modelframenext;
bool hasExternAnimation = false;
if (animationid >= 0) if (animationid >= 0)
{ {
@ -362,11 +361,8 @@ void RenderFrameModels(FModelRenderer *renderer, FLevelLocals *Level, const FSpr
animationData = animation->AttachAnimationData(); animationData = animation->AttachAnimationData();
if(!attachments || boneData.Size() == 0) if(!attachments || boneData.Size() == 0)
boneData = animation->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData); boneData = animation->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData);
hasExternAnimation = true;
} }
else boneData = mdl->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData);
if(!hasExternAnimation) boneData = mdl->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData);
if (smfNext && modelframe != modelframenext) if (smfNext && modelframe != modelframenext)
mdl->RenderFrame(renderer, tex, modelframe, modelframenext, inter, translation, ssidp, boneData); mdl->RenderFrame(renderer, tex, modelframe, modelframenext, inter, translation, ssidp, boneData);