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

Merge pull request #13431 from Mugen87/dev8

WebGLInfo: Renamed primitives
Mr.doob 7 жил өмнө
parent
commit
006abf3922

+ 2 - 2
docs/api/renderers/WebGLRenderer.html

@@ -180,9 +180,9 @@
 			<li>render:
 			<li>render:
 				<ul>
 				<ul>
 					<li>calls</li>
 					<li>calls</li>
-					<li>faces</li>
+					<li>triangles</li>
 					<li>points</li>
 					<li>points</li>
-					<li>segments</li>
+					<li>lines</li>
 				</ul>
 				</ul>
 			</li>
 			</li>
 			<li>programs
 			<li>programs

+ 9 - 9
src/renderers/webgl/WebGLInfo.js

@@ -12,9 +12,9 @@ function WebGLInfo( gl ) {
 	var render = {
 	var render = {
 		frame: 0,
 		frame: 0,
 		calls: 0,
 		calls: 0,
-		faces: 0,
+		triangles: 0,
 		points: 0,
 		points: 0,
-		segments: 0
+		lines: 0
 	};
 	};
 
 
 	function update( count, mode, instanceCount ) {
 	function update( count, mode, instanceCount ) {
@@ -26,24 +26,24 @@ function WebGLInfo( gl ) {
 		switch ( mode ) {
 		switch ( mode ) {
 
 
 			case gl.TRIANGLES:
 			case gl.TRIANGLES:
-				render.faces += instanceCount * ( count / 3 );
+				render.triangles += instanceCount * ( count / 3 );
 				break;
 				break;
 
 
 			case gl.TRIANGLE_STRIP:
 			case gl.TRIANGLE_STRIP:
 			case gl.TRIANGLE_FAN:
 			case gl.TRIANGLE_FAN:
-				render.faces += instanceCount * ( count - 2 );
+				render.triangles += instanceCount * ( count - 2 );
 				break;
 				break;
 
 
 			case gl.LINES:
 			case gl.LINES:
-				render.segments += instanceCount * ( count / 2 );
+				render.lines += instanceCount * ( count / 2 );
 				break;
 				break;
 
 
 			case gl.LINE_STRIP:
 			case gl.LINE_STRIP:
-				render.segments += instanceCount * ( count - 1 );
+				render.lines += instanceCount * ( count - 1 );
 				break;
 				break;
 
 
 			case gl.LINE_LOOP:
 			case gl.LINE_LOOP:
-				render.segments += instanceCount * count;
+				render.lines += instanceCount * count;
 				break;
 				break;
 
 
 			case gl.POINTS:
 			case gl.POINTS:
@@ -62,9 +62,9 @@ function WebGLInfo( gl ) {
 
 
 		render.frame ++;
 		render.frame ++;
 		render.calls = 0;
 		render.calls = 0;
-		render.faces = 0;
+		render.triangles = 0;
 		render.points = 0;
 		render.points = 0;
-		render.segments = 0;
+		render.lines = 0;
 
 
 	}
 	}