Bladeren bron

support dynamic colors for non-dynamic trixls.

don't know if this is very bad for performance, but it might be fun.
Lucas Stadler 12 jaren geleden
bovenliggende
commit
f01eddee9d
1 gewijzigde bestanden met toevoegingen van 2 en 1 verwijderingen
  1. 2 1
      js/pixl/public/trixl.html

+ 2 - 1
js/pixl/public/trixl.html

411
411
412
			for (var pair of trixl.world) {
412
			for (var pair of trixl.world) {
413
				var pos = pair[0], data = pair[1];
413
				var pos = pair[0], data = pair[1];
414
				var color = data ? (data.color.apply ? data.color(pos, t) : data.color) : trixl.color;
414
415
415
				gl.uniform4fv(program.color, data ? data.color || trixl.color : trixl.color);
416
				gl.uniform4fv(program.color, color);
416
				gl.uniformMatrix4fv(program.transform, false, transform(pos));
417
				gl.uniformMatrix4fv(program.transform, false, transform(pos));
417
				gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
418
				gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
418
			}
419
			}