Skip to content

Commit c0513a3

Browse files
authored
Merge pull request #8411 from skyash-dev/fix/suppress-stroke-warning-buildGeometry
Suppress stroke warnings during buildGeometry
2 parents 9ced70d + 7d741e7 commit c0513a3

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/webgl/3d_primitives.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ p5.prototype.plane = function(
993993
planeGeom.computeFaces().computeNormals();
994994
if (detailX <= 1 && detailY <= 1) {
995995
planeGeom._makeTriangleEdges()._edgesToVertices();
996-
} else if (this._renderer._doStroke) {
996+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
997997
console.log(
998998
'Cannot draw stroke on plane objects with more' +
999999
' than 1 detailX or 1 detailY'
@@ -1208,7 +1208,7 @@ p5.prototype.box = function(width, height, depth, detailX, detailY) {
12081208
boxGeom.computeNormals();
12091209
if (detailX <= 4 && detailY <= 4) {
12101210
boxGeom._edgesToVertices();
1211-
} else if (this._renderer._doStroke) {
1211+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
12121212
console.log(
12131213
'Cannot draw stroke on box objects with more' +
12141214
' than 4 detailX or 4 detailY'
@@ -1713,7 +1713,7 @@ p5.prototype.cylinder = function(
17131713
// normals are computed in call to _truncatedCone
17141714
if (detailX <= 24 && detailY <= 16) {
17151715
cylinderGeom._makeTriangleEdges()._edgesToVertices();
1716-
} else if (this._renderer._doStroke) {
1716+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
17171717
console.log(
17181718
'Cannot draw stroke on cylinder objects with more' +
17191719
' than 24 detailX or 16 detailY'
@@ -1948,7 +1948,7 @@ p5.prototype.cone = function(
19481948
_truncatedCone.call(coneGeom, 1, 0, 1, detailX, detailY, cap, false);
19491949
if (detailX <= 24 && detailY <= 16) {
19501950
coneGeom._makeTriangleEdges()._edgesToVertices();
1951-
} else if (this._renderer._doStroke) {
1951+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
19521952
console.log(
19531953
'Cannot draw stroke on cone objects with more' +
19541954
' than 24 detailX or 16 detailY'
@@ -2166,7 +2166,7 @@ p5.prototype.ellipsoid = function(
21662166
ellipsoidGeom.computeFaces();
21672167
if (detailX <= 24 && detailY <= 24) {
21682168
ellipsoidGeom._makeTriangleEdges()._edgesToVertices();
2169-
} else if (this._renderer._doStroke) {
2169+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
21702170
console.log(
21712171
'Cannot draw stroke on ellipsoids with more' +
21722172
' than 24 detailX or 24 detailY'
@@ -2388,7 +2388,7 @@ p5.prototype.torus = function(radius, tubeRadius, detailX, detailY) {
23882388
torusGeom.computeFaces();
23892389
if (detailX <= 24 && detailY <= 16) {
23902390
torusGeom._makeTriangleEdges()._edgesToVertices();
2391-
} else if (this._renderer._doStroke) {
2391+
} else if (this._renderer._doStroke && !this._renderer.geometryBuilder) {
23922392
console.log(
23932393
'Cannot draw strokes on torus object with more' +
23942394
' than 24 detailX or 16 detailY'

0 commit comments

Comments
 (0)