瀏覽代碼

Sprite cleanup

WestLangley 11 年之前
父節點
當前提交
bee89eb50c
共有 2 個文件被更改,包括 0 次插入8 次删除
  1. 0 6
      src/extras/renderers/plugins/SpritePlugin.js
  2. 0 2
      src/materials/SpriteMaterial.js

+ 0 - 6
src/extras/renderers/plugins/SpritePlugin.js

@@ -49,7 +49,6 @@ THREE.SpritePlugin = function () {
 
 
 			rotation:			_gl.getUniformLocation( program, 'rotation' ),
 			rotation:			_gl.getUniformLocation( program, 'rotation' ),
 			scale:				_gl.getUniformLocation( program, 'scale' ),
 			scale:				_gl.getUniformLocation( program, 'scale' ),
-			halfViewport: 		_gl.getUniformLocation( program, 'halfViewport' ),
 
 
 			color:				_gl.getUniformLocation( program, 'color' ),
 			color:				_gl.getUniformLocation( program, 'color' ),
 			map:				_gl.getUniformLocation( program, 'map' ),
 			map:				_gl.getUniformLocation( program, 'map' ),
@@ -87,9 +86,6 @@ THREE.SpritePlugin = function () {
 
 
 		if ( ! nSprites ) return;
 		if ( ! nSprites ) return;
 
 
-		var halfViewportWidth = viewportWidth * 0.5,
-			halfViewportHeight = viewportHeight * 0.5;
-
 		// setup gl
 		// setup gl
 
 
 		_gl.useProgram( program );
 		_gl.useProgram( program );
@@ -206,7 +202,6 @@ THREE.SpritePlugin = function () {
 
 
 			_gl.uniform1f( uniforms.rotation, material.rotation );
 			_gl.uniform1f( uniforms.rotation, material.rotation );
 			_gl.uniform2fv( uniforms.scale, scale );
 			_gl.uniform2fv( uniforms.scale, scale );
-			_gl.uniform2f( uniforms.halfViewport, halfViewportWidth, halfViewportHeight );
 
 
 			_renderer.setBlending( material.blending, material.blendEquation, material.blendSrc, material.blendDst );
 			_renderer.setBlending( material.blending, material.blendEquation, material.blendSrc, material.blendDst );
 			_renderer.setDepthTest( material.depthTest );
 			_renderer.setDepthTest( material.depthTest );
@@ -249,7 +244,6 @@ THREE.SpritePlugin = function () {
 			'uniform vec2 scale;',
 			'uniform vec2 scale;',
 			'uniform vec2 uvOffset;',
 			'uniform vec2 uvOffset;',
 			'uniform vec2 uvScale;',
 			'uniform vec2 uvScale;',
-			'uniform vec2 halfViewport;',
 
 
 			'attribute vec2 position;',
 			'attribute vec2 position;',
 			'attribute vec2 uv;',
 			'attribute vec2 uv;',

+ 0 - 2
src/materials/SpriteMaterial.js

@@ -26,8 +26,6 @@ THREE.SpriteMaterial = function ( parameters ) {
 	this.color = new THREE.Color( 0xffffff );
 	this.color = new THREE.Color( 0xffffff );
 	this.map = null;
 	this.map = null;
 
 
-	this.depthTest = true;
-	this.sizeAttenuation = true;
 	this.rotation = 0;
 	this.rotation = 0;
 
 
 	this.fog = false;
 	this.fog = false;