Add back null microcontroller, change controls space in abs mode

rianadon · Dec 22, 2024 · 7a738c9 · 7a738c9
1 parent 43dae97
commit 7a738c9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/src/lib/3d/TransformControls.svelte b/src/lib/3d/TransformControls.svelte
@@ -14,6 +14,7 @@
 
   export let visible = true
   export let snap: boolean
+  export let useAbsolute = false
   let controls: TC
 
   const dispatch = createEventDispatcher()
@@ -58,7 +59,10 @@
     <TransformControls
       object={ref}
       size={0.9}
-      space={$transformMode == 'translate' && $selectMode == 'cluster' ? 'world' : 'local'}
+      space={($transformMode == 'translate' && $selectMode == 'cluster') ||
+      (useAbsolute && $selectMode == 'key')
+        ? 'world'
+        : 'local'}
       mode={$transformMode}
       rotationSnap={snap ? Math.PI / 2 : undefined}
       bind:controls

diff --git a/src/routes/beta/lib/editor/SelectMicrocontrollerInner.svelte b/src/routes/beta/lib/editor/SelectMicrocontrollerInner.svelte
@@ -34,7 +34,7 @@
   <span>{option.label}</span>
 </div>
 
-{#if $tooltipOpen}
+{#if $tooltipOpen && option.key !== null}
   <div
     use:melt={$content}
     transition:fade={{ duration: 50 }}

diff --git a/src/routes/beta/lib/editor/SelectThingy.svelte b/src/routes/beta/lib/editor/SelectThingy.svelte
@@ -15,11 +15,10 @@
   export let options: Option[] | Record<string, Option[]>
   const allOptions = Array.isArray(options) ? options : Object.values(options).flat()
 
-  const toOption = (option: Option): SelectOptionProps<string> => ({
-    value: option.key,
-    label: option.label,
-    disabled: false,
-  })
+  const toOption = (option: Option | undefined): SelectOptionProps<string> =>
+    option
+      ? { value: option.key, label: option.label, disabled: false }
+      : { value: '', label: '', disabled: true }
 
   export let value: string
   export let clazz: string = ''
@@ -41,7 +40,7 @@
 
   // This DX is pretty bad.
   const sync = createSync({ selected })
-  $: sync.selected(toOption(allOptions.find((opt) => opt.key == value)!), (v) => v && (value = v.value))
+  $: sync.selected(toOption(allOptions.find((opt) => opt.key == value)), (v) => v && (value = v.value))
 
   export let component: ComponentType<SvelteComponent<{ option: Option }>>
   export let labelComponent: ComponentType<SvelteComponent<{ option: { label: string; value: string } }>>
@@ -51,15 +50,11 @@
 </script>
 
 <div class="relative">
-  <button
-    use:melt={$trigger}
-    class={clazz || 's-input pl-2 pr-8 truncate text-start'}
-    placeholder="Choose Switch"
-  >
+  <button use:melt={$trigger} class={clazz || 's-input pl-2 pr-8 truncate text-start'}>
     {#if labelComponent && $selected}
       <svelte:component this={labelComponent} option={$selected} />
     {:else}
-      {$selectedLabel || 'Select a Switch'}
+      {$selectedLabel || 'Choose One'}
     {/if}
   </button>
   <div class="absolute right-4 top-1/2 z-10 -translate-y-1/2">

diff --git a/src/routes/beta/lib/editor/VisualEditor2.svelte b/src/routes/beta/lib/editor/VisualEditor2.svelte
@@ -1043,20 +1043,23 @@
     <SelectThingy
       bind:value={$protoConfig.microcontroller}
       on:change={updateMicrocontroller}
-      options={Object.fromEntries(
-        MICROCONTROLLER_SIZES.map((s) => [
-          s,
-          notNull(MICROCONTROLLER_NAME)
-            .filter(
-              (m) => BOARD_PROPERTIES[m].sizeName == s && (flags.draftuc || !BOARD_PROPERTIES[m].draft)
-            )
-            .sort(sortMicrocontrollers)
-            .map((m) => ({
-              key: m,
-              label: BOARD_PROPERTIES[m].name + ' ' + (BOARD_PROPERTIES[m].extraName || ''),
-            })),
-        ])
-      )}
+      options={{
+        ...Object.fromEntries(
+          MICROCONTROLLER_SIZES.map((s) => [
+            s,
+            notNull(MICROCONTROLLER_NAME)
+              .filter(
+                (m) => BOARD_PROPERTIES[m].sizeName == s && (flags.draftuc || !BOARD_PROPERTIES[m].draft)
+              )
+              .sort(sortMicrocontrollers)
+              .map((m) => ({
+                key: m,
+                label: BOARD_PROPERTIES[m].name + ' ' + (BOARD_PROPERTIES[m].extraName || ''),
+              })),
+          ])
+        ),
+        More: [{ key: null, label: 'None' }],
+      }}
       component={SelectMicrocontrollerInner}
     />
     <!-- <Select bind:value={$protoConfig.microcontroller} on:change={updateMicrocontroller}>

diff --git a/src/routes/beta/lib/viewers/Viewer3D.svelte b/src/routes/beta/lib/viewers/Viewer3D.svelte
@@ -1606,6 +1606,7 @@
       <TransformControls
         snap={snapRotation}
         visible={!showSupports}
+        useAbsolute={$useAbsolute}
         on:move={(e) => onMove(e.detail, false)}
         on:change={(e) => onMove(e.detail, true)}
       />