|
|
@ -142,6 +142,8 @@
|
|
142
|
142
|
program.color = gl.getUniformLocation(program, 'color');
|
|
143
|
143
|
gl.uniform4f(program.color, -1, -1, -1, -1);
|
|
144
|
144
|
|
|
|
145
|
trixl.color = [0, 0, 0, 1];
|
|
|
146
|
|
|
145
|
147
|
trixl.world = new Map([
|
|
146
|
148
|
[[0, 0, 2], {color: [0.7, 0, 0, 1]}],
|
|
147
|
149
|
[[-3.0, +0.0, 2], {color: [0.5, 0.5, 0.5, 1]}],
|
|
|
@ -167,7 +169,7 @@
|
|
167
|
169
|
y = lo + Math.round(Math.random() * (hi - lo)),
|
|
168
|
170
|
z = lo + Math.round(Math.random() * (hi - lo)),
|
|
169
|
171
|
color = color || [Math.random(), Math.random(), Math.random(), 1];
|
|
170
|
|
trixl.world.set([x, y, z], {color: color});
|
|
|
172
|
trixl.world.set([x, y, z], {color: color || trixl.color});
|
|
171
|
173
|
}
|
|
172
|
174
|
|
|
173
|
175
|
trixl.generate.many = function(n, lo, hi, color) {
|
|
|
@ -212,7 +214,7 @@
|
|
212
|
214
|
for (var pair of trixl.world) {
|
|
213
|
215
|
var pos = pair[0], data = pair[1];
|
|
214
|
216
|
|
|
215
|
|
gl.uniform4fv(program.color, data.color);
|
|
|
217
|
gl.uniform4fv(program.color, data ? data.color || trixl.color : trixl.color);
|
|
216
|
218
|
gl.uniformMatrix4fv(program.transform, false, transform(pos));
|
|
217
|
219
|
gl.drawArrays(gl.TRIANGLES, 0, 6 * 6);
|
|
218
|
220
|
}
|