From d51b248225907cca901a9744a117cba974dda6bc Mon Sep 17 00:00:00 2001 From: gbrochar Date: Sun, 29 Nov 2020 12:02:55 +0100 Subject: [PATCH] minor changes --- src/client/camera.ts | 42 ++++++++++++++---------------------------- src/client/uiscene.ts | 8 ++++---- views/index.ejs | 22 +++++++++++----------- 3 files changed, 29 insertions(+), 43 deletions(-) diff --git a/src/client/camera.ts b/src/client/camera.ts index d303373..6a74835 100644 --- a/src/client/camera.ts +++ b/src/client/camera.ts @@ -6,31 +6,17 @@ import mat4 from 'gl-mat4'; * @param {any} context the program context */ export function updateCamera(context: any) { - const xAxis = mat4.create(); - mat4.rotateY(xAxis, xAxis, context.params.camRot.y); - const xMat = mat4.create(); - mat4.rotateY(xMat, xMat, context.params.camRot.y); - mat4.rotate(xMat, xMat, context.params.camRot.x, [ - xAxis[0], - xAxis[4], - xAxis[8], - ]); - const zMat = mat4.create(); - mat4.rotateY(zMat, zMat, context.params.camRot.y); - mat4.rotate(zMat, zMat, context.params.camRot.x, [ - xAxis[0], - xAxis[4], - xAxis[8], - ]); + const mat = mat4.create(); + mat4.rotateY(mat, mat, context.params.camRot.y); if (context.params.keyboard.a) { - context.params.camPos.x += xMat[0]; - context.params.camPos.y += xMat[4]; - context.params.camPos.z += xMat[8]; + context.params.camPos.x += mat[0]; + context.params.camPos.y += mat[4]; + context.params.camPos.z += mat[8]; } if (context.params.keyboard.d) { - context.params.camPos.x -= xMat[0]; - context.params.camPos.y -= xMat[4]; - context.params.camPos.z -= xMat[8]; + context.params.camPos.x -= mat[0]; + context.params.camPos.y -= mat[4]; + context.params.camPos.z -= mat[8]; } if (context.params.keyboard.space) { context.params.camPos.y -= 1; @@ -39,13 +25,13 @@ export function updateCamera(context: any) { context.params.camPos.y += 1; } if (context.params.keyboard.w) { - context.params.camPos.x += zMat[2]; - context.params.camPos.y += zMat[6]; - context.params.camPos.z += zMat[10]; + context.params.camPos.x += mat[2]; + context.params.camPos.y += mat[6]; + context.params.camPos.z += mat[10]; } if (context.params.keyboard.s) { - context.params.camPos.x -= zMat[2]; - context.params.camPos.y -= zMat[6]; - context.params.camPos.z -= zMat[10]; + context.params.camPos.x -= mat[2]; + context.params.camPos.y -= mat[6]; + context.params.camPos.z -= mat[10]; } } diff --git a/src/client/uiscene.ts b/src/client/uiscene.ts index 5e53e5a..9df94b4 100644 --- a/src/client/uiscene.ts +++ b/src/client/uiscene.ts @@ -80,7 +80,7 @@ export function uiUpdateScene(context: any) { `; } $('#scene-block').append(` -
@@ -117,14 +117,14 @@ export function uiUpdateScene(context: any) {
-
Change instances number:
+
Instances Number:
` + instanceRadioString + `
-
Change rotation:
+
Rotate:
X:
Y:
@@ -133,7 +133,7 @@ export function uiUpdateScene(context: any) {
-
Change scale:
+
Scale:
X:
Y:
diff --git a/views/index.ejs b/views/index.ejs index cdc7158..9107e78 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -19,10 +19,10 @@
-
+
To control the camera orientation with mouse, click in the canvas, to exit, click again.
- To control the camera position, use W/S for Z axis, A/D for X axis, and Space/Shift for fixed Y axis. + To control the camera position, use W/S for Z axis, A/D for X axis, and Space/Shift for Y axis.
Change shader:
@@ -66,19 +66,19 @@
-
Change circle size:
+
Circle Size:
-
Change fov:
- -
-
-
Change base rotation speed:
+
Rotation Speed:
-
Change instances number:
+
FOV:
+ +
+
+
Instances Number:
@@ -98,7 +98,7 @@
-
Change rotation:
+
Rotate:
X:
Y:
@@ -107,7 +107,7 @@
-
Change scale:
+
Scale:
X:
Y: