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

add delete filter support

Browse source
This commit is contained in:
ZappoMan 2018-01-25 15:01:29 -08:00
parent dc35ecf0c2
commit aea16fe071
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,6 +245,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
entitiesObject.setProperty("ADD_FILTER_TYPE", EntityTree::FilterType::Add); entitiesObject.setProperty("ADD_FILTER_TYPE", EntityTree::FilterType::Add);
entitiesObject.setProperty("EDIT_FILTER_TYPE", EntityTree::FilterType::Edit); entitiesObject.setProperty("EDIT_FILTER_TYPE", EntityTree::FilterType::Edit);
entitiesObject.setProperty("PHYSICS_FILTER_TYPE", EntityTree::FilterType::Physics); entitiesObject.setProperty("PHYSICS_FILTER_TYPE", EntityTree::FilterType::Physics);
entitiesObject.setProperty("ERASE_FILTER_TYPE", EntityTree::FilterType::Erase);
global.setProperty("Entities", entitiesObject); global.setProperty("Entities", entitiesObject);
filterData.filterFn = global.property("filter"); filterData.filterFn = global.property("filter");
if (!filterData.filterFn.isFunction()) { if (!filterData.filterFn.isFunction()) {

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

@ -1928,6 +1928,24 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
#endif #endif
EntityItemID entityItemID(entityID); EntityItemID entityItemID(entityID);
EntityItemPointer existingEntity;
auto startLookup = usecTimestampNow();
existingEntity = findEntityByEntityItemID(entityItemID);
auto endLookup = usecTimestampNow();
_totalLookupTime += endLookup - startLookup;
auto startFilter = usecTimestampNow();
FilterType filterType = FilterType::Erase;
EntityItemProperties dummyProperties;
bool wasChanged = false;
bool allowed = (sourceNode->isAllowedEditor()) || filterProperties(existingEntity, dummyProperties, dummyProperties, wasChanged, filterType);
auto endFilter = usecTimestampNow();
_totalFilterTime += endFilter - startFilter;
entityItemIDsToDelete << entityItemID; entityItemIDsToDelete << entityItemID;
if (wantEditLogging() || wantTerseEditLogging()) { if (wantEditLogging() || wantTerseEditLogging()) {

3
libraries/entities/src/EntityTree.h
View file

@ -57,7 +57,8 @@ public:
enum FilterType { enum FilterType {
Add, Add,
Edit, Edit,
Physics Physics,
Erase
}; };
EntityTree(bool shouldReaverage = false); EntityTree(bool shouldReaverage = false);
virtual ~EntityTree(); virtual ~EntityTree();