History

Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection

Atlante45 committed 11 years ago

Commit ad16f492 parents 36814e8 dfd39ca41 files · +1501 −199Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 41 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+19−0
@@ -35,6 +35,25 @@ bool EntityScriptingInterface::canAdjustLocks() { · 34 unmodified lines
3535 }
3636
3737
38+void EntityScriptingInterface::setEntityTree(EntityTree* modelTree) {
39+ if (_entityTree) {
40+ disconnect(_entityTree, &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);
41+ disconnect(_entityTree, &EntityTree::deletingEntity, this, &EntityScriptingInterface::deletingEntity);
42+ disconnect(_entityTree, &EntityTree::changingEntityID, this, &EntityScriptingInterface::changingEntityID);
43+ disconnect(_entityTree, &EntityTree::clearingEntities, this, &EntityScriptingInterface::clearingEntities);
44+ }
45+
46+ _entityTree = modelTree;
47+
48+ if (_entityTree) {
49+ connect(_entityTree, &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);
50+ connect(_entityTree, &EntityTree::deletingEntity, this, &EntityScriptingInterface::deletingEntity);
51+ connect(_entityTree, &EntityTree::changingEntityID, this, &EntityScriptingInterface::changingEntityID);
52+ connect(_entityTree, &EntityTree::clearingEntities, this, &EntityScriptingInterface::clearingEntities);
53+ }
54+}
55+
56+
3857 EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& properties) {
3958
4059 // The application will keep track of creatorTokenID