diff --git a/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs b/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs index 922dca8..0938ecf 100644 --- a/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs +++ b/Assets/Scripts/Exporters/VMDRecorder/UnityCameraVMDRecorder.cs @@ -325,14 +325,18 @@ public class UnityCameraVMDRecorder : MonoBehaviour } - public static void SaveLiveCameraVMD(List frames) + public static void SaveLiveCameraVMD(List frames, int MultiCameraIndex = -1) { string directory = $"{Application.dataPath}/../VMDRecords/"; Directory.CreateDirectory(directory); var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"); string fileName = $"{directory}LiveCamera_POS_{time}.vmd"; string fovFileName = $"{directory}LiveCamera_FOV_{time}.vmd"; - + if(MultiCameraIndex >= 0) + { + fileName = $"{directory}LiveMultiCamera{MultiCameraIndex}_POS_{time}.vmd"; + fovFileName = $"{directory}LiveMultiCamera{MultiCameraIndex}_FOV_{time}.vmd"; + } const string modelName = "カメラ・照明"; diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs index 8175913..d0e5d90 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs @@ -100,6 +100,7 @@ namespace Gallop.Live.Cutt public bool IsRecordVMD; public List RecordFrames = new List(); + public List> MultiRecordFrames = new List>(); public float currentLiveTime { @@ -204,9 +205,9 @@ namespace Gallop.Live.Cutt private static bool availableFindKeyCache => true; - //private static Func fnGetMultiCameraPositionValueFunc = GetMultiCameraPositionValue; + private static Func fnGetMultiCameraPositionValueFunc = GetMultiCameraPositionValue; - //private static Func fnGetMultiCameraLookAtValueFunc = GetMultiCameraLookAtValue; + private static Func fnGetMultiCameraLookAtValueFunc = GetMultiCameraLookAtValue; public void CopyValues(T from, T to) { @@ -328,6 +329,7 @@ namespace Gallop.Live.Cutt AlterUpdate_CameraLookAt(workSheet, _currentFrame, ref outLookAt); AlterUpdate_CameraFov(workSheet, _currentFrame); AlterUpdate_CameraRoll(workSheet, _currentFrame); + AlterUpdate_MultiCamera(workSheet, _currentFrame); _isNowAlterUpdate = false; if (IsRecordVMD) @@ -343,6 +345,16 @@ namespace Gallop.Live.Cutt var camera = cacheCamera.camera; LiveCameraFrame frame = new LiveCameraFrame(currentFrame, transform, camera.fieldOfView, lastframe); RecordFrames.Add(frame); + + for (int i = 0; i < MultiRecordFrames.Count; i++) + { + var MulFrame = MultiRecordFrames[i]; + LiveCameraFrame lastMulframe = MulFrame.Count > 0 ? MulFrame[MulFrame.Count - 1] : null; + MultiCamera MulCamera = _multiCamera[i]; + var cam = MulCamera.GetCamera(); + LiveCameraFrame mulframe = new LiveCameraFrame(currentFrame, MulCamera.transform, cam.fieldOfView, lastMulframe); + MulFrame.Add(mulframe); + } } } @@ -648,12 +660,6 @@ namespace Gallop.Live.Cutt return curKey; } - //**************************************// - - public MultiCameraManager GetMultiCameraManager() - { - return _multiCameraManager; - } public Quaternion GetMultiCameraWorldRotation(int index) { @@ -1385,175 +1391,172 @@ namespace Gallop.Live.Cutt } //public void SetMultiCamera(MultiCameraManager manager, MultiCamera[] multiCamera) - //{ - // _multiCamera = multiCamera; - // _multiCameraManager = manager; - // if (multiCamera != null) - // { - // _multiCameraCache = new CacheCamera[multiCamera.Length]; - // for (int i = 0; i < multiCamera.Length; i++) - // { - // _multiCameraCache[i] = new CacheCamera(multiCamera[i].GetCamera()); - // } - // } - //} + public void SetMultiCamera(MultiCamera[] multiCamera) + { + _multiCamera = multiCamera; + //_multiCameraManager = manager; + if (multiCamera != null) + { + _multiCameraCache = new CacheCamera[multiCamera.Length]; + for (int i = 0; i < multiCamera.Length; i++) + { + _multiCameraCache[i] = new CacheCamera(multiCamera[i].GetCamera()); + } + } + } - //private static Vector3 GetMultiCameraPositionValue(LiveTimelineKeyCameraPositionData keyData, LiveTimelineControl timelineControl, FindTimelineConfig config) - //{ - // return (keyData as LiveTimelineKeyMultiCameraPositionData).GetValue(timelineControl, config.extraCameraIndex); - //} + private static Vector3 GetMultiCameraPositionValue(LiveTimelineKeyCameraPositionData keyData, LiveTimelineControl timelineControl, FindTimelineConfig config) + { + return (keyData as LiveTimelineKeyMultiCameraPositionData).GetValue(timelineControl); + } - //public bool CalculateMultiCameraPos(out Vector3 pos, LiveTimelineWorkSheet sheet, LiveTimelineKey curKey, LiveTimelineKey nextKey, int currentFrame, int timelineIndex) - //{ - // if (sheet.multiCameraPositionKeys.Count <= timelineIndex) - // { - // pos = Vector3.zero; - // return false; - // } - // FindTimelineConfig config = default(FindTimelineConfig); - // config.curKey = curKey; - // config.nextKey = nextKey; - // config.keyType = FindTimelineConfig.KeyType.KeyDirect; - // config.posKeys = sheet.multiCameraPositionKeys[timelineIndex].keys; - // config.lookAtKeys = null; - // config.extraCameraIndex = timelineIndex; - // return CalculateCameraPos(out pos, sheet, currentFrame, _multiCameraCache[timelineIndex], ref config, ref fnGetMultiCameraPositionValueFunc); - //} + public bool CalculateMultiCameraPos(out Vector3 pos, LiveTimelineWorkSheet sheet, LiveTimelineKey curKey, LiveTimelineKey nextKey, float currentFrame, int timelineIndex) + { + if (sheet.multiCameraPosKeys.Count <= timelineIndex) + { + pos = Vector3.zero; + return false; + } + FindTimelineConfig config = default(FindTimelineConfig); + config.curKey = curKey; + config.nextKey = nextKey; + config.keyType = FindTimelineConfig.KeyType.KeyDirect; + config.posKeys = sheet.multiCameraPosKeys[timelineIndex].keys; + config.lookAtKeys = null; + config.extraCameraIndex = timelineIndex; + return CalculateCameraPos(out pos, sheet, currentFrame, _multiCameraCache[timelineIndex], ref config, ref fnGetMultiCameraPositionValueFunc); + } - //private void AlterUpdate_MultiCameraPosition(LiveTimelineWorkSheet sheet, int currentFrame) - //{ - // int count = sheet.multiCameraPositionKeys.Count; - // for (int i = 0; i < count; i++) - // { - // LiveTimelineKeyMultiCameraPositionDataList keys = sheet.multiCameraPositionKeys[i].keys; - // if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode) || i >= _multiCameraCache.Length) - // { - // continue; - // } - // LiveTimelineKey curKey = null; - // LiveTimelineKey nextKey = null; - // FindTimelineKey(out curKey, out nextKey, keys, currentFrame); - // if (!CalculateMultiCameraPos(out var pos, sheet, curKey, nextKey, currentFrame, i)) - // { - // continue; - // } - // CacheCamera cacheCamera = _multiCameraCache[i]; - // Camera camera = cacheCamera.camera; - // if (curKey == null) - // { - // continue; - // } - // LiveTimelineKeyMultiCameraPositionData liveTimelineKeyMultiCameraPositionData = curKey as LiveTimelineKeyMultiCameraPositionData; - // LiveTimelineKeyMultiCameraPositionData liveTimelineKeyMultiCameraPositionData2 = nextKey as LiveTimelineKeyMultiCameraPositionData; - // camera.enabled = liveTimelineKeyMultiCameraPositionData.enableMultiCamera; - // if (liveTimelineKeyMultiCameraPositionData.enableMultiCamera) - // { - // _isMultiCameraEnable = true; - // camera.cullingMask = 0x10000000 | liveTimelineKeyMultiCameraPositionData.GetCullingMask(); - // float fieldOfView; - // Vector3 maskPosition; - // Quaternion maskRotation; - // Vector3 maskScale; - // if (liveTimelineKeyMultiCameraPositionData2 != null && liveTimelineKeyMultiCameraPositionData2.interpolateType != 0) - // { - // float t = CalculateInterpolationValue(liveTimelineKeyMultiCameraPositionData, liveTimelineKeyMultiCameraPositionData2, currentFrame); - // fieldOfView = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.fov, liveTimelineKeyMultiCameraPositionData2.fov, t); - // maskPosition = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.maskPosition, liveTimelineKeyMultiCameraPositionData2.maskPosition, t); - // maskRotation = Quaternion.Lerp(liveTimelineKeyMultiCameraPositionData.maskRotation, liveTimelineKeyMultiCameraPositionData2.maskRotation, t); - // maskScale = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.maskScale, liveTimelineKeyMultiCameraPositionData2.maskScale, t); - // } - // else - // { - // fieldOfView = liveTimelineKeyMultiCameraPositionData.fov; - // maskPosition = liveTimelineKeyMultiCameraPositionData.maskPosition; - // maskRotation = liveTimelineKeyMultiCameraPositionData.maskRotation; - // maskScale = liveTimelineKeyMultiCameraPositionData.maskScale; - // } - // camera.nearClipPlane = liveTimelineKeyMultiCameraPositionData.nearClip; - // camera.farClipPlane = liveTimelineKeyMultiCameraPositionData.farClip; - // camera.fieldOfView = fieldOfView; - // cacheCamera.cacheTransform.localPosition = pos; - // if (_multiCamera[i].maskIndex != liveTimelineKeyMultiCameraPositionData.maskIndex) - // { - // _multiCameraManager.AttachMask(i, liveTimelineKeyMultiCameraPositionData.maskIndex); - // } - // if (_multiCamera[i].maskIndex >= 0) - // { - // _multiCamera[i].maskPosition = maskPosition; - // _multiCamera[i].maskRotation = maskRotation; - // _multiCamera[i].maskScale = maskScale; - // } - // } - // } - //} + private void AlterUpdate_MultiCameraPosition(LiveTimelineWorkSheet sheet, float currentFrame) + { + int count = sheet.multiCameraPosKeys.Count; + for (int i = 0; i < count; i++) + { + LiveTimelineKeyMultiCameraPositionDataList keys = sheet.multiCameraPosKeys[i].keys; + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode) || i >= _multiCameraCache.Length) + { + continue; + } + LiveTimelineKey curKey = null; + LiveTimelineKey nextKey = null; + FindTimelineKey(out curKey, out nextKey, keys, currentFrame); + if (!CalculateMultiCameraPos(out var pos, sheet, curKey, nextKey, currentFrame, i)) + { + continue; + } + CacheCamera cacheCamera = _multiCameraCache[i]; + Camera camera = cacheCamera.camera; + if (curKey == null) + { + continue; + } + LiveTimelineKeyMultiCameraPositionData liveTimelineKeyMultiCameraPositionData = curKey as LiveTimelineKeyMultiCameraPositionData; + LiveTimelineKeyMultiCameraPositionData liveTimelineKeyMultiCameraPositionData2 = nextKey as LiveTimelineKeyMultiCameraPositionData; + camera.enabled = liveTimelineKeyMultiCameraPositionData.enableMultiCamera; + if (liveTimelineKeyMultiCameraPositionData.enableMultiCamera) + { + + _isMultiCameraEnable = true; + //camera.cullingMask = 0x10000000 | liveTimelineKeyMultiCameraPositionData.GetCullingMask(); + + float zAngle; + float fieldOfView; + Vector3 maskOffset; + float maskRoll; + if (liveTimelineKeyMultiCameraPositionData2 != null && liveTimelineKeyMultiCameraPositionData2.interpolateType != 0) + { + float t = CalculateInterpolationValue(liveTimelineKeyMultiCameraPositionData, liveTimelineKeyMultiCameraPositionData2, currentFrame); + fieldOfView = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.fov, liveTimelineKeyMultiCameraPositionData2.fov, t); + maskOffset = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.maskOffset, liveTimelineKeyMultiCameraPositionData2.maskOffset, t); + maskRoll = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.maskRoll, liveTimelineKeyMultiCameraPositionData2.maskRoll, t); + zAngle = LerpWithoutClamp(liveTimelineKeyMultiCameraPositionData.roll, liveTimelineKeyMultiCameraPositionData2.roll, t); + } + else + { + fieldOfView = liveTimelineKeyMultiCameraPositionData.fov; + maskOffset = liveTimelineKeyMultiCameraPositionData.maskOffset; + maskRoll = liveTimelineKeyMultiCameraPositionData.maskRoll; + zAngle = liveTimelineKeyMultiCameraPositionData.roll; + } - //private static Vector3 GetMultiCameraLookAtValue(LiveTimelineKeyCameraLookAtData keyData, LiveTimelineControl timelineControl, Vector3 camPos, FindTimelineConfig config) - //{ - // return (keyData as LiveTimelineKeyMultiCameraLookAtData).GetValue(timelineControl, camPos, config.extraCameraIndex); - //} + - //public bool CalculateMultiCameraLookAt(out Vector3 pos, LiveTimelineWorkSheet sheet, LiveTimelineKey curKey, LiveTimelineKey nextKey, int currentFrame, int timelineIndex = 0) - //{ - // if (sheet.multiCameraPositionKeys.Count <= timelineIndex || sheet.multiCameraLookAtKeys.Count <= timelineIndex) - // { - // pos = Vector3.zero; - // return false; - // } - // FindTimelineConfig config = default(FindTimelineConfig); - // config.curKey = curKey; - // config.nextKey = nextKey; - // config.keyType = FindTimelineConfig.KeyType.KeyDirect; - // config.posKeys = sheet.multiCameraPositionKeys[timelineIndex].keys; - // config.lookAtKeys = sheet.multiCameraLookAtKeys[timelineIndex].keys; - // config.extraCameraIndex = timelineIndex; - // return CalculateCameraLookAt(out pos, sheet, currentFrame, _multiCameraCache[timelineIndex], ref config, ref fnGetMultiCameraLookAtValueFunc, ref fnGetMultiCameraPositionValueFunc); - //} + camera.nearClipPlane = liveTimelineKeyMultiCameraPositionData.nearClip; + camera.farClipPlane = liveTimelineKeyMultiCameraPositionData.farClip; + camera.fieldOfView = fieldOfView; + cacheCamera.cacheTransform.localPosition = pos; + cacheCamera.cacheTransform.Rotate(0f, 0f, zAngle); + if (_multiCamera[i].maskIndex != (int)liveTimelineKeyMultiCameraPositionData.maskType) + { + //_multiCameraManager.AttachMask(i, (int)liveTimelineKeyMultiCameraPositionData.maskType); + } + + if (_multiCamera[i].maskIndex >= 0) + { + _multiCamera[i].MaskOffset = maskOffset; + _multiCamera[i].MaskRoll= maskRoll; + //_multiCamera[i].maskScale = maskScale; + } + } + } + } + + private static Vector3 GetMultiCameraLookAtValue(LiveTimelineKeyCameraLookAtData keyData, LiveTimelineControl timelineControl, Vector3 camPos, FindTimelineConfig config) + { + return (keyData as LiveTimelineKeyMultiCameraLookAtData).GetValue(timelineControl, camPos); + } + + public bool CalculateMultiCameraLookAt(out Vector3 pos, LiveTimelineWorkSheet sheet, LiveTimelineKey curKey, LiveTimelineKey nextKey, float currentFrame, int timelineIndex = 0) + { + if (sheet.multiCameraPosKeys.Count <= timelineIndex || sheet.multiCameraLookAtKeys.Count <= timelineIndex) + { + pos = Vector3.zero; + return false; + } + FindTimelineConfig config = default(FindTimelineConfig); + config.curKey = curKey; + config.nextKey = nextKey; + config.keyType = FindTimelineConfig.KeyType.KeyDirect; + config.posKeys = sheet.multiCameraPosKeys[timelineIndex].keys; + config.lookAtKeys = sheet.multiCameraLookAtKeys[timelineIndex].keys; + config.extraCameraIndex = timelineIndex; + return CalculateCameraLookAt(out pos, sheet, currentFrame, _multiCameraCache[timelineIndex], ref config, ref fnGetMultiCameraLookAtValueFunc, ref fnGetMultiCameraPositionValueFunc); + } - //private void AlterUpdate_MultiCameraLookAt(LiveTimelineWorkSheet sheet, int currentFrame) - //{ - // int count = sheet.multiCameraLookAtKeys.Count; - // for (int i = 0; i < count; i++) - // { - // LiveTimelineKeyMultiCameraLookAtDataList keys = sheet.multiCameraLookAtKeys[i].keys; - // if (i >= _multiCameraCache.Length) - // { - // break; - // } - // if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) - // { - // continue; - // } - // FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); - // if (curKey != null && CalculateMultiCameraLookAt(out var pos, sheet, curKey, nextKey, currentFrame, i)) - // { - // LiveTimelineKeyMultiCameraLookAtData liveTimelineKeyMultiCameraLookAtData = curKey as LiveTimelineKeyMultiCameraLookAtData; - // LiveTimelineKeyMultiCameraLookAtData liveTimelineKeyMultiCameraLookAtData2 = nextKey as LiveTimelineKeyMultiCameraLookAtData; - // float zAngle; - // if (liveTimelineKeyMultiCameraLookAtData2 != null && liveTimelineKeyMultiCameraLookAtData2.interpolateType != 0) - // { - // float t = CalculateInterpolationValue(liveTimelineKeyMultiCameraLookAtData, liveTimelineKeyMultiCameraLookAtData2, currentFrame); - // zAngle = LerpWithoutClamp(liveTimelineKeyMultiCameraLookAtData.roll, liveTimelineKeyMultiCameraLookAtData2.roll, t); - // } - // else - // { - // zAngle = liveTimelineKeyMultiCameraLookAtData.roll; - // } - // Transform cacheTransform = _multiCameraCache[i].cacheTransform; - // cacheTransform.LookAt(pos); - // cacheTransform.Rotate(0f, 0f, zAngle); - // } - // } - //} + private void AlterUpdate_MultiCameraLookAt(LiveTimelineWorkSheet sheet, float currentFrame) + { + int count = sheet.multiCameraLookAtKeys.Count; + for (int i = 0; i < count; i++) + { + LiveTimelineKeyMultiCameraLookAtDataList keys = sheet.multiCameraLookAtKeys[i].keys; + if (i >= _multiCameraCache.Length) + { + break; + } + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) + { + continue; + } + FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); + if (curKey != null && CalculateMultiCameraLookAt(out var pos, sheet, curKey, nextKey, currentFrame, i)) + { + Transform cacheTransform = _multiCameraCache[i].cacheTransform; + cacheTransform.LookAt(pos); + } + } + } - //private void AlterUpdate_MultiCamera(LiveTimelineWorkSheet sheet, int currentFrame) - //{ - // if (_multiCameraCache != null && !(_multiCameraManager == null) && _multiCameraManager.isInitialize) - // { - // AlterUpdate_MultiCameraPosition(sheet, currentFrame); - // AlterUpdate_MultiCameraLookAt(sheet, currentFrame); - // } - //} + private void AlterUpdate_MultiCamera(LiveTimelineWorkSheet sheet, float currentFrame) + { + //if (_multiCameraCache != null && !(_multiCameraManager == null) && _multiCameraManager.isInitialize) + if (_multiCameraCache != null) + { + AlterUpdate_MultiCameraPosition(sheet, currentFrame); + if(_isMultiCameraEnable) + AlterUpdate_MultiCameraLookAt(sheet, currentFrame); + } + } private static float LerpWithoutClamp(float a, float b, float t) { @@ -1580,8 +1583,6 @@ namespace Gallop.Live.Cutt return new Color(a.r + (b.r - a.r) * t, a.g + (b.g - a.g) * t, a.b + (b.b - a.b) * t, a.a + (b.a - a.a) * t); } - - //**************************************// } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineMultiCameraPositionData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineMultiCameraPositionData.cs index 471d407..6c3a192 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineMultiCameraPositionData.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineMultiCameraPositionData.cs @@ -33,6 +33,8 @@ namespace Gallop.Live.Cutt public float fov; public float maskRoll; public Vector2 maskOffset; + + } [System.Serializable] diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 00552b7..efc0670 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -464,6 +464,7 @@ namespace Gallop.Live SetupCharacterLocator(); InitializeCamera(); UpdateMainCamera(); + InitializeMultiCamera(_liveTimelineControl); for (int i = 0; i < kTimelineCameraIndices.Length; i++) { int num = kTimelineCameraIndices[i]; @@ -507,6 +508,25 @@ namespace Gallop.Live } } + public void InitializeMultiCamera(LiveTimelineControl control) + { + var cameraCount = control.data.multiCameraSettings.cameraNum; + MultiCamera[] cameras = new MultiCamera[cameraCount]; + var root = new GameObject("MultiCameras"); + root.transform.SetParent(control.transform); + for (int i = 0; i < cameraCount; i++) + { + var camObj = new GameObject($"MultiCamera_{i}"); + camObj.transform.SetParent(root.transform); + + var cam = camObj.AddComponent(); + cam.Initialize(); + cameras[i] = cam; + control.MultiRecordFrames.Add(new List()); + } + control.SetMultiCamera(cameras); + } + private void UpdateMainCamera() { if (_cameraObjects == null) return; @@ -686,7 +706,7 @@ namespace Gallop.Live { _liveCurrentTime += Time.deltaTime; - Debug.Log(_liveCurrentTime * 60); + //Debug.Log(_liveCurrentTime * 60); UI.ProgressBar.SetValueWithoutNotify(_liveCurrentTime / totalTime); OnTimelineUpdate(_liveCurrentTime); @@ -706,9 +726,41 @@ namespace Gallop.Live isExit = true; if (_liveTimelineControl.IsRecordVMD) { - var frames = _liveTimelineControl.RecordFrames; + SaveCameraVMD(); + SaveMultiCameraVMD(); + SaveCharacterVMD(); + + + + + } + UmaSceneController.LoadScene("Version2"); + UmaAssetManager.UnloadAllBundle(true); + } + + private void SaveCharacterVMD() + { + foreach (var container in CharaContainerScript) + { + var rootbone = container.transform.Find("Position"); + if (rootbone.gameObject.TryGetComponent(out UnityHumanoidVMDRecorder recorder)) + { + if (recorder.IsRecording) + { + recorder.StopRecording(); + recorder.SaveLiveVMD($"Live{live.MusicId}_Pos{CharaContainerScript.IndexOf(container)}"); + } + } + } + } + + private void SaveMultiCameraVMD() + { + for (int i = 0; i < _liveTimelineControl.MultiRecordFrames.Count; i++) + { + var frames = _liveTimelineControl.MultiRecordFrames[i]; frames[0].FovVaild = true; - var fov = _liveTimelineControl.data.worksheetList[0].cameraFovKeys.thisList; + var fov = _liveTimelineControl.data.worksheetList[0].multiCameraPosKeys[i].keys.thisList; fov.ForEach(k => { var index = k.frame; if (index < frames.Count) @@ -716,28 +768,31 @@ namespace Gallop.Live frames[index].FovVaild = true; if (index - 1 > 0) frames[index - 1].FovVaild = true; if (index - 2 > 0) frames[index - 2].FovVaild = true; - if (index + 1 < frames.Count) frames[index + 1].FovVaild = true; - if (index + 2 < frames.Count) frames[index + 2].FovVaild = true; + if (index - 3 > 0) frames[index - 3].FovVaild = true; } }); - UnityCameraVMDRecorder.SaveLiveCameraVMD(frames); - - foreach (var container in CharaContainerScript) - { - var rootbone = container.transform.Find("Position"); - if (rootbone.gameObject.TryGetComponent(out UnityHumanoidVMDRecorder recorder)) - { - if (recorder.IsRecording) - { - recorder.StopRecording(); - recorder.SaveLiveVMD($"Live{live.MusicId}_Pos{CharaContainerScript.IndexOf(container)}"); - } - } - } + UnityCameraVMDRecorder.SaveLiveCameraVMD(frames,i); } - UmaSceneController.LoadScene("Version2"); - UmaAssetManager.UnloadAllBundle(true); + } + + private void SaveCameraVMD() + { + var frames = _liveTimelineControl.RecordFrames; + frames[0].FovVaild = true; + var fov = _liveTimelineControl.data.worksheetList[0].cameraFovKeys.thisList; + fov.ForEach(k => { + var index = k.frame; + if (index < frames.Count) + { + frames[index].FovVaild = true; + if (index - 1 > 0) frames[index - 1].FovVaild = true; + if (index - 2 > 0) frames[index - 2].FovVaild = true; + if (index - 3 > 0) frames[index - 3].FovVaild = true; + } + }); + + UnityCameraVMDRecorder.SaveLiveCameraVMD(frames); } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/MultiCamera.cs b/Assets/Scripts/umamusume/Gallop/Live/MultiCamera.cs index 4898ac9..a813dd6 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/MultiCamera.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/MultiCamera.cs @@ -10,5 +10,124 @@ namespace Gallop.Live private RenderTexture _compositeTexture; // 0x20 [SerializeField] // RVA: 0xEBE0 Offset: 0xEBE0 VA: 0x7FF85CCBEBE0 private Material[] _compositeMaterial; // 0x28 + + public Vector2 MaskOffset; + public float MaskRoll; + + //From DereViewer + + private const float NearClipOffset = 0.01f; + + private Camera _camera; + + private int _maskIndex = -1; + + private Transform _myTransform; + + private Transform _maskTransform; + + private Renderer[] _maskRenderer; + + + public Vector3 maskPosition { get; set; } + + public Quaternion maskRotation { get; set; } + + public Vector3 maskScale { get; set; } + + public int maskIndex => _maskIndex; + + public Camera GetCamera() + { + return _camera; + } + + public Transform GetMaskTransform() + { + return _maskTransform; + } + + public void DetachMask() + { + _maskTransform = null; + _maskRenderer = null; + _maskIndex = -1; + } + + public void AttachMask(ref MultiCameraManager.MaskInfo maskInfo, int maskIndex) + { + _maskIndex = maskIndex; + _maskTransform = maskInfo.transform; + _maskRenderer = maskInfo.renderer; + } + + public void Initialize() + { + if (!(_camera != null)) + { + _myTransform = base.transform; + _camera = base.gameObject.AddComponent(); + _camera.enabled = false; + _camera.depth = -3; + } + } + + public void Setup(int cameraDepth, RenderTexture colorBuffer, RenderTexture depthBuffer) + { + if (!(_camera == null)) + { + _camera.depth = cameraDepth; + //_camera.cullingMask = StageUtil.Background3dAllLayers() | StageUtil.CharaAllLayers(); + _camera.clearFlags = CameraClearFlags.Depth; + _camera.allowHDR = false; + _camera.SetTargetBuffers(colorBuffer.colorBuffer, depthBuffer.depthBuffer); + } + } + + private void Release() + { + DetachMask(); + _myTransform = null; + _camera = null; + } + + private void OnDestroy() + { + Release(); + } + + private void UpdateTransform() + { + Vector3 forward = _myTransform.forward; + Vector3 vector = _myTransform.localRotation * maskPosition + forward * (_camera.nearClipPlane + 0.01f); + _maskTransform.localPosition = _myTransform.localPosition + vector; + _maskTransform.localRotation = Quaternion.LookRotation(forward) * maskRotation; + _maskTransform.localScale = maskScale; + } + + private void OnPreCull() + { + if (_maskIndex != -1) + { + UpdateTransform(); + Renderer[] maskRenderer = _maskRenderer; + for (int i = 0; i < maskRenderer.Length; i++) + { + maskRenderer[i].enabled = true; + } + } + } + + private void OnPostRender() + { + if (_maskIndex != -1) + { + Renderer[] maskRenderer = _maskRenderer; + for (int i = 0; i < maskRenderer.Length; i++) + { + maskRenderer[i].enabled = false; + } + } + } } }