From fc2f17b4538c254b797e6537e8949d0937fcb6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Fri, 9 Feb 2018 20:07:38 +0100 Subject: [PATCH] March gen: refactor for easier testing --- tools/gen_marching_cubes_conf.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/gen_marching_cubes_conf.py b/tools/gen_marching_cubes_conf.py index da4eebe..6d96965 100644 --- a/tools/gen_marching_cubes_conf.py +++ b/tools/gen_marching_cubes_conf.py @@ -76,9 +76,21 @@ class Edg: class TriangulatedCube: + ALL_ELTS = { + Vert.frnt_bot_l, + Vert.frnt_bot_r, + Vert.frnt_top_l, + Vert.frnt_top_r, + Vert.back_bot_l, + Vert.back_bot_r, + Vert.back_top_l, + Vert.back_top_r, + } + def __init__(self, activated, triangles=None): self.triangles = [] if triangles is None else triangles self.activated = activated + self.non_activated = TriangulatedCube.ALL_ELTS - activated def transform(self, transf): n_tri = [] @@ -94,17 +106,8 @@ class TriangulatedCube: return TriangulatedCube(n_act, n_tri) def reverse_activated(self): - all_elts = { - Vert.frnt_bot_l, - Vert.frnt_bot_r, - Vert.frnt_top_l, - Vert.frnt_top_r, - Vert.back_bot_l, - Vert.back_bot_r, - Vert.back_top_l, - Vert.back_top_r, - } - self.activated = all_elts - self.activated + self.activated, self.non_activated = \ + self.non_activated, self.activated def activated_code(self): out = 0