Merge pull request #88 from MasatoMakino/readonly_props

Readonly props
MasatoMakino · Mar 17, 2023 · 1381bee · 1381bee
2 parents 3041c64 + a7621ff
commit 1381bee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/src/CheckBoxObject.ts b/src/CheckBoxObject.ts
@@ -6,7 +6,7 @@ import {
 } from "./";
 
 export class CheckBoxObject<Value> extends ClickableObject<Value> {
-  declare view: CheckBoxMesh<Value> | CheckBoxSprite<Value>;
+  declare readonly view: CheckBoxMesh<Value> | CheckBoxSprite<Value>;
   protected _isSelect: boolean = false;
 
   /**

diff --git a/src/ClickableObject.ts b/src/ClickableObject.ts
@@ -48,7 +48,7 @@ export class ClickableObject<Value> {
     return this._isPress;
   }
 
-  view: ClickableView<Value>;
+  readonly view: ClickableView<Value>;
   protected _isPress: boolean = false;
   protected _isOver: boolean = false;
   protected _enable: boolean = true;

diff --git a/src/InteractiveMesh.ts b/src/InteractiveMesh.ts
@@ -17,7 +17,7 @@ class InteractiveMesh<Value, Model extends ClickableObject<Value>>
   extends Mesh
   implements IClickableObject3D<Value>
 {
-  public model: Model;
+  readonly model: Model;
 
   constructor(
     parameters: InteractiveMeshParameters,

diff --git a/src/InteractiveSprite.ts b/src/InteractiveSprite.ts
@@ -16,8 +16,7 @@ class InteractiveSprite<Value, Model extends ClickableObject<Value>>
   extends Sprite
   implements IClickableObject3D<Value>
 {
-  public model: Model;
-
+  readonly model: Model;
   constructor(
     material: StateMaterialSet,
     ctor: ModelConstructor<Model, Value>

diff --git a/src/RadioButtonObject.ts b/src/RadioButtonObject.ts
@@ -1,7 +1,7 @@
 import { CheckBoxObject, RadioButtonMesh, RadioButtonSprite } from "./";
 
 export class RadioButtonObject<Value> extends CheckBoxObject<Value> {
-  declare view: RadioButtonMesh<Value> | RadioButtonSprite<Value>;
+  declare readonly view: RadioButtonMesh<Value> | RadioButtonSprite<Value>;
   protected _isFrozen: boolean = false;
 
   /**

diff --git a/src/ThreeMouseEvent.ts b/src/ThreeMouseEvent.ts
@@ -3,24 +3,28 @@ import { ClickableObject, IClickableObject3D } from "./";
 
 export interface ThreeMouseEvent<Value> extends Event {
   type: ThreeMouseEventType;
-  model?: ClickableObject<Value>;
-  isSelected?: boolean;
+  readonly model?: ClickableObject<Value>;
+  readonly isSelected?: boolean;
 }
 
 export class ThreeMouseEventUtil {
   static generate<Value>(
     type: ThreeMouseEventType,
     modelOrView: ClickableObject<Value> | IClickableObject3D<Value> | undefined
   ): ThreeMouseEvent<Value> {
-    const e: ThreeMouseEvent<Value> = {
-      type,
-      model: ThreeMouseEventUtil.getModel(modelOrView),
+    const model = ThreeMouseEventUtil.getModel(modelOrView);
+    const getSelection = () => {
+      if (type === "select") {
+        return ThreeMouseEventUtil.getSelection(model);
+      }
+      return undefined;
     };
 
-    if (type === "select") {
-      e.isSelected = ThreeMouseEventUtil.getSelection(e.model);
-    }
-    return e;
+    return {
+      type,
+      model,
+      isSelected: getSelection(),
+    };
   }
 
   private static getModel<Value>(