Skip to content

Commit ec91a9d

Browse files
marcopixelmarcopixel
authored
Merge experimental branch to master
Merge experimental branch to master
2 parents 0cb221f + 6a2df8e commit ec91a9d

27 files changed

+923
-850
lines changed

Diff for: ‎.installer/plugins/x32/Mouse.dll

90 KB
Binary file not shown.

Diff for: ‎.installer/plugins/x64/Mouse.dll

111 KB
Binary file not shown.

Diff for: ‎@Resources/addons/RainRGB4.exe

0 Bytes
Binary file not shown.

Diff for: ‎@Resources/include/MeasureBandsSmoothed.inc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[Variables]
2-
@include=#@#variables.ini
3-
41
[MeasureAudioSmoothed0]
52
Measure=Calc
63
Formula=(MeasureAudioRaw0+MeasureAudioRaw0+MeasureAudioRaw1)/12+#MinBarValue#
@@ -404,4 +401,4 @@ AverageSize=#AverageSize#
404401
[MeasureAudioSmoothed100]
405402
Measure=Calc
406403
Formula=(MeasureAudioRaw99+MeasureAudioRaw100+MeasureAudioRaw100)/10+#MinBarValue#
407-
AverageSize=#AverageSize#
404+
AverageSize=#AverageSize#

Diff for: ‎@Resources/include/MeasureGPMDP.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[Variables]
2-
; Includes the variables/styles used for the skin.
3-
@include=#@#variables.ini
4-
51
[MeasureState]
62
Measure=Plugin
73
Plugin=GPMDPPlugin
@@ -13,7 +9,7 @@ Measure=Plugin
139
Plugin=GPMDPPlugin
1410
PlayerInfo=ConnectionStatus
1511
IfEqualValue=1
16-
IfEqualAction=[!ActivateConfig "#ROOTCONFIG#\Settings\auth"]
12+
IfEqualAction=[!ActivateConfig "#ROOTCONFIG#\Settings\misc\auth" "GPMDPAuth.ini"]
1713
UpdateDivider=100
1814

1915
[MeasureStateButton]
@@ -74,4 +70,4 @@ IfEqualAction=[!HideFade][!HideFade "#ROOTCONFIG#\Song Information"]
7470
IfAboveValue=0
7571
IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
7672
Disabled=#DisableAutoHide#
77-
UpdateDivider=100
73+
UpdateDivider=100

Diff for: ‎@Resources/include/MeasureNowPlaying.inc

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[Variables]
2-
; Includes the variables/styles used for the skin.
3-
@include=#@#variables.ini
4-
51
[MeasureState]
62
Measure=Plugin
73
Plugin=NowPlaying
@@ -73,4 +69,4 @@ IfEqualAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
7369
IfAboveValue=1
7470
IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
7571
Disabled=#DisableAutoHide#
76-
UpdateDivider=100
72+
UpdateDivider=100

Diff for: ‎@Resources/include/MeasureRotate.inc

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
[Width]
2+
Measure=Calc
3+
Formula=(((#BarGap#*#ScaleVisualizer#)+(#BarWidth#*#ScaleVisualizer#))*#BarCount#)+(5*#ScaleVisualizer#)
4+
5+
[Height]
6+
Measure=Calc
7+
Formula=(#BarHeight#)
8+
9+
[AbsSinWidth]
10+
Measure=Calc
11+
Formula=(Abs(Sin(#Angle#*PI/180)*Width))
12+
13+
[AbsCosWidth]
14+
Measure=Calc
15+
Formula=(Abs(Cos(#Angle#*PI/180)*Width))
16+
17+
[AbsSinHeight]
18+
Measure=Calc
19+
Formula=(Abs(Sin(#Angle#*PI/180)*Height))
20+
21+
[AbsCosHeight]
22+
Measure=Calc
23+
Formula=(Abs(Cos(#Angle#*PI/180)*Height))
24+
25+
; The pivot point is always the top-left corner of the first meter
26+
; The point of rotation (relative to the top-left corner of the skin window) is along the skin boundaries based on the angle
27+
[MoveX]
28+
Measure=Calc
29+
IfCondition=(((#Angle# > 0) && (#Angle# <= 45)) || ((#Angle# > 270) && (#Angle# <= 315)))
30+
IfTrueAction=[!SetOption MoveX Formula 0][!UpdateMeasure MoveX]
31+
IfCondition2=(((#Angle# > 45) && (#Angle# <= 90)) || ((#Angle# > 315) && (#Angle# < 360)))
32+
IfTrueAction2=[!SetOption MoveX Formula (AbsSinHeight)][!UpdateMeasure MoveX]
33+
IfCondition3=(((#Angle# > 90) && (#Angle# <= 135)) || ((#Angle# > 180) && (#Angle# <= 225)))
34+
IfTrueAction3=[!SetOption MoveX Formula (AbsSinHeight+AbsCosWidth)][!UpdateMeasure MoveX]
35+
IfCondition4=(((#Angle# > 135) && (#Angle# <= 180)) || ((#Angle# > 225) && (#Angle# <= 270)))
36+
IfTrueAction4=[!SetOption MoveX Formula (AbsCosWidth)][!UpdateMeasure MoveX]
37+
DynamicVariables=1
38+
39+
[MoveY]
40+
Measure=Calc
41+
IfCondition=(((#Angle# > 0) && (#Angle# <= 45)) || ((#Angle# > 90) && (#Angle# <= 135)))
42+
IfTrueAction=[!SetOption MoveY Formula (AbsSinWidth)][!UpdateMeasure MoveY]
43+
IfCondition2=(((#Angle# > 45) && (#Angle# <= 90)) || ((#Angle# > 135) && (#Angle# <= 180)))
44+
IfTrueAction2=[!SetOption MoveY Formula (AbsSinWidth+AbsCosHeight)][!UpdateMeasure MoveY]
45+
IfCondition3=(((#Angle# > 180) && (#Angle# <= 225)) || ((#Angle# > 270) && (#Angle# <= 315)))
46+
IfTrueAction3=[!SetOption MoveY Formula (AbsCosHeight)][!UpdateMeasure MoveY]
47+
IfCondition4=(((#Angle# > 225) && (#Angle# <= 270)) || ((#Angle# > 315) && (#Angle# < 360)))
48+
IfTrueAction4=[!SetOption MoveY Formula 0][!UpdateMeasure MoveY]
49+
DynamicVariables=1
50+
51+
; 0 = X-axis, 1 = Y-axis
52+
[NearestAxis]
53+
Measure=Calc
54+
Formula=((((#Angle# > 45) && (#Angle# <= 135)) || ((#Angle# > 225) && (#Angle# <= 315))) ? 1 : 0)
55+
IfCondition=NearestAxis = 1
56+
IfTrueAction=[!WriteKeyValue Variables NearestAxis "1" "#@#Variables.ini"]
57+
IfFalseAction=[!WriteKeyValue Variables NearestAxis "0" "#@#Variables.ini"]
58+
DynamicVariables=1
59+
60+
; Only antialias and set the matrix when the angle has changed
61+
[CheckRotation]
62+
Measure=Calc
63+
Formula=(((#Angle# = 0) || (#Angle# = 360)) ? 0 : 1)
64+
65+
; Adjust rotation angle based on orientation
66+
[Angle]
67+
Measure=Calc
68+
Formula=(NearestAxis = 0 ? #Angle# : (#Angle# + 90))
69+
70+
[Matrix]
71+
Measure=String
72+
String="(Cos([Angle]*PI/180));(-Sin([Angle]*PI/180));(Sin([Angle]*PI/180));(Cos([Angle]*PI/180));[MoveX];[MoveY]"
73+
DynamicVariables=1
74+
OnUpdateAction=
75+
76+
; Reveal the transformation by expanding the skin window through an invisible meter
77+
[BoundingBox]
78+
Meter=Image
79+
W=([AbsCosWidth]+[AbsSinHeight])
80+
H=([AbsSinWidth]+[AbsCosHeight])
81+
DynamicVariables=1

Diff for: ‎@Resources/include/MeasureSpotify.inc

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[Variables]
2-
; Includes the variables/styles used for the skin.
3-
@include=#@#variables.ini
4-
51
[MeasureState]
62
Measure=Plugin
73
Plugin=NowPlaying
@@ -61,12 +57,11 @@ UpdateDivider=10
6157

6258
[MeasureAutoHideSpotify]
6359
Measure=Plugin
64-
Plugin=NowPlaying
65-
PlayerName=Spotify
66-
PlayerType=State
67-
IfEqualValue=0
60+
Plugin=Process
61+
ProcessName=Spotify.exe
62+
IfEqualValue=-1
6863
IfEqualAction=[!HideFade][!HideFade "#ROOTCONFIG#\Song Information"]
69-
IfAboveValue=0
64+
IfAboveValue=-1
7065
IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
7166
Disabled=#DisableAutoHide#
72-
UpdateDivider=100
67+
UpdateDivider=100

Diff for: ‎@Resources/include/MeasureStyling.inc

+4-11
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ UpdateDivider=-1
1212
Measure=Calc
1313
Formula=#EnableDynamicColors#
1414
IfBelowValue=1
15-
IfBelowAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleStaticBar"][!SetOption MeterCoverBG MeterStyle "StyleStaticMeter"][!SetOptionGroup SongMeta MeterStyle "StyleStaticText"][!DisableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
15+
IfBelowAction=[!SetOptionGroup GroupBars MeterStyle "StyleStaticBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleStaticBar"][!SetOption MeterCoverBG MeterStyle "StyleStaticMeter"][!SetOptionGroup SongMeta MeterStyle "StyleStaticText"][!DisableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
1616
IfEqualValue=1
17-
IfEqualAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleGenreBar"][!SetOption MeterCoverBG MeterStyle "StyleGenreMeter"][!SetOptionGroup SongMeta MeterStyle "StyleGenreText"][!EnableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
17+
IfEqualAction=[!SetOptionGroup GroupBars MeterStyle "StyleGenreBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleGenreBar"][!SetOption MeterCoverBG MeterStyle "StyleGenreMeter"][!SetOptionGroup SongMeta MeterStyle "StyleGenreText"][!EnableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
1818
IfAboveValue=1
19-
IfAboveAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleCoverBar"][!SetOption MeterCoverBG MeterStyle "StyleCoverMeter"][!SetOptionGroup SongMeta MeterStyle "StyleCoverText"][!DisableMeasure MeasureGenre][!EnableMeasure MeasureGetCoverColor][!EnableMeasure MeasureCoverColor]
19+
IfAboveAction=[!SetOptionGroup GroupBars MeterStyle "StyleCoverBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleCoverBar"][!SetOption MeterCoverBG MeterStyle "StyleCoverMeter"][!SetOptionGroup SongMeta MeterStyle "StyleCoverText"][!DisableMeasure MeasureGenre][!EnableMeasure MeasureGetCoverColor][!EnableMeasure MeasureCoverColor]
2020
UpdateDivider=-1
2121

2222
[MeasureDisableDynamicFontColors]
@@ -26,13 +26,6 @@ IfEqualValue=1
2626
IfEqualAction=[!SetOptionGroup SongMeta MeterStyle "StyleStaticText"]
2727
UpdateDivider=-1
2828

29-
[MeasureFlipProgressbar]
30-
Measure=Calc
31-
Formula=#FlipVisualizer#
32-
IfEqualValue=1
33-
IfEqualAction=[!SetOption MeterProgressBar Y 0]
34-
UpdateDivider=-1
35-
3629
[MeasureClipSongInformation]
3730
Measure=Calc
3831
Formula=#ClipSongInformation#
@@ -133,4 +126,4 @@ BarColor=[MeasureCoverColor]
133126
DynamicVariables=1
134127
[StyleCoverText]
135128
FontColor=[MeasureCoverColor]
136-
DynamicVariables=1
129+
DynamicVariables=1

0 commit comments

Comments
 (0)