Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3895 from AndrewMeadows/thermonuclear

Browse source 
fix for non-animating models
This commit is contained in:
Brad Hefta-Gaub 2014-12-03 17:26:00 -08:00
commit c901b8d1eb
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities/src/ModelEntityItem.cpp
View file

@ -374,17 +374,9 @@ bool ModelEntityItem::isAnimatingSomething() const {
} }
EntityItem::SimulationState ModelEntityItem::computeSimulationState() const { EntityItem::SimulationState ModelEntityItem::computeSimulationState() const {
EntityItem::SimulationState baseClassState = EntityItem::computeSimulationState(); // if we're animating then we need to have update() periodically called on this entity
// which means we need to categorized as Moving
// if the base class is static, then consider our animation state, and upgrade to changing if return isAnimatingSomething() ? EntityItem::Moving : EntityItem::computeSimulationState();
// we are animating. If the base class has a higher simulation state than static, then
// use the base class state.
if (baseClassState == EntityItem::Static) {
if (isAnimatingSomething()) {
return EntityItem::Moving;
}
}
return baseClassState;
} }
void ModelEntityItem::update(const quint64& updateTime) { void ModelEntityItem::update(const quint64& updateTime) {