vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename join_type "square" to the more commonly used "bevel".

offset
Torsten Paul 2014-03-03 19:57:46 +01:00
parent 404f9ab5d2
commit 2064f91486
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/offset.cc
View File

@ -74,7 +74,7 @@ AbstractNode *OffsetModule::instantiate(const Context *ctx, const ModuleInstanti
Value join_type = c.lookup_variable("join_type", true);
if (join_type.type() == Value::STRING) {
std::string jt = join_type.toString();
if (std::string("square") == jt) {
if (std::string("bevel") == jt) {
node->join_type = ClipperLib::jtSquare;
} else if (std::string("round") == jt) {
node->join_type = ClipperLib::jtRound;
@ -103,7 +103,7 @@ std::string OffsetNode::toString() const
<< "(delta = " << std::dec << this->delta
<< ", join_type = "
<< (this->join_type == ClipperLib::jtSquare
? "square"
? "bevel"
: this->join_type == ClipperLib::jtRound
? "round"
: "miter")

4
testdata/scad/features/offset-tests.scad vendored
View File

@ -23,8 +23,8 @@ offset(delta = 1, join_type = "miter") shape2(1, 2);
offset(delta = -1, join_type = "miter", miter_limit = 10) shape2(2, 2);
offset(delta = 1, join_type = "miter", miter_limit = 10) shape2(3, 2);
offset(delta = -1, join_type = "square", miter_limit = 10) shape2(2, -1);
offset(delta = 1, join_type = "square", miter_limit = 10) shape2(3, -1);
offset(delta = -1, join_type = "bevel") shape2(2, -1);
offset(delta = 1, join_type = "bevel") shape2(3, -1);
offset(delta = -5, join_type = "round") shape1(-1, 1);
shape1(0, 1);