laser emitter module

2023-04-06 15:21:23 +02:00
parent b4612b482f
commit cb54ebab05
39 changed files with 540 additions and 32 deletions
--- a/Assets/Station46/Modules/Laser/Laser
+++ b/Assets/Station46/Modules/Laser/Laser
@@ -0,0 +1,206 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4661341054449179328
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5691171783781926815}
+    m_Modifications:
+    - target: {fileID: 4014956364524074673, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_Name
+      value: Hole
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 66e96758671198f4cbb877705317cb9d, type: 3}
+--- !u!4 &1019683130525926234 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d,
+    type: 3}
+  m_PrefabInstance: {fileID: 4661341054449179328}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1813200712754693479 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6456368068151599015, guid: 66e96758671198f4cbb877705317cb9d,
+    type: 3}
+  m_PrefabInstance: {fileID: 4661341054449179328}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 05ccb586cbc54f9e8c46ade911449f7f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1001 &7611823108006064761
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1660506592467587114, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: firing
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7329942003389928718, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      propertyPath: m_Name
+      value: Button Emitter Variant
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 2394984000857638811, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 1019683130525926234}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7329942003389928718, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+        type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 8560417468725262182}
+  m_SourcePrefab: {fileID: 100100000, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3}
+--- !u!1 &872448883161704311 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7329942003389928718, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+    type: 3}
+  m_PrefabInstance: {fileID: 7611823108006064761}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8560417468725262182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 872448883161704311}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3b54c89b5d984a33b015bfcd8a793d8c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  size: {x: 1, y: 1}
+  button: {fileID: 1813200712754693479}
+--- !u!4 &5691171783781926815 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de,
+    type: 3}
+  m_PrefabInstance: {fileID: 7611823108006064761}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Station46/Modules/Laser/Laser
+++ b/Assets/Station46/Modules/Laser/Laser
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 511d605163a2abf49a0f1f69be067561
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Station46/Modules/Laser/Laser
+++ b/Assets/Station46/Modules/Laser/Laser
@@ -147,6 +147,7 @@ GameObject:
  m_Component:
  - component: {fileID: 2835502344937141734}
  - component: {fileID: 2394984000857638811}
+  - component: {fileID: 1660506592467587114}
  m_Layer: 0
  m_Name: Laser Emitter
  m_TagString: Untagged
@@ -183,6 +184,19 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 77f303a5ac191df499650cffd0903373, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  size: {x: 1, y: 1}
+--- !u!114 &1660506592467587114
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7329942003389928718}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f534253f30947c3be8ac6e0924a9cde, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
  firing: 1
  laserStart: {fileID: 5831954408757011522}
  laserLineRenderer: {fileID: 8529185019471240263}
--- a/Assets/Station46/Modules/Laser/Scripts/LaserButtonEmitter.cs
+++ b/Assets/Station46/Modules/Laser/Scripts/LaserButtonEmitter.cs
@@ -0,0 +1,18 @@
+using NaughtyAttributes;
+using Station46.Scripts;
+using UnityEngine;
+
+namespace Station46.Modules.Laser.Scripts
+{
+    public class LaserButtonEmitter : LaserEmitter
+    {
+        [BoxGroup("Internal")] [SerializeField] private Button button;
+        
+        protected override void Awake()
+        {
+            base.Awake();
+
+            button.ButtonEvent += (_, type) => laser.firing = type == ButtonEventType.Pressed;
+        }
+    }
+}
--- a/Assets/Station46/Modules/Laser/Scripts/LaserButtonEmitter.cs.meta
+++ b/Assets/Station46/Modules/Laser/Scripts/LaserButtonEmitter.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3b54c89b5d984a33b015bfcd8a793d8c
+timeCreated: 1683675862
--- a/Assets/Station46/Modules/Laser/Scripts/LaserEmitter.cs
+++ b/Assets/Station46/Modules/Laser/Scripts/LaserEmitter.cs
@@ -1,6 +1,19 @@
+using EscapeRoomEngine.Engine.Runtime.Modules;
+using EscapeRoomEngine.Engine.Runtime.Modules.State;
+using UnityEngine;
+
 namespace Station46.Modules.Laser.Scripts
 {
-    public class LaserEmitter : Laser
+    [RequireComponent(typeof(Laser))]
+    public class LaserEmitter : ModuleState
    {
+        protected Laser laser;
+
+        protected virtual void Awake()
+        {
+            laser = GetComponent<Laser>();
+        }
+
+        public override void SetModule(Module module) {}
    }
 }