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

changes to modelEntity.cpp

Browse source
This commit is contained in:
amantley 2017-11-22 17:53:21 -08:00
parent fdf5139a74
commit 2e75016021
3 changed files with 53 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -991,7 +991,7 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
int firstFrame = entity->getAnimationFirstFrame();
int lastFrame = entity->getAnimationLastFrame();
bool isHolding = entity->getAnimationHold();
int updatedFrameCount = frameCount;
int updatedFrameCount = lastFrame - firstFrame + 1;
//get the updated frame from the ModelEntity
auto modelAnimProperties = entity->getAnimationProperties();
@ -1018,45 +1018,45 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
auto now = usecTimestampNow();
//find out how long it has been since this animation started.
auto interval = now - _currentlyPlayingFrame;
//auto interval = now - _lastAnimated;
auto interval = now - _lastAnimated;
_lastAnimated = now;
//new global start time code
float nowTime = (float)interval / (float)USECS_PER_SECOND;
float oldCurrentFrame = _currentFrame;
_currentFrame = _renderAnimationProperties.getCurrentFrame() + (nowTime * _renderAnimationProperties.getFPS());
float deltaTime = (float)interval / (float)USECS_PER_SECOND;
_currentFrame += (deltaTime * _renderAnimationProperties.getFPS());
//here we implement the looping animation property
//if we have played through the animation once then we hold on the last frame
if( isLooping || (_currentFrame < _endAnim ) ){
if( isLooping || (_currentFrame < _renderAnimationProperties.getLastFrame() ) ){
//else advance the current frame.
//if hold or not playing don't advance the current frame.
//also if the animFrame is outside of first or last frame then don't advance the motion.
if (!isHolding && entity->getAnimationIsPlaying() && !( _renderAnimationProperties.getCurrentFrame() > _renderAnimationProperties.getLastFrame() ) && !( _renderAnimationProperties.getCurrentFrame() < _renderAnimationProperties.getFirstFrame() ) ) {
//float deltaTime = (float)interval / (float)USECS_PER_SECOND;
//_currentlyPlayingFrame += (deltaTime * _renderAnimationProperties.getFPS());
//do nothing
float deltaTime = (float)interval / (float)USECS_PER_SECOND;
_currentFrame += (deltaTime * _renderAnimationProperties.getFPS());
while ((_currentFrame - _renderAnimationProperties.getFirstFrame()) > updatedFrameCount) {
_currentFrame -= updatedFrameCount;
}
}
else {
//use old currentFrame
_currentFrame = oldCurrentFrame;
}
}
else {
}else {
//make current frame the endanim frame
_currentFrame = _endAnim;
_currentFrame = _renderAnimationProperties.getLastFrame();
}
//save the last place that we rendered ourselves.
//entity->setAnimationCurrentFrame(_currentFrame);
{
//where are we in the currently defined animation segment?
int animationCurrentFrame = (int)(glm::floor(_currentFrame - firstFrame)) % updatedFrameCount;
// int animationCurrentFrame = (int)(glm::floor(_currentFrame - firstFrame)) % updatedFrameCount;
//this gives us the absolute frame value to use by adding the first frame value.
animationCurrentFrame += firstFrame;
// animationCurrentFrame += firstFrame;
int animationCurrentFrame = (int)(glm::floor(_currentFrame));
@ -1383,7 +1383,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
auto newAnimationProperties = entity->getAnimationProperties();
if (newAnimationProperties != _renderAnimationProperties) {
qCDebug(entitiesrenderer) << "this is where the change is currently handled in the rendering code";
qCDebug(entitiesrenderer) << "getting the currently playing frame from the modelentityitem update" << entity->getCurrentlyPlayingFrame();
qCDebug(entitiesrenderer) << "getting the currently playing frame from the modelentityitem update" << newAnimationProperties.getCurrentFrame();
withWriteLock([&] {
if ( (newAnimationProperties.getCurrentFrame() != _renderAnimationProperties.getCurrentFrame()) || (newAnimationProperties.getFirstFrame() != _renderAnimationProperties.getFirstFrame()) || (newAnimationProperties.getLastFrame() != _renderAnimationProperties.getLastFrame()) || (newAnimationProperties.getRunning() && !_renderAnimationProperties.getRunning())) {
if (!(newAnimationProperties.getCurrentFrame() > newAnimationProperties.getLastFrame()) && !(newAnimationProperties.getCurrentFrame() < newAnimationProperties.getFirstFrame())) {
@ -1392,11 +1392,11 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
_lastAnimated = 0;
}
}else if ( _renderAnimationProperties.getLoop() && !newAnimationProperties.getLoop()) {
int currentframe_mod_length = (int)(_currentFrame - (int)(glm::floor(newAnimationProperties.getCurrentFrame()))) % ((int)(glm::floor(newAnimationProperties.getLastFrame())) - (int)(glm::floor(newAnimationProperties.getFirstFrame())) + 1);
_endAnim = _currentFrame + ((int)(newAnimationProperties.getLastFrame()) - (int)(newAnimationProperties.getFirstFrame())) - (float)currentframe_mod_length;
//int currentframe_mod_length = (int)(_currentFrame - (int)(glm::floor(newAnimationProperties.getCurrentFrame()))) % ((int)(glm::floor(newAnimationProperties.getLastFrame())) - (int)(glm::floor(newAnimationProperties.getFirstFrame())) + 1);
//_endAnim = _currentFrame + ((int)(newAnimationProperties.getLastFrame()) - (int)(newAnimationProperties.getFirstFrame())) - (float)currentframe_mod_length;
}
_currentlyPlayingFrame = newAnimationProperties.getCurrentlyPlayingFrame();
qCDebug(entitiesrenderer) << "renderable update to currently playing frame " << _currentlyPlayingFrame;
_currentFrame = newAnimationProperties.getCurrentFrame();
qCDebug(entitiesrenderer) << "renderable update to current frame " << _currentFrame;
_renderAnimationProperties = newAnimationProperties;
});
}

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

@ -199,22 +199,27 @@ void ModelEntityItem::update(const quint64& now) {
if (_previousAnimationProperties != currentAnimationProperties) {
qCDebug(entities) << "this is where the _currentFrame change is handled in the ModelEntityItem.cpp code";
withWriteLock([&] {
if ( (currentAnimationProperties.getCurrentFrame() != _previousAnimationProperties.getCurrentFrame()) || (currentAnimationProperties.getFirstFrame() != _previousAnimationProperties.getFirstFrame()) || (currentAnimationProperties.getLastFrame() != _previousAnimationProperties.getLastFrame()) || (currentAnimationProperties.getRunning() && !_previousAnimationProperties.getRunning())) {
_previousAnimationProperties = currentAnimationProperties;
if ( (currentAnimationProperties.getFirstFrame() != _previousAnimationProperties.getFirstFrame()) || (currentAnimationProperties.getLastFrame() != _previousAnimationProperties.getLastFrame()) || (currentAnimationProperties.getRunning() && !_previousAnimationProperties.getRunning())) {
// if (!(currentAnimationProperties.getCurrentFrame() > currentAnimationProperties.getLastFrame()) && !(currentAnimationProperties.getCurrentFrame() < currentAnimationProperties.getFirstFrame())) {
// _currentlyPlayingFrame = currentAnimationProperties.getCurrentFrame();
//_endAnim = _currentlyPlayingFrame + ( currentAnimationProperties.getLastFrame() - currentAnimationProperties.getFirstFrame() );
//_lastAnimated = 0;
// }
setAnimationCurrentlyPlayingFrame(usecTimestampNow());
qCDebug(entities) << "this is where the _currentFrame change is handled in the ModelEntityItem.cpp code, current frame is: \n\n" << currentAnimationProperties.getCurrentFrame();
setAnimationCurrentFrame(currentAnimationProperties.getFirstFrame());
}
//else if ( _previousAnimationProperties.getLoop() && !currentAnimationProperties.getLoop()) {
// int currentframe_mod_length = (int)(_currentlyPlayingFrame - (int)(glm::floor(currentAnimationProperties.getCurrentFrame()))) % ((int)(glm::floor(currentAnimationProperties.getLastFrame())) - (int)(glm::floor(currentAnimationProperties.getFirstFrame())) + 1);
//_endAnim = _currentlyPlayingFrame + ((int)(currentAnimationProperties.getLastFrame()) - (int)(currentAnimationProperties.getFirstFrame())) - (float)currentframe_mod_length;
//}
_previousAnimationProperties = currentAnimationProperties;
else {
//else if ( _previousAnimationProperties.getLoop() && !currentAnimationProperties.getLoop()) {
// int currentframe_mod_length = (int)(_currentlyPlayingFrame - (int)(glm::floor(currentAnimationProperties.getCurrentFrame()))) % ((int)(glm::floor(currentAnimationProperties.getLastFrame())) - (int)(glm::floor(currentAnimationProperties.getFirstFrame())) + 1);
//_endAnim = _currentlyPlayingFrame + ((int)(currentAnimationProperties.getLastFrame()) - (int)(currentAnimationProperties.getFirstFrame())) - (float)currentframe_mod_length;
//}
setAnimationCurrentFrame(currentAnimationProperties.getCurrentFrame());
}
});
qCDebug(entities) << "this is where the _currentFrame change is handled in the ModelEntityItem.cpp code, currently playing frame is: " << currentAnimationProperties.getCurrentlyPlayingFrame();
qCDebug(entities) << "this is where the _currentFrame change is handled in the ModelEntityItem.cpp code, current frame is: " << currentAnimationProperties.getCurrentFrame();
}
//_previousAnimationProperties = currentAnimationProperties;
updateFrameCount();
@ -244,8 +249,8 @@ void ModelEntityItem::updateFrameCount() {
//this is now getting the time since the server started the animation.
//auto interval = now - _currentlyPlayingFrame;
//auto interval = now - _lastAnimated;
//_lastAnimated = now;
auto interval = now - _lastAnimated;
_lastAnimated = now;
@ -257,20 +262,28 @@ void ModelEntityItem::updateFrameCount() {
int firstFrame = getAnimationFirstFrame();
int lastFrame = getAnimationLastFrame();
bool isHolding = getAnimationHold();
int updatedFrameCount = lastFrame - firstFrame + 1;
//if (isLooping || (_currentFrame < _endAnim)) {
if (isLooping || (_currentFrame < _previousAnimationProperties.getLastFrame())) {
//else advance the current frame.
//if hold or not playing don't advance the current frame.
//also if the animFrame is outside of first or last frame then don't advance the motion.
if (!isHolding && getAnimationIsPlaying() && !(_previousAnimationProperties.getCurrentFrame() > _previousAnimationProperties.getLastFrame()) && !(_previousAnimationProperties.getCurrentFrame() < _previousAnimationProperties.getFirstFrame())) {
// float deltaTime = (float)interval / (float)USECS_PER_SECOND;
// _currentlyPlayingFrame += (deltaTime * _previousAnimationProperties.getFPS());
// qCDebug(entities) << "the frame is now " << _currentlyPlayingFrame;
float deltaTime = (float)interval / (float)USECS_PER_SECOND;
_currentFrame += (deltaTime * _previousAnimationProperties.getFPS());
while ((_currentFrame - _previousAnimationProperties.getFirstFrame()) > updatedFrameCount) {
_currentFrame -= updatedFrameCount;
}
qCDebug(entities) << "the frame is now 1 " << _currentFrame;
// setAnimationCurrentlyPlayingFrame(_currentlyPlayingFrame);
setAnimationCurrentlyPlayingFrame(now);
setAnimationCurrentFrame(_currentFrame);
}
//}
} else {
_currentFrame = getAnimationLastFrame();
setAnimationCurrentFrame(_currentFrame);
qCDebug(entities) << "the frame is now 2 " << _currentFrame;
}
}

1
libraries/entities/src/ModelEntityItem.h
View file

@ -178,6 +178,7 @@ private:
AnimationPropertyGroup _previousAnimationProperties;
bool _propTestFlag{ true };
bool _propTestFlag2{ true };
float _currentFrame{ 0 };
//angus
};