mirror/ObjToSchematic
2
0
Fork 1
mirror of https://github.com/LucasDower/ObjToSchematic.git synced 2025-03-07 14:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Additional refactoring

Browse Source
This commit is contained in:
Lucas Dower 2021-10-30 01:41:39 +01:00
parent d3b2f9d2a0
commit 2e4a030cc1
4 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app_context.ts
View File

@ -63,6 +63,7 @@ export class AppContext {
const file = files[0];
if (!file.name.endsWith(".obj") && !file.name.endsWith(".OBJ")) {
throw Error("Files must be .obj format");
this._showToast("Files must be .obj format", ToastColour.RED);
return;
}

50
src/camera.ts
View File

@ -1,12 +1,11 @@
import { m4, v3 } from "twgl.js";
import { MouseManager } from "./mouse";
import * as mathUtil from "./math";
import { degreesToRadians, clamp } from "./math";
import { Renderer } from "./renderer";
export class ArcballCamera {
public isRotating = false;
public isUserRotating = false;
private readonly fov: number;
private readonly zNear: number;
@ -41,7 +40,7 @@ export class ArcballCamera {
}
private constructor() {
this.fov = 30 * (Math.PI / 180);
this.fov = 30 * degreesToRadians;
this.zNear = 0.5;
this.zFar = 100.0;
this.gl = Renderer.Get._gl;
@ -50,34 +49,25 @@ export class ArcballCamera {
this.targetDistance = this.actualDistance;
this.targetAzimuth = this.actualAzimuth;
this.targetElevation = this.actualElevation;
this.updateCameraPosition();
}
public updateCamera() {
if (!this.isRotating) {
return;
}
//console.log("update camera");
this.aspect = this.gl.canvas.width / this.gl.canvas.height;
// Update target location if user is rotating camera
if (this.isUserRotating) {
const mouseDelta = MouseManager.Get.getMouseDelta();
this.targetAzimuth += mouseDelta.dx * this.mouseSensitivity;
this.targetElevation += mouseDelta.dy * this.mouseSensitivity;
//console.log(mouseDelta);
const mouseDelta = MouseManager.Get.getMouseDelta();
this.targetAzimuth += mouseDelta.dx * this.mouseSensitivity;
this.targetElevation += mouseDelta.dy * this.mouseSensitivity;
// Prevent the camera going upside-down
const eps = 0.01;
this.targetElevation = Math.max(Math.min(Math.PI - eps, this.targetElevation), eps);
}
// Prevent the camera going upside-down
const eps = 0.01;
this.targetElevation = Math.max(Math.min(Math.PI - eps, this.targetElevation), eps);
this.updateCameraPosition();
}
updateCameraPosition() {
this.actualDistance += (this.targetDistance - this.actualDistance) * 2 * this.cameraSmoothing;
this.actualAzimuth += (this.targetAzimuth - this.actualAzimuth) * this.cameraSmoothing;
// Move camera towards target location
this.actualDistance += (this.targetDistance - this.actualDistance ) * this.cameraSmoothing;
this.actualAzimuth += (this.targetAzimuth - this.actualAzimuth ) * this.cameraSmoothing;
this.actualElevation += (this.targetElevation - this.actualElevation) * this.cameraSmoothing;
this.eye = [
@ -98,18 +88,16 @@ export class ArcballCamera {
}
public onMouseDown(e: MouseEvent) {
this.isRotating = true;
this.isUserRotating = true;
}
public onMouseUp(e: MouseEvent) {
this.isRotating = false;
this.isUserRotating = false;
}
public onWheelScroll(e: WheelEvent) {
this.targetDistance += e.deltaY * this.scrollSensitivity;
this.targetDistance = mathUtil.clamp(this.targetDistance, this.zoomDistMin, this.zoomDistMax);
this.updateCameraPosition();
this.targetDistance = clamp(this.targetDistance, this.zoomDistMin, this.zoomDistMax);
}
public getProjectionMatrix() {

4
src/math.ts
View File

@ -28,4 +28,6 @@ export const triangleArea = (a: number, b: number, c: number) => {
export const xAxis = new Vector3(1.0, 0.0, 0.0);
export const yAxis = new Vector3(0.0, 1.0, 0.0);
export const zAxis = new Vector3(0.0, 0.0, 1.0);
export const zAxis = new Vector3(0.0, 0.0, 1.0);
export const degreesToRadians = Math.PI / 180;

2
src/renderer.ts
View File

@ -337,8 +337,6 @@ export class Renderer {
this._gl.enable(this._gl.BLEND);
this._gl.clearColor(this._backgroundColour.r, this._backgroundColour.g, this._backgroundColour.b, 1.0);
this._gl.clear(this._gl.COLOR_BUFFER_BIT | this._gl.DEPTH_BUFFER_BIT);
ArcballCamera.Get.updateCameraPosition();
}
_drawBuffer(drawMode: number, buffer: {numElements: number, buffer: twgl.BufferInfo}, shader: twgl.ProgramInfo, uniforms: any) {