This commit is contained in:
Maurice Grönwoldt 2020-08-08 21:58:15 +02:00
commit 4c4afe3bdf
29 changed files with 595 additions and 139 deletions

View file

@ -6,13 +6,15 @@ class Wave2D extends Visual {
updateData() {
let data = audioHandler.getFloatArray();
let add = 2 / data.length,
x = -1;
let add = c.width / data.length,
x = 0,
y = c.height / 2,
goTrough = y / 2;
let outerLoop = 0;
for (let i = 0; i < data.length; i++) {
//first
this.data[outerLoop] = x;
this.data[outerLoop + 1] = data[i];
this.data[outerLoop + 1] = y + (data[i] * goTrough);
this.data[outerLoop + 2] = data[i];
outerLoop += 3;
x += add;
@ -35,17 +37,18 @@ class Wave2D extends Visual {
}
rotate(program) {
let matrix = [
1, 0, 0, 0,
0, 0.6, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
]
matrix = TDUtils.multiply(matrix, TDUtils.xRotation(vConf.get("rotation-x", 0)));
matrix = TDUtils.multiply(matrix, TDUtils.yRotation(vConf.get("rotation-y", 0)));
matrix = TDUtils.multiply(matrix, TDUtils.zRotation(vConf.get("rotation-z", 0)));
let rotate = gl.getUniformLocation(program, "u_matrix");
gl.uniformMatrix4fv(rotate, false, matrix);
let glHelper = new GLHelper(program);
glHelper.project();
glHelper.addFudgeFactor(vConf.get("fudgeFactor", 1));
glHelper.translate([
camera.translate.x,
camera.translate.y,
camera.translate.z
]);
glHelper.rotateX(camera.mouse.x);
glHelper.rotateY(camera.mouse.y);
glHelper.rotateZ(vConf.get("rotation-z", 0));
glHelper.applyMatrix();
}
setup() {
@ -59,9 +62,8 @@ class Wave2D extends Visual {
prepare(program) {
this.position = gl.getAttribLocation(program, "a_position");
this.color = gl.getUniformLocation(program, "u_color");
let lightPos = gl.getUniformLocation(program, "u_lightPos");
gl.uniform3fv(lightPos, vConf.get("light", [0, 5, -56]));
//GLHelper.uniform1f(program, "u_fudgeFactor", vConf.get("fudgeFactor", 1));
GLHelper.uniform3fv(program, "u_lightPos", vConf.get("light", [0, 5, -56]));
}
afterDraw() {