Showing the changes to libraries/entities/src/UpdateEntityOperator.cpp (1 of 11 files). Show all
Unified · Split
| @@ -121,7 +121,7 @@ bool UpdateEntityOperator::subTreeContainsNewEntity(OctreeElement* element) { · 120 unmodified lines | |||
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | 123 | ||
| 124 | bool UpdateEntityOperator::PreRecursion(OctreeElement* element) { | 124 | bool UpdateEntityOperator::preRecursion(OctreeElement* element) { |
| 125 | EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element); | 125 | EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element); |
| 126 | 126 | ||
| 127 | // In Pre-recursion, we're generally deciding whether or not we want to recurse this | 127 | // 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 | |||
| 194 | return keepSearching; // if we haven't yet found it, keep looking | 194 | return keepSearching; // if we haven't yet found it, keep looking |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | bool UpdateEntityOperator::PostRecursion(OctreeElement* element) { | 197 | bool UpdateEntityOperator::postRecursion(OctreeElement* element) { |
| 198 | // Post-recursion is the unwinding process. For this operation, while we | 198 | // Post-recursion is the unwinding process. For this operation, while we |
| 199 | // unwind we want to mark the path as being dirty if we changed it below. | 199 | // unwind we want to mark the path as being dirty if we changed it below. |
| 200 | // We might have two paths, one for the old entity and one for the new entity. | 200 | // 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 | |||
| 226 | return keepSearching; // if we haven't yet found it, keep looking | 226 | return keepSearching; // if we haven't yet found it, keep looking |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | OctreeElement* UpdateEntityOperator::PossiblyCreateChildAt(OctreeElement* element, int childIndex) { | 229 | OctreeElement* UpdateEntityOperator::possiblyCreateChildAt(OctreeElement* element, int childIndex) { |
| 230 | // If we're getting called, it's because there was no child element at this index while recursing. | 230 | // If we're getting called, it's because there was no child element at this index while recursing. |
| 231 | // We only care if this happens while still searching for the new entity location. | 231 | // We only care if this happens while still searching for the new entity location. |
| 232 | // Check to see if | 232 | // Check to see if |