Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 21:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous

Browse source
This commit is contained in:
amantley 2017-12-13 19:07:23 -08:00
parent 2817eadb7a
commit 5bc113c818
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,12 +207,10 @@ void ModelEntityItem::update(const quint64& now) {
// don't reset _lastAnimated here because we need the timestamp from the ModelEntityItem constructor for when the properties were set // don't reset _lastAnimated here because we need the timestamp from the ModelEntityItem constructor for when the properties were set
_currentFrame = currentAnimationProperties.getCurrentFrame(); _currentFrame = currentAnimationProperties.getCurrentFrame();
setAnimationCurrentFrame(_currentFrame); setAnimationCurrentFrame(_currentFrame);
qCDebug(entities) << "setting first frame 1 " << _currentFrame;
} else { } else {
_lastAnimated = usecTimestampNow(); _lastAnimated = usecTimestampNow();
_currentFrame = currentAnimationProperties.getFirstFrame(); _currentFrame = currentAnimationProperties.getFirstFrame();
setAnimationCurrentFrame(currentAnimationProperties.getFirstFrame()); setAnimationCurrentFrame(currentAnimationProperties.getFirstFrame());
qCDebug(entities) << "setting first frame 2" << _currentFrame;
} }
} else if (!currentAnimationProperties.getRunning() && _previousAnimationProperties.getRunning()) { } else if (!currentAnimationProperties.getRunning() && _previousAnimationProperties.getRunning()) {
_currentFrame = currentAnimationProperties.getFirstFrame(); _currentFrame = currentAnimationProperties.getFirstFrame();
@ -220,31 +218,11 @@ void ModelEntityItem::update(const quint64& now) {
} else if (currentAnimationProperties.getCurrentFrame() != _previousAnimationProperties.getCurrentFrame()) { } else if (currentAnimationProperties.getCurrentFrame() != _previousAnimationProperties.getCurrentFrame()) {
// don't reset _lastAnimated here because the currentFrame was set with the previous setting of _lastAnimated // don't reset _lastAnimated here because the currentFrame was set with the previous setting of _lastAnimated
_currentFrame = currentAnimationProperties.getCurrentFrame(); _currentFrame = currentAnimationProperties.getCurrentFrame();
// qCDebug(entities) << "point 3 " << _currentFrame;
} }
}); });
_previousAnimationProperties = this->getAnimationProperties(); _previousAnimationProperties = this->getAnimationProperties();
} else {
// else the animation properties have not changed.
// if the first frame is less than zero don't do anything.
if (!(getAnimationFirstFrame() < 0)) {
// if the current frame is less than zero then we have restarted the server.
if (_currentFrame < 0) {
//qCDebug(entities) << "setting first frame 3 " << _currentFrame;
if ((currentAnimationProperties.getCurrentFrame() < currentAnimationProperties.getLastFrame()) &&
(currentAnimationProperties.getCurrentFrame() > currentAnimationProperties.getFirstFrame())) {
// _currentFrame = currentAnimationProperties.getCurrentFrame();
} else {
//qCDebug(entities) << "setting first frame 4 " << _currentFrame;
// _currentFrame = currentAnimationProperties.getFirstFrame();
// setAnimationCurrentFrame(_currentFrame);
// _lastAnimated = usecTimestampNow();
}
}
}
} }
if (isAnimatingSomething()) { if (isAnimatingSomething()) {
@ -263,6 +241,10 @@ bool ModelEntityItem::needsToCallUpdate() const {
} }
void ModelEntityItem::updateFrameCount() { void ModelEntityItem::updateFrameCount() {
if (_currentFrame < 0.0f) {
return;
}
if (!_lastAnimated) { if (!_lastAnimated) {
_lastAnimated = usecTimestampNow(); _lastAnimated = usecTimestampNow();
@ -298,7 +280,7 @@ void ModelEntityItem::updateFrameCount() {
_currentFrame = getAnimationFirstFrame(); _currentFrame = getAnimationFirstFrame();
} }
} }
qCDebug(entities) << "in update frame " << _currentFrame; // qCDebug(entities) << "in update frame " << _currentFrame;
setAnimationCurrentFrame(_currentFrame); setAnimationCurrentFrame(_currentFrame);
} }