Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2017-03-27 07:25:40 -07:00
parent 2682586c38
commit 5ed0ff729b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -446,7 +446,6 @@ bool RenderablePolyVoxEntityItem::setSphere(glm::vec3 centerWorldCoords, float r
} }
}); });
if (result) { if (result) {
compressVolumeDataAndSendEditPacket(); compressVolumeDataAndSendEditPacket();
} }
@ -773,6 +772,7 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
0, 0,
sizeof(PolyVox::PositionMaterialNormal)); sizeof(PolyVox::PositionMaterialNormal));
// TODO -- should we be setting this?
// batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer, // batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer,
// 12, // 12,
// sizeof(PolyVox::PositionMaterialNormal)); // sizeof(PolyVox::PositionMaterialNormal));

2
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1663,7 +1663,7 @@ void EntityScriptingInterface::getMeshes(QUuid entityID, QScriptValue callback)
EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID)); EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
if (!entity) { if (!entity) {
qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID; qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID;
QScriptValueList args { false, false }; QScriptValueList args { callback.engine()->undefinedValue(), false };
callback.call(QScriptValue(), args); callback.call(QScriptValue(), args);
return; return;
} }