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

initial changes to incorporate snap model

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-01-18 14:40:33 -08:00
parent dc5f29aa58
commit 576d683d3b
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,8 +266,6 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
bool success = true;
if (_entityTree) {
_entityTree->withWriteLock([&] {
propertiesWithSimID.getType();
qCDebug(entities) << "check 2 type: " << propertiesWithSimID.getType();
EntityItemPointer entity = _entityTree->addEntity(id, propertiesWithSimID);
if (entity) {
if (propertiesWithSimID.queryAACubeRelatedPropertyChanged()) {

1
libraries/entities/src/EntityTree.cpp
View file

@ -514,7 +514,6 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
// construct the instance of the entity
EntityTypes::EntityType type = props.getType();
qCDebug(entities) << "check 3 type: " << type;
result = EntityTypes::constructEntityItem(type, entityID, props);
if (result) {

4
libraries/entities/src/EntityTypes.cpp
View file

@ -91,7 +91,9 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
EntityItemPointer newEntityItem = NULL;
EntityTypeFactory factory = NULL;
if (entityType >= 0 && entityType <= LAST) {
qCDebug(entities) << "check 4 type: " << entityType << ", name: " << properties.getName();
if (getEntityTypeName(entityType) == "Image") {
entityType = getEntityTypeFromName("Web");
}
factory = _factories[entityType];
}
if (factory) {