Added 'loaded' events to panorama and image objects

povdocs · Oct 20, 2015 · b11524e · b11524e
1 parent 8861f16
commit b11524e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/build/vr.dev.js b/build/vr.dev.js
diff --git a/src/objects/image.js b/src/objects/image.js
@@ -9,7 +9,8 @@ module.exports = (function () {
 			material,
 			mesh,
 			src,
-			tex;
+			tex,
+			self = this;
 
 		if (typeof options === 'string') {
 			src = options;
@@ -25,6 +26,8 @@ module.exports = (function () {
 				material.visible = true;
 				mesh.visible = true;
 				parent.add(mesh);
+
+				self.emit('loaded');
 			});
 		}
 

diff --git a/src/objects/panorama.js b/src/objects/panorama.js
@@ -12,7 +12,8 @@ module.exports = (function () {
 		var material,
 			mesh,
 			src,
-			tex;
+			tex,
+			self = this;
 
 		if (typeof options === 'string') {
 			src = options;
@@ -21,7 +22,9 @@ module.exports = (function () {
 		}
 
 		if (src) {
-			tex = materials.imageTexture(src, THREE.UVMapping);
+			tex = materials.imageTexture(src, THREE.UVMapping, function () {
+				self.emit('loaded');
+			});
 		}
 
 		material = new THREE.MeshBasicMaterial({