浏览代码

Merge branch 'SoftwareRenderEnhance' of https://github.com/DaoshengMu/three.js into dev

Conflicts:
	examples/js/renderers/SoftwareRenderer.js
Mr.doob 11 年之前
父节点
当前提交
55d8d2a40f
共有 2 个文件被更改,包括 491 次插入327 次删除
  1. 490 326
      examples/js/renderers/SoftwareRenderer.js
  2. 1 1
      examples/misc_ubiquity_test.html

文件差异内容过多而无法显示
+ 490 - 326
examples/js/renderers/SoftwareRenderer.js


+ 1 - 1
examples/misc_ubiquity_test.html

@@ -143,7 +143,7 @@
 				// SPRITES
 
 				var texture = THREE.ImageUtils.loadTexture( 'textures/sprite.png' );
-				var material = new THREE.SpriteMaterial( { map: texture } );
+				var material = new THREE.SpriteMaterial( { map: texture, transparent: true } );
 
 				for ( var i = 0; i < 50; i ++ ) {
 

部分文件因为文件数量过多而无法显示