mirror of
https://github.com/revarbat/BOSL2.git
synced 2025-08-13 04:24:31 +02:00
Fixed vnf_validate() for reporting errors after warnings.
This commit is contained in:
14
vnf.scad
14
vnf.scad
@@ -837,7 +837,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("BAD_INDEX", [idx])
|
_vnf_validate_err("BAD_INDEX", [idx])
|
||||||
],
|
],
|
||||||
issues = concat(issues, bad_indices)
|
issues = concat(issues, bad_indices)
|
||||||
) issues? issues :
|
) bad_indices? issues :
|
||||||
let(
|
let(
|
||||||
repeated_faces = [
|
repeated_faces = [
|
||||||
for (i=idx(dfaces), j=idx(dfaces))
|
for (i=idx(dfaces), j=idx(dfaces))
|
||||||
@@ -854,7 +854,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("DUP_FACE", [for (i=sface1) varr[i]])
|
_vnf_validate_err("DUP_FACE", [for (i=sface1) varr[i]])
|
||||||
],
|
],
|
||||||
issues = concat(issues, repeated_faces)
|
issues = concat(issues, repeated_faces)
|
||||||
) issues? issues :
|
) repeated_faces? issues :
|
||||||
let(
|
let(
|
||||||
multconn_edges = unique([
|
multconn_edges = unique([
|
||||||
for (i = idx(uniq_edges))
|
for (i = idx(uniq_edges))
|
||||||
@@ -862,7 +862,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("MULTCONN", [for (i=uniq_edges[i]) varr[i]])
|
_vnf_validate_err("MULTCONN", [for (i=uniq_edges[i]) varr[i]])
|
||||||
]),
|
]),
|
||||||
issues = concat(issues, multconn_edges)
|
issues = concat(issues, multconn_edges)
|
||||||
) issues? issues :
|
) multconn_edges? issues :
|
||||||
let(
|
let(
|
||||||
reversals = unique([
|
reversals = unique([
|
||||||
for(i = idx(dfaces), j = idx(dfaces)) if(i != j)
|
for(i = idx(dfaces), j = idx(dfaces)) if(i != j)
|
||||||
@@ -873,7 +873,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("REVERSAL", [for (i=edge1) varr[i]])
|
_vnf_validate_err("REVERSAL", [for (i=edge1) varr[i]])
|
||||||
]),
|
]),
|
||||||
issues = concat(issues, reversals)
|
issues = concat(issues, reversals)
|
||||||
) issues? issues :
|
) reversals? issues :
|
||||||
let(
|
let(
|
||||||
t_juncts = unique([
|
t_juncts = unique([
|
||||||
for (v=idx(varr), edge=uniq_edges) let(
|
for (v=idx(varr), edge=uniq_edges) let(
|
||||||
@@ -893,7 +893,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("T_JUNCTION", [b])
|
_vnf_validate_err("T_JUNCTION", [b])
|
||||||
]),
|
]),
|
||||||
issues = concat(issues, t_juncts)
|
issues = concat(issues, t_juncts)
|
||||||
) issues? issues :
|
) t_juncts? issues :
|
||||||
let(
|
let(
|
||||||
isect_faces = !check_isects? [] : unique([
|
isect_faces = !check_isects? [] : unique([
|
||||||
for (i = [0:1:len(faces)-2]) let(
|
for (i = [0:1:len(faces)-2]) let(
|
||||||
@@ -935,7 +935,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("FACE_ISECT", seg)
|
_vnf_validate_err("FACE_ISECT", seg)
|
||||||
]),
|
]),
|
||||||
issues = concat(issues, isect_faces)
|
issues = concat(issues, isect_faces)
|
||||||
) issues? issues :
|
) isect_faces? issues :
|
||||||
let(
|
let(
|
||||||
hole_edges = unique([
|
hole_edges = unique([
|
||||||
for (i=idx(uniq_edges))
|
for (i=idx(uniq_edges))
|
||||||
@@ -945,7 +945,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
|
|||||||
_vnf_validate_err("HOLE_EDGE", [for (i=uniq_edges[i]) varr[i]])
|
_vnf_validate_err("HOLE_EDGE", [for (i=uniq_edges[i]) varr[i]])
|
||||||
]),
|
]),
|
||||||
issues = concat(issues, hole_edges)
|
issues = concat(issues, hole_edges)
|
||||||
) issues? issues :
|
) hole_edges? issues :
|
||||||
let(
|
let(
|
||||||
nonplanars = unique([
|
nonplanars = unique([
|
||||||
for (i = idx(faces)) let(
|
for (i = idx(faces)) let(
|
||||||
|
Reference in New Issue
Block a user