merge branch 'perf-more-trixls'.

js/pixl/public/trixl.html

@@ -394,23 +394,17 @@
			}
		}
		var angle = {x: 0, y: 0, z: 0};
		var offset = {x: 0, y: 0, z: 0};
		program.transform = gl.getUniformLocation(program, 'transform');
		trixl.redraw = function(t) {
			var view = mat4.lookAt([], trixl.camera.pos, trixl.camera.focus, trixl.camera.up);
			var aspect = trixl.window.w / trixl.window.h;
			var transform = function(pos) {
				return mat4.multiplyMany(
					matrix.translate(-0.5, -0.5, -0.5),
					matrix.rotateZ(angle.z / 10),
					//matrix.rotateY(angle.y / 10),
					matrix.rotateX(angle.x / 10),
					matrix.translate(pos[0] + offset.x, pos[1] + offset.y, pos[2] + offset.z),
					view,
					matrix.perspective(Math.PI / 3, aspect)
				);
				var m = mat4.create();
				mat4.translate(m, m, [-0.5 + pos[0], -0.5 + pos[1], -0.5 + pos[2]]);
				mat4.multiply(m, view, m);
				mat4.multiply(m, matrix.perspective(Math.PI / 3, aspect), m);
				return m;
			}
			gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
@@ -432,19 +426,12 @@
			});
			gl.uniform4f(program.color, -1, -1, -1, 0);
			//angle.x += Math.PI / 10;
			//angle.y += Math.PI / 10;
			//angle.z += Math.PI / 10;
			//offset.x = Math.sin(angle.x * 0.1);
			//offset.y = Math.sin(angle.y * 0.1);
			//offset.z = Math.cos(angle.z * 0.1) * 2;
		}
		trixl.step = function(t) {
			trixl.redraw(t);
			trixl.step.reqId = requestAnimationFrame(trixl.step);
			trixl.redraw(t);
		}
		trixl.start = function() {
			trixl.step.reqId = requestAnimationFrame(trixl.step);