History

fix method names for CR feedback

ZappoMan committed 12 years ago

Commit 29bbead1 parent ca3cf6d11 files · +31 −32Browse files

Unified · Split

11 files
  1. libraries/entities/src/AddEntityOperator.cpp +3 −3
  2. libraries/entities/src/AddEntityOperator.h +3 −3
  3. libraries/entities/src/DeleteEntityOperator.cpp +2 −2
  4. libraries/entities/src/DeleteEntityOperator.h +2 −2
  5. libraries/entities/src/EntityTree.cpp +3 −4
  6. libraries/entities/src/MovingEntitiesOperator.cpp +3 −3
  7. libraries/entities/src/MovingEntitiesOperator.h +3 −3
  8. libraries/entities/src/UpdateEntityOperator.cpp +3 −3
  9. libraries/entities/src/UpdateEntityOperator.h +3 −3
  10. libraries/octree/src/Octree.cpp +3 −3
  11. libraries/octree/src/Octree.h +3 −3
libraries/entities/src/AddEntityOperator.cpp+3−3
@@ -29,7 +29,7 @@ AddEntityOperator::AddEntityOperator(EntityTree* tree, · 28 unmodified lines
2929 _newEntityBox = _newEntity->getAACube().clamp(0.0f, 1.0f);
3030 }
3131
32−bool AddEntityOperator::PreRecursion(OctreeElement* element) {
32+bool AddEntityOperator::preRecursion(OctreeElement* element) {
3333 EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
3434
3535 // In Pre-recursion, we're generally deciding whether or not we want to recurse this
@@ -59,7 +59,7 @@ bool AddEntityOperator::PreRecursion(OctreeElement* element) { · 23 unmodified lines
5959 return keepSearching; // if we haven't yet found it, keep looking
6060 }
6161
62−bool AddEntityOperator::PostRecursion(OctreeElement* element) {
62+bool AddEntityOperator::postRecursion(OctreeElement* element) {
6363 // Post-recursion is the unwinding process. For this operation, while we
6464 // unwind we want to mark the path as being dirty if we changed it below.
6565 // We might have two paths, one for the old entity and one for the new entity.
@@ -73,7 +73,7 @@ bool AddEntityOperator::PostRecursion(OctreeElement* element) { · 7 unmodified lines
7373 return keepSearching; // if we haven't yet found it, keep looking
7474 }
7575
76−OctreeElement* AddEntityOperator::PossiblyCreateChildAt(OctreeElement* element, int childIndex) {
76+OctreeElement* AddEntityOperator::possiblyCreateChildAt(OctreeElement* element, int childIndex) {
7777 // If we're getting called, it's because there was no child element at this index while recursing.
7878 // We only care if this happens while still searching for the new entity location.
7979 // Check to see if
libraries/entities/src/AddEntityOperator.h+3−3
@@ -16,9 +16,9 @@ class AddEntityOperator : public RecurseOctreeOperator { · 15 unmodified lines
1616 public:
1717 AddEntityOperator(EntityTree* tree, EntityItem* newEntity);
1818
19− virtual bool PreRecursion(OctreeElement* element);
20− virtual bool PostRecursion(OctreeElement* element);
21− virtual OctreeElement* PossiblyCreateChildAt(OctreeElement* element, int childIndex);
19+ virtual bool preRecursion(OctreeElement* element);
20+ virtual bool postRecursion(OctreeElement* element);
21+ virtual OctreeElement* possiblyCreateChildAt(OctreeElement* element, int childIndex);
2222 private:
2323 EntityTree* _tree;
2424 EntityItem* _newEntity;
libraries/entities/src/DeleteEntityOperator.cpp+2−2
@@ -74,7 +74,7 @@ bool DeleteEntityOperator::subTreeContainsSomeEntitiesToDelete(OctreeElement* el · 73 unmodified lines
7474 return containsEntity;
7575 }
7676
77−bool DeleteEntityOperator::PreRecursion(OctreeElement* element) {
77+bool DeleteEntityOperator::preRecursion(OctreeElement* element) {
7878 EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
7979
8080 // In Pre-recursion, we're generally deciding whether or not we want to recurse this
@@ -114,7 +114,7 @@ bool DeleteEntityOperator::PreRecursion(OctreeElement* element) { · 33 unmodified lines
114114 return keepSearching; // if we haven't yet found it, keep looking
115115 }
116116
117−bool DeleteEntityOperator::PostRecursion(OctreeElement* element) {
117+bool DeleteEntityOperator::postRecursion(OctreeElement* element) {
118118 // Post-recursion is the unwinding process. For this operation, while we
119119 // unwind we want to mark the path as being dirty if we changed it below.
120120 // We might have two paths, one for the old entity and one for the new entity.
libraries/entities/src/DeleteEntityOperator.h+2−2
@@ -34,8 +34,8 @@ public: · 33 unmodified lines
3434 ~DeleteEntityOperator();
3535
3636 void addEntityIDToDeleteList(const EntityItemID& searchEntityID);
37− virtual bool PreRecursion(OctreeElement* element);
38− virtual bool PostRecursion(OctreeElement* element);
37+ virtual bool preRecursion(OctreeElement* element);
38+ virtual bool postRecursion(OctreeElement* element);
3939 private:
4040 EntityTree* _tree;
4141 QSet<EntityToDeleteDetails> _entitiesToDelete;
libraries/entities/src/EntityTree.cpp+3−4
@@ -1008,12 +1008,11 @@ void EntityTree::debugDumpMap() { · 1007 unmodified lines
10081008
10091009 class DebugOperator : public RecurseOctreeOperator {
10101010 public:
1011− virtual bool PreRecursion(OctreeElement* element);
1012− virtual bool PostRecursion(OctreeElement* element) { return true; };
1013− virtual OctreeElement* PossiblyCreateChildAt(OctreeElement* element, int childIndex) { return NULL; }
1011+ virtual bool preRecursion(OctreeElement* element);
1012+ virtual bool postRecursion(OctreeElement* element) { return true; }
10141013 };
10151014
1016−bool DebugOperator::PreRecursion(OctreeElement* element) {
1015+bool DebugOperator::preRecursion(OctreeElement* element) {
10171016 EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
10181017 qDebug() << "EntityTreeElement [" << entityTreeElement << "]";
10191018 entityTreeElement->debugDump();
libraries/entities/src/MovingEntitiesOperator.cpp+3−3
@@ -67,7 +67,7 @@ bool MovingEntitiesOperator::shouldRecurseSubTree(OctreeElement* element) { · 66 unmodified lines
6767 return containsEntity;
6868 }
6969
70−bool MovingEntitiesOperator::PreRecursion(OctreeElement* element) {
70+bool MovingEntitiesOperator::preRecursion(OctreeElement* element) {
7171 EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
7272
7373 // In Pre-recursion, we're generally deciding whether or not we want to recurse this
@@ -111,7 +111,7 @@ bool MovingEntitiesOperator::PreRecursion(OctreeElement* element) { · 37 unmodified lines
111111 return keepSearching; // if we haven't yet found it, keep looking
112112 }
113113
114−bool MovingEntitiesOperator::PostRecursion(OctreeElement* element) {
114+bool MovingEntitiesOperator::postRecursion(OctreeElement* element) {
115115 // Post-recursion is the unwinding process. For this operation, while we
116116 // unwind we want to mark the path as being dirty if we changed it below.
117117 // We might have two paths, one for the old entity and one for the new entity.
@@ -129,7 +129,7 @@ bool MovingEntitiesOperator::PostRecursion(OctreeElement* element) { · 11 unmodified lines
129129 return keepSearching; // if we haven't yet found it, keep looking
130130 }
131131
132−OctreeElement* MovingEntitiesOperator::PossiblyCreateChildAt(OctreeElement* element, int childIndex) {
132+OctreeElement* MovingEntitiesOperator::possiblyCreateChildAt(OctreeElement* element, int childIndex) {
133133 // If we're getting called, it's because there was no child element at this index while recursing.
134134 // We only care if this happens while still searching for the new entity locations.
135135 if (_foundNewCount < _lookingCount) {
libraries/entities/src/MovingEntitiesOperator.h+3−3
@@ -37,9 +37,9 @@ public: · 36 unmodified lines
3737 ~MovingEntitiesOperator();
3838
3939 void addEntityToMoveList(EntityItem* entity, const AACube& oldCube, const AACube& newCube);
40− virtual bool PreRecursion(OctreeElement* element);
41− virtual bool PostRecursion(OctreeElement* element);
42− virtual OctreeElement* PossiblyCreateChildAt(OctreeElement* element, int childIndex);
40+ virtual bool preRecursion(OctreeElement* element);
41+ virtual bool postRecursion(OctreeElement* element);
42+ virtual OctreeElement* possiblyCreateChildAt(OctreeElement* element, int childIndex);
4343 bool hasMovingEntities() const { return _entitiesToMove.size() > 0; }
4444 private:
4545 EntityTree* _tree;
libraries/entities/src/UpdateEntityOperator.cpp+3−3
@@ -121,7 +121,7 @@ bool UpdateEntityOperator::subTreeContainsNewEntity(OctreeElement* element) { · 120 unmodified lines
121121 }
122122
123123
124−bool UpdateEntityOperator::PreRecursion(OctreeElement* element) {
124+bool UpdateEntityOperator::preRecursion(OctreeElement* element) {
125125 EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
126126
127127 // In Pre-recursion, we're generally deciding whether or not we want to recurse this
@@ -194,7 +194,7 @@ bool UpdateEntityOperator::PreRecursion(OctreeElement* element) { · 66 unmodified lines
194194 return keepSearching; // if we haven't yet found it, keep looking
195195 }
196196
197−bool UpdateEntityOperator::PostRecursion(OctreeElement* element) {
197+bool UpdateEntityOperator::postRecursion(OctreeElement* element) {
198198 // Post-recursion is the unwinding process. For this operation, while we
199199 // unwind we want to mark the path as being dirty if we changed it below.
200200 // We might have two paths, one for the old entity and one for the new entity.
@@ -226,7 +226,7 @@ bool UpdateEntityOperator::PostRecursion(OctreeElement* element) { · 25 unmodified lines
226226 return keepSearching; // if we haven't yet found it, keep looking
227227 }
228228
229−OctreeElement* UpdateEntityOperator::PossiblyCreateChildAt(OctreeElement* element, int childIndex) {
229+OctreeElement* UpdateEntityOperator::possiblyCreateChildAt(OctreeElement* element, int childIndex) {
230230 // If we're getting called, it's because there was no child element at this index while recursing.
231231 // We only care if this happens while still searching for the new entity location.
232232 // Check to see if
libraries/entities/src/UpdateEntityOperator.h+3−3
@@ -18,9 +18,9 @@ public: · 17 unmodified lines
1818 EntityItem* existingEntity, const EntityItemProperties& properties);
1919 ~UpdateEntityOperator();
2020
21− virtual bool PreRecursion(OctreeElement* element);
22− virtual bool PostRecursion(OctreeElement* element);
23− virtual OctreeElement* PossiblyCreateChildAt(OctreeElement* element, int childIndex);
21+ virtual bool preRecursion(OctreeElement* element);
22+ virtual bool postRecursion(OctreeElement* element);
23+ virtual OctreeElement* possiblyCreateChildAt(OctreeElement* element, int childIndex);
2424 private:
2525 EntityTree* _tree;
2626 EntityItem* _existingEntity;
libraries/octree/src/Octree.cpp+3−3
@@ -155,14 +155,14 @@ bool Octree::recurseElementWithOperator(OctreeElement* element, RecurseOctreeOpe · 154 unmodified lines
155155 return false;
156156 }
157157
158− if (operatorObject->PreRecursion(element)) {
158+ if (operatorObject->preRecursion(element)) {
159159 for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
160160 OctreeElement* child = element->getChildAtIndex(i);
161161
162162 // If there is no child at that location, the Operator may want to create a child at that location.
163163 // So give the operator a chance to do so....
164164 if (!child) {
165− child = operatorObject->PossiblyCreateChildAt(element, i);
165+ child = operatorObject->possiblyCreateChildAt(element, i);
166166 }
167167
168168 if (child) {
@@ -173,7 +173,7 @@ bool Octree::recurseElementWithOperator(OctreeElement* element, RecurseOctreeOpe · 4 unmodified lines
173173 }
174174 }
175175
176− return operatorObject->PostRecursion(element);
176+ return operatorObject->postRecursion(element);
177177 }
178178
179179
libraries/octree/src/Octree.h+3−3
@@ -39,9 +39,9 @@ class Shape; · 38 unmodified lines
3939 /// derive from this class to use the Octree::recurseTreeWithOperator() method
4040 class RecurseOctreeOperator {
4141 public:
42− virtual bool PreRecursion(OctreeElement* element) = 0;
43− virtual bool PostRecursion(OctreeElement* element) = 0;
44− virtual OctreeElement* PossiblyCreateChildAt(OctreeElement* element, int childIndex) { return NULL; }
42+ virtual bool preRecursion(OctreeElement* element) = 0;
43+ virtual bool postRecursion(OctreeElement* element) = 0;
44+ virtual OctreeElement* possiblyCreateChildAt(OctreeElement* element, int childIndex) { return NULL; }
4545 };
4646
4747 // Callback function, for recuseTreeWithOperation

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