Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup remove some debug

Browse source
This commit is contained in:
ZappoMan 2014-05-14 12:59:59 -07:00
parent 18de6dddec
commit 0c34d9e065
4 changed files with 2 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/models/ModelTreeRenderer.cpp
View file

@ -183,12 +183,6 @@ void ModelTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
// set the position
model->setTranslation(position);
/*
qDebug() << "modelItem.getModelURL()=" << modelItem.getModelURL();
qDebug() << "modelItem.getAnimationURL()=" << modelItem.getAnimationURL();
qDebug() << "modelItem.hasAnimation()=" << modelItem.hasAnimation();
*/
// handle animations..
if (modelItem.hasAnimation()) {
if (!modelItem.jointsMapped()) {

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

@ -278,8 +278,6 @@ int ModelItem::readModelDataFromBuffer(const unsigned char* data, int bytesLeftT
dataAt += animationURLLength;
bytesRead += animationURLLength;
qDebug() << "readModelDataFromBuffer()... animationURL=" << qPrintable(animationURLString);
// animationIsPlaying
memcpy(&_animationIsPlaying, dataAt, sizeof(_animationIsPlaying));
dataAt += sizeof(_animationIsPlaying);
@ -290,26 +288,16 @@ int ModelItem::readModelDataFromBuffer(const unsigned char* data, int bytesLeftT
dataAt += sizeof(_animationFrameIndex);
bytesRead += sizeof(_animationFrameIndex);
qDebug() << "readModelDataFromBuffer()... _animationFrameIndex=" << _animationFrameIndex;
// animationFPS
memcpy(&_animationFPS, dataAt, sizeof(_animationFPS));
dataAt += sizeof(_animationFPS);
bytesRead += sizeof(_animationFPS);
qDebug() << "readModelDataFromBuffer()... _animationFPS=" << _animationFPS;
} else {
qDebug() << "readModelDataFromBuffer()... this model didn't have animation details";
}
//qDebug() << "ModelItem::readModelDataFromBuffer()... "; debugDump();
}
return bytesRead;
}
ModelItem ModelItem::fromEditPacket(const unsigned char* data, int length, int& processedBytes, ModelTree* tree, bool& valid) {
ModelItem newModelItem; // id and _lastUpdated will get set here...
const unsigned char* dataAt = data;
processedBytes = 0;
@ -419,7 +407,8 @@ ModelItem ModelItem::fromEditPacket(const unsigned char* data, int length, int&
}
// modelRotation
if (isNewModelItem || ((packetContainsBits & MODEL_PACKET_CONTAINS_MODEL_ROTATION) == MODEL_PACKET_CONTAINS_MODEL_ROTATION)) {
if (isNewModelItem || ((packetContainsBits &
MODEL_PACKET_CONTAINS_MODEL_ROTATION) == MODEL_PACKET_CONTAINS_MODEL_ROTATION)) {
int bytes = unpackOrientationQuatFromBytes(dataAt, newModelItem._modelRotation);
dataAt += bytes;
processedBytes += bytes;
@ -435,7 +424,6 @@ ModelItem ModelItem::fromEditPacket(const unsigned char* data, int length, int&
newModelItem._animationURL = tempString;
dataAt += animationURLLength;
processedBytes += animationURLLength;
qDebug() << "fromEditPacket()... animationURL=" << qPrintable(tempString);
}
// animationIsPlaying
@ -605,9 +593,6 @@ bool ModelItem::encodeModelEditMessageDetails(PacketType command, ModelItemID id
memcpy(copyAt, qPrintable(properties.getAnimationURL()), urlLength);
copyAt += urlLength;
sizeOut += urlLength;
qDebug() << "encodeModelItemEditMessageDetails()... animationURL=" << qPrintable(properties.getAnimationURL());
}
// animationIsPlaying
@ -618,9 +603,6 @@ qDebug() << "encodeModelItemEditMessageDetails()... animationURL=" << qPrintable
memcpy(copyAt, &animationIsPlaying, sizeof(animationIsPlaying));
copyAt += sizeof(animationIsPlaying);
sizeOut += sizeof(animationIsPlaying);
qDebug() << "encodeModelItemEditMessageDetails()... animationIsPlaying=" << animationIsPlaying;
}
// animationFrameIndex
@ -631,8 +613,6 @@ qDebug() << "encodeModelItemEditMessageDetails()... animationIsPlaying=" << anim
memcpy(copyAt, &animationFrameIndex, sizeof(animationFrameIndex));
copyAt += sizeof(animationFrameIndex);
sizeOut += sizeof(animationFrameIndex);
qDebug() << "encodeModelItemEditMessageDetails()... animationFrameIndex=" << animationFrameIndex;
}
// animationFPS
@ -643,8 +623,6 @@ qDebug() << "encodeModelItemEditMessageDetails()... animationFrameIndex=" << ani
memcpy(copyAt, &animationFPS, sizeof(animationFPS));
copyAt += sizeof(animationFPS);
sizeOut += sizeof(animationFPS);
qDebug() << "encodeModelItemEditMessageDetails()... animationFPS=" << animationFPS;
}
bool wantDebugging = false;
@ -1023,7 +1001,6 @@ void ModelItemProperties::copyFromScriptValue(const QScriptValue &object) {
if (_defaultSettings || newFPS != _animationFPS) {
_animationFPS = newFPS;
_animationFPSChanged = true;
qDebug() << "ModelItemProperties::copyFromScriptValue()... _animationFPS=" << _animationFPS;
}
}
@ -1065,29 +1042,21 @@ void ModelItemProperties::copyToModelItem(ModelItem& modelItem) const {
if (_animationURLChanged) {
modelItem.setAnimationURL(_animationURL);
somethingChanged = true;
qDebug() << "ModelItemProperties::copyToModelItem()... modelItem.setAnimationURL(_animationURL)=" << _animationURL;
}
if (_animationIsPlayingChanged) {
modelItem.setAnimationIsPlaying(_animationIsPlaying);
somethingChanged = true;
qDebug() << "ModelItemProperties::copyToModelItem()... _animationIsPlaying=" << _animationIsPlaying;
}
if (_animationFrameIndexChanged) {
modelItem.setAnimationFrameIndex(_animationFrameIndex);
somethingChanged = true;
qDebug() << "ModelItemProperties::copyToModelItem()... _animationFrameIndex=" << _animationFrameIndex;
}
if (_animationFPSChanged) {
modelItem.setAnimationFPS(_animationFPS);
somethingChanged = true;
qDebug() << "ModelItemProperties::copyToModelItem()... _animationFPS=" << _animationFPS;
}
if (somethingChanged) {

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

@ -102,7 +102,6 @@ bool ModelTreeElement::bestFitModelBounds(const ModelItem& model) const {
}
void ModelTreeElement::update(ModelTreeUpdateArgs& args) {
//qDebug() << "ModelTreeElement::update()...";
// update our contained models
QList<ModelItem>::iterator modelItr = _modelItems->begin();
while(modelItr != _modelItems->end()) {

17
libraries/models/src/ModelsScriptingInterface.h
View file

@ -59,23 +59,6 @@ public slots:
/// this function will not find any models in script engine contexts which don't have access to models
QVector<ModelItemID> findModels(const glm::vec3& center, float radius) const;
/*
/// pauses the model animation.
ModelItemID pauseModelAnimation(ModelItemID modelID);
/// plays the model animation.
ModelItemID playModelAnimation(ModelItemID modelID);
*/
/*
/// gets the current frame of the model animation.
float getModelAnimationFrame(ModelItemID modelID);
/// gets the current frame of the model animation.
void setModelAnimationFrame(ModelItemID modelID, float frame);
*/
signals:
void modelCollisionWithVoxel(const ModelItemID& modelID, const VoxelDetail& voxel, const CollisionInfo& collision);
void modelCollisionWithModel(const ModelItemID& idA, const ModelItemID& idB, const CollisionInfo& collision);