Some objects can share a single geometry instance

povdocs · May 21, 2015 · af557d9 · af557d9
1 parent 5d5fa19
commit af557d9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 54 deletions.
diff --git a/build/vr.dev.js b/build/vr.dev.js
diff --git a/build/vr.js b/build/vr.js
diff --git a/build/vr.js.map b/build/vr.js.map
diff --git a/src/objects/box.js b/src/objects/box.js
@@ -2,13 +2,12 @@ module.exports = (function () {
 	'use strict';
 
 	var materials = require('../materials'),
-		THREE = require('three');
+		THREE = require('three'),
+		geometry = new THREE.BoxGeometry( 1, 1, 1 );
 
 	return function box(parent, options) {
-		var geometry,
-			mesh;
+		var mesh;
 
-		geometry = new THREE.BoxGeometry( 1, 1, 1 );
 		mesh = new THREE.Mesh(geometry, materials.standard());
 		mesh.name = 'box';
 

diff --git a/src/objects/panorama.js b/src/objects/panorama.js
@@ -2,11 +2,14 @@ module.exports = (function () {
 	'use strict';
 
 	var materials = require('../materials'),
-		THREE = require('three');
+		THREE = require('three'),
+		geometry = new THREE.SphereGeometry(1000, 60, 60);
+
+	geometry.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
+	geometry.applyMatrix(new THREE.Matrix4().makeRotationY(- Math.PI / 2));
 
 	return function panorama(parent, options) {
-		var geometry,
-			material,
+		var material,
 			mesh,
 			src,
 			tex;
@@ -21,16 +24,12 @@ module.exports = (function () {
 			tex = materials.imageTexture(src, THREE.UVMapping);
 		}
 
-		geometry = new THREE.SphereGeometry(1000, 60, 60);
-		geometry.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
-		geometry.applyMatrix(new THREE.Matrix4().makeRotationY(- Math.PI / 2));
-
 		material = new THREE.MeshBasicMaterial({
 			transparent: true,
 			map: tex
 		});
 
-		mesh = new THREE.Mesh( geometry, material );
+		mesh = new THREE.Mesh(geometry, material);
 
 		if (options && options.stereo) {
 			if (options.stereo === 'vertical') {

diff --git a/src/objects/text.js b/src/objects/text.js
@@ -5,11 +5,11 @@ module.exports = (function () {
 		fontSizeRegex = /(\d+)px/i,
 		newLineRegex = /[\n\r]/,
 		spaceRegex = /[\t ]/,
-		log2 = Math.log(2);
+		log2 = Math.log(2),
+		geometry = new THREE.PlaneBufferGeometry(1, 1);
 
 	return function text(parent, options) {
 		var self = this,
-			geometry,
 			material,
 			canvas,
 			ctx,
@@ -242,8 +242,6 @@ module.exports = (function () {
 			tex.generateMipmaps = true;
 		}
 
-		geometry = new THREE.PlaneBufferGeometry(1, 1);
-
 		material = new THREE.MeshBasicMaterial({
 			side: THREE.DoubleSide,
 			transparent: true,