From 59be96aa8181acefe04cb8fa9fa07ce545be2cd2 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 22 Jan 2016 00:57:04 +0000 Subject: [PATCH] Clean up. --- examples/files.js | 1 + ...html => webgl_multiple_elements_text.html} | 20 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) rename examples/{webgl_multiple_elements_with_text.html => webgl_multiple_elements_text.html} (99%) diff --git a/examples/files.js b/examples/files.js index e6c72a6abd..7c135f1356 100644 --- a/examples/files.js +++ b/examples/files.js @@ -150,6 +150,7 @@ var files = { "webgl_multiple_canvases_complex", "webgl_multiple_canvases_grid", "webgl_multiple_elements", + "webgl_multiple_elements_text", "webgl_multiple_renderers", "webgl_multiple_views", "webgl_nearestneighbour", diff --git a/examples/webgl_multiple_elements_with_text.html b/examples/webgl_multiple_elements_text.html similarity index 99% rename from examples/webgl_multiple_elements_with_text.html rename to examples/webgl_multiple_elements_text.html index e5ad196607..c5089540b0 100644 --- a/examples/webgl_multiple_elements_with_text.html +++ b/examples/webgl_multiple_elements_text.html @@ -116,7 +116,7 @@ var size = .25; var colors = [ 'rgb(0,127,255)', 'rgb(255,0,0)', 'rgb(0,255,0)', 'rgb(0,255,255)', - 'rgb(255,0,255)', 'rgb(255,0,127)', 'rgb(255,255,0)', 'rgb(0,255,127)' ]; + 'rgb(255,0,255)', 'rgb(255,0,127)', 'rgb(255,255,0)', 'rgb(0,255,127)' ]; canvas = document.getElementById( 'c' ); @@ -150,7 +150,7 @@ } } - + } else { for ( var m = 0 ; m < Math.pow( balls, 3 ) ; m++ ) { @@ -191,7 +191,7 @@ var controls = new THREE.OrbitControls( camera, views[n] ); scene.userData.controls = controls; - + scenes.push( scene ); } @@ -213,12 +213,12 @@ } } - + function animate() { - + render(); requestAnimationFrame( animate ); - + } function render() { @@ -226,11 +226,10 @@ updateSize(); renderer.setClearColor( 0xffffff ); - renderer.setViewport( 0, 0, canvas.clientWidth, canvas.clientHeight ); + renderer.setScissorTest( false ); renderer.clear(); renderer.setClearColor( 0x000000 ); - renderer.setScissorTest( true ); scenes.forEach( function( scene ) { @@ -251,7 +250,7 @@ renderer.render( scene, scene.userData.camera ); scene.userData.controls.update(); - + for ( var i = 0 ; i < scene.children[0].geometry.vertices.length ; i++ ) { var v0 = scene.userData.geometry0.vertices[i]; @@ -264,8 +263,7 @@ } ); - renderer.setScissorTest( false ); - t++; + t ++; } -- GitLab