Skip to content

Commit cddceb2

Browse files
committed
Increased snap point granularity. Fixed weird snap points for spin sliders.
1 parent 06d2aad commit cddceb2

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/gui.gloa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ export Slider :: struct {
356356
min = 0.0,
357357
max = 1.0,
358358

359-
steps = 16,
359+
steps = 32,
360360

361361
limitName = "",
362362
limitCenter = 0.0,

src/guiSetup.gloa

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ export setupGuiFrames :: () {
207207
guiState.separator!({ thick=false }),
208208

209209
guiState.section!({ name="spinSection", label="Spin", icon16="spin",
210-
guiState.slider!({ name="spinMin", labelLeft="at start", min=-8*math.TAU, max=8*math.TAU, exponential=true, limitName="spin", readoutMulti=1/math.TAU, readout="%.2f turns / sec", linkMultiDrag={"spinMax"} }),
211-
guiState.slider!({ name="spinMax", labelLeft="at end", min=-8*math.TAU, max=8*math.TAU, exponential=true, limitName="spin", readoutMulti=1/math.TAU, readout="%.2f turns / sec", linkMultiDrag={"spinMin"} }),
212-
guiState.slider!({ name="spinVariation", labelLeft="variation", min=0, max=1, readoutMulti=100, readout="%d%%" }),
210+
guiState.slider!({ name="spinMin", labelLeft="at start", min=-8, max=8, exponential=true, limitName="spin", readout="%.2f turns / sec", linkMultiDrag={"spinMax"} }),
211+
guiState.slider!({ name="spinMax", labelLeft="at end", min=-8, max=8, exponential=true, limitName="spin", readout="%.2f turns / sec", linkMultiDrag={"spinMin"} }),
212+
guiState.slider!({ name="spinVariation", labelLeft="variation", min=0, max=1, readoutMulti=100, readout="%d%%" }),
213213
}),
214214

215215
guiState.separator!({ thick=true }),

src/main.gloa

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ export System :: struct {
344344
psSizeVariation = 0.0,
345345
psSpeedMin = 0.0,
346346
psSpeedMax = 0.0,
347-
psSpinMin = 0.0,
348-
psSpinMax = 0.0,
347+
psSpinMin = 0.0, -- Turns, not angle.
348+
psSpinMax = 0.0, -- Turns, not angle.
349349
psSpinVariation = 0.0,
350350
psSpread = 0.0,
351351
psTangentialAccelerationMin = 0.0,
@@ -500,7 +500,7 @@ export updateParticleParams :: (project:Project, s:System) {
500500
ps.setSizes!(sizes)
501501
ps.setSizeVariation!(s.psSizeVariation)
502502
ps.setSpeed!(s.psSpeedMin*space*time, s.psSpeedMax*space*time)
503-
ps.setSpin!(s.psSpinMin*time, s.psSpinMax*time)
503+
ps.setSpin!(s.psSpinMin*time*math.TAU, s.psSpinMax*time*math.TAU)
504504
ps.setSpinVariation!(s.psSpinVariation)
505505
ps.setSpread!(s.psSpread)
506506
ps.setTangentialAcceleration!(s.psTangentialAccelerationMin*space*time^2, s.psTangentialAccelerationMax*space*time^2)

src/workspace.gloa

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
--============================================================]]
1616

17-
local LAST_FILE_VERSION :: 5
17+
local LAST_FILE_VERSION :: 6
1818

1919

2020

@@ -814,6 +814,8 @@ export loadWorkspace :: (path:string) -> (success:bool, gotError:bool, app:App)
814814
local ^ok, ^ptr, min = readFloat(version, line, cast(int)ptr) ; if not ok return parsingError(path, ln, "Bad value format: %s", line)
815815
local ^ok, ^ptr, max = readFloat(version, line, cast(int)ptr) ; if not ok return parsingError(path, ln, "Bad value format: %s", line)
816816
if cast(int)ptr <= #line return parsingError(path, ln, "Garbage after values: %s", line)
817+
if version < 6 min /= math.TAU
818+
if version < 6 max /= math.TAU
817819
system.psSpinMin = min
818820
system.psSpinMax = max
819821

0 commit comments

Comments
 (0)