Skip to content

Commit 06927c3

Browse files
RumyraRumyra
committed
effects
1 parent 7014f3b commit 06927c3

5 files changed

Lines changed: 129 additions & 40 deletions

File tree

‎public/scripts/VizFX.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var VizFX = function(canvasEl) {
1+
var VizFX = (function() {
22

33
let vizFXMethods = {};
44

@@ -8,6 +8,7 @@ var VizFX = function(canvasEl) {
88
vizFXMethods.filter = function(filter, amount) {
99
switch (filter) {
1010
case 'invert':
11+
console.log('inverting');
1112
document.documentElement.style.setProperty("--invert", amount+'%');
1213
break;
1314
case 'grayscale':
@@ -46,8 +47,8 @@ var VizFX = function(canvasEl) {
4647
break;
4748
default:
4849
document.documentElement.style.setProperty("--zoom", 1);
49-
document.documentElement.style.setProperty("--transX", '50vw');
50-
document.documentElement.style.setProperty("--transY", '50vh');
50+
document.documentElement.style.setProperty("--transX", '0vw');
51+
document.documentElement.style.setProperty("--transY", '0vh');
5152
document.documentElement.style.setProperty("--rotate", '0turn');
5253
break;
5354
}
@@ -69,7 +70,7 @@ var VizFX = function(canvasEl) {
6970

7071
return vizFXMethods;
7172

72-
});
73+
})();
7374

7475

7576

‎public/scripts/control.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,62 @@ function onMIDIMessage(message) {
8080

8181
// effects
8282

83+
// bank one is filters
84+
if ( data[0] === quneo.vertSliders.bankOne[0][0] ) {
85+
86+
// switch over filter types
87+
let filterType = 'reset';
88+
89+
switch(data[1]) {
90+
case quneo.vertSliders.bankOne[0][1]:
91+
filterType = 'invert';
92+
break;
93+
case quneo.vertSliders.bankOne[1][1]:
94+
filterType = 'grayscale';
95+
break;
96+
case quneo.vertSliders.bankOne[2][1]:
97+
filterType = 'hue';
98+
break;
99+
case quneo.vertSliders.bankOne[3][1]:
100+
filterType = 'blur';
101+
break;
102+
default:
103+
filterType = 'reset';
104+
break;
105+
}
106+
107+
VizFX.filter(filterType, data[2]);
108+
109+
}
110+
111+
// bank two is transforms
112+
if ( data[0] === quneo.vertSliders.bankTwo[0][0] ) {
113+
114+
// switch over filter types
115+
let transformType = 'reset';
116+
117+
switch(data[1]) {
118+
case quneo.vertSliders.bankTwo[0][1]:
119+
transformType = 'zoom';
120+
break;
121+
case quneo.vertSliders.bankTwo[1][1]:
122+
transformType = 'transX';
123+
break;
124+
case quneo.vertSliders.bankTwo[2][1]:
125+
transformType = 'transY';
126+
break;
127+
case quneo.vertSliders.bankTwo[3][1]:
128+
transformType = 'rotate';
129+
break;
130+
default:
131+
transformType = 'reset';
132+
break;
133+
}
134+
135+
VizFX.transform(transformType, data[2]);
136+
137+
}
138+
83139
// black on
84140
if ( (data[0] === quneo.arrows[0].left.onPress[0]) && (data[1] === quneo.arrows[0].left.onPress[1]) ) {
85141

‎public/scripts/midiCont.js‎

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,111 @@
55
// setup quneo structure
66
var quneo = {
77
mainSlider: [176,0],
8+
pause: {
9+
onPress: [144,1,127],
10+
onRelease: [128,1,0]
11+
},
12+
stop: {
13+
onPress: [144,2,127],
14+
onRelease: [128,2,0]
15+
},
16+
play: {
17+
onPress: [144,3,127],
18+
onRelease: [128,3,0]
19+
},
820
pads: [
921
[],[],[],[]
1022
],
1123
arrows: [
1224
{
1325
left: {
14-
onPress: [144,11,127],
15-
onRelease: [128,11,0]
26+
onPress: [145,0,127],
27+
onRelease: [129,0,0]
1628
},
1729
right: {
18-
onPress: [144,12,127],
19-
onRelease: [128,12,0]
30+
onPress: [145,1,127],
31+
onRelease: [129,1,0]
2032
}
2133
},
2234
{
2335
left: {
24-
onPress: [144,13,127],
25-
onRelease: [128,13,0]
36+
onPress: [145,2,127],
37+
onRelease: [129,2,0]
2638
},
2739
right: {
28-
onPress: [144,14,127],
29-
onRelease: [128,14,0]
40+
onPress: [145,3,127],
41+
onRelease: [129,3,0]
3042
}
3143
},
3244
{
3345
left: {
34-
onPress: [144,15,127],
35-
onRelease: [128,15,0]
46+
onPress: [145,4,127],
47+
onRelease: [129,4,0]
3648
},
3749
right: {
38-
onPress: [144,16,127],
39-
onRelease: [128,16,0]
50+
onPress: [145,5,127],
51+
onRelease: [129,5,0]
4052
}
4153
},
4254
{
4355
left: {
44-
onPress: [144,17,127],
45-
onRelease: [128,17,0]
56+
onPress: [145,6,127],
57+
onRelease: [129,6,0]
4658
},
4759
right: {
48-
onPress: [144,18,127],
49-
onRelease: [128,18,0]
60+
onPress: [145,7,127],
61+
onRelease: [129,7,0]
5062
}
5163
}
5264
],
5365
horSliders: [
5466
[177,1],
55-
[177,2],
56-
[177,3],
57-
[177,4]
67+
[177,5],
68+
[177,9],
69+
[177,13]
5870
],
71+
rotaries: {
72+
bankOne: {
73+
left: [178,0],
74+
right: [178,1]
75+
},
76+
bankTwo: {
77+
left: [178,2],
78+
right: [178,3]
79+
},
80+
bankThree: {
81+
left: [178,4],
82+
right: [178,5]
83+
},
84+
bankFour: {
85+
left: [178,6],
86+
right: [178,7]
87+
},
88+
},
5989
vertSliders: {
6090
bankOne: [
61-
[177,5],
62-
[177,6],
63-
[177,7],
64-
[177,8]
65-
],
66-
bankTwo: [
67-
[178,5],
68-
[178,6],
69-
[178,7],
70-
[178,8]
71-
],
72-
bankThree: [
7391
[179,5],
7492
[179,6],
7593
[179,7],
7694
[179,8]
7795
],
78-
bankFour: [
96+
bankTwo: [
7997
[180,5],
8098
[180,6],
8199
[180,7],
82100
[180,8]
101+
],
102+
bankThree: [
103+
[181,5],
104+
[181,6],
105+
[181,7],
106+
[181,8]
107+
],
108+
bankFour: [
109+
[182,5],
110+
[182,6],
111+
[182,7],
112+
[182,8]
83113
]
84114
}
85115
};
@@ -94,8 +124,8 @@ function generatePadVals() {
94124

95125
for (j=0; j<64; j++) {
96126
var toPush = {
97-
onPress: [145+i,j,127],
98-
onRelease: [129+i,j,0]
127+
onPress: [159-i,j,127],
128+
onRelease: [143-i,j,0]
99129
};
100130
quneo.pads[i].push(toPush);
101131
}

‎public/styles/effects.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
--blur: 0px;
66

77
--zoom: 1;
8-
--transX: 50vw;
9-
--transY: 50vh;
8+
--transX: 0vw;
9+
--transY: 0vh;
1010
--rotate: 0turn;
1111

1212
--whiteFade: 0;

‎views/screen.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
<script src="scripts/d3.min.js"></script>
6161
<script src="scripts/midiCont.js"></script>
6262
<script src="scripts/sets.js"></script>
63+
<script src="scripts/VizFX.js"></script>
64+
<!-- <script src="scripts/VixDraw.js"></script> -->
6365

6466
<script src="scripts/visualFuncs.js"></script>
6567
<script src="scripts/coldfrontVF.js"></script>

0 commit comments

Comments
 (0)