@woosh/meep-engine 2.39.23 → 2.39.27

package/editor/tools/paint/prototypeTerrainEditor.js

@@ -69,7 +69,7 @@ async function main(engine) {
 
     editor_controls.enable();
 
-    const camera_orientation_gizmo = new BlenderCameraOrientationGizmo(new Quaternion());
+    const camera_orientation_gizmo = new BlenderCameraOrientationGizmo();
 
     camera_orientation_gizmo.css({
         position: 'absolute',

package/editor/tools/v2/BlenderCameraOrientationGizmo.d.ts

@@ -3,11 +3,44 @@ import Quaternion from "../../../core/geom/Quaternion";
 import Signal from "../../../core/events/signal/Signal";
 
 interface ISignals extends IViewSignals {
-    readonly axisSelected: Signal
+    readonly axisSelected: Signal<string>
+}
+
+interface IDirectionStyle {
+    near_fill?: string
+    near_stroke_width?: number
+    near_stroke_color?: string
+
+    far_fill?: string
+    far_stroke_width?: number
+    far_stroke_color?: string
+}
+
+interface IOptions {
+    size?: number,
+    padding?: number,
+    bubbleSizePrimary?: number,
+    bubbleSizeSecondary?: number,
+    lineWidth?: number,
+    fontSize?: string,
+    fontFamily?: string,
+    fontWeight?: string,
+    fontColor?: string,
+    fontYAdjust?: number,
+    selectionFontColor?: string,
+    axisStyles?: {
+        px?: IDirectionStyle,
+        py?: IDirectionStyle,
+        pz?: IDirectionStyle,
+
+        nx?: IDirectionStyle,
+        ny?: IDirectionStyle,
+        nz?: IDirectionStyle,
+    }
 }
 
 export class BlenderCameraOrientationGizmo extends View {
-    constructor(orientation?: Quaternion)
+    constructor(options?: IOptions)
 
     on: ISignals
 

package/editor/tools/v2/BlenderCameraOrientationGizmo.js

@@ -57,6 +57,30 @@ class DirectionStyle {
     }
 }
 
+function apply_hierarchical_options(source, target) {
+    for (const prop_name in source) {
+        if (!target.hasOwnProperty(prop_name)) {
+            console.warn(`Property '${prop_name}' doesn't exist, valid properties are : ${Object.keys(target)}`);
+            continue;
+        }
+
+        const existing_target_value = target[prop_name];
+        const source_value = source[prop_name];
+
+        if (typeof existing_target_value === "object") {
+            if (typeof existing_target_value.fromJSON === "function") {
+                existing_target_value.fromJSON(source_value);
+            } else {
+                apply_hierarchical_options(source_value, existing_target_value);
+            }
+        } else {
+            target[prop_name] = source_value;
+        }
+
+
+    }
+}
+
 
 /**
  * Modelled on https://github.com/jrj2211/three-orientation-gizmo/blob/master/src/OrientationGizmo.js
@@ -64,16 +88,15 @@ class DirectionStyle {
 export class BlenderCameraOrientationGizmo extends CanvasView {
     /**
      *
-     * @param {Quaternion} quaternion
      */
-    constructor(quaternion = null) {
+    constructor(options = {}) {
         super();
 
         /**
          *
          * @type {Quaternion}
          */
-        this.orientation = quaternion;
+        this.orientation = null;
 
         this.options = {
             size: 100,
@@ -129,6 +152,9 @@ export class BlenderCameraOrientationGizmo extends CanvasView {
             }
         };
 
+        // read options
+        apply_hierarchical_options(options, this.options);
+
         // Generate list of axes
         this.bubbles = [
             {
@@ -312,7 +338,7 @@ export class BlenderCameraOrientationGizmo extends CanvasView {
         compose_matrix4_array(rotation_matrix, Vector3.zero, rotation, Vector3.one);
         mat4.invert(rotation_matrix, rotation_matrix);
 
-        for (let bubble of this.bubbles) {
+        for (const bubble of this.bubbles) {
             const direction = bubble.direction.clone();
             direction.applyMatrix4(rotation_matrix);
 
@@ -321,10 +347,12 @@ export class BlenderCameraOrientationGizmo extends CanvasView {
 
         // Generate a list of layers to draw
         const layers = [];
-        for (let axis in this.bubbles) {
+
+        for (const bubble of this.bubbles) {
             // Check if the name starts with a negative and dont add it to the layer list if secondary axis is turned off
-            if (this.options.showSecondary === true || axis[0] !== "-") {
-                layers.push(this.bubbles[axis]);
+            const is_secondary = bubble.axis[0] !== "-";
+            if (this.options.showSecondary === true || is_secondary) {
+                layers.push(bubble);
             }
         }
 

package/engine/graphics/GraphicsEngine.d.ts

@@ -1,4 +1,4 @@
-import {Camera, PerspectiveCamera, Scene, WebGLRenderer, WebGLRenderTarget} from "three";
+import {PerspectiveCamera, Scene, WebGLRenderer, WebGLRenderTarget} from "three";
 import {RenderLayerManager} from "./render/layers/RenderLayerManager";
 import Vector3 from "../../core/geom/Vector3";
 import Vector2 from "../../core/geom/Vector2";

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.39.23",
+  "version": "2.39.27",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",