Skip to content

Commit ae3bdd6

Browse files
ERSUCCERSUCC
committed
Fix incorrect switch/note widget heights and slider values
1 parent 73dc2c3 commit ae3bdd6

43 files changed

Lines changed: 161 additions & 161 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎3D/Code Examples/Turtle Perspective Example 3D.nlogox3d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ end
4040
<button x="23" y="143" height="33" disableUntilTicks="true" forever="false" kind="Observer" width="123" sizeVersion="0">watch turtle 0</button>
4141
<button x="23" y="177" height="33" disableUntilTicks="true" forever="false" kind="Observer" width="123" sizeVersion="0">follow turtle 0</button>
4242
<button x="23" y="211" height="33" disableUntilTicks="true" forever="false" kind="Observer" width="123" sizeVersion="0">ride turtle 0</button>
43-
<note x="25" y="90" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Perspective</note>
44-
<note x="170" y="88" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Observer position</note>
43+
<note x="25" y="90" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Perspective</note>
44+
<note x="170" y="88" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Observer position</note>
4545
</widgets>
4646
<info><![CDATA[## WHAT IS IT?
4747

‎3D/Code Examples/Turtle and Observer Motion Example 3D.nlogox3d‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ display</button>
5757
display</button>
5858
<button x="49" y="329" height="33" disableUntilTicks="true" forever="false" kind="Observer" width="140" sizeVersion="0">ride turtle 0</button>
5959
<button x="331" y="329" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="140" sizeVersion="0">reset-perspective</button>
60-
<note x="263" y="59" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Turtle movement</note>
61-
<note x="28" y="197" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Observer (point of view)</note>
62-
<note x="22" y="58" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Turtle position</note>
60+
<note x="263" y="59" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Turtle movement</note>
61+
<note x="28" y="197" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Observer (point of view)</note>
62+
<note x="22" y="58" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Turtle position</note>
6363
<button x="124" y="363" height="33" disableUntilTicks="false" forever="true" kind="Observer" display="orbit-right" width="140" sizeVersion="0">orbit-right 1
6464
display</button>
6565
<button x="265" y="363" height="33" disableUntilTicks="false" forever="true" kind="Observer" display="orbit-left" width="140" sizeVersion="0">orbit-left 1

‎3D/Sample Models/GasLab/GasLab Free Gas 3D.nlogox3d‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,11 @@ This is a 3D version of the 2D model GasLab Free Gas.
14331433
</indicator>
14341434
</shape>
14351435
</linkShapes>
1436+
<previewCommands>set trace? false
1437+
setup
1438+
orbit-down 45
1439+
orbit-right 45
1440+
repeat 2000 [ go ]</previewCommands>
14361441
<experiments>
14371442
<experiment name="100 runs" repetitions="1" sequentialRunOrder="true" runMetricsEveryStep="true" timeLimit="150">
14381443
<setup>setup</setup>
@@ -1461,9 +1466,4 @@ This is a 3D version of the 2D model GasLab Free Gas.
14611466
</constants>
14621467
</experiment>
14631468
</experiments>
1464-
<previewCommands>set trace? false
1465-
setup
1466-
orbit-down 45
1467-
orbit-right 45
1468-
repeat 2000 [ go ]</previewCommands>
14691469
</model>

‎3D/Sample Models/Life 3D.nlogox3d‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ end
4343
<slider x="35" step="1" y="223" max="26" display="r2" height="33" min="0" direction="Horizontal" default="4.0" variable="r2" width="196" sizeVersion="0"></slider>
4444
<slider x="36" step="1" y="319" max="26" display="r3" height="33" min="1" direction="Horizontal" default="2.0" variable="r3" width="191" sizeVersion="0"></slider>
4545
<slider x="36" step="1" y="363" max="26" display="r4" height="33" min="1" direction="Horizontal" default="3.0" variable="r4" width="192" sizeVersion="0"></slider>
46-
<note x="36" y="152" height="18" textColorLight="-16777216" fontSize="11" width="52" markdown="false">RULES</note>
47-
<note x="35" y="262" height="42" textColorLight="-16777216" fontSize="11" width="257" markdown="false"><![CDATA[If an empty cell with n living neighbors has
46+
<note x="36" y="152" backgroundDark="0" fontSize="11" width="52" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">RULES</note>
47+
<note x="35" y="262" backgroundDark="0" fontSize="11" width="257" markdown="false" height="42" textColorDark="-1" textColorLight="-16777216" backgroundLight="0"><![CDATA[If an empty cell with n living neighbors has
4848
r1 <= n <= r2, the cell becomes alive.]]></note>
49-
<note x="37" y="402" height="42" textColorLight="-16777216" fontSize="11" width="261" markdown="false"><![CDATA[If a living cell with n living neighbors has
49+
<note x="37" y="402" backgroundDark="0" fontSize="11" width="261" markdown="false" height="42" textColorDark="-1" textColorLight="-16777216" backgroundLight="0"><![CDATA[If a living cell with n living neighbors has
5050
n < r3 or n > r4, the cell dies.]]></note>
5151
</widgets>
5252
<info><![CDATA[## WHAT IS IT?

‎3D/Sample Models/Raindrops 3D.nlogox3d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ end
9494
<slider x="27" step="1" y="75" max="2000" display="impact" height="33" min="0" direction="Horizontal" default="500.0" variable="impact" width="195" sizeVersion="0"></slider>
9595
<slider x="281" step="0.1" y="71" max="10" display="friction" height="33" min="0" direction="Horizontal" default="1.0" variable="friction" units="%" width="194" sizeVersion="0"></slider>
9696
<slider x="281" step="1" y="37" max="50" display="surface-tension" height="33" min="0" direction="Horizontal" default="8.0" variable="surface-tension" units="%" width="194" sizeVersion="0"></slider>
97-
<note x="292" y="14" height="18" textColorLight="-16777216" fontSize="11" width="112" markdown="false">Pond properties</note>
97+
<note x="292" y="14" backgroundDark="0" fontSize="11" width="112" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Pond properties</note>
9898
<button x="126" y="23" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="82" sizeVersion="0">go</button>
9999
</widgets>
100100
<info><![CDATA[## WHAT IS IT?

‎3D/Sample Models/Rope 3D.nlogox3d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ end
100100
<slider x="304" step="1.0" y="316" max="99.0" display="y-amplitude-blue" height="33" min="0.0" direction="Horizontal" default="10.0" variable="y-amplitude-blue" width="240" sizeVersion="0"></slider>
101101
<slider x="304" step="1.0" y="350" max="99" display="z-amplitude-blue" height="33" min="0" direction="Horizontal" default="10.0" variable="z-amplitude-blue" width="240" sizeVersion="0"></slider>
102102
<slider x="304" step="1.0" y="277" max="100" display="z-frequency-blue" height="33" min="0" direction="Horizontal" default="5.0" variable="z-frequency-blue" width="240" sizeVersion="0"></slider>
103-
<note x="29" y="179" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">green end</note>
104-
<note x="309" y="175" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">blue end</note>
103+
<note x="29" y="179" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">green end</note>
104+
<note x="309" y="175" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">blue end</note>
105105
<switch x="179" y="119" height="33" on="false" variable="synchronize-ends?" display="synchronize-ends?" width="164" sizeVersion="0"></switch>
106106
<switch x="66" y="204" height="33" on="true" variable="move-green-end?" display="move-green-end?" width="155" sizeVersion="0"></switch>
107107
<switch x="352" y="204" height="33" on="false" variable="move-blue-end?" display="move-blue-end?" width="155" sizeVersion="0"></switch>

‎3D/Sample Models/Termites 3D.nlogox3d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ end
8181
<button x="81" y="314" height="33" disableUntilTicks="true" forever="false" kind="Observer" width="132" sizeVersion="0">ride turtle 0
8282
</button>
8383
<button x="81" y="211" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="132" sizeVersion="0">reset-perspective</button>
84-
<note x="96" y="190" height="18" textColorLight="-16777216" fontSize="11" width="150" markdown="false">Observer controls</note>
84+
<note x="96" y="190" backgroundDark="0" fontSize="11" width="150" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Observer controls</note>
8585
</widgets>
8686
<info><![CDATA[## WHAT IS IT?
8787

‎3D/Sample Models/Wave Machine 3D.nlogox3d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ end
8787
<slider x="152" step="1.0" y="215" max="30.0" display="driver-amplitude" height="33" min="0.0" direction="Horizontal" default="6.0" variable="driver-amplitude" width="140" sizeVersion="0"></slider>
8888
<slider x="71" step="1.0" y="249" max="100.0" display="driver-frequency" height="33" min="0.0" direction="Horizontal" default="100.0" variable="driver-frequency" width="163" sizeVersion="0"></slider>
8989
<slider x="151" step="1.0" y="114" max="99.0" display="friction" height="33" min="0.0" direction="Horizontal" default="10.0" variable="friction" width="141" sizeVersion="0"></slider>
90-
<note x="14" y="92" height="20" textColorLight="-16777216" fontSize="11" width="121" markdown="false">Membrane settings</note>
91-
<note x="13" y="161" height="18" textColorLight="-16777216" fontSize="11" width="90" markdown="false">Driver settings</note>
90+
<note x="14" y="92" backgroundDark="0" fontSize="11" width="121" markdown="false" height="20" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Membrane settings</note>
91+
<note x="13" y="161" backgroundDark="0" fontSize="11" width="90" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Driver settings</note>
9292
</widgets>
9393
<info><![CDATA[## WHAT IS IT?
9494

‎Sample Models/Art/GenJam - Duple.nlogox‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -391,17 +391,50 @@ end
391391
<button x="5" y="65" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="66" display="setup">setup
392392
sound:play-note "TRUMPET" 60 62 2
393393
wait 2</button>
394-
<switch x="5" y="105" height="37" on="true" variable="sound?" width="95" display="sound?"></switch>
395-
<button x="105" y="105" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="105">go-no-evolve</button>
396-
<slider x="5" step="1" y="200" max="200" width="150" display="hit-limit" height="50" min="50" direction="Horizontal" default="120.0" variable="hit-limit"></slider>
397-
<slider x="5" step="1" y="255" max="10" width="150" display="num-mutations" height="50" min="1" direction="Horizontal" default="1.0" variable="num-mutations"></slider>
398-
<slider x="160" step="0.01" y="200" max="1" width="170" display="hit-density-modifier" height="50" min="0" direction="Horizontal" default="0.5" variable="hit-density-modifier"></slider>
399-
<slider x="160" step="1" y="255" max="8" width="170" display="mutation-strength" height="50" min="0" direction="Horizontal" default="1.0" variable="mutation-strength"></slider>
400394
<switch x="180" y="10" height="50" on="true" variable="shuffle-parts?" width="150" display="shuffle-parts?"></switch>
401-
<slider x="5" step="1" y="145" max="200" width="325" display="tempo-bpm" height="50" min="40" direction="Horizontal" default="135.0" variable="tempo-bpm"></slider>
402395
<button x="215" y="65" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="115" display="go-once">repeat num-chromosomes * 4 [ go ]</button>
403-
<button x="215" y="105" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="115" display="go">go</button>
404-
<chooser x="55" y="310" height="60" variable="soloer" current="0" width="100" display="soloer">
396+
<monitor x="690" precision="17" y="112" height="60" fontSize="11" width="100">generations</monitor>
397+
<monitor x="690" precision="17" y="175" height="60" fontSize="11" width="100" display="density">precision (count patches with [(pcolor != black) and (pcolor != yellow)] / (count patches)) 3</monitor>
398+
<slider x="5" step="1" y="150" max="200" width="325" display="tempo-bpm" height="50" min="40" direction="Horizontal" default="135.0" variable="tempo-bpm"></slider>
399+
<plot x="10" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Fitness" y="380" xMin="0.0" height="240" legend="true" xMax="1.0" yMin="0.0" width="280" xAxis="Ticks" display="Average Fitness">
400+
<setup></setup>
401+
<update></update>
402+
<pen interval="1.0" mode="0" display="all" color="-16777216" legend="true">
403+
<setup></setup>
404+
<update>plot mean [fitness] of turtles</update>
405+
</pen>
406+
<pen interval="1.0" mode="0" display="low" color="-2674135" legend="true">
407+
<setup></setup>
408+
<update>plot mean [fitness] of low-drums</update>
409+
</pen>
410+
<pen interval="1.0" mode="0" display="med" color="-10899396" legend="true">
411+
<setup></setup>
412+
<update>plot mean [fitness] of med-drums</update>
413+
</pen>
414+
<pen interval="1.0" mode="0" display="high" color="-13345367" legend="true">
415+
<setup></setup>
416+
<update>plot mean [fitness] of high-drums</update>
417+
</pen>
418+
</plot>
419+
<plot x="295" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="380" xMin="0.0" height="240" legend="false" xMax="10.0" yMin="0.0" width="250" xAxis="Drummer" display="Hits Since Evolution">
420+
<setup></setup>
421+
<update></update>
422+
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
423+
<setup></setup>
424+
<update>plot-pen-reset
425+
ask low-drums [ plotxy who hits-since-evolve ]</update>
426+
</pen>
427+
<pen interval="1.0" mode="1" display="pen-1" color="-10899396" legend="true">
428+
<setup></setup>
429+
<update>plot-pen-reset ask med-drums [ plotxy who hits-since-evolve ]</update>
430+
</pen>
431+
<pen interval="1.0" mode="1" display="pen-2" color="-13345367" legend="true">
432+
<setup></setup>
433+
<update>plot-pen-reset ask high-drums [ plotxy who hits-since-evolve ]</update>
434+
</pen>
435+
</plot>
436+
<switch x="160" y="315" height="60" on="false" variable="solo?" width="100" display="solo?"></switch>
437+
<chooser x="55" y="315" height="60" variable="soloer" current="0" width="100" display="soloer">
405438
<choice type="double" value="0.0"></choice>
406439
<choice type="double" value="1.0"></choice>
407440
<choice type="double" value="2.0"></choice>
@@ -419,8 +452,11 @@ wait 2</button>
419452
<choice type="double" value="14.0"></choice>
420453
<choice type="double" value="15.0"></choice>
421454
</chooser>
422-
<switch x="160" y="310" height="60" on="false" variable="solo?" width="100" display="solo?"></switch>
423-
<plot x="550" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="375" xMin="0.0" height="240" legend="false" xMax="16.0" yMin="0.0" width="315" xAxis="Drummer" display="Hits per Drummer (total)">
455+
<slider x="160" step="1" y="260" max="8" width="170" display="mutation-strength" height="50" min="0" direction="Horizontal" default="1.0" variable="mutation-strength"></slider>
456+
<slider x="160" step="0.01" y="205" max="1" width="170" display="hit-density-modifier" height="50" min="0" direction="Horizontal" default="0.5" variable="hit-density-modifier"></slider>
457+
<slider x="5" step="1" y="260" max="10" width="150" display="num-mutations" height="50" min="1" direction="Horizontal" default="1.0" variable="num-mutations"></slider>
458+
<slider x="5" step="1" y="205" max="200" width="150" display="hit-limit" height="50" min="50" direction="Horizontal" default="120.0" variable="hit-limit"></slider>
459+
<plot x="550" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="380" xMin="0.0" height="240" legend="false" xMax="16.0" yMin="0.0" width="315" xAxis="Drummer" display="Hits per Drummer (total)">
424460
<setup></setup>
425461
<update></update>
426462
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
@@ -439,45 +475,9 @@ ask med-drums [plotxy who hits]</update>
439475
ask high-drums [plotxy who hits]</update>
440476
</pen>
441477
</plot>
442-
<plot x="295" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="375" xMin="0.0" height="240" legend="false" xMax="10.0" yMin="0.0" width="250" xAxis="Drummer" display="Hits Since Evolution">
443-
<setup></setup>
444-
<update></update>
445-
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
446-
<setup></setup>
447-
<update>plot-pen-reset
448-
ask low-drums [ plotxy who hits-since-evolve ]</update>
449-
</pen>
450-
<pen interval="1.0" mode="1" display="pen-1" color="-10899396" legend="true">
451-
<setup></setup>
452-
<update>plot-pen-reset ask med-drums [ plotxy who hits-since-evolve ]</update>
453-
</pen>
454-
<pen interval="1.0" mode="1" display="pen-2" color="-13345367" legend="true">
455-
<setup></setup>
456-
<update>plot-pen-reset ask high-drums [ plotxy who hits-since-evolve ]</update>
457-
</pen>
458-
</plot>
459-
<plot x="10" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Fitness" y="375" xMin="0.0" height="240" legend="true" xMax="1.0" yMin="0.0" width="280" xAxis="Ticks" display="Average Fitness">
460-
<setup></setup>
461-
<update></update>
462-
<pen interval="1.0" mode="0" display="all" color="-16777216" legend="true">
463-
<setup></setup>
464-
<update>plot mean [fitness] of turtles</update>
465-
</pen>
466-
<pen interval="1.0" mode="0" display="low" color="-2674135" legend="true">
467-
<setup></setup>
468-
<update>plot mean [fitness] of low-drums</update>
469-
</pen>
470-
<pen interval="1.0" mode="0" display="med" color="-10899396" legend="true">
471-
<setup></setup>
472-
<update>plot mean [fitness] of med-drums</update>
473-
</pen>
474-
<pen interval="1.0" mode="0" display="high" color="-13345367" legend="true">
475-
<setup></setup>
476-
<update>plot mean [fitness] of high-drums</update>
477-
</pen>
478-
</plot>
479-
<monitor x="690" precision="17" y="112" height="60" fontSize="11" width="100">generations</monitor>
480-
<monitor x="690" precision="17" y="175" height="60" fontSize="11" width="100" display="density">precision (count patches with [(pcolor != black) and (pcolor != yellow)] / (count patches)) 3</monitor>
478+
<switch x="5" y="105" height="40" on="true" variable="sound?" width="95" display="sound?"></switch>
479+
<button x="105" y="105" height="40" disableUntilTicks="true" forever="true" kind="Observer" width="105">go-no-evolve</button>
480+
<button x="215" y="105" height="40" disableUntilTicks="true" forever="true" kind="Observer" width="115" display="go">go</button>
481481
</widgets>
482482
<info><![CDATA[## WHAT IS IT?
483483

0 commit comments

Comments
 (0)