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

moving frame advancement to update()

Browse source
This commit is contained in:
ZappoMan 2014-05-12 14:07:54 -07:00
parent 5309c5ad8b
commit 0fc33f575f
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/models/src/ModelItem.cpp
View file

@ -283,6 +283,8 @@ int ModelItem::readModelDataFromBuffer(const unsigned char* data, int bytesLeftT
dataAt += sizeof(_frameIndex); dataAt += sizeof(_frameIndex);
bytesRead += sizeof(_frameIndex); bytesRead += sizeof(_frameIndex);
qDebug() << "readModelDataFromBuffer()... _frameIndex=" << _frameIndex;
} else { } else {
qDebug() << "readModelDataFromBuffer()... this model didn't have animation details"; qDebug() << "readModelDataFromBuffer()... this model didn't have animation details";
} }
@ -695,16 +697,6 @@ void ModelItem::mapJoints(const QStringList& modelJointNames) {
QVector<glm::quat> ModelItem::getAnimationFrame() { QVector<glm::quat> ModelItem::getAnimationFrame() {
QVector<glm::quat> frameData; QVector<glm::quat> frameData;
if (hasAnimation() && _jointMappingCompleted) { if (hasAnimation() && _jointMappingCompleted) {
// only advance the frame index if we're playing
if (getIsAnimationPlaying()) {
quint64 now = usecTimestampNow();
float deltaTime = (float)(now - _lastAnimated) / (float)USECS_PER_SECOND;
_lastAnimated = now;
const float FRAME_RATE = 10.0f;
_frameIndex += deltaTime * FRAME_RATE;
}
Animation* myAnimation = getAnimation(_animationURL); Animation* myAnimation = getAnimation(_animationURL);
QVector<FBXAnimationFrame> frames = myAnimation->getFrames(); QVector<FBXAnimationFrame> frames = myAnimation->getFrames();
int frameIndex = (int)std::floor(_frameIndex) % frames.size(); int frameIndex = (int)std::floor(_frameIndex) % frames.size();
@ -720,9 +712,28 @@ QVector<glm::quat> ModelItem::getAnimationFrame() {
return frameData; return frameData;
} }
void ModelItem::update(const quint64& now) { void ModelItem::update(const quint64& updateTime) {
_lastUpdated = now; _lastUpdated = updateTime;
setShouldDie(getShouldDie()); setShouldDie(getShouldDie());
//qDebug() << "ModelItem::update() now=" << now;
// only advance the frame index if we're playing
if (getIsAnimationPlaying()) {
quint64 now = usecTimestampNow();
float deltaTime = (float)(now - _lastAnimated) / (float)USECS_PER_SECOND;
qDebug() << "ModelItem::update() now=" << now;
qDebug() << " updateTime=" << updateTime;
qDebug() << " _lastAnimated=" << _lastAnimated;
qDebug() << " deltaTime=" << deltaTime;
_lastAnimated = now;
const float FRAME_RATE = 10.0f;
_frameIndex += deltaTime * FRAME_RATE;
qDebug() << " _frameIndex=" << _frameIndex;
}
} }
void ModelItem::copyChangedProperties(const ModelItem& other) { void ModelItem::copyChangedProperties(const ModelItem& other) {

5
libraries/models/src/ModelTreeElement.cpp
View file

@ -102,10 +102,15 @@ bool ModelTreeElement::bestFitModelBounds(const ModelItem& model) const {
} }
void ModelTreeElement::update(ModelTreeUpdateArgs& args) { void ModelTreeElement::update(ModelTreeUpdateArgs& args) {
//qDebug() << "ModelTreeElement::update()...";
// update our contained models // update our contained models
QList<ModelItem>::iterator modelItr = _modelItems->begin(); QList<ModelItem>::iterator modelItr = _modelItems->begin();
while(modelItr != _modelItems->end()) { while(modelItr != _modelItems->end()) {
ModelItem& model = (*modelItr); ModelItem& model = (*modelItr);
// TODO: this _lastChanged isn't actually changing because we're not marking this element as changed.
// how do we want to handle this??? We really only want to consider an element changed when it is
// edited... not just animated...
model.update(_lastChanged); model.update(_lastChanged);
// If the model wants to die, or if it's left our bounding box, then move it // If the model wants to die, or if it's left our bounding box, then move it