cleanup in prep for PR

ZappoMan committed 12 years ago

Commit 58759d31 parent 73d5e8c23 files · +168 −646Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+0−14

     return results;
 }
 EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const EntityItemProperties& properties) {
     EntityItemID actualID = entityID;
     if (actualID.id != UNKNOWN_ENTITY_ID) {
         entityID.id = actualID.id;
         entityID.isKnownID = true;
-        //qDebug() << "EntityScriptingInterface::editEntity()... isKnownID=" << entityID.isKnownID << "id=" << entityID.id << "creatorTokenID=" << entityID.creatorTokenID;
         queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, properties);
     }
     // the actual id, because we can edit out local models just with creatorTokenID
     if (_entityTree) {
         _entityTree->lockForWrite();
-        //qDebug() << "EntityScriptingInterface::editEntity() ******* START _entityTree->updateEntity()...";
         _entityTree->updateEntity(entityID, properties);
-        //qDebug() << "EntityScriptingInterface::editEntity() ******* DONE _entityTree->updateEntity()...";
         _entityTree->unlock();
     }
     return entityID;
 }
-// TODO: This deleteEntity() method uses the PacketTypeEntityAddOrEdit message to send
-// a changed model with a shouldDie() property set to true. This works and is currently the only
-// way to tell the model server to delete a model. But we should change this to use the PacketTypeEntityErase
-// message which takes a list of model id's to delete.
 void EntityScriptingInterface::deleteEntity(EntityItemID entityID) {
     EntityItemID actualID = entityID;
         result.intersects = _entityTree->findRayIntersection(ray.origin, ray.direction, element, result.distance, result.face,
                                                                 (void**)&intersectedEntity, lockType, &result.accurate);
         if (result.intersects && intersectedEntity) {
-            //qDebug() << "findRayIntersectionWorker().... intersectedEntity=" << intersectedEntity;
-            //intersectedEntity->debugDump();
             result.entityID = intersectedEntity->getEntityItemID();
             result.properties = intersectedEntity->getProperties();
             result.intersection = ray.origin + (ray.direction * result.distance);

cleanup in prep for PR

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code