net.dreditor.actors 0.1.6 → 0.1.7

package/Implementation/ActorFocusHandler.cs

@@ -1,196 +1,196 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Events;
-using DREditor.Dialogues.LineReading;
-using DREditor.EventObjects;
-using DREditor.Services;
-using DREditor.Talkables;
-using System.Collections;
-using System.Linq;
-using UnityEngine;
-
-namespace DREditor.Actors.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    /// <remarks>
-    ///
-    /// </remarks>
-    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineProcessorRoutine) +
-        "\n\n")]
-    public class ActorFocusHandler : DialogueComponent, ILineProcessorRoutine
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isLoadingFile = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inCGMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inVideoMode = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected float characterPanWaitTime = 0.3f;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int fastForwardBufferedFrames = 5;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected FocusHandler focusHandler = null;
-
-
-        /// <inheritdoc/>
-        public virtual bool ShouldProcess(Line currentLine) 
-            => currentLine.ContainsEventType<ShakeObject>() || currentLine.PanToChar || ShouldUsePanBufferTime(currentLine);
-
-        /// <inheritdoc/>
-        public virtual IEnumerator LineProcessRoutine(Line currentLine) => EvaluateCameraMovement(currentLine);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        protected virtual IEnumerator EvaluateCameraMovement(Line currentLine)
-        {
-            if (currentLine.PanToChar)
-                yield return PanToCharacterEvent(currentLine);
-            else if (ShouldUsePanBufferTime(currentLine))
-                yield return FocusCharacter();
-
-            yield return InvokeCameraDialogueEvent<ShakeObject>(currentLine);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        protected virtual IEnumerator PanToCharacterEvent(Line currentLine)
-        {
-            Actor actorPan = (Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>()
-                .GetObjectByName(currentLine.CharToPan.FirstName);
-
-            if (!actorPan)
-                UnityEngine.Debug.LogWarning(ToString() + ": ALERT: PAN TO CHARACTER ACTOR WAS NOT FOUND IN THE SCENE");
-
-            focusHandler.ChangeFocus(actorPan, (Actor)lastActor.Value);
-
-            lastActor.SetValue(actorPan);
-
-            yield return new WaitForSeconds(characterPanWaitTime);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        /// <returns></returns>
-        protected virtual bool ShouldUsePanBufferTime(Line currentLine)
-        {
-            bool notInCGState = !inVideoMode.Value && !inCGMode.Value;
-
-            bool currentActorIsValid = (Actor)currentActor.Value != null;
-
-            bool lastActorIsntCurrent = (Actor)lastActor.Value != (Actor)currentActor.Value;
-
-            bool protagIsntSpeaking = !isProtagSpeaking.Value;
-
-            //bool actorIsntLeaving = !currentLine.Leave; Leave is removed so needs testing.
-
-            bool validActorStates = currentActorIsValid && lastActorIsntCurrent;
-
-            bool validStates = validActorStates && notInCGState && protagIsntSpeaking;// && actorIsntLeaving;
-
-            bool lineValidStates = !currentLine.PanToChar && !currentLine.DontPan;
-
-            return lineValidStates && validStates;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator FocusCharacter()
-        {
-            if (isLoadingFile.Value)
-                yield return new WaitForSeconds(Time.unscaledDeltaTime);
-
-            /* The Above had to be added because for some reason loading on the line to kai before the
-             * tree room shakes : it'd put the camera on the wrong angle
-             * D_Ch0_Inv_ToTrial_AfterStatue Line before tree vid
-             */
-
-            focusHandler.ChangeFocus((Actor)currentActor.Value, (Actor)lastActor.Value);
-
-            yield return new WaitForSeconds(Time.unscaledDeltaTime);
-
-            if (inFastForwardMode.Value)
-                yield return new WaitForSeconds(Time.unscaledDeltaTime * fastForwardBufferedFrames);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="currentLine"></param>
-        protected virtual IEnumerator InvokeCameraDialogueEvent<T>(Line currentLine)
-        {
-            var cameraEvents = currentLine.DiaEvents.Where(dialogueEvent => dialogueEvent.GetType() == typeof(T));
-
-            if (cameraEvents.Count() > 0 && !inFastForwardMode.Value)
-            {
-                if (ShouldUsePanBufferTime(currentLine))
-                    yield return new WaitForSeconds(characterPanWaitTime);
-
-                foreach (IDialogueEvent cameraEvent in cameraEvents)
-                    cameraEvent.TriggerDialogueEvent();
-            }
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Events;
+using DREditor.Dialogues.LineReading;
+using DREditor.EventObjects;
+using DREditor.Services;
+using DREditor.Talkables;
+using System.Collections;
+using System.Linq;
+using UnityEngine;
+
+namespace DREditor.Actors.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineProcessorRoutine) +
+        "\n\n")]
+    public class ActorFocusHandler : DialogueComponent, ILineProcessorRoutine
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isLoadingFile = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inCGMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inVideoMode = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected float characterPanWaitTime = 0.3f;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int fastForwardBufferedFrames = 5;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected FocusHandler focusHandler = null;
+
+
+        /// <inheritdoc/>
+        public virtual bool ShouldProcess(Line currentLine) 
+            => currentLine.ContainsEventType<ShakeObject>() || currentLine.PanToChar || ShouldUsePanBufferTime(currentLine);
+
+        /// <inheritdoc/>
+        public virtual IEnumerator LineProcessRoutine(Line currentLine) => EvaluateCameraMovement(currentLine);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        protected virtual IEnumerator EvaluateCameraMovement(Line currentLine)
+        {
+            if (currentLine.PanToChar)
+                yield return PanToCharacterEvent(currentLine);
+            else if (ShouldUsePanBufferTime(currentLine))
+                yield return FocusCharacter();
+
+            yield return InvokeCameraDialogueEvent<ShakeObject>(currentLine);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        protected virtual IEnumerator PanToCharacterEvent(Line currentLine)
+        {
+            Actor actorPan = (Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>()
+                .GetObjectByName(currentLine.CharToPan.FirstName);
+
+            if (!actorPan)
+                UnityEngine.Debug.LogWarning(ToString() + ": ALERT: PAN TO CHARACTER ACTOR WAS NOT FOUND IN THE SCENE");
+
+            focusHandler.ChangeFocus(actorPan, (Actor)lastActor.Value);
+
+            lastActor.SetValue(actorPan);
+
+            yield return new WaitForSeconds(characterPanWaitTime);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        /// <returns></returns>
+        protected virtual bool ShouldUsePanBufferTime(Line currentLine)
+        {
+            bool notInCGState = !inVideoMode.Value && !inCGMode.Value;
+
+            bool currentActorIsValid = (Actor)currentActor.Value != null;
+
+            bool lastActorIsntCurrent = (Actor)lastActor.Value != (Actor)currentActor.Value;
+
+            bool protagIsntSpeaking = !isProtagSpeaking.Value;
+
+            //bool actorIsntLeaving = !currentLine.Leave; Leave is removed so needs testing.
+
+            bool validActorStates = currentActorIsValid && lastActorIsntCurrent;
+
+            bool validStates = validActorStates && notInCGState && protagIsntSpeaking;// && actorIsntLeaving;
+
+            bool lineValidStates = !currentLine.PanToChar && !currentLine.DontPan;
+
+            return lineValidStates && validStates;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator FocusCharacter()
+        {
+            if (isLoadingFile.Value)
+                yield return new WaitForSeconds(Time.unscaledDeltaTime);
+
+            /* The Above had to be added because for some reason loading on the line to kai before the
+             * tree room shakes : it'd put the camera on the wrong angle
+             * D_Ch0_Inv_ToTrial_AfterStatue Line before tree vid
+             */
+
+            focusHandler.ChangeFocus((Actor)currentActor.Value, (Actor)lastActor.Value);
+
+            yield return new WaitForSeconds(Time.unscaledDeltaTime);
+
+            if (inFastForwardMode.Value)
+                yield return new WaitForSeconds(Time.unscaledDeltaTime * fastForwardBufferedFrames);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="currentLine"></param>
+        protected virtual IEnumerator InvokeCameraDialogueEvent<T>(Line currentLine)
+        {
+            var cameraEvents = currentLine.DiaEvents.Where(dialogueEvent => dialogueEvent.GetType() == typeof(T));
+
+            if (cameraEvents.Count() > 0 && !inFastForwardMode.Value)
+            {
+                if (ShouldUsePanBufferTime(currentLine))
+                    yield return new WaitForSeconds(characterPanWaitTime);
+
+                foreach (IDialogueEvent cameraEvent in cameraEvents)
+                    cameraEvent.TriggerDialogueEvent();
+            }
+        }
+    }
 }

package/Implementation/ActorFocusHandler.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 0d63c1751a42fea47898c229d54f2598
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0d63c1751a42fea47898c229d54f2598
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Implementation/ActorFocusLoadEnd.cs

@@ -1,109 +1,109 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Loading;
-using DREditor.EventObjects;
-using DREditor.Services;
-using DREditor.Talkables;
-using UnityEngine;
-
-namespace DREditor.Actors.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILoadToLineEnd) +
-        "\n\n")]
-    public class ActorFocusLoadEnd : DialogueComponent, ILoadToLineEnd
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent loadingToLine = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected FocusHandler FocusHandler = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected Line currentLine;
-
-
-        /// <inheritdoc/>
-        public virtual void OnLoadToLineEnd(Line currentLine) => InitializeActorFocus(currentLine);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        protected virtual void InitializeActorFocus(Line currentLine)
-        {
-            this.currentLine = currentLine;
-
-            EvaluateActorFocus();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void EvaluateActorFocus()
-        {
-            if (LinePansToCharacter())
-                FocusPanToCharacterProcess();
-            else if (NotSkippingPanning())
-                FocusCurrentActor();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool LinePansToCharacter() => currentLine.PanToChar;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void FocusPanToCharacterProcess()
-        {
-            Actor actorPan = null;
-
-            if (currentLine.CharToPan != null)
-                actorPan = (Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>()
-                    .GetObjectByName(currentLine.CharToPan.FirstName);
-
-            if (actorPan != null)
-                FocusHandler.ChangeFocus(actorPan, (Actor)lastActor.Value);
-
-            lastActor.SetValue(actorPan);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool NotSkippingPanning() => currentActor.Value != null && !currentLine.DontPan && 
-            (!loadingToLine.Value || lastActor.Value != currentActor.Value);
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void FocusCurrentActor() => FocusHandler.ChangeFocus((Actor)currentActor.Value, (Actor)lastActor.Value);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Loading;
+using DREditor.EventObjects;
+using DREditor.Services;
+using DREditor.Talkables;
+using UnityEngine;
+
+namespace DREditor.Actors.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILoadToLineEnd) +
+        "\n\n")]
+    public class ActorFocusLoadEnd : DialogueComponent, ILoadToLineEnd
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent loadingToLine = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected FocusHandler FocusHandler = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected Line currentLine;
+
+
+        /// <inheritdoc/>
+        public virtual void OnLoadToLineEnd(Line currentLine) => InitializeActorFocus(currentLine);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        protected virtual void InitializeActorFocus(Line currentLine)
+        {
+            this.currentLine = currentLine;
+
+            EvaluateActorFocus();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void EvaluateActorFocus()
+        {
+            if (LinePansToCharacter())
+                FocusPanToCharacterProcess();
+            else if (NotSkippingPanning())
+                FocusCurrentActor();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool LinePansToCharacter() => currentLine.PanToChar;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void FocusPanToCharacterProcess()
+        {
+            Actor actorPan = null;
+
+            if (currentLine.CharToPan != null)
+                actorPan = (Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>()
+                    .GetObjectByName(currentLine.CharToPan.FirstName);
+
+            if (actorPan != null)
+                FocusHandler.ChangeFocus(actorPan, (Actor)lastActor.Value);
+
+            lastActor.SetValue(actorPan);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool NotSkippingPanning() => currentActor.Value != null && !currentLine.DontPan && 
+            (!loadingToLine.Value || lastActor.Value != currentActor.Value);
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void FocusCurrentActor() => FocusHandler.ChangeFocus((Actor)currentActor.Value, (Actor)lastActor.Value);
+    }
 }

package/Implementation/ActorFocusLoadEnd.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: ac36e60798fe58447ae22f4420faaeb4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ac36e60798fe58447ae22f4420faaeb4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: