openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-29 17:30:11 +02:00
Code Issues Releases Wiki Activity

refactor: use contains

Browse Source
This commit is contained in:
Justin Lin
2022-04-15 09:50:25 +08:00
parent 178e3372c6
commit 5d26af0f31
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/maze/maze3d.scad
View File

@@ -1,6 +1,6 @@
use <experimental/mz_cube.scad>;
use <experimental/mz_cube_get.scad>;
use <util/has.scad>;
use <util/contains.scad>;
use <crystal_ball.scad>;
layers = 4;
@@ -41,11 +41,11 @@ module draw_3dmaze(cells, cell_width, road_width) {
}
}
function z_road(type) = !has(["Z_WALL", "Z_Y_WALL", "Z_X_WALL", "Z_Y_X_WALL", "MASK"], type);
function z_road(type) = !contains(["Z_WALL", "Z_Y_WALL", "Z_X_WALL", "Z_Y_X_WALL", "MASK"], type);
function y_road(type) = !has(["Y_WALL", "Y_X_WALL", "Z_Y_WALL", "Z_Y_X_WALL", "MASK"], type);
function y_road(type) = !contains(["Y_WALL", "Y_X_WALL", "Z_Y_WALL", "Z_Y_X_WALL", "MASK"], type);
function x_road(type) = !has(["X_WALL", "Y_X_WALL", "Z_X_WALL", "Z_Y_X_WALL", "MASK"], type);
function x_road(type) = !contains(["X_WALL", "Y_X_WALL", "Z_X_WALL", "Z_Y_X_WALL", "MASK"], type);
module drawCell(cell_width, road_width, channels) {
half_cw = cell_width / 2;

12
examples/tiles/random_town_square.scad
View File

@@ -1,6 +1,6 @@
use <pie.scad>;
use <util/parse_number.scad>;
use <util/has.scad>;
use <util/contains.scad>;
use <util/rand.scad>;
use <util/choose.scad>;
use <experimental/tile_wfc.scad>;
@@ -58,25 +58,25 @@ module random_town_square(size, tileW, layerH) {
}
module draw_tile(tile, tileW, layerH) {
if(has(["F2", "F4", "F6"], tile)) {
if(contains(["F2", "F4", "F6"], tile)) {
layers = parse_number(tile[len(tile) - 1]);
floor(tileW, layers * layerH);
}
else if(has(["CCRS0", "CCRS1", "CCRS2", "CCRS3"], tile)) {
else if(contains(["CCRS0", "CCRS1", "CCRS2", "CCRS3"], tile)) {
type = parse_number(tile[len(tile) - 1]);
ccr_stairs(tileW, layerH, type);
}
else if(has(["VCRS02", "VCRS12", "VCRS22", "VCRS32", "VCRS04", "VCRS14", "VCRS24", "VCRS34"], tile)) {
else if(contains(["VCRS02", "VCRS12", "VCRS22", "VCRS32", "VCRS04", "VCRS14", "VCRS24", "VCRS34"], tile)) {
type = parse_number(tile[len(tile) - 2]);
stairs = parse_number(tile[len(tile) - 1]);
vcr_stairs(tileW, layerH, type, stairs);
}
else if(has(["SS02", "SS12", "SS22", "SS32", "SS04", "SS14", "SS24", "SS34"], tile)) {
else if(contains(["SS02", "SS12", "SS22", "SS32", "SS04", "SS14", "SS24", "SS34"], tile)) {
type = parse_number(tile[len(tile) - 2]);
stairs = parse_number(tile[len(tile) - 1]);
side_stairs(tileW, layerH, type, stairs);
}
else if(has(["FW0", "FW1", "FW2", "FW3"], tile)) {
else if(contains(["FW0", "FW1", "FW2", "FW3"], tile)) {
type = parse_number(tile[len(tile) - 1]);
floor_wall(tileW, layerH, type);
}