Mr.doob 9 år sedan
förälder
incheckning
75d4b88a76
2 ändrade filer med 19 tillägg och 22 borttagningar
  1. 11 14
      examples/index.html
  2. 8 8
      src/renderers/webgl/WebGLPrograms.js

+ 11 - 14
examples/index.html

@@ -87,19 +87,17 @@
 				overflow: auto;
 			}
 
-			.action-button {
+			#button {
+				position: fixed;
+				bottom: 20px;
+				right: 20px;
 				padding: 8px;
 				color: #fff;
 				background-color: #555;
 				opacity: 0.7;
-				float: left;
-				margin-left: 1px;
-				position: fixed;
-				bottom: 20px;
-				right: 20px;
 			}
-			
-			.action-button:hover {
+
+			#button:hover {
 				cursor: pointer;
 				opacity: 1;
 			}
@@ -274,7 +272,6 @@
 		content.appendChild( container );
 
 		var button = document.createElement( 'div' );
-		button.className = 'action-button';
 		button.id = 'button';
 		button.textContent = 'View source';
 		button.addEventListener( 'click', function ( event ) {
@@ -327,14 +324,14 @@
 
 		}
 
-		var load = function ( file ) {
+		function loadFile( file ) {
 
 			selectFile( file );
 			viewer.src = file + '.html';
 
-		};
+		}
 
-		var selectFile = function( file ) {
+		function selectFile( file ) {
 
 			if ( selected !== null ) links[ selected ].className = 'link';
 
@@ -345,14 +342,14 @@
 
 			button.style.display = '';
 			panel.classList.toggle( 'collapsed' );
-			
+
 			selected = file;
 
 		}
 
 		if ( window.location.hash !== '' ) {
 
-			load( window.location.hash.substring( 1 ) );
+			loadFile( window.location.hash.substring( 1 ) );
 
 		}
 

+ 8 - 8
src/renderers/webgl/WebGLPrograms.js

@@ -189,16 +189,16 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 
 	this.getProgramCode = function ( material, parameters ) {
 
-		var chunks = [];
+		var array = [];
 
 		if ( parameters.shaderID ) {
 
-			chunks.push( parameters.shaderID );
+			array.push( parameters.shaderID );
 
 		} else {
 
-			chunks.push( material.fragmentShader );
-			chunks.push( material.vertexShader );
+			array.push( material.fragmentShader );
+			array.push( material.vertexShader );
 
 		}
 
@@ -206,8 +206,8 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 
 			for ( var name in material.defines ) {
 
-				chunks.push( name );
-				chunks.push( material.defines[ name ] );
+				array.push( name );
+				array.push( material.defines[ name ] );
 
 			}
 
@@ -215,11 +215,11 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 
 		for ( var i = 0; i < parameterNames.length; i ++ ) {
 
-			chunks.push( parameters[ parameterNames[ i ] ] );
+			array.push( parameters[ parameterNames[ i ] ] );
 
 		}
 
-		return chunks.join();
+		return array.join();
 
 	};