|
@@ -19834,18 +19834,18 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
hash: '',
|
|
|
|
|
|
- ambient: [ 0, 0, 0 ],
|
|
|
- directional: [],
|
|
|
- directionalShadowMap: [],
|
|
|
- directionalShadowMatrix: [],
|
|
|
- spot: [],
|
|
|
- spotShadowMap: [],
|
|
|
- spotShadowMatrix: [],
|
|
|
- rectArea: [],
|
|
|
- point: [],
|
|
|
- pointShadowMap: [],
|
|
|
- pointShadowMatrix: [],
|
|
|
- hemi: [],
|
|
|
+ ambient: [ 0, 0, 0 ],
|
|
|
+ directional: [],
|
|
|
+ directionalShadowMap: [],
|
|
|
+ directionalShadowMatrix: [],
|
|
|
+ spot: [],
|
|
|
+ spotShadowMap: [],
|
|
|
+ spotShadowMatrix: [],
|
|
|
+ rectArea: [],
|
|
|
+ point: [],
|
|
|
+ pointShadowMap: [],
|
|
|
+ pointShadowMatrix: [],
|
|
|
+ hemi: [],
|
|
|
|
|
|
shadows: []
|
|
|
|
|
@@ -20180,12 +20180,12 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
this.resetGLState = resetGLState;
|
|
|
|
|
|
- this.dispose = function() {
|
|
|
+ this.dispose = function () {
|
|
|
|
|
|
transparentObjects = [];
|
|
|
- transparentObjectsLastIndex = -1;
|
|
|
+ transparentObjectsLastIndex = - 1;
|
|
|
opaqueObjects = [];
|
|
|
- opaqueObjectsLastIndex = -1;
|
|
|
+ opaqueObjectsLastIndex = - 1;
|
|
|
|
|
|
_canvas.removeEventListener( 'webglcontextlost', onContextLost, false );
|
|
|
|
|
@@ -20241,6 +20241,16 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
// Buffer rendering
|
|
|
|
|
|
+ function renderObjectImmediate( object, program, material ) {
|
|
|
+
|
|
|
+ object.render( function ( object ) {
|
|
|
+
|
|
|
+ _this.renderBufferImmediate( object, program, material );
|
|
|
+
|
|
|
+ } );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
this.renderBufferImmediate = function ( object, program, material ) {
|
|
|
|
|
|
state.initAttributes();
|
|
@@ -21151,11 +21161,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
_currentGeometryProgram = '';
|
|
|
|
|
|
- object.render( function ( object ) {
|
|
|
-
|
|
|
- _this.renderBufferImmediate( object, program, material );
|
|
|
-
|
|
|
- } );
|
|
|
+ renderObjectImmediate( object, program, material );
|
|
|
|
|
|
} else {
|
|
|
|
|
@@ -21972,11 +21978,11 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
viewMatrix = camera.matrixWorldInverse,
|
|
|
|
|
|
- directionalLength = 0,
|
|
|
- pointLength = 0,
|
|
|
- spotLength = 0,
|
|
|
- rectAreaLength = 0,
|
|
|
- hemiLength = 0;
|
|
|
+ directionalLength = 0,
|
|
|
+ pointLength = 0,
|
|
|
+ spotLength = 0,
|
|
|
+ rectAreaLength = 0,
|
|
|
+ hemiLength = 0;
|
|
|
|
|
|
for ( l = 0, ll = lights.length; l < ll; l ++ ) {
|
|
|
|
|
@@ -22181,7 +22187,7 @@ function WebGLRenderer( parameters ) {
|
|
|
this.allocTextureUnit = allocTextureUnit;
|
|
|
|
|
|
// this.setTexture2D = setTexture2D;
|
|
|
- this.setTexture2D = ( function() {
|
|
|
+ this.setTexture2D = ( function () {
|
|
|
|
|
|
var warned = false;
|
|
|
|
|
@@ -22207,7 +22213,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
}() );
|
|
|
|
|
|
- this.setTexture = ( function() {
|
|
|
+ this.setTexture = ( function () {
|
|
|
|
|
|
var warned = false;
|
|
|
|
|
@@ -22226,7 +22232,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
}() );
|
|
|
|
|
|
- this.setTextureCube = ( function() {
|
|
|
+ this.setTextureCube = ( function () {
|
|
|
|
|
|
var warned = false;
|
|
|
|
|
@@ -22268,7 +22274,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
}() );
|
|
|
|
|
|
- this.getCurrentRenderTarget = function() {
|
|
|
+ this.getCurrentRenderTarget = function () {
|
|
|
|
|
|
return _currentRenderTarget;
|
|
|
|