瀏覽代碼

Gizmo Mesh Upgrade - Linting Fixes

Dave Gould 4 年之前
父節點
當前提交
e2be9965d5

+ 4 - 5
src/Gizmos/axisDragGizmo.ts

@@ -5,6 +5,7 @@ import { Vector3 } from "../Maths/math.vector";
 import { TransformNode } from "../Meshes/transformNode";
 import { Node } from "../node";
 import { Mesh } from "../Meshes/mesh";
+import { LinesMesh } from 'Meshes/linesMesh';
 import { CylinderBuilder } from "../Meshes/Builders/cylinderBuilder";
 import { PointerDragBehavior } from "../Behaviors/Meshes/pointerDragBehavior";
 import { Gizmo } from "./gizmo";
@@ -13,7 +14,6 @@ import { StandardMaterial } from "../Materials/standardMaterial";
 import { Scene } from "../scene";
 import { PositionGizmo } from "./positionGizmo";
 import { Color3 } from '../Maths/math.color';
-import { LinesMesh } from 'Meshes/linesMesh';
 /**
  * Single axis drag gizmo
  */
@@ -52,7 +52,7 @@ export class AxisDragGizmo extends Gizmo {
         cylinder.material = material;
         cylinder.rotation.x = Math.PI / 2;
         cylinder.position.z += 0.3;
-        
+
         line.parent = arrow;
         line.material = material;
         line.position.z += 0.275 / 2;
@@ -103,10 +103,10 @@ export class AxisDragGizmo extends Gizmo {
         // Build Mesh + Collider
         const arrow = AxisDragGizmo._CreateArrow(gizmoLayer.utilityLayerScene, this._coloredMaterial, thickness);
         const collider = AxisDragGizmo._CreateArrow(gizmoLayer.utilityLayerScene, this._coloredMaterial, thickness * 4, true);
-        
+
         // Add to Root Node
         this._gizmoMesh = new Mesh("", gizmoLayer.utilityLayerScene);
-        [...arrow.getChildMeshes(), ...collider.getChildMeshes()].forEach(mesh => {
+        [...arrow.getChildMeshes(), ...collider.getChildMeshes()].forEach((mesh) => {
             this._gizmoMesh.addChild(mesh);
         });
 
@@ -170,7 +170,6 @@ export class AxisDragGizmo extends Gizmo {
             }
         });
 
-
         var light = gizmoLayer._getSharedGizmoLight();
         light.includedOnlyMeshes = light.includedOnlyMeshes.concat(this._rootMesh.getChildMeshes(false));
 

+ 6 - 6
src/Gizmos/axisScaleGizmo.ts

@@ -45,7 +45,7 @@ export class AxisScaleGizmo extends Gizmo {
     private _isEnabled: boolean = true;
     private _parent: Nullable<ScaleGizmo> = null;
 
-    private _gizmoMesh: AbstractMesh;
+    private _gizmoMesh: Mesh;
     private _coloredMaterial: StandardMaterial;
     private _hoverMaterial: StandardMaterial;
     private _disableMaterial: StandardMaterial;
@@ -75,7 +75,7 @@ export class AxisScaleGizmo extends Gizmo {
         this._disableMaterial.alpha = 0.4;
 
         // Build mesh + Collider
-        this._gizmoMesh = new AbstractMesh("axis", gizmoLayer.utilityLayerScene);
+        this._gizmoMesh = new Mesh("axis", gizmoLayer.utilityLayerScene);
         const { arrowMesh, arrowTail } = this._createGizmoMesh(this._gizmoMesh, thickness);
         this._createGizmoMesh(this._gizmoMesh, thickness * 4, true);
 
@@ -157,11 +157,11 @@ export class AxisScaleGizmo extends Gizmo {
             }
         });
         // On Drag Listener: to move gizmo mesh with user action
-        this.dragBehavior.onDragObservable.add(e => increaseGizmoMesh(e.dragDistance));
+        this.dragBehavior.onDragObservable.add((e) => increaseGizmoMesh(e.dragDistance));
         this.dragBehavior.onDragEndObservable.add(resetGizmoMesh);
 
         // Listeners for Universal Scalar
-        document.addEventListener('universalGizmoDrag', e => increaseGizmoMesh((e as any).detail));
+        document.addEventListener('universalGizmoDrag', (e) => increaseGizmoMesh((e as any).detail));
         document.addEventListener('universalGizmoEnd', resetGizmoMesh);
         this._eventListeners.push({listener: 'universalGizmoDrag', fn: increaseGizmoMesh });
         this._eventListeners.push({listener: 'universalGizmoEnd', fn: resetGizmoMesh });
@@ -172,7 +172,7 @@ export class AxisScaleGizmo extends Gizmo {
             disableMaterial: this._disableMaterial,
             active: false
         };
-        this._parent?.addToAxisCache((this._gizmoMesh as Mesh), cache);
+        this._parent?.addToAxisCache(this._gizmoMesh, cache);
 
         this._pointerObserver = gizmoLayer.utilityLayerScene.onPointerObservable.add((pointerInfo) => {
             if (this._customMeshSet) {
@@ -262,7 +262,7 @@ export class AxisScaleGizmo extends Gizmo {
                 matl.dispose();
             }
         });
-        this._eventListeners.forEach(e => {
+        this._eventListeners.forEach((e) => {
             document.addEventListener(e.listener, e.fn, false);
         });
         super.dispose();

+ 1 - 5
src/Gizmos/planeDragGizmo.ts

@@ -13,7 +13,6 @@ import { UtilityLayerRenderer } from "../Rendering/utilityLayerRenderer";
 import { StandardMaterial } from "../Materials/standardMaterial";
 import { Scene } from "../scene";
 import { PositionGizmo } from "./positionGizmo";
-import { LinesMesh } from 'Meshes/linesMesh';
 /**
  * Single plane drag gizmo
  */
@@ -68,7 +67,7 @@ export class PlaneDragGizmo extends Gizmo {
 
         this._hoverMaterial = new StandardMaterial("", gizmoLayer.utilityLayerScene);
         this._hoverMaterial.diffuseColor = Color3.Yellow();
-        
+
         this._disableMaterial = new StandardMaterial("", gizmoLayer.utilityLayerScene);
         this._disableMaterial.diffuseColor = Color3.Gray();
         this._disableMaterial.alpha = 0.4;
@@ -122,9 +121,6 @@ export class PlaneDragGizmo extends Gizmo {
                 var material = this._isHovered ? this._hoverMaterial : this._coloredMaterial;
                 this._rootMesh.getChildMeshes().forEach((m) => {
                     m.material = material;
-                    if ((<LinesMesh>m).color) {
-                        (<LinesMesh>m).color = material.diffuseColor;
-                    }
                 });
             }
         });

+ 6 - 10
src/Gizmos/planeRotationGizmo.ts

@@ -103,13 +103,13 @@ export class PlaneRotationGizmo extends Gizmo {
 
                 // This is for instantiation location of rotation circle
                 // Rotation Circle Forward Vector
-                const forward = new Vector3(0, 0, 1);		
+                const forward = new Vector3(0, 0, 1);
                 const direction = rotationCircle.getDirection(forward);
                 direction.normalize();
 
                 // Remove Rotation Circle from parent mesh before drag interaction
                 this._gizmoMesh.removeChild(rotationCircle);
-                
+
                 lastDragPosition.copyFrom(e.dragPlanePoint);
                 dragPlanePoint = e.dragPlanePoint;
                 const origin = rotationCircle.getAbsolutePosition().clone();
@@ -131,10 +131,6 @@ export class PlaneRotationGizmo extends Gizmo {
             this._gizmoMesh.addChild(rotationCircle);    // Add rotation circle back to parent mesh after drag behavior
         });
 
-        // var rotationMatrix = new Matrix();
-        // var planeNormalTowardsCamera = new Vector3();
-        // var localPlaneNormalTowardsCamera = new Vector3();
-
         var tmpSnapEvent = { snapDistance: 0 };
         var currentSnapDragDistance = 0;
         var tmpMatrix = new Matrix();
@@ -188,7 +184,7 @@ export class PlaneRotationGizmo extends Gizmo {
                     }
                 }
 
-                dragDistance += cameraFlipped ? -angle: angle;
+                dragDistance += cameraFlipped ? -angle : angle;
                 this.updateRotationCircle(rotationCircle, rotationCirclePaths, dragDistance, dragPlanePoint);
 
                 // Convert angle and axis to quaternion (http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm)
@@ -251,7 +247,7 @@ export class PlaneRotationGizmo extends Gizmo {
         this._parent?.addToAxisCache(this._gizmoMesh, cache);
     }
 
-    private _createGizmoMesh(parentMesh: AbstractMesh, thickness: number, tessellation: number){
+    private _createGizmoMesh(parentMesh: AbstractMesh, thickness: number, tessellation: number) {
         let drag = Mesh.CreateTorus("ignore", 0.6, 0.03 * thickness, tessellation, this.gizmoLayer.utilityLayerScene);
         drag.visibility = 0;
         let rotationMesh = Mesh.CreateTorus("", 0.6, 0.005 * thickness, tessellation, this.gizmoLayer.utilityLayerScene);
@@ -304,7 +300,7 @@ export class PlaneRotationGizmo extends Gizmo {
         const step = this.circleConstants.pi2 / this.circleConstants.tessellation;
         for (let p = -Math.PI / 2; p < Math.PI / 2 - 1.5; p += step / 2) {
             const path = [];
-            for (let i = 0; i < this.circleConstants.pi2; i += step ) {
+            for (let i = 0; i < this.circleConstants.pi2; i += step) {
                 if (i < fillRadians) {
                     const x = this.circleConstants.radius * Math.sin(i) * Math.cos(p);
                     const z = this.circleConstants.radius * Math.cos(i) * Math.cos(p);
@@ -337,7 +333,7 @@ export class PlaneRotationGizmo extends Gizmo {
             const path = pathArr[tessellationCounter];
             if (path) {
                 let radianCounter = 0;
-                for (let i = 0; i < this.circleConstants.pi2; i += step ) {
+                for (let i = 0; i < this.circleConstants.pi2; i += step) {
                     if (path[radianCounter]) {
                         if (i < Math.abs(newFill)) {
                             const eie = (newFill > 0) ? i : i * -1;

+ 1 - 1
src/Gizmos/positionGizmo.ts

@@ -285,7 +285,7 @@ export class PositionGizmo extends Gizmo {
                 gizmo.dispose();
             }
         });
-        this._observables.forEach(obs => {
+        this._observables.forEach((obs) => {
             this.gizmoLayer.utilityLayerScene.onPointerObservable.remove(obs);
         });
         this.onDragStartObservable.clear();

+ 1 - 1
src/Gizmos/rotationGizmo.ts

@@ -237,7 +237,7 @@ export class RotationGizmo extends Gizmo {
         this.zGizmo.dispose();
         this.onDragStartObservable.clear();
         this.onDragEndObservable.clear();
-        this._observables.forEach(obs => {
+        this._observables.forEach((obs) => {
             this.gizmoLayer.utilityLayerScene.onPointerObservable.remove(obs);
         });
     }

+ 3 - 3
src/Gizmos/scaleGizmo.ts

@@ -151,13 +151,13 @@ export class ScaleGizmo extends Gizmo {
         light.includedOnlyMeshes = light.includedOnlyMeshes.concat(this._octahedron);
 
         // Drag Event Listeners
-        uniformScaleGizmo.dragBehavior.onDragObservable.add(e => {
+        uniformScaleGizmo.dragBehavior.onDragObservable.add((e) => {
             document.dispatchEvent(new CustomEvent('universalGizmoDrag', {
                 detail: e.delta.y
             }));
         });
 
-        uniformScaleGizmo.dragBehavior.onDragEndObservable.add(e => {
+        uniformScaleGizmo.dragBehavior.onDragEndObservable.add((e) => {
             document.dispatchEvent(new CustomEvent('universalGizmoEnd'));
         });
 
@@ -321,7 +321,7 @@ export class ScaleGizmo extends Gizmo {
                 gizmo.dispose();
             }
         });
-        this._observables.forEach(obs => {
+        this._observables.forEach((obs) => {
             this.gizmoLayer.utilityLayerScene.onPointerObservable.remove(obs);
         });
         this.onDragStartObservable.clear();