Kelder/planet-wars
33
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

do voronoi dance, once more?

Browse source
This commit is contained in:
ajuvercr 2020-04-19 19:59:40 +02:00
parent b8fc4e1710
commit c2365d3668
4 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/www/src/index.ts
View file

@ -129,7 +129,7 @@ class GameInstance {
const planet_points = [];
for(let i = 0; i < planets.length; i += 3) {
planet_points.push({'x': planets[i], 'y': planets[i+1]});
planet_points.push({'x': -planets[i], 'y': -planets[i+1]});
}
const _bbox = this.resizer.get_viewbox();
const bbox = {
@ -307,6 +307,7 @@ class GameInstance {
GL.viewport(0, 0, GL.canvas.width, GL.canvas.height);
GL.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
this.vor_shader.uniform(GL, "u_time", new Uniform1f((time - this.last_time) / ms_per_frame));
this.vor_shader.uniform(GL, "u_viewbox", new Uniform4f(this.resizer.get_viewbox()));
this.vor_shader.uniform(GL, "u_resolution", new Uniform2f(RESOLUTION));
this.vor_shader.uniform(GL, "u_vor", new UniformBool(this.use_vor));

25
frontend/www/src/voronoi/voronoi.ts
View file

@ -39,24 +39,29 @@ export class VoronoiBuilder {
a_own.push(planetId);
for (let edge of cell.halfedges) {
ids.push(centerId);
const start = edge.getStartpoint();
ids.push(vertCount++);
a_pos.push(start.x, start.y);
a_own.push(planetId);
const end = edge.getEndpoint();
ids.push(vertCount++);
const center = {'x': (start.x + end.x) / 2, 'y': (start.y + end.y) / 2};
ids.push(centerId);
ids.push(vertCount++);
a_pos.push(start.x, start.y);
a_own.push(-1);
// ids.push(vertCount++);
// a_pos.push(center.x, center.y);
// a_own.push(planetId);
// ids.push(centerId);
// ids.push(vertCount-1);
ids.push(vertCount++);
a_pos.push(end.x, end.y);
a_own.push(planetId);
a_own.push(-1);
}
}
const ib = new IndexBuffer(gl, ids);
const vb_pos = new VertexBuffer(gl, a_pos.map((x) => -1 * x));
const vb_pos = new VertexBuffer(gl, a_pos);
const vb_own = new VertexBuffer(gl, a_own);
const layout_pos = new VertexBufferLayout();

2
frontend/www/static/shaders/frag/vor.glsl
View file

@ -12,5 +12,5 @@ varying vec3 v_color;
varying vec2 v_pos;
void main() {
gl_FragColor = vec4(v_color, 0.3);
gl_FragColor = vec4(v_color, 0.6);
}

7
frontend/www/static/shaders/vert/vor.glsl
View file

@ -8,6 +8,7 @@ attribute float a_own;
uniform vec3 u_planet_colours[$PLANETS * 2];
uniform vec4 u_viewbox; // [x, y, width, height]
uniform vec2 u_resolution;
uniform float u_time;
varying vec2 v_pos;
varying vec3 v_color;
@ -21,14 +22,14 @@ void main() {
// So translate and scale the viewbox**
uv -= u_viewbox.xy + (u_viewbox.zw * 0.5);
uv /= u_viewbox.zw * 0.5;
v_pos = uv.xy;
v_pos = (uv.xy + 1.0) * 0.5;
// v_pos = (uv.xy + 1.0) * 0.5;
if (own < 0) {
v_color = vec3(0., 0., 0.);
} else {
v_color = u_planet_colours[own * 2];
v_color = mix(u_planet_colours[own * 2], u_planet_colours[own * 2 + 1], u_time);
}
gl_Position = vec4(uv.xy, 0.0, 1.0);