Skip to content

Commit 8b77906

Browse files
oskarshoskarsh
committed
fixed startup splash screen bug, gain stage presets, 10 new preests
Former-commit-id: e28ec2f
1 parent 64215e4 commit 8b77906

Some content is hidden

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

58 files changed

+2117
-477
lines changed

‎Installer/Windows/exe/reach-installer.exe.REMOVED.git-id

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
67d1ca7d1ed09b3db03e469a761367a7ad71e936
1+
87a25b94500a5e1132e3915a0c44a913e166a15d

‎Presets/Autosave_1.hip

-90 Bytes
Binary file not shown.

‎Presets/Autosave_2.hip

-8 Bytes
Binary file not shown.

‎Presets/Autosave_3.hip

-98 Bytes
Binary file not shown.

‎Presets/Autosave_4.hip

65.1 KB
Binary file not shown.

‎Presets/Autosave_5.hip

65.1 KB
Binary file not shown.

‎Presets/REACH.hip

-27 Bytes
Binary file not shown.

‎Presets/Reach.hip

-27 Bytes
Binary file not shown.

‎Scripts/Handler.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ inline function onComboBox1Control(component, value)
9898
if (value == 2.0) {
9999
Theme.setTheme('Dark');
100100
}
101+
UserSettings.saveSettings();
101102
};
102103

103104
// Animations
@@ -205,13 +206,12 @@ Content.getComponent("button_quickTheme").setControlCallback(onbutton_quickTheme
205206
inline function onbutton_quickThemeControl(component, value)
206207
{
207208
if (value) {
208-
209209
if (Theme.name == 'Light') {
210210
Theme.setTheme('Dark');
211211
} else {
212212
Theme.setTheme('Light');
213213
}
214-
214+
UserSettings.saveSettings();
215215
}
216216

217217
};

‎Scripts/ScriptProcessors/Reach/Interface.js

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ include("Helpers.js");
44
include("Reverb.js");
55
include("Effects.js");
66
include("Filter.js");
7+
include("Config.js");
78
include("Settings.js");
89
include("EffectCustomizer.js");
910
include("ZoomHandler.js");
@@ -44,6 +45,7 @@ Globals.screenLock = true;
4445
// Loading Settings
4546
if (settingsExist()) {
4647
UserSettings.loadSettings();
48+
Console.print(UserSettings.startupAnimation);
4749
if (UserSettings.startupAnimation) {
4850
SplashAnimation.init();
4951
} else {

‎Scripts/Server.js

+19-21
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ namespace API {
1010
var license = getLocalLicense();
1111
if (license) Globals.activated = true;
1212
}
13-
const testSerial = '8868-40D2-E54C-2601';
1413
inline function activateLicenseWithSerial(serialKey) {
15-
Console.print(serialKey);
16-
1714
Server.callWithPOST('', {
1815
'license_key': serialKey,
1916
'fslm_api_key': Config.API_KEY,
@@ -22,15 +19,14 @@ namespace API {
2219
}
2320

2421
inline function checkSerialLicense(status, data) {
25-
22+
Console.print(trace(data));
2623
if (data['product_id'] == '62') {
27-
Console.print('license is valid for Reach');
24+
setActivate();
2825
}
2926
}
3027

3128
inline function activateLicense(usermail, userpw) {
3229
Server.setHttpHeader('Content-Type: application/json');
33-
3430
local p = '{
3531
"username": "'+usermail+'",
3632
"password": "'+userpw+'"
@@ -50,25 +46,27 @@ namespace API {
5046
}
5147
}
5248

49+
inline function setActivate() {
50+
local data = {'isActivated': true, date: Engine.getSystemTime(true)};
51+
local machineId = FileSystem.getSystemId();
52+
local appDateDir = FileSystem.getFolder(FileSystem.UserPresets).getParentDirectory();
53+
appDateDir.getChildFile("license.dat").writeEncryptedObject(data, machineId);
54+
55+
Globals.activated = true;
56+
57+
// Disable gain reduction
58+
GainReduction.setBypassed(true);
59+
GainReductionTimer.stopTimer();
60+
61+
UserSettings.button_not_activated.set('visible', !Globals.activated);
62+
UserSettings.activatePageRadio('thankyou');
63+
}
64+
5365

5466

5567
inline function checkLicense(status, data) {
5668
if (data.response.licenses[0].product_name == 'Reach') {
57-
local data = {'isActivated': true, date: Engine.getSystemTime(true)};
58-
local machineId = FileSystem.getSystemId();
59-
local appDateDir = FileSystem.getFolder(FileSystem.UserPresets).getParentDirectory();
60-
appDateDir.getChildFile("license.dat").writeEncryptedObject(data, machineId);
61-
Globals.activated = true;
62-
63-
// Disable gain reduction
64-
GainReduction.setBypassed(true);
65-
GainReductionTimer.stopTimer();
66-
67-
// update panels
68-
panel_non_activated.set('visible', !Globals.activated);
69-
panel_non_activated.repaint();
70-
button_not_activated.set('visible', !Globals.activated);
71-
label_thank_you.set('visible', Globals.activated);
69+
setActivate();
7270
} else {
7371
label_not_found.set('text', 'Serial Key is not valid.');
7472
label_not_found.set('visible', true);

‎Scripts/Settings.js

+27-7
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ namespace UserSettings {
6363
{
6464
settingsButtonsRadio(1);
6565
displayShowSettings('activate');
66-
activatePageRadio('serial');
66+
if (!Globals.activated) {
67+
settingsButtonsRadio(1);
68+
activatePageRadio('serial');
69+
} else {
70+
activatePageRadio('thankyou');
71+
}
6772
};
6873

6974

@@ -131,8 +136,7 @@ namespace UserSettings {
131136

132137
// Buy Reach Button
133138
Content.getComponent("button_buy_reach").setControlCallback(onbutton_buy_reachControl);
134-
inline function onbutton_buy_reachControl(component, value)
135-
{
139+
inline function onbutton_buy_reachControl(component, value) {
136140
if (value) Engine.openWebsite('https://sinuslabs.io/product/reach');
137141
};
138142

@@ -143,8 +147,10 @@ namespace UserSettings {
143147
if (value) {
144148
displayShowSettings('activate');
145149
Globals.settingsOpen = true;
146-
settingsButtonsRadio(1);
147-
activatePageRadio('serial');
150+
if (!Globals.activated) {
151+
settingsButtonsRadio(1);
152+
activatePageRadio('serial');
153+
}
148154
}
149155
};
150156

@@ -181,22 +187,37 @@ namespace UserSettings {
181187
case 'serial':
182188
displayPanel_serial.set('visible', true);
183189
displayPanel_login.set('visible', false);
190+
label_thank_you.set('visible', false);
191+
displayButton_serial.set('visible', true);
192+
displayButton_login.set('visible', true);
184193
displayButton_serial.setValue(true);
185194
displayButton_login.setValue(false);
186195
break;
187196
case 'login':
188197
displayPanel_login.set('visible', true);
189198
displayPanel_serial.set('visible', false);
199+
label_thank_you.set('visible', false);
200+
displayButton_serial.set('visible', true);
201+
displayButton_login.set('visible', true);
190202
displayButton_serial.setValue(false);
191203
displayButton_login.setValue(true);
192204
break;
205+
case 'thankyou':
206+
displayPanel_login.set('visible', false);
207+
displayPanel_serial.set('visible', false);
208+
label_thank_you.set('visible', true);
209+
displayButton_serial.set('visible', false);
210+
displayButton_login.set('visible', false);
211+
break;
193212
default:
194213
break
195214
}
196215
}
197216

198217
// saves the settings from the general page
199218
function saveSettings() {
219+
Console.print('startup animation enabled: ' + UserSettings.startupAnimation);
220+
200221
settingsFile.writeObject({
201222
'zoom': Settings.getZoomLevel(),
202223
'animationEnabled': UserSettings.enableAnimations,
@@ -214,7 +235,7 @@ namespace UserSettings {
214235
var zoomSaved = Engine.doubleToString(savedSettings['zoom'], 1);
215236
var animationEnabledSaved = savedSettings['animationEnabled'];
216237
var startupAnimationSaved = savedSettings['startupAnimation'];
217-
238+
Console.print('load animation' + startupAnimationSaved);
218239
// zoom level
219240
Settings.setZoomLevel(zoomSaved);
220241
var zoomFactorsIndex = zoomFactors.indexOf(zoomSaved, 0, 0);
@@ -235,7 +256,6 @@ namespace UserSettings {
235256
// Toggle buttons are using reversed value to display on by default
236257
button_animationToggle.setValue(!animationEnabledSaved);
237258
UserSettings.enableAnimations = animationEnabledSaved;
238-
239259
// startup animation
240260
button_startupAnimationToggle.setValue(!startupAnimationSaved);
241261
startupAnimation = startupAnimationSaved;

‎Scripts/Theme.js

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ namespace Theme {
146146
repaintAllPanels();
147147
themeLabels();
148148

149-
saveSettings();
150149
}
151150
}
152151

‎UserPresets/Creative/Arktis.preset

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<Preset Version="1.3.0">
3+
<Preset Version="1.4.0">
44
<Content Processor="Interface">
5-
<Control type="ScriptSlider" id="header_vumeter_ch1" value="0.2626477371420342"/>
6-
<Control type="ScriptSlider" id="header_vumeter_ch2" value="0.2517360201136095"/>
75
<Control type="ScriptButton" id="onPresetLoad" value="0.0"/>
86
<Control type="ScriptButton" id="button_quickTheme" value="0.0"/>
9-
<Control type="ScriptSlider" id="knob_reverb_space" value="1.850000023841858"/>
7+
<Control type="ScriptSlider" id="knob_reverb_space" value="1.849999904632568"/>
108
<Control type="ScriptSlider" id="knob_reverb_diffusion" value="1.0"/>
11-
<Control type="ScriptSlider" id="knob_reverb_damping" value="0.05000000074505806"/>
12-
<Control type="ScriptSlider" id="knob_reverb_mix" value="0.9200000166893005"/>
9+
<Control type="ScriptSlider" id="knob_reverb_damping" value="0.04999999701976776"/>
10+
<Control type="ScriptSlider" id="knob_reverb_mix" value="0.9199999570846558"/>
1311
<Control type="ScriptSlider" id="knob_reverb_time" value="3.819999933242798"/>
1412
<Control type="ScriptSlider" id="knob_cleanup_low" value="0.3700000047683716"/>
1513
<Control type="ScriptSlider" id="knob_cleanup_high" value="1.0"/>
1614
<Control type="ScriptSlider" id="knob_modulation_depth" value="0.8199999928474426"/>
1715
<Control type="ScriptSlider" id="knob_modulation_frequency" value="3.539999961853027"/>
1816
<Control type="ScriptButton" id="button_degrade_bypass" value="1.0"/>
19-
<Control type="ScriptSlider" id="knob_effects_degrade" value="0.6700000166893005"/>
17+
<Control type="ScriptSlider" id="knob_effects_degrade" value="0.6699999570846558"/>
2018
<Control type="ScriptButton" id="button_flanger_bypass" value="1.0"/>
2119
<Control type="ScriptSlider" id="knob_effects_flair" value="1.0"/>
2220
<Control type="ScriptButton" id="button_chorus_bypass" value="1.0"/>
23-
<Control type="ScriptSlider" id="knob_effects_chorus" value="0.8500000238418579"/>
21+
<Control type="ScriptSlider" id="knob_effects_chorus" value="0.8499999642372131"/>
2422
<Control type="ScriptButton" id="button_distort_bypass" value="1.0"/>
25-
<Control type="ScriptSlider" id="knob_effects_distortion" value="0.4600000083446503"/>
26-
<Control type="ScriptSlider" id="knob_io_in" value="1.490116119384766e-6"/>
23+
<Control type="ScriptSlider" id="knob_effects_distortion" value="0.4599999785423279"/>
24+
<Control type="ScriptSlider" id="knob_io_in" value="7.500001430511475"/>
2725
<Control type="ScriptSlider" id="knob_io_out" value="0.5199999809265137"/>
2826
<Control type="ScriptButton" id="button_not_activated" value="0.0"/>
2927
<Control type="ScriptSlider" id="displayKnob_reverb_feedback" value="0.6600000262260437"/>
@@ -37,25 +35,25 @@
3735
<Control type="ScriptButton" id="displayButton_reverb_bypass" value="1.0"/>
3836
<Control type="ScriptSlider" id="displayKnob_degrade_highcut" value="15357.0"/>
3937
<Control type="ScriptSlider" id="displayKnob_degrade_lowcut" value="8577.0"/>
40-
<Control type="ScriptSlider" id="displayKnob_degrade_depth" value="0.7300000190734863"/>
38+
<Control type="ScriptSlider" id="displayKnob_degrade_depth" value="0.7299999594688416"/>
4139
<Control type="ScriptSlider" id="displayKnob_degrade_frequency" value="0.07999999821186066"/>
4240
<Control type="ScriptSlider" id="displayKnob_degrade_amount" value="41.29999923706055"/>
4341
<Control type="ScriptButton" id="displayButton_degrade_bypass" value="1.0"/>
4442
<Control type="ScriptSlider" id="displayKnob_flanger_speed" value="0.1299999952316284"/>
45-
<Control type="ScriptSlider" id="displayKnob_flanger_depth" value="0.9700000286102295"/>
46-
<Control type="ScriptSlider" id="displayKnob_flanger_feedback" value="0.9100000262260437"/>
47-
<Control type="ScriptSlider" id="displayKnob_flanger_delay" value="0.2300000041723251"/>
43+
<Control type="ScriptSlider" id="displayKnob_flanger_depth" value="0.9699999690055847"/>
44+
<Control type="ScriptSlider" id="displayKnob_flanger_feedback" value="0.9099999666213989"/>
45+
<Control type="ScriptSlider" id="displayKnob_flanger_delay" value="0.2299999892711639"/>
4846
<Control type="ScriptSlider" id="displayKnob_flanger_offset" value="0.550000011920929"/>
4947
<Control type="ScriptButton" id="displayButton_flanger_bypass" value="1.0"/>
5048
<Control type="ScriptSlider" id="displayKnob_distort_lowPass" value="0.0"/>
5149
<Control type="ScriptSlider" id="displayKnob_distort_highpass" value="0.0"/>
52-
<Control type="ScriptSlider" id="displayKnob_distort_amount" value="0.2700000107288361"/>
50+
<Control type="ScriptSlider" id="displayKnob_distort_amount" value="0.2699999809265137"/>
5351
<Control type="ScriptSlider" id="displayKnob_distort_postlowcut" value="0.0"/>
5452
<Control type="ScriptSlider" id="displayKnob_distort_posthighcut" value="0.0"/>
5553
<Control type="ScriptButton" id="displayButton_distort_bypass" value="1.0"/>
5654
<Control type="ScriptSlider" id="displayKnob_chorus_Delay" value="0.0"/>
5755
<Control type="ScriptSlider" id="displayKnob_chorus_depth" value="0.9200000166893005"/>
58-
<Control type="ScriptSlider" id="displayKnob_chorus_feedback" value="0.800000011920929"/>
56+
<Control type="ScriptSlider" id="displayKnob_chorus_feedback" value="0.7999999523162842"/>
5957
<Control type="ScriptSlider" id="displayKnob_chorus_rate" value="0.2199999988079071"/>
6058
<Control type="ScriptButton" id="displayButton_chorus_bypass" value="1.0"/>
6159
</Content>

‎UserPresets/Creative/Der letzte Raum.preset

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<Preset Version="1.3.0">
3+
<Preset Version="1.4.0">
44
<Content Processor="Interface">
5-
<Control type="ScriptSlider" id="header_vumeter_ch1" value="0.4214525094873947"/>
6-
<Control type="ScriptSlider" id="header_vumeter_ch2" value="0.4186185372229063"/>
75
<Control type="ScriptButton" id="onPresetLoad" value="0.0"/>
86
<Control type="ScriptButton" id="button_quickTheme" value="0.0"/>
97
<Control type="ScriptSlider" id="knob_reverb_space" value="0.6399999856948853"/>
@@ -23,8 +21,8 @@
2321
<Control type="ScriptSlider" id="knob_effects_chorus" value="0.6800000071525574"/>
2422
<Control type="ScriptButton" id="button_distort_bypass" value="0.0"/>
2523
<Control type="ScriptSlider" id="knob_effects_distortion" value="0.199999988079071"/>
26-
<Control type="ScriptSlider" id="knob_io_in" value="0.0"/>
27-
<Control type="ScriptSlider" id="knob_io_out" value="0.8500000238418579"/>
24+
<Control type="ScriptSlider" id="knob_io_in" value="2.600001573562622"/>
25+
<Control type="ScriptSlider" id="knob_io_out" value="0.8499999642372131"/>
2826
<Control type="ScriptButton" id="button_not_activated" value="0.0"/>
2927
<Control type="ScriptSlider" id="displayKnob_reverb_feedback" value="0.0"/>
3028
<Control type="ScriptSlider" id="displayKnob_reverb_preDelay" value="0.0"/>
@@ -37,15 +35,15 @@
3735
<Control type="ScriptButton" id="displayButton_reverb_bypass" value="1.0"/>
3836
<Control type="ScriptSlider" id="displayKnob_degrade_highcut" value="18404.0"/>
3937
<Control type="ScriptSlider" id="displayKnob_degrade_lowcut" value="90.0"/>
40-
<Control type="ScriptSlider" id="displayKnob_degrade_depth" value="0.6700000166893005"/>
38+
<Control type="ScriptSlider" id="displayKnob_degrade_depth" value="0.6699999570846558"/>
4139
<Control type="ScriptSlider" id="displayKnob_degrade_frequency" value="0.949999988079071"/>
4240
<Control type="ScriptSlider" id="displayKnob_degrade_amount" value="44.79999923706055"/>
4341
<Control type="ScriptButton" id="displayButton_degrade_bypass" value="1.0"/>
4442
<Control type="ScriptSlider" id="displayKnob_flanger_speed" value="1.0"/>
45-
<Control type="ScriptSlider" id="displayKnob_flanger_depth" value="0.9200000166893005"/>
46-
<Control type="ScriptSlider" id="displayKnob_flanger_feedback" value="0.9800000190734863"/>
43+
<Control type="ScriptSlider" id="displayKnob_flanger_depth" value="0.9199999570846558"/>
44+
<Control type="ScriptSlider" id="displayKnob_flanger_feedback" value="0.9799999594688416"/>
4745
<Control type="ScriptSlider" id="displayKnob_flanger_delay" value="0.07000000029802322"/>
48-
<Control type="ScriptSlider" id="displayKnob_flanger_offset" value="0.9100000262260437"/>
46+
<Control type="ScriptSlider" id="displayKnob_flanger_offset" value="0.9099999666213989"/>
4947
<Control type="ScriptButton" id="displayButton_flanger_bypass" value="1.0"/>
5048
<Control type="ScriptSlider" id="displayKnob_distort_lowPass" value="0.0"/>
5149
<Control type="ScriptSlider" id="displayKnob_distort_highpass" value="0.0"/>
@@ -77,7 +75,7 @@
7775
</Processor>
7876
<Processor Type="SlotFX" ID="Effect Slot1" Bypassed="0">
7977
<ChildProcessors>
80-
<Processor Type="Hardcoded Master FX" ID="Effect Slot3_Hardcoded Master FX"
78+
<Processor Type="Hardcoded Master FX" ID="Effect Slot1_Hardcoded Master FX"
8179
Bypassed="0" Network="Flair" Flanger="1.0" Speed="1.0" Depth="0.9200000166893005"
8280
Feedback="0.9800000190734863" Delay="0.07000000029802322" Offset="0.9100000262260437"
8381
Mix="1.0">
@@ -91,7 +89,7 @@
9189
</Processor>
9290
<Processor Type="SlotFX" ID="Effect Slot2" Bypassed="0">
9391
<ChildProcessors>
94-
<Processor Type="Hardcoded Master FX" ID="Effect Slot1_Hardcoded Master FX"
92+
<Processor Type="Hardcoded Master FX" ID="Effect Slot2_Hardcoded Master FX"
9593
Bypassed="0" Network="Reverb" Reverb="1.0" Damping="0.3100000023841858"
9694
Diffusion="0.7199999690055847" HFGain="1.0" HighCrossover="1667.0"
9795
LFGain="0.550000011920929" LowCrossover="523.0" MidGain="0.7699999809265137"
@@ -108,7 +106,7 @@
108106
</Processor>
109107
<Processor Type="SlotFX" ID="Effect Slot3" Bypassed="0">
110108
<ChildProcessors>
111-
<Processor Type="Hardcoded Master FX" ID="Effect Slot2_Hardcoded Master FX"
109+
<Processor Type="Hardcoded Master FX" ID="Effect Slot3_Hardcoded Master FX"
112110
Bypassed="0" Network="Degrade" Degrade="1.0" Mix="0.1899999976158142"
113111
HighCut="18404.0" LowCut="90.0" ModulationDepth="0.6700000166893005"
114112
ModulationSpeed="0.949999988079071" Amount="44.79999923706055">

0 commit comments

Comments
 (0)