From 32361d57c5800d355a8b5f6e6274175d241c2ddf Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Mon, 9 Sep 2019 09:03:46 +0800
Subject: [PATCH] refactor

---
 examples/maze/cylinder_maze.scad | 39 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/examples/maze/cylinder_maze.scad b/examples/maze/cylinder_maze.scad
index a7e654b2..2ba7afae 100644
--- a/examples/maze/cylinder_maze.scad
+++ b/examples/maze/cylinder_maze.scad
@@ -32,29 +32,30 @@ module build_ramp_maze(rows, columns, blocks, block_width, wall_thickness, wall_
         }
     }
 
-    module draw_ramp_block(wall_type, block_width, wall_thickness, wall_height, wall_top_scale) {
-        if(wall_type == UPPER_WALL || wall_type == UPPER_RIGHT_WALL) {
-            ramp_line(
-                [0, block_width], [block_width, block_width], wall_thickness, wall_height, wall_top_scale
-            ); 
-        }
+    module draw_ramp_block(block, block_width, wall_thickness, wall_height, wall_top_scale) {
+        translate([get_x(block) - 1, get_y(block) - 1] * block_width) {
+            if(upper_wall(block) || upper_right_wall(block)) {
+                ramp_line(
+                    [0, block_width], [block_width, block_width], wall_thickness, wall_height, wall_top_scale
+                ); 
+            }
 
-        if(wall_type == RIGHT_WALL || wall_type == UPPER_RIGHT_WALL) {
-            ramp_line(
-                [block_width, block_width], [block_width, 0], wall_thickness, wall_height, wall_top_scale
-            ); 
+            if(right_wall(block) || upper_right_wall(block)) {
+                ramp_line(
+                    [block_width, block_width], [block_width, 0], wall_thickness, wall_height, wall_top_scale
+                ); 
+            }
         }
     }
 
-    for(block = blocks) {
-        translate([get_x(block) - 1, get_y(block) - 1] * block_width) 
-            draw_ramp_block(
-                get_wall_type(block), 
-                block_width, 
-                wall_thickness,
-                wall_height,
-                wall_top_scale
-            );
+    for(block = blocks) {        
+        draw_ramp_block(
+            block, 
+            block_width, 
+            wall_thickness,
+            wall_height,
+            wall_top_scale
+        );
     }
 
     ramp_line(