General shifts
This commit is contained in:
@@ -7,6 +7,8 @@ import {
|
||||
applyMaterialControls,
|
||||
createCardMaterial,
|
||||
createStudioCubeTexture,
|
||||
finishNames,
|
||||
substrateNames,
|
||||
type FinishName,
|
||||
type MaterialControls,
|
||||
type SubstrateName,
|
||||
@@ -101,17 +103,12 @@ document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
|
||||
</label>
|
||||
<label>Finish
|
||||
<select id="finish">
|
||||
<option>Holographic</option>
|
||||
<option>Foil</option>
|
||||
<option>Printed ink</option>
|
||||
${finishNames.map(name => `<option${name === 'Holographic' ? ' selected' : ''}>${name}</option>`).join('')}
|
||||
</select>
|
||||
</label>
|
||||
<label>Material
|
||||
<select id="substrate">
|
||||
<option>Paper</option>
|
||||
<option>Linen</option>
|
||||
<option>Metal</option>
|
||||
<option>Wood</option>
|
||||
${substrateNames.map(name => `<option>${name}</option>`).join('')}
|
||||
</select>
|
||||
</label>
|
||||
<label>Pose
|
||||
@@ -426,13 +423,13 @@ let applyingLightingPreset = false
|
||||
|
||||
const gui = new GUI({ title: 'Material proof' })
|
||||
const surfaceFolder = gui.addFolder('Surface')
|
||||
surfaceFolder.add(controls, 'finish', ['Printed ink', 'Foil', 'Holographic']).name('Finish').onChange((value: FinishName) => {
|
||||
surfaceFolder.add(controls, 'finish', [...finishNames]).name('Finish').onChange((value: FinishName) => {
|
||||
pauseScriptedMotion()
|
||||
finishSelect.value = value
|
||||
updateMaterial()
|
||||
updateStatus()
|
||||
})
|
||||
surfaceFolder.add(controls, 'substrate', ['Paper', 'Linen', 'Metal', 'Wood']).name('Material').onChange((value: SubstrateName) => {
|
||||
surfaceFolder.add(controls, 'substrate', [...substrateNames]).name('Material').onChange((value: SubstrateName) => {
|
||||
pauseScriptedMotion()
|
||||
substrateSelect.value = value
|
||||
updateMaterial()
|
||||
@@ -832,16 +829,9 @@ function isExperimentSnapshot(value: unknown): value is ExperimentSnapshot {
|
||||
if (typeof value !== 'object' || value === null) return false
|
||||
const snapshot = value as Record<string, unknown>
|
||||
const fixtureValid = typeof snapshot.fixture === 'string' && snapshot.fixture.length > 0
|
||||
const finishValid =
|
||||
snapshot.finish === 'Printed ink' ||
|
||||
snapshot.finish === 'Foil' ||
|
||||
snapshot.finish === 'Holographic'
|
||||
const substrateValid =
|
||||
snapshot.substrate === 'Paper' ||
|
||||
snapshot.substrate === 'Linen' ||
|
||||
snapshot.substrate === 'Plastic' ||
|
||||
snapshot.substrate === 'Metal' ||
|
||||
snapshot.substrate === 'Wood'
|
||||
const finishValid = finishNames.some(name => name === snapshot.finish)
|
||||
const substrateValid = snapshot.substrate === 'Plastic' ||
|
||||
substrateNames.some(name => name === snapshot.substrate)
|
||||
const lightingPresetValid =
|
||||
snapshot.lightingPreset === 'Studio' ||
|
||||
snapshot.lightingPreset === 'Warm gallery' ||
|
||||
|
||||
Reference in New Issue
Block a user