Skip to content

Handle vertex data in TESS mode #5830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2022
Merged

Handle vertex data in TESS mode #5830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c6836
Handle vertex data in TESS mode
davepagurek Oct 12, 2022
b39ffa7
Handle null data in tessy callbacks
davepagurek Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/webgl/p5.RendererGL.Immediate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,17 +309,36 @@ p5.RendererGL.prototype._calculateEdges = function(
p5.RendererGL.prototype._tesselateShape = function() {
this.immediateMode.shapeMode = constants.TRIANGLES;
const contours = [
new Float32Array(this._vToNArray(this.immediateMode.geometry.vertices))
this._flatten(this.immediateMode.geometry.vertices.map((vert, i) => [
vert.x,
vert.y,
vert.z,
this.immediateMode.geometry.uvs[i * 2],
this.immediateMode.geometry.uvs[i * 2 + 1],
this.immediateMode.geometry.vertexColors[i * 4],
this.immediateMode.geometry.vertexColors[i * 4 + 1],
this.immediateMode.geometry.vertexColors[i * 4 + 2],
this.immediateMode.geometry.vertexColors[i * 4 + 3],
this.immediateMode.geometry.vertexNormals[i].x,
this.immediateMode.geometry.vertexNormals[i].y,
this.immediateMode.geometry.vertexNormals[i].z
]))
];
const polyTriangles = this._triangulate(contours);
this.immediateMode.geometry.vertices = [];
this.immediateMode.geometry.vertexNormals = [];
this.immediateMode.geometry.uvs = [];
const colors = [];
for (
let j = 0, polyTriLength = polyTriangles.length;
j < polyTriLength;
j = j + 3
j = j + 12
) {
this.vertex(polyTriangles[j], polyTriangles[j + 1], polyTriangles[j + 2]);
colors.push(...polyTriangles.slice(j + 5, j + 9));
this.normal(...polyTriangles.slice(j + 9, j + 12));
this.vertex(...polyTriangles.slice(j, j + 5));
}
this.immediateMode.geometry.vertexColors = colors;
};

/**
Expand Down
19 changes: 13 additions & 6 deletions src/webgl/p5.RendererGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,9 +1434,9 @@ p5.prototype._assert3d = function(name) {
p5.RendererGL.prototype._initTessy = function initTesselator() {
// function called for each vertex of tesselator output
function vertexCallback(data, polyVertArray) {
polyVertArray[polyVertArray.length] = data[0];
polyVertArray[polyVertArray.length] = data[1];
polyVertArray[polyVertArray.length] = data[2];
for (let i = 0; i < data.length; i++) {
polyVertArray[polyVertArray.length] = data[i];
}
}

function begincallback(type) {
Expand All @@ -1451,7 +1451,14 @@ p5.RendererGL.prototype._initTessy = function initTesselator() {
}
// callback for when segments intersect and must be split
function combinecallback(coords, data, weight) {
return [coords[0], coords[1], coords[2]];
const result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
for (let i = 0; i < weight.length; i++) {
for (let j = 0; j < result.length; j++) {
if (weight[i] === 0 || !data[i]) continue;
result[j] += data[i][j] * weight[i];
}
}
return result;
}

function edgeCallback(flag) {
Expand Down Expand Up @@ -1481,8 +1488,8 @@ p5.RendererGL.prototype._triangulate = function(contours) {
for (let i = 0; i < contours.length; i++) {
this._tessy.gluTessBeginContour();
const contour = contours[i];
for (let j = 0; j < contour.length; j += 3) {
const coords = [contour[j], contour[j + 1], contour[j + 2]];
for (let j = 0; j < contour.length; j += 12) {
const coords = contour.slice(j, j + 12);
this._tessy.gluTessVertex(coords, coords);
}
this._tessy.gluTessEndContour();
Expand Down
194 changes: 194 additions & 0 deletions test/unit/webgl/p5.RendererGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,5 +755,199 @@ suite('p5.RendererGL', function() {
assert.equal(renderer.immediateMode.geometry.edges.length, 10);
done();
});

test('TESS preserves vertex data', function(done) {
var renderer = myp5.createCanvas(10, 10, myp5.WEBGL);

myp5.textureMode(myp5.NORMAL);
renderer.beginShape(myp5.TESS);
renderer.fill(255, 255, 255);
renderer.normal(-1, -1, 1);
renderer.vertex(-10, -10, 0, 0);
renderer.fill(255, 0, 0);
renderer.normal(1, -1, 1);
renderer.vertex(10, -10, 1, 0);
renderer.fill(0, 255, 0);
renderer.normal(1, 1, 1);
renderer.vertex(10, 10, 1, 1);
renderer.fill(0, 0, 255);
renderer.normal(-1, 1, 1);
renderer.vertex(-10, 10, 0, 1);
renderer.endShape(myp5.CLOSE);

assert.equal(renderer.immediateMode.geometry.vertices.length, 6);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[0].array(),
[10, -10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[1].array(),
[-10, 10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[2].array(),
[-10, -10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[3].array(),
[-10, 10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[4].array(),
[10, -10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[5].array(),
[10, 10, 0]
);

assert.equal(renderer.immediateMode.geometry.vertexNormals.length, 6);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[0].array(),
[1, -1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[1].array(),
[-1, 1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[2].array(),
[-1, -1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[3].array(),
[-1, 1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[4].array(),
[1, -1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[5].array(),
[1, 1, 1]
);

assert.deepEqual(renderer.immediateMode.geometry.vertexColors, [
1, 0, 0, 1,
0, 0, 1, 1,
1, 1, 1, 1,
0, 0, 1, 1,
1, 0, 0, 1,
0, 1, 0, 1
]);

assert.deepEqual(renderer.immediateMode.geometry.uvs, [
1, 0,
0, 1,
0, 0,
0, 1,
1, 0,
1, 1
]);

done();
});

test('TESS interpolates vertex data at intersections', function(done) {
var renderer = myp5.createCanvas(10, 10, myp5.WEBGL);

// Hourglass shape:
//
// 1 3
// o o
// | \ / |
// | / \ |
// o o
// 4 2
//
// Tessy will add a vertex in the middle
myp5.textureMode(myp5.NORMAL);
renderer.beginShape(myp5.TESS);
renderer.fill(255, 255, 255);
renderer.normal(-1, -1, 1);
renderer.vertex(-10, -10, 0, 0);
renderer.fill(0, 255, 0);
renderer.normal(1, 1, 1);
renderer.vertex(10, 10, 1, 1);
renderer.fill(255, 0, 0);
renderer.normal(1, -1, 1);
renderer.vertex(10, -10, 1, 0);
renderer.fill(0, 0, 255);
renderer.normal(-1, 1, 1);
renderer.vertex(-10, 10, 0, 1);
renderer.endShape(myp5.CLOSE);

assert.equal(renderer.immediateMode.geometry.vertices.length, 6);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[0].array(),
[0, 0, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[1].array(),
[-10, 10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[2].array(),
[-10, -10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[3].array(),
[10, 10, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[4].array(),
[0, 0, 0]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertices[5].array(),
[10, -10, 0]
);

assert.equal(renderer.immediateMode.geometry.vertexNormals.length, 6);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[0].array(),
[0, 0, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[1].array(),
[-1, 1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[2].array(),
[-1, -1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[3].array(),
[1, 1, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[4].array(),
[0, 0, 1]
);
assert.deepEqual(
renderer.immediateMode.geometry.vertexNormals[5].array(),
[1, -1, 1]
);

assert.deepEqual(renderer.immediateMode.geometry.vertexColors, [
0.5, 0.5, 0.5, 1,
0, 0, 1, 1,
1, 1, 1, 1,
0, 1, 0, 1,
0.5, 0.5, 0.5, 1,
1, 0, 0, 1
]);

assert.deepEqual(renderer.immediateMode.geometry.uvs, [
0.5, 0.5,
0, 1,
0, 0,
1, 1,
0.5, 0.5,
1, 0
]);

done();
});
});
});