update

Assets/Scripts/Game/Animations/Camera.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 486b800798d495647b597ab969133165
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Ichni.RhythmGame.Beatmap;
+using UnityEngine;
+
+namespace Ichni.RhythmGame
+{
+    public partial class CameraFieldOfView : AnimationBase
+    {
+        public FlexibleFloat fieldOfView;
+        public GameCamera targetGameCamera;
+        
+        public static CameraFieldOfView GenerateElement(string elementName, Guid id,
+            List<string> tags, bool isFirstGenerated, GameCamera gameCamera, FlexibleFloat fieldOfView)
+        {
+            CameraFieldOfView camFOV = Instantiate(GameManager.instance.basePrefabs.emptyObject)
+                .AddComponent<CameraFieldOfView>();
+            camFOV.Initialize(elementName, id, tags, isFirstGenerated, gameCamera);
+
+            camFOV.animatedObject = gameCamera;
+            camFOV.targetGameCamera = gameCamera;
+            
+            camFOV.fieldOfView = fieldOfView;
+            camFOV.animationReturnType = FlexibleReturnType.Before;
+
+            return camFOV;
+        }
+        
+        public override void SetDefaultSubmodules()
+        {
+            timeDurationSubmodule = new TimeDurationSubmodule(this);
+        }
+
+        protected override void UpdateAnimation(float songTime)
+        {
+            fieldOfView.UpdateFlexibleFloat(songTime);
+
+            if (fieldOfView.returnType == FlexibleReturnType.MiddleExecuting)
+            {
+                targetGameCamera.perspectiveAngle = fieldOfView.value;
+                targetGameCamera.gameCamera.fieldOfView = fieldOfView.value;
+            }
+        }
+        
+        public override void ApplyTimeOffset(float offset)
+        {
+            base.ApplyTimeOffset(offset);
+            fieldOfView.animations.ForEach(anim => anim.ApplyTimeOffset(offset));
+        }
+    }
+
+    public partial class CameraFieldOfView
+    {
+        public override void SaveBM()
+        {
+            matchedBM = new CameraFieldOfView_BM(elementName, elementGuid, tags, targetGameCamera.matchedBM as GameCamera_BM, fieldOfView.ConvertToBM());
+        }
+    }
+
+    namespace Beatmap
+    {
+        public partial class CameraFieldOfView_BM : AnimationBase_BM
+        {
+            public FlexibleFloat_BM fieldOfView;
+
+            public CameraFieldOfView_BM()
+            {
+                
+            }
+            
+            public CameraFieldOfView_BM(string elementName, Guid elementGuid, List<string> tags,
+                GameElement_BM attachedElement, FlexibleFloat_BM fieldOfView)
+                : base(elementName, elementGuid, tags, attachedElement)
+            {
+                this.fieldOfView = fieldOfView;
+            }
+
+            public override void ExecuteBM()
+            {
+                 matchedElement = CameraFieldOfView.GenerateElement(elementName, elementGuid, tags, false,
+                    GetElement(attachedElementGuid) as GameCamera, fieldOfView.ConvertToGameType());
+            }
+        }
+    }
+}

Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs.meta

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

Assets/Scripts/Game/Animations/Transform/Displacement.cs

@@ -40,9 +40,16 @@ namespace Ichni.RhythmGame
             positionY.UpdateFlexibleFloat(songTime);
             positionZ.UpdateFlexibleFloat(songTime);
 
-            if ((positionX.returnType is FlexibleReturnType.MiddleExecuting || positionX.isSwitchingReturnType) ||
-                (positionY.returnType is FlexibleReturnType.MiddleExecuting || positionY.isSwitchingReturnType) ||
-                (positionZ.returnType is FlexibleReturnType.MiddleExecuting || positionZ.isSwitchingReturnType))
+            if (positionX.returnType is FlexibleReturnType.MiddleExecuting ||
+                positionY.returnType is FlexibleReturnType.MiddleExecuting ||
+                positionZ.returnType is FlexibleReturnType.MiddleExecuting)
+            {
+                animationReturnType = FlexibleReturnType.MiddleExecuting;
+                Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value);
+                targetTransformSubmodule.positionOffset += currentPosition;
+                targetTransformSubmodule.positionDirtyMark = true;
+            }
+            else if (positionX.isSwitchingReturnType || positionY.isSwitchingReturnType || positionZ.isSwitchingReturnType)
             {
                 animationReturnType = FlexibleReturnType.MiddleExecuting;
                 Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value);

Assets/Scripts/Game/Animations/Transform/Scale.cs

@@ -43,9 +43,16 @@ namespace Ichni.RhythmGame
             scaleY.UpdateFlexibleFloat(songTime);
             scaleZ.UpdateFlexibleFloat(songTime);
 
-            if ((scaleX.returnType is FlexibleReturnType.MiddleExecuting || scaleX.isSwitchingReturnType) ||
-                (scaleY.returnType is FlexibleReturnType.MiddleExecuting || scaleY.isSwitchingReturnType) ||
-                (scaleZ.returnType is FlexibleReturnType.MiddleExecuting || scaleZ.isSwitchingReturnType))
+            if (scaleX.returnType is FlexibleReturnType.MiddleExecuting ||
+                scaleY.returnType is FlexibleReturnType.MiddleExecuting ||
+                scaleZ.returnType is FlexibleReturnType.MiddleExecuting)
+            {
+                animationReturnType = FlexibleReturnType.MiddleExecuting;
+                Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value);
+                targetTransformSubmodule.scaleOffset += currentScale;
+                targetTransformSubmodule.scaleDirtyMark = true;
+            }
+            else if (scaleX.isSwitchingReturnType || scaleY.isSwitchingReturnType || scaleZ.isSwitchingReturnType)
             {
                 animationReturnType = FlexibleReturnType.MiddleExecuting;
                 Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value);
@@ -57,7 +64,7 @@ namespace Ichni.RhythmGame
                 animationReturnType = FlexibleReturnType.MiddleInterval;
             }
         }
-        
+
         public override void ApplyTimeOffset(float offset)
         {
             base.ApplyTimeOffset(offset);

Assets/Scripts/Game/Animations/Transform/Swirl.cs

@@ -38,9 +38,16 @@ namespace Ichni.RhythmGame
             eulerAngleY.UpdateFlexibleFloat(songTime);
             eulerAngleZ.UpdateFlexibleFloat(songTime);
 
-            if ((eulerAngleX.returnType is FlexibleReturnType.MiddleExecuting || eulerAngleX.isSwitchingReturnType) ||
-                (eulerAngleY.returnType is FlexibleReturnType.MiddleExecuting || eulerAngleY.isSwitchingReturnType) ||
-                (eulerAngleZ.returnType is FlexibleReturnType.MiddleExecuting || eulerAngleZ.isSwitchingReturnType))
+            if (eulerAngleX.returnType is FlexibleReturnType.MiddleExecuting ||
+                eulerAngleY.returnType is FlexibleReturnType.MiddleExecuting ||
+                eulerAngleZ.returnType is FlexibleReturnType.MiddleExecuting)
+            {
+                animationReturnType = FlexibleReturnType.MiddleExecuting;
+                Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value);
+                targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles;
+                targetTransformSubmodule.eulerAnglesDirtyMark = true;
+            }
+            else if (eulerAngleX.isSwitchingReturnType || eulerAngleY.isSwitchingReturnType || eulerAngleZ.isSwitchingReturnType)
             {
                 animationReturnType = FlexibleReturnType.MiddleExecuting;
                 Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value);