Explorar el Código

add world map for trixls to draw.

Lucas Stadler %!s(int64=12) %!d(string=hace) años
padre
commit
926792660d
Se han modificado 1 ficheros con 14 adiciones y 17 borrados
  1. 14 17
      js/pixl/public/trixl.html

+ 14 - 17
js/pixl/public/trixl.html

@ -142,6 +142,14 @@
142 142
		program.color = gl.getUniformLocation(program, 'color');
143 143
		gl.uniform4f(program.color, -1, -1, -1, -1);
144 144
145
		trixl.world = new Map([
146
			[[0, 0, 2], {color: [0.7, 0, 0, 1]}],
147
			[[-3.0, +0.0, 2], {color: [0.5, 0.5, 0.5, 1]}],
148
			[[+3.0, +0.0, 2], {color: [0.5, 0.5, 0.5, 1]}],
149
			[[+0.0, -3.0, 2], {color: [0.5, 0.5, 0.5, 1]}],
150
			[[+0.0, +3.0, 2], {color: [0.5, 0.5, 0.5, 1]}]
151
		]);
152
145 153
		var angle = {x: 0, y: 0, z: 0};
146 154
		var offset = {x: 0, y: 0, z: 0};
147 155
		program.transform = gl.getUniformLocation(program, 'transform');
@ -171,24 +179,13 @@
171 179
172 180
			gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
173 181
174
			gl.uniform4f(program.color, (Math.sin(angle.x) + 1.0) * 0.5, 0, 0, 1.0);
175
			gl.uniformMatrix4fv(program.transform, false, t);
176
			gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
177
178
			var c = (Math.sin(angle.x) + 1.0) * 0.5;
179
			gl.uniform4f(program.color, c, c, c, 1.0);
180
181
			gl.uniformMatrix4fv(program.transform, false, transform([-3.0, 0.0, 2]));
182
			gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
182
			for (var pair of trixl.world) {
183
				var pos = pair[0], data = pair[1];
183 184
184
			gl.uniformMatrix4fv(program.transform, false, transform([+3.0, 0.0, 2]));
185
			gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
186
187
			gl.uniformMatrix4fv(program.transform, false, transform([+0.0, +3.0, 2]));
188
			gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
189
190
			gl.uniformMatrix4fv(program.transform, false, transform([+0.0, -3.0, 2]));
191
			gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
185
				gl.uniform4fv(program.color, data.color);
186
				gl.uniformMatrix4fv(program.transform, false, transform(pos));
187
				gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
188
			}
192 189
193 190
			gl.uniform4f(program.color, -1, -1, -1, 0);
194 191