Skip to content

Commit ca8e3cd

Browse files
committed
Ray Marching 2D controls & options rewrite
- Ray Marching 2D can now be controlled with the mouse - Options backend rewrite
1 parent 21670b1 commit ca8e3cd

26 files changed

+729
-128
lines changed

Fractals Project/Assets/Scenes/InfiniteSpheres.unity

+49-4
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,16 @@ PrefabInstance:
585585
m_Modification:
586586
m_TransformParent: {fileID: 1785685576}
587587
m_Modifications:
588+
- target: {fileID: 2886464298844970360, guid: 1f834fe602c595649a57bd478ffa5942,
589+
type: 3}
590+
propertyPath: app
591+
value:
592+
objectReference: {fileID: 192913189}
593+
- target: {fileID: 2886464298844970360, guid: 1f834fe602c595649a57bd478ffa5942,
594+
type: 3}
595+
propertyPath: optionName
596+
value: O_Fog
597+
objectReference: {fileID: 0}
588598
- target: {fileID: 4412081283395472661, guid: 1f834fe602c595649a57bd478ffa5942,
589599
type: 3}
590600
propertyPath: m_textInfo.characterCount
@@ -628,7 +638,7 @@ PrefabInstance:
628638
- target: {fileID: 4412081283669781129, guid: 1f834fe602c595649a57bd478ffa5942,
629639
type: 3}
630640
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
631-
value: 2
641+
value: 1
632642
objectReference: {fileID: 0}
633643
- target: {fileID: 4412081283669781129, guid: 1f834fe602c595649a57bd478ffa5942,
634644
type: 3}
@@ -1292,7 +1302,7 @@ PrefabInstance:
12921302
- target: {fileID: 117713803568397471, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
12931303
type: 3}
12941304
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size
1295-
value: 2
1305+
value: 1
12961306
objectReference: {fileID: 0}
12971307
- target: {fileID: 117713803568397471, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
12981308
type: 3}
@@ -1494,6 +1504,16 @@ PrefabInstance:
14941504
propertyPath: m_textInfo.pageCount
14951505
value: 0
14961506
objectReference: {fileID: 0}
1507+
- target: {fileID: 2050770917476727994, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
1508+
type: 3}
1509+
propertyPath: app
1510+
value:
1511+
objectReference: {fileID: 192913189}
1512+
- target: {fileID: 2050770917476727994, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
1513+
type: 3}
1514+
propertyPath: optionName
1515+
value: O_Invert
1516+
objectReference: {fileID: 0}
14971517
m_RemovedComponents: []
14981518
m_SourcePrefab: {fileID: 100100000, guid: b42cdeec70fa9e2409c1cd6d2f60154d, type: 3}
14991519
--- !u!224 &989737192 stripped
@@ -1512,7 +1532,7 @@ PrefabInstance:
15121532
- target: {fileID: 117713803568397471, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
15131533
type: 3}
15141534
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size
1515-
value: 2
1535+
value: 1
15161536
objectReference: {fileID: 0}
15171537
- target: {fileID: 117713803568397471, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
15181538
type: 3}
@@ -1714,6 +1734,16 @@ PrefabInstance:
17141734
propertyPath: m_textInfo.pageCount
17151735
value: 0
17161736
objectReference: {fileID: 0}
1737+
- target: {fileID: 2050770917476727994, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
1738+
type: 3}
1739+
propertyPath: app
1740+
value:
1741+
objectReference: {fileID: 192913189}
1742+
- target: {fileID: 2050770917476727994, guid: b42cdeec70fa9e2409c1cd6d2f60154d,
1743+
type: 3}
1744+
propertyPath: optionName
1745+
value: O_Repeat
1746+
objectReference: {fileID: 0}
17171747
m_RemovedComponents: []
17181748
m_SourcePrefab: {fileID: 100100000, guid: b42cdeec70fa9e2409c1cd6d2f60154d, type: 3}
17191749
--- !u!224 &998870536 stripped
@@ -2212,6 +2242,21 @@ PrefabInstance:
22122242
m_Modification:
22132243
m_TransformParent: {fileID: 1785685576}
22142244
m_Modifications:
2245+
- target: {fileID: 2886464298844970360, guid: 1f834fe602c595649a57bd478ffa5942,
2246+
type: 3}
2247+
propertyPath: app
2248+
value:
2249+
objectReference: {fileID: 192913189}
2250+
- target: {fileID: 2886464298844970360, guid: 1f834fe602c595649a57bd478ffa5942,
2251+
type: 3}
2252+
propertyPath: max
2253+
value: 3
2254+
objectReference: {fileID: 0}
2255+
- target: {fileID: 2886464298844970360, guid: 1f834fe602c595649a57bd478ffa5942,
2256+
type: 3}
2257+
propertyPath: optionName
2258+
value: O_Radius
2259+
objectReference: {fileID: 0}
22152260
- target: {fileID: 4412081283395472661, guid: 1f834fe602c595649a57bd478ffa5942,
22162261
type: 3}
22172262
propertyPath: m_textInfo.characterCount
@@ -2255,7 +2300,7 @@ PrefabInstance:
22552300
- target: {fileID: 4412081283669781129, guid: 1f834fe602c595649a57bd478ffa5942,
22562301
type: 3}
22572302
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
2258-
value: 2
2303+
value: 1
22592304
objectReference: {fileID: 0}
22602305
- target: {fileID: 4412081283669781129, guid: 1f834fe602c595649a57bd478ffa5942,
22612306
type: 3}

0 commit comments

Comments
 (0)