Skip to content

Commit b0db8a2

Browse files
Some optimizations in SceneGraph code (aframevr#809)
* Break the for loop when entity is found in SceneGraph selectEntity * Simplify getting visible property, it's okay to always use entity.object3D.visible * No need to uppercase entity.tagName
1 parent 1359bed commit b0db8a2

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

src/components/scenegraph/Entity.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ export default class Entity extends React.Component {
3333

3434
toggleVisibility = () => {
3535
const entity = this.props.entity;
36-
const visible =
37-
entity.tagName.toLowerCase() === 'a-scene'
38-
? entity.object3D.visible
39-
: entity.getAttribute('visible');
36+
const visible = entity.object3D.visible;
4037
entity.setAttribute('visible', !visible);
4138
};
4239

@@ -92,10 +89,7 @@ export default class Entity extends React.Component {
9289
}
9390

9491
// Visibility button.
95-
const visible =
96-
tagName === 'a-scene'
97-
? entity.object3D.visible
98-
: entity.getAttribute('visible');
92+
const visible = entity.object3D.visible;
9993
const visibilityButton = (
10094
<i title="Toggle entity visibility" onClick={this.toggleVisibility}>
10195
{visible ? (

src/components/scenegraph/SceneGraph.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ export default class SceneGraph extends React.Component {
109109
this.expandToRoot(entity);
110110
Events.emit('entityselect', entity);
111111
found = true;
112+
break;
112113
}
113114
}
114115

@@ -364,7 +365,7 @@ function filterEntity(entity, filter) {
364365
// Check if the ID, tagName, class, selector includes the filter.
365366
if (
366367
entity.id.toUpperCase().indexOf(filter.toUpperCase()) !== -1 ||
367-
entity.tagName.toUpperCase().indexOf(filter.toUpperCase()) !== -1 ||
368+
entity.tagName.indexOf(filter.toUpperCase()) !== -1 ||
368369
entity.classList.contains(filter) ||
369370
entity.matches(filter)
370371
) {

0 commit comments

Comments
 (0)