History

first cut at using erase entity message to delete entities

ZappoMan committed 12 years ago

Commit 49e616d1 parent 4bdb87615 files · +207 −233Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+7−6
@@ -123,10 +123,6 @@ EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const E · 122 unmodified lines
123123 // message which takes a list of model id's to delete.
124124 void EntityScriptingInterface::deleteEntity(EntityItemID entityID) {
125125
126− // setup properties to kill the model
127− EntityItemProperties properties;
128− properties.setShouldBeDeleted(true);
129−
130126 EntityItemID actualID = entityID;
131127
132128 // if the model is unknown, attempt to look it up
@@ -138,8 +134,13 @@ void EntityScriptingInterface::deleteEntity(EntityItemID entityID) { · 5 unmodified lines
138134 if (actualID.id != UNKNOWN_ENTITY_ID) {
139135 entityID.id = actualID.id;
140136 entityID.isKnownID = true;
141− //qDebug() << "EntityScriptingInterface::deleteEntity()... isKnownID=" << entityID.isKnownID << "id=" << entityID.id << "creatorTokenID=" << entityID.creatorTokenID;
142− queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, properties);
137+
138+ qDebug() << "EntityScriptingInterface::deleteEntity()... "
139+ << "isKnownID=" << entityID.isKnownID
140+ << "id=" << entityID.id
141+ << "creatorTokenID=" << entityID.creatorTokenID;
142+
143+ getEntityPacketSender()->queueEraseEntityMessage(entityID);
143144 }
144145
145146 // If we have a local model tree set, then also update it.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t