Skip to content

Commit

Permalink
r85
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdoob committed Apr 21, 2017
1 parent d68323e commit f5b9e5a
Show file tree
Hide file tree
Showing 5 changed files with 774 additions and 694 deletions.
52 changes: 46 additions & 6 deletions build/three.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@

} );

var REVISION = '85dev';
var REVISION = '85';
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
var CullFaceNone = 0;
var CullFaceBack = 1;
Expand Down Expand Up @@ -16267,7 +16267,7 @@

if ( list === undefined ) {

console.log( 'THREE.WebGLRenderLists:', hash );
// console.log( 'THREE.WebGLRenderLists:', hash );

list = new WebGLRenderList();
lists[ hash ] = list;
Expand Down Expand Up @@ -20518,6 +20518,12 @@

};

function absNumericalSort( a, b ) {

return Math.abs( b[ 0 ] ) - Math.abs( a[ 0 ] );

}

this.renderBufferDirect = function ( camera, fog, geometry, material, object, group ) {

state.setMaterial( material );
Expand Down Expand Up @@ -20856,13 +20862,47 @@

}

// Sorting
// Compile

function absNumericalSort( a, b ) {
this.compile = function ( scene, camera ) {

return Math.abs( b[ 0 ] ) - Math.abs( a[ 0 ] );
lights = [];

}
scene.traverse( function ( object ) {

if ( object.isLight ) {

lights.push( object );

}

} );

setupLights( lights, camera );

scene.traverse( function ( object ) {

if ( object.material ) {

if ( Array.isArray( object.material ) ) {

for ( var i = 0; i < object.material.length; i ++ ) {

initMaterial( object.material[ i ], scene.fog, object );

}

} else {

initMaterial( object.material, scene.fog, object );

}

}

} );

};

// Rendering

Expand Down
Loading

0 comments on commit f5b9e5a

Please sign in to comment.