-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Fix textToModel face normals for extruded text #8091
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.
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
Open
VANSH3104
wants to merge
9
commits into
processing:dev-2.0
Choose a base branch
from
VANSH3104:fix-textToModel
base: dev-2.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5e557e5
Fix textToModel face normals for extruded text
VANSH3104 9a7e956
Merge branch 'dev-2.0' into fix-textToModel
VANSH3104 3e567bf
Fix textToModel extrusion and degenerate face issues
VANSH3104 4c91d6e
Fix textToModel extrusion and degenerate face issues
VANSH3104 a68bd7b
Fix text extrusion with proper vertex deduplication, edge detection, …
VANSH3104 db20daa
Merge branch 'dev-2.0' into fix-textToModel
davepagurek 1a58251
Fix text extrusion with proper vertex deduplication, edge detection, …
VANSH3104 6894f2d
Fix text extrusion with proper vertex deduplication, edge detection, …
VANSH3104 0b31fa5
Fix text extrusion with proper vertex deduplication, edge detection, …
VANSH3104 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -541,63 +541,130 @@ export class Font { | |
| textToModel(str, x, y, width, height, options) { | ||
| ({ width, height, options } = this._parseArgs(width, height, options)); | ||
| const extrude = options?.extrude || 0; | ||
| const contours = this.textToContours(str, x, y, width, height, options); | ||
| // Step 1: generate glyph contours | ||
| let contours = this.textToContours(str, x, y, width, height, options); | ||
| if (!Array.isArray(contours[0][0])) { | ||
| contours = [contours]; | ||
| } | ||
|
|
||
| // Step 2: build base flat geometry | ||
| const geom = this._pInst.buildGeometry(() => { | ||
| if (extrude === 0) { | ||
| const prevValidateFaces = this._pInst._renderer._validateFaces; | ||
| this._pInst._renderer._validateFaces = true; | ||
| const prevValidateFaces = this._pInst._renderer._validateFaces; | ||
| this._pInst._renderer._validateFaces = true; | ||
|
|
||
| contours.forEach(glyphContours => { | ||
| this._pInst.beginShape(); | ||
| this._pInst.normal(0, 0, 1); | ||
| for (const contour of contours) { | ||
| const outer = glyphContours[0]; | ||
davepagurek marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| outer.forEach(({ x, y }) => this._pInst.vertex(x, y, 0)); | ||
|
|
||
| for (let i = 1; i < glyphContours.length; i++) { | ||
| this._pInst.beginContour(); | ||
| for (const { x, y } of contour) { | ||
| this._pInst.vertex(x, y); | ||
| } | ||
| glyphContours[i].forEach(({ x, y }) => this._pInst.vertex(x, y, 0)); | ||
| this._pInst.endContour(this._pInst.CLOSE); | ||
| } | ||
| this._pInst.endShape(); | ||
| this._pInst._renderer._validateFaces = prevValidateFaces; | ||
|
|
||
| this._pInst.endShape(this._pInst.CLOSE); | ||
| }); | ||
|
|
||
| this._pInst._renderer._validateFaces = prevValidateFaces; | ||
| }); | ||
|
|
||
| if (extrude === 0) { | ||
| console.log('No extrusion'); | ||
|
||
| return geom; | ||
| } | ||
|
|
||
| // Step 3: Create extruded geometry with UNSHARED vertices for flat shading | ||
| const extruded = this._pInst.buildGeometry(() => {}); | ||
| const half = extrude * 0.5; | ||
|
|
||
| extruded.vertices = []; | ||
| extruded.vertexNormals = []; | ||
| extruded.faces = []; | ||
|
|
||
| let vertexIndex = 0; | ||
| const Vector = this._pInst.constructor.Vector; | ||
davepagurek marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // Helper to add a triangle with flat normal | ||
| const addTriangle = (v0, v1, v2) => { | ||
| const edge1 = Vector.sub(v1, v0); | ||
| const edge2 = Vector.sub(v2, v0); | ||
| const normal = Vector.cross(edge1, edge2); | ||
| if (normal.magSq() > 0.0001) { | ||
| normal.normalize(); | ||
| } else { | ||
| const prevValidateFaces = this._pInst._renderer._validateFaces; | ||
| this._pInst._renderer._validateFaces = true; | ||
|
|
||
| // Draw front faces | ||
| for (const side of [1, -1]) { | ||
| this._pInst.beginShape(); | ||
| for (const contour of contours) { | ||
| this._pInst.beginContour(); | ||
| for (const { x, y } of contour) { | ||
| this._pInst.vertex(x, y, side * extrude * 0.5); | ||
| } | ||
| this._pInst.endContour(this._pInst.CLOSE); | ||
| } | ||
| this._pInst.endShape(); | ||
| } | ||
| this._pInst._renderer._validateFaces = prevValidateFaces; | ||
|
|
||
| // Draw sides | ||
| for (const contour of contours) { | ||
| this._pInst.beginShape(this._pInst.QUAD_STRIP); | ||
| for (const v of contour) { | ||
| for (const side of [-1, 1]) { | ||
| this._pInst.vertex(v.x, v.y, side * extrude * 0.5); | ||
| } | ||
| } | ||
| this._pInst.endShape(); | ||
| } | ||
| normal.set(0, 0, 1); | ||
| } | ||
| }); | ||
| if (extrude !== 0) { | ||
| geom.computeNormals(); | ||
|
|
||
| // Add vertices (unshared - each triangle gets its own copies) | ||
| extruded.vertices.push(v0.copy(), v1.copy(), v2.copy()); | ||
| extruded.vertexNormals.push(normal.copy(), normal.copy(), normal.copy()); | ||
| extruded.faces.push([vertexIndex, vertexIndex + 1, vertexIndex + 2]); | ||
| vertexIndex += 3; | ||
| }; | ||
|
|
||
| for (const face of geom.faces) { | ||
| if (face.length < 3) continue; | ||
| const v0 = geom.vertices[face[0]]; | ||
| for (let i = 1; i < face.length - 1; i++) { | ||
| const v1 = geom.vertices[face[i]]; | ||
| const v2 = geom.vertices[face[i + 1]]; | ||
| addTriangle( | ||
| new Vector(v0.x, v0.y, v0.z + half), | ||
| new Vector(v1.x, v1.y, v1.z + half), | ||
| new Vector(v2.x, v2.y, v2.z + half) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| for (const face of geom.faces) { | ||
| if (face.length < 3) continue; | ||
| const v0 = geom.vertices[face[0]]; | ||
| for (let i = 1; i < face.length - 1; i++) { | ||
| const v1 = geom.vertices[face[i]]; | ||
| const v2 = geom.vertices[face[i + 1]]; | ||
| addTriangle( | ||
| new Vector(v0.x, v0.y, v0.z - half), | ||
| new Vector(v2.x, v2.y, v2.z - half), | ||
| new Vector(v1.x, v1.y, v1.z - half) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // Side faces from edges | ||
| let edges = geom.edges; | ||
| if (!edges || !Array.isArray(edges)) { | ||
| edges = []; | ||
davepagurek marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const edgeSet = new Set(); | ||
| for (const face of geom.faces) { | ||
| if (face.every(idx => geom.vertices[idx].z <= -extrude * 0.5 + 0.1)) { | ||
| for (const idx of face) geom.vertexNormals[idx].set(0, 0, -1); | ||
| face.reverse(); | ||
| for (let i = 0; i < face.length; i++) { | ||
| const a = face[i]; | ||
| const b = face[(i + 1) % face.length]; | ||
| if (a === b) continue; | ||
| const key = a < b ? `${a},${b}` : `${b},${a}`; | ||
| if (!edgeSet.has(key)) { | ||
| edgeSet.add(key); | ||
| edges.push([a, b]); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return geom; | ||
|
|
||
| const validEdges = edges.filter(([a, b]) => a !== b); | ||
|
|
||
| for (const [a, b] of validEdges) { | ||
| const v0 = geom.vertices[a]; | ||
| const v1 = geom.vertices[b]; | ||
|
|
||
| const vFront0 = new Vector(v0.x, v0.y, v0.z + half); | ||
| const vFront1 = new Vector(v1.x, v1.y, v1.z + half); | ||
| const vBack0 = new Vector(v0.x, v0.y, v0.z - half); | ||
| const vBack1 = new Vector(v1.x, v1.y, v1.z - half); | ||
|
|
||
| // Two triangles forming the side quad | ||
| addTriangle(vFront0, vBack0, vBack1); | ||
| addTriangle(vFront0, vBack1, vFront1); | ||
| } | ||
| return extruded; | ||
| } | ||
|
|
||
| variations() { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like right now this is being used to create multiple begin/endShape calls. Do we need that? I assumed it would be ok to just get a list of contours and put them all in one shape.
Also I believe textToContours should always be returning an array of array of points (a list of contours, each contour a list of points), so I also wonder if we always go down the same branch here anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked textToContours() it returns a flat array of contours like [{x,y}, {x,y}, ...] for a single character, so contours[0][0] is an object, not an array. The check wraps it into [[contours]] so the loop works correctly and i simplify it to one beginShape/endShape call with all contours inside its good idea