From d6873f7b6c8b18aa5decad675ca237692b30ba9e Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 25 Aug 2014 14:48:08 -0700 Subject: [PATCH] added some debugging for referentials --- interface/src/avatar/ModelReferential.cpp | 2 ++ interface/src/avatar/MyAvatar.cpp | 4 ++++ .../entities/RenderableModelEntityItem.cpp | 1 + libraries/entities/src/EntityItem.cpp | 2 ++ libraries/entities/src/todo.txt | 23 +++++++++++-------- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/interface/src/avatar/ModelReferential.cpp b/interface/src/avatar/ModelReferential.cpp index 063b872f1f..9675cc4766 100644 --- a/interface/src/avatar/ModelReferential.cpp +++ b/interface/src/avatar/ModelReferential.cpp @@ -76,11 +76,13 @@ void ModelReferential::update() { } if (item->getRotation() != _refRotation) { _refRotation = item->getRotation(); +qDebug() << "ModelReferential::update() _refRotation=" << _refRotation; _avatar->setOrientation(_refRotation * _rotation, true); somethingChanged = true; } if (item->getPosition() != _refPosition || somethingChanged) { _refPosition = item->getPosition(); +qDebug() << "ModelReferential::update() _refPosition=" << _refPosition << " QThread::currentThread()=" << QThread::currentThread(); _avatar->setPosition(_refPosition * (float)TREE_SCALE + _refRotation * (_translation * _refScale), true); } } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index d6e53259b0..b4db238f76 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -383,6 +383,10 @@ void MyAvatar::render(const glm::vec3& cameraPosition, RenderMode renderMode) { return; // exit early } + if (renderMode != SHADOW_RENDER_MODE) { + qDebug() << "MyAvatar::render() position=" << getPosition() / (float)TREE_SCALE << " QThread::currentThread()=" << QThread::currentThread(); + } + Avatar::render(cameraPosition, renderMode); // don't display IK constraints in shadow mode diff --git a/interface/src/entities/RenderableModelEntityItem.cpp b/interface/src/entities/RenderableModelEntityItem.cpp index 7c866ffbb6..5f775d4b5b 100644 --- a/interface/src/entities/RenderableModelEntityItem.cpp +++ b/interface/src/entities/RenderableModelEntityItem.cpp @@ -57,6 +57,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) { bool drawAsModel = hasModel(); glm::vec3 position = getPosition() * (float)TREE_SCALE; +qDebug() << "RenderableModelEntityItem::render() _position=" << _position << "QThread::currentThread()=" << QThread::currentThread(); float radius = getRadius() * (float)TREE_SCALE; float size = getSize() * (float)TREE_SCALE; diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 261df45cda..fcdd491a6f 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -487,6 +487,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef bytesRead += sizeof(positionFromBuffer); if (overwriteLocalData) { _position = positionFromBuffer; +qDebug() << "EntityItem::readEntityDataFromBuffer() _position=" << _position << " QThread::currentThread()=" << QThread::currentThread(); } } @@ -780,6 +781,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties, bool forc bool somethingChanged = false; if (properties._positionChanged || forceCopy) { setPosition(properties._position / (float) TREE_SCALE); +qDebug() << "EntityItem::setProperties() _position=" << _position << " QThread::currentThread()=" << QThread::currentThread(); somethingChanged = true; } diff --git a/libraries/entities/src/todo.txt b/libraries/entities/src/todo.txt index 033da3847f..dade93eba7 100644 --- a/libraries/entities/src/todo.txt +++ b/libraries/entities/src/todo.txt @@ -33,6 +33,19 @@ Model properties: // // REQUIRED TO DO: + + 7) Referentials -- basics are working... performance/jutter + + For sitting points and referentials you can kill two birds with one stone. + Put this model in world: http://highfidelity-public.s3-us-west-1.amazonaws.com/ozan/theater.fst + Launch sit.js + See sitting points + Sit somewhere + Move model with another avatar. + Observe first avatar moving. + + + 1) random crashes on moving (I think things going out of bounds???) 2) some jutter with moving entities @@ -57,16 +70,6 @@ Model properties: DONE -- 22d) void ModelTree::findModelsInCube(const AACube& cube, QVector& foundModels)... DONE -- 22e) void ModelTreeElement::getModelsInside(const AACube& box, QVector& foundModels)... - 7) Referentials???? - - For sitting points and referentials you can kill two birds with one stone. - Put this model in world: http://highfidelity-public.s3-us-west-1.amazonaws.com/ozan/theater.fst - Launch sit.js - See sitting points - Sit somewhere - Move model with another avatar. - Observe first avatar moving. - 8) verify shadows work 9) Handle the ID -> UUID swap in old files to new files