From 0fe4a8737b9fb31fa659b519c776b729406b4783 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 29 Oct 2012 11:57:28 +0100 Subject: [PATCH] Refactored CSS3D billboard implementation. --- examples/css3d_molecules.html | 3 +-- examples/js/renderers/CSS3DRenderer.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/css3d_molecules.html b/examples/css3d_molecules.html index c67d80a8e6..b2b3ecebb1 100644 --- a/examples/css3d_molecules.html +++ b/examples/css3d_molecules.html @@ -261,10 +261,9 @@ var atom = document.createElement( 'img' ); atom.src = colorSprite; - var object = new THREE.CSS3DObject( atom ); + var object = new THREE.CSS3DSprite( atom ); object.position.copy( position ); object.position.multiplyScalar( 50 ); - object.billboard = true; root.add( object ); objects.push( object ); diff --git a/examples/js/renderers/CSS3DRenderer.js b/examples/js/renderers/CSS3DRenderer.js index b43a526d31..677a51a745 100644 --- a/examples/js/renderers/CSS3DRenderer.js +++ b/examples/js/renderers/CSS3DRenderer.js @@ -7,8 +7,6 @@ THREE.CSS3DObject = function ( element ) { THREE.Object3D.call( this ); - this.billboard = false; - this.element = element; this.element.style.position = "absolute"; this.element.style.WebkitTransformStyle = 'preserve-3d'; @@ -20,6 +18,14 @@ THREE.CSS3DObject = function ( element ) { THREE.CSS3DObject.prototype = Object.create( THREE.Object3D.prototype ); +THREE.CSS3DSprite = function ( element ) { + + THREE.CSS3DObject.call( this, element ); + +}; + +THREE.CSS3DSprite.prototype = Object.create( THREE.CSS3DObject.prototype ); + // THREE.CSS3DRenderer = function () { @@ -157,7 +163,7 @@ THREE.CSS3DRenderer = function () { var element = object.element; - if ( object.billboard ) { + if ( object instanceof THREE.CSS3DSprite ) { // http://swiftcoder.wordpress.com/2008/11/25/constructing-a-billboard-matrix/ -- GitLab