2
0
Эх сурвалжийг харах

Merge branch 'master' of https://github.com/chuckfairy/three.js into dev

Conflicts:
	examples/js/renderers/RaytracingRenderer.js
Mr.doob 10 жил өмнө
parent
commit
b7c99989a7

+ 10 - 1
examples/js/renderers/RaytracingRenderer.js

@@ -9,6 +9,8 @@ THREE.RaytracingRenderer = function ( parameters ) {
 
 	parameters = parameters || {};
 
+	var scope = this;
+
 	var canvas = document.createElement( 'canvas' );
 	var context = canvas.getContext( '2d', {
 		alpha: parameters.alpha === true
@@ -458,7 +460,12 @@ THREE.RaytracingRenderer = function ( parameters ) {
 				blockX = 0;
 				blockY += blockSize;
 
-				if ( blockY >= canvasHeight ) return;
+				if ( blockY >= canvasHeight ) {
+
+					scope.dispatchEvent( { type: "complete" } );
+					return;
+
+				}
 
 			}
 
@@ -535,3 +542,5 @@ THREE.RaytracingRenderer = function ( parameters ) {
 	};
 
 };
+
+THREE.EventDispatcher.prototype.apply(THREE.RaytracingRenderer.prototype);