Move changes from jsm to js version

examples/js/renderers/CSS2DRenderer.js

@@ -32,6 +32,8 @@ THREE.CSS2DObject.prototype.constructor = THREE.CSS2DObject;
 
 THREE.CSS2DRenderer = function () {
 
+	var _this = this;
+
 	var _width, _height;
 	var _widthHalf, _heightHalf;
 
@@ -70,10 +72,12 @@ THREE.CSS2DRenderer = function () {
 
 	};
 
-	var renderObject = function ( object, camera ) {
+	var renderObject = function ( object, scene, camera ) {
 
 		if ( object instanceof THREE.CSS2DObject ) {
 
+			object.onBeforeRender( _this, scene, camera );
+
 			vector.setFromMatrixPosition( object.matrixWorld );
 			vector.applyMatrix4( viewProjectionMatrix );
 
@@ -99,6 +103,8 @@ THREE.CSS2DRenderer = function () {
 
 			}
 
+			object.onAfterRender( _this, scene, camera );
+
 		}
 
 		for ( var i = 0, l = object.children.length; i < l; i ++ ) {
@@ -168,7 +174,7 @@ THREE.CSS2DRenderer = function () {
 		viewMatrix.copy( camera.matrixWorldInverse );
 		viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, viewMatrix );
 
-		renderObject( scene, camera );
+		renderObject( scene, scene, camera );
 		zOrder( scene );
 
 	};

examples/jsm/renderers/CSS2DRenderer.js

@@ -38,8 +38,6 @@ CSS2DObject.prototype.constructor = CSS2DObject;
 
 var CSS2DRenderer = function () {
 
-	var _this = this;
-
 	var _width, _height;
 	var _widthHalf, _heightHalf;
 
@@ -78,12 +76,10 @@ var CSS2DRenderer = function () {
 
 	};
 
-	var renderObject = function ( object, scene, camera ) {
+	var renderObject = function ( object, camera ) {
 
 		if ( object instanceof CSS2DObject ) {
 
-			object.onBeforeRender( _this, scene, camera );
-
 			vector.setFromMatrixPosition( object.matrixWorld );
 			vector.applyMatrix4( viewProjectionMatrix );
 
@@ -109,8 +105,6 @@ var CSS2DRenderer = function () {
 
 			}
 
-			object.onAfterRender( _this, scene, camera );
-
 		}
 
 		for ( var i = 0, l = object.children.length; i < l; i ++ ) {
@@ -180,7 +174,7 @@ var CSS2DRenderer = function () {
 		viewMatrix.copy( camera.matrixWorldInverse );
 		viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, viewMatrix );
 
-		renderObject( scene, scene, camera );
+		renderObject( scene, camera );
 		zOrder( scene );
 
 	};