Skip to content

Replaces setOBject3D(type, null) with removeObject3D(type) #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2016
Merged

Replaces setOBject3D(type, null) with removeObject3D(type) #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Replaces setOBject3D(type, null) with removeObject3D(type)
  • Loading branch information
@dmarcos
dmarcos committed Jan 15, 2016
commit 4a2fcfbbcb9beb1da5382fee1af7688634e9a46e
2 changes: 1 addition & 1 deletion src/components/camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports.Component = registerComponent('camera', {
* Remove camera on remove (callback).
*/
remove: function () {
this.el.setObject3D('camera', null);
this.el.removeObject3D('camera');
},

/**
Expand Down
4 changes: 2 additions & 2 deletions src/components/light.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ module.exports.Component = registerComponent('light', {
var newLight = getLight(data);
if (newLight) {
if (this.light) {
el.setObject3D('light', null);
el.removeObject3D('light');
}

this.light = newLight;
Expand All @@ -91,7 +91,7 @@ module.exports.Component = registerComponent('light', {
* Remove light on remove (callback).
*/
remove: function () {
this.el.setObject3D('light', null);
this.el.removeObject3D('light');
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports.Component = registerComponent('loader', {
var url = parseUrl(data.src);
var mtlUrl = parseUrl(data.mtl);
var format = data.format;
if (model) { el.setObject3D('mesh', null); }
if (model) { el.removeObject3D('mesh'); }
if (!url) {
warn('Model URL not provided');
return;
Expand Down
4 changes: 2 additions & 2 deletions src/components/sound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports.Component = registerComponent('sound', {
},

remove: function () {
this.el.setObject3D('sound', null);
this.el.removeObject3D('sound');
},

/**
Expand All @@ -85,7 +85,7 @@ module.exports.Component = registerComponent('sound', {

if (sound) {
this.stop();
el.setObject3D('sound', null);
el.removeObject3D('sound');
}

listener = this.listener = new THREE.AudioListener();
Expand Down