Skip to content

Commit c507786

Browse files
committed
added more fall animations
changed fallAnimation control type to combo updated readme
1 parent 7c8b21f commit c507786

File tree

3 files changed

+50
-10
lines changed

3 files changed

+50
-10
lines changed

README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ This is a highly customizable animated Matrix wallpaper for Wallpaper Engine (We
3939
- Rain Customization
4040
- Matrix Speed
4141
- Trail Length
42-
- Enable/Disable Initial Fall Animation
42+
- Initial Fall Animation
43+
- None
44+
- Fall
45+
- Scatter
4346
- Color Customization
4447
- Color Mode
4548
- Static Color
@@ -65,6 +68,7 @@ This is a highly customizable animated Matrix wallpaper for Wallpaper Engine (We
6568
- Silence Timeout
6669
- Logo Customization
6770
- Logo
71+
- None
6872
- 23 presets
6973

7074
<p align="left">
@@ -98,13 +102,18 @@ This is a highly customizable animated Matrix wallpaper for Wallpaper Engine (We
98102
- Scale
99103
- Position
100104
- Clock
101-
- Horizontal/Vertical
105+
- Clock
106+
- None
107+
- Horizontal
108+
- Vertical
102109
- 12/24 Hour Format
103110
- Day-light Saving
104111
- Scale
105112
- Position
106113
- Message
107-
- Horizontal
114+
- Message
115+
- None
116+
- Horizontal
108117
- Text
109118
- Scale
110119
- Position

index.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ window.onload = function () {
2525
fpsInterval: calculateFpsInterval(24),
2626
ui_rain_trailLength: 0.86,
2727
trailLength: calculateTrailLength(0.86),
28-
ui_rain_initialAnimation: true,
28+
ui_rain_initialAnimation: "1",
2929
ui_characters_charset: "4",
3030
ui_characters_customCharset: "0123456789ABCDEF",
3131
ui_font_font: "3",
@@ -97,7 +97,7 @@ window.onload = function () {
9797
options.trailLength = calculateTrailLength(options.ui_rain_trailLength);
9898
updateMask();
9999
});
100-
rainFolder.add(options, "ui_rain_initialAnimation").name("Initial Animation");
100+
rainFolder.add(options, "ui_rain_initialAnimation", optionsToDict(config.general.properties.ui_rain_initialanimation.options)).name("Initial Animation").onChange(fallAnimation);
101101

102102
const colorFolder = gui.addFolder("Color");
103103
colorFolder.add(options, 'ui_color_colorMode', optionsToDict(config.general.properties.ui_color_colormode.options)).name('Color Mode');
@@ -177,8 +177,10 @@ window.onload = function () {
177177
options.trailLength = calculateTrailLength(properties.ui_rain_traillength.value);
178178
updateMask();
179179
}
180-
if (properties.ui_rain_initialanimation)
180+
if (properties.ui_rain_initialanimation) {
181181
options.ui_rain_initialAnimation = properties.ui_rain_initialanimation.value;
182+
fallAnimation();
183+
}
182184

183185
if (properties.ui_color_colormode)
184186
options.ui_color_colorMode = properties.ui_color_colormode.value;
@@ -459,15 +461,29 @@ window.onload = function () {
459461
function fallAnimation() {
460462
drops = [];
461463
drop_chars = [];
462-
if (options.ui_rain_initialAnimation)
464+
465+
switch (options.ui_rain_initialAnimation) {
466+
case "0": {
467+
for (var i = 0; i < columns; i++) {
468+
drops[i] = [rows + 1, 0, 0];
469+
drop_chars[i] = ["", false];
470+
}
471+
break;
472+
}
473+
case "1": {
463474
for (var i = 0; i < columns; i++) {
464475
drops[i] = [1, 0, 0];
465476
drop_chars[i] = ["", false];
466477
}
467-
else
478+
break;
479+
}
480+
case "2": {
468481
for (var i = 0; i < columns; i++) {
469482
drops[i] = [Math.floor(Math.random() * rows), 0, 0];
470483
drop_chars[i] = ["", false];
484+
}
485+
break;
486+
}
471487
}
472488
}
473489

project.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,25 @@
595595
"ui_rain_initialanimation" :
596596
{
597597
"index" : 3,
598+
"options" :
599+
[
600+
{
601+
"label" : "None",
602+
"value" : "0"
603+
},
604+
{
605+
"label" : "Fall",
606+
"value" : "1"
607+
},
608+
{
609+
"label" : "Scatter",
610+
"value" : "2"
611+
}
612+
],
598613
"order" : 103,
599614
"text" : "Initial Animation",
600-
"type" : "bool",
601-
"value" : true
615+
"type" : "combo",
616+
"value" : "1"
602617
},
603618
"ui_rain_matrixspeed" :
604619
{

0 commit comments

Comments
 (0)