Browse Source

Replace THREE.ScaleModifier with geometry.applyMatrix

zz85 13 years ago
parent
commit
f39c58b79b
3 changed files with 1 additions and 22 deletions
  1. 1 3
      examples/webgl_geometry_subdivison.html
  2. 0 18
      src/extras/modifiers/ScaleModifier.js
  3. 0 1
      utils/build.py

+ 1 - 3
examples/webgl_geometry_subdivison.html

@@ -25,7 +25,6 @@
 		<script src="../src/extras/geometries/CylinderGeometry.js"></script>
 		<script src="../src/extras/geometries/CylinderGeometry.js"></script>
 		<script src="../src/extras/geometries/TorusGeometry.js"></script>
 		<script src="../src/extras/geometries/TorusGeometry.js"></script>
 		<script src="../src/extras/modifiers/SubdivisionModifier.js"></script>
 		<script src="../src/extras/modifiers/SubdivisionModifier.js"></script>
-		<script src="../src/extras/modifiers/ScaleModifier.js"></script>
 
 
 		<script src="fonts/helvetiker_regular.typeface.js"></script>
 		<script src="fonts/helvetiker_regular.typeface.js"></script>
 
 
@@ -177,8 +176,7 @@
 				
 				
 				// Scale Geometry
 				// Scale Geometry
 				if (params.scale) {
 				if (params.scale) {
-					var scaler = new THREE.ScaleModifier( new THREE.Vector3(params.scale,params.scale,params.scale));
-					scaler.modify(geometry);
+					geometry.applyMatrix( new THREE.Matrix4().setScale( params.scale, params.scale, params.scale ) );
 				}
 				}
 
 
 				// Cloning original geometry for debuging
 				// Cloning original geometry for debuging

+ 0 - 18
src/extras/modifiers/ScaleModifier.js

@@ -1,18 +0,0 @@
-/*
- *	@author zz85 / http://twitter.com/blurspline
- *
- *	Scales a geometry by vector
- */
-
-// Scale from 0,0,0 with (x,y,z)
-THREE.ScaleModifier = function( scale /*Vector3*/ ) {
-	this.scale = scale;
-};
-
-THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
-
-THREE.ScaleModifier.prototype.modify = function ( geometry ) {
-	
-	geometry.applyMatrix( new THREE.Matrix4().setScale( this.scale.x, this.scale.y, this.scale.z ) );
-	
-};

+ 0 - 1
utils/build.py

@@ -117,7 +117,6 @@ EXTRAS_FILES = [
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
 'extras/modifiers/SubdivisionModifier.js',
 'extras/modifiers/SubdivisionModifier.js',
-'extras/modifiers/ScaleModifier.js',
 'extras/loaders/Loader.js',
 'extras/loaders/Loader.js',
 'extras/loaders/BinaryLoader.js',
 'extras/loaders/BinaryLoader.js',
 'extras/loaders/ColladaLoader.js',
 'extras/loaders/ColladaLoader.js',