From 9dff5864b671133e350a14dd80246baed8f3fa59 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Sun, 15 Aug 2021 20:21:13 -0400 Subject: Trackball updates. Still need to refresh geometry. Optical distance is too long. --- src/model_builder.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/model_builder.py') diff --git a/src/model_builder.py b/src/model_builder.py index d8a9fac..7cca387 100644 --- a/src/model_builder.py +++ b/src/model_builder.py @@ -3,12 +3,15 @@ import copy import importlib from generate_configuration import * -ENGINE = 'solid' -# ENGINE = 'cadquery' base = shape_config config_options = [ + { + 'name': '{}', 'vars': ['ball_side'], # set ball side to both, other half can come from other renders + 'vals': ['both'], + 'val_names': [''] + }, { 'name': '{}x{}', 'vars': ['nrows', 'ncols'], 'vals':[(4, 5), (5, 6)], @@ -21,8 +24,8 @@ config_options = [ }, { 'name': '{}TMB', 'vars': ['thumb_style'], - 'vals': ['DEFAULT', 'MINIDOX'], - 'val_names': ['DEF', 'MDOX'] + 'vals': ['DEFAULT', 'MINIDOX', 'TRACKBALL_ORBISSYL'], + 'val_names': ['DEF', 'MDOX', 'ORBY'] # 'vals': ['DEFAULT', 'MINI', 'CARBONFET', 'MINIDOX'], # 'val_names': ['DEF', 'MINI', 'CF', 'MDOX'] }, @@ -65,7 +68,9 @@ def create_config(config_options): else: n_input = vals - new_config['config_name'] += "_" + temp_opt['name'].format(*n_input) + name_ext = temp_opt['name'].format(*n_input) + if not name_ext == '': + new_config['config_name'] += "_" + name_ext new_config['save_dir'] = new_config['config_name'] new_configurations.append(new_config) configurations = new_configurations -- cgit v1.2.3