Browse Source

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

Conflicts:
	examples/js/renderers/SoftwareRenderer.js
Mr.doob 11 years ago
parent
commit
55d8d2a40f
2 changed files with 491 additions and 327 deletions
  1. 490 326
      examples/js/renderers/SoftwareRenderer.js
  2. 1 1
      examples/misc_ubiquity_test.html

File diff suppressed because it is too large
+ 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 ++ ) {
 

Some files were not shown because too many files changed in this diff