vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-31 15:23:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix winding of 3d shapes

Browse Source
This commit is contained in:
casperlamboo 2017-12-11 15:30:45 +01:00
parent f855f0e165
commit 81f4829ca6
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/d3/ShapeMesh.js vendored
View File

@ -49,6 +49,12 @@ class ShapeMesh extends THREE.Object3D {
this.updatePoints(shapeData); this.updatePoints(shapeData);
} }
_isReverse() {
const sx = this._transform.sx > 0;
const sy = this._transform.sy > 0;
return sx !== sy;
}
add(object) { add(object) {
if (!this.children.includes(object)) super.add(object); if (!this.children.includes(object)) super.add(object);
} }
@ -116,10 +122,12 @@ class ShapeMesh extends THREE.Object3D {
this._triangleSize = shapeData.triangleSize; this._triangleSize = shapeData.triangleSize;
const compoundPaths = shapeToPointsCornered(shapeData); const compoundPaths = shapeToPointsCornered(shapeData);
this._shapes = compoundPaths.map(({ points, holes = [], pointsMap, holesMaps = [] }) => ({ this._shapes = compoundPaths.map(({ points, holes = [], pointsMap, holesMaps = [] }) => {
shape: [points, ...holes], const shape = [points, ...holes];
maps: [pointsMap, ...holesMaps] const maps = [pointsMap, ...holesMaps];
}));
return { shape, maps };
});
const { min, max } = getPointsBounds(compoundPaths); const { min, max } = getPointsBounds(compoundPaths);
this._center.copy(min.add(max).scale(0.5)); this._center.copy(min.add(max).scale(0.5));
@ -246,18 +254,10 @@ class ShapeMesh extends THREE.Object3D {
return { x: point.x, y: y + this._z, z: point.y }; return { x: point.x, y: y + this._z, z: point.y };
} }
_reversePath() {
const sx = this._transform.sx > 0;
const sy = this._transform.sy > 0;
return sx !== sy;
}
_updateVerticesHorizontal(heightStep, paths, center, indexCounter) { _updateVerticesHorizontal(heightStep, paths, center, indexCounter) {
for (let pathindex = 0; pathindex < paths.length; pathindex ++) { for (let pathindex = 0; pathindex < paths.length; pathindex ++) {
const path = applyMatrixOnPath(paths[pathindex], this._transform); const path = applyMatrixOnPath(paths[pathindex], this._transform);
if (this._isReverse()) path.reverse();
if (this._reversePath()) path.reverse();
for (let pathIndex = 0; pathIndex < path.length; pathIndex ++) { for (let pathIndex = 0; pathIndex < path.length; pathIndex ++) {
let point = path[pathIndex]; let point = path[pathIndex];
@ -290,8 +290,7 @@ class ShapeMesh extends THREE.Object3D {
for (let pathsIndex = 0; pathsIndex < paths.length; pathsIndex ++) { for (let pathsIndex = 0; pathsIndex < paths.length; pathsIndex ++) {
const path = applyMatrixOnPath(paths[pathsIndex], this._transform); const path = applyMatrixOnPath(paths[pathsIndex], this._transform);
if (this._isReverse()) path.reverse();
if (this._reversePath()) path.reverse();
for (let pathIndex = 0; pathIndex < path.length; pathIndex ++) { for (let pathIndex = 0; pathIndex < path.length; pathIndex ++) {
const point = path[pathIndex]; const point = path[pathIndex];
@ -405,20 +404,30 @@ class ShapeMesh extends THREE.Object3D {
}) })
.map(path => path.map(({ x, y }) => new THREE.Vector2(x, y))); .map(path => path.map(({ x, y }) => new THREE.Vector2(x, y)));
if (this._isReverse()) {
points.reverse();
holes.map(hole => hole.reverse());
}
// triangulate // triangulate
const triangulatedBottom = THREE.ShapeUtils.triangulateShape(points, holes) const triangulatedTop = THREE.ShapeUtils.triangulateShape(points, holes)
.reduce((a, b) => a.concat(b), []) .reduce((a, b) => a.concat(b), [])
// // map mapped indexes back to original indexes // // map mapped indexes back to original indexes
.map(value => flatMap[value]) .map(value => flatMap[value])
.map(value => value + vertexOffset); .map(value => value + vertexOffset);
// reverse index order for bottom so faces are flipped // reverse index order for bottom so faces are flipped
const triangulatedTop = triangulatedBottom const triangulatedBottom = triangulatedTop
.map(value => value + numPoints) .map(value => value + numPoints)
.reverse();
if (this._isReverse()) {
triangulatedTop.reverse();
} else {
triangulatedBottom.reverse();
}
triangulatedIndexes.push(triangulatedBottom.concat(triangulatedTop)); triangulatedIndexes.push(triangulatedBottom.concat(triangulatedTop));
indexBufferLength += triangulatedBottom.length + triangulatedTop.length; indexBufferLength += triangulatedTop.length + triangulatedBottom.length;
vertexBufferLength += numPoints * 6; vertexBufferLength += numPoints * 6;
vertexOffsets.push(vertexOffset + numPoints * 2); vertexOffsets.push(vertexOffset + numPoints * 2);
} else { } else {