Publish current live selection and graphics source with external keys
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using NAudio.Wave;
|
||||
using NAudio.Wave;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using System.IO;
|
||||
@@ -9,19 +9,13 @@ namespace UmaMusumeAudio
|
||||
{
|
||||
public class UmaWaveStream : WaveStream
|
||||
{
|
||||
/*
|
||||
* Open Umamusume > umamusume_Data > resources.assets with a hex editor.
|
||||
* Check the results when finding the string "StreamingAssets".
|
||||
* The key should be near a string named "cri_auth".
|
||||
*/
|
||||
private const ulong umaMusumeKey = 75923756697503;
|
||||
|
||||
private readonly HcaWaveStream hcaWaveStream;
|
||||
|
||||
public UmaWaveStream(AwbReader awbReader, int waveId)
|
||||
{
|
||||
ulong audioKey = Config.Instance.GetAudioKey();
|
||||
Stream awbSubfile = awbReader.GetWaveSubfileStream(awbReader.Waves.Find((wave) => wave.WaveId == waveId));
|
||||
hcaWaveStream = new HcaWaveStream(awbSubfile, MixKey(umaMusumeKey, awbReader.Subkey));
|
||||
hcaWaveStream = new HcaWaveStream(awbSubfile, MixKey(audioKey, awbReader.Subkey));
|
||||
}
|
||||
|
||||
public override WaveFormat WaveFormat => hcaWaveStream.WaveFormat;
|
||||
|
||||
@@ -23,6 +23,9 @@ public class Config
|
||||
public string ABKeyTip = "Key to read asset bundles";
|
||||
public string ABKeyText;
|
||||
|
||||
public string AudioKeyTip = "Hexadecimal key to read game audio files (up to 16 hex digits, without 0x prefix)";
|
||||
public string AudioKeyText = "";
|
||||
|
||||
public string LanguageTip = "Affects Uma names on the list. Language options: 0 - En, 1 - Jp, 2 - Simplified Chinese";
|
||||
public Language Language = Language.En;
|
||||
|
||||
@@ -53,9 +56,15 @@ public class Config
|
||||
public string AntiAliasingTip = "Display, screenshot antialiasing level. 0 - no AA, 1 - 2x MSAA, 2 - 4x MSAA, 3 - 8x MSAA";
|
||||
public int AntiAliasing = 2;
|
||||
|
||||
public string TargetFrameRateTip = "Limits application frame rate. Available values: 60, 30";
|
||||
public string TargetFrameRateTip = "Application frame rate: positive integer FPS, 0 = unlimited (desktop).";
|
||||
public int TargetFrameRate = 60;
|
||||
|
||||
public int RenderScalePercent = 100;
|
||||
public int AnisotropicFiltering = 2;
|
||||
public int TextureMipmapLimit = 0;
|
||||
public float LodBias = 2f;
|
||||
public float ShadowDistance = 50f;
|
||||
|
||||
public bool RegionDetectionPassed = false;
|
||||
|
||||
public string VmdMorphConvertSettingTip = "The mapping of MMD mprphs to UMA mprphs during VMD recording, multiple UMA expression weights will be combined (not exceeding 1)";
|
||||
@@ -223,9 +232,26 @@ public class Config
|
||||
}
|
||||
}
|
||||
|
||||
public ulong GetAudioKey()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(AudioKeyText))
|
||||
{
|
||||
throw new InvalidOperationException("AudioKeyText is missing. Supply your authorized audio key in Config.json and restart the application.");
|
||||
}
|
||||
|
||||
string keyText = AudioKeyText.Trim();
|
||||
if (keyText.Length > 16 || !ulong.TryParse(keyText, System.Globalization.NumberStyles.AllowHexSpecifier,
|
||||
System.Globalization.CultureInfo.InvariantCulture, out ulong key) || key == 0)
|
||||
{
|
||||
throw new InvalidOperationException("AudioKeyText must be a nonzero hexadecimal key of at most 16 digits, without a 0x prefix.");
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
public int GetTargetFrameRate()
|
||||
{
|
||||
return TargetFrameRate == 30 ? 30 : 60;
|
||||
return TargetFrameRate <= 0 ? -1 : TargetFrameRate;
|
||||
}
|
||||
|
||||
public bool TryGetNetworkProxyUri(out Uri proxyUri, out string error)
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Globalization;
|
||||
using UnityEngine;
|
||||
|
||||
public static class LiveAutoSelection
|
||||
{
|
||||
private sealed class Candidate
|
||||
{
|
||||
public CharaEntry Character;
|
||||
public string CostumeId;
|
||||
public Sprite Icon;
|
||||
public int BodyTypeSub;
|
||||
}
|
||||
|
||||
// Existing character, body costume and head costume choices are never replaced.
|
||||
public static bool FillMissing(UmaViewerMain main, LiveEntry live,
|
||||
IList<LiveCharacterSelect> slots, Sprite fallbackIcon = null)
|
||||
{
|
||||
if (main == null || live == null || slots == null) return false;
|
||||
bool needsDefaults = false;
|
||||
var used = new HashSet<int>();
|
||||
foreach (var slot in slots)
|
||||
{
|
||||
if (slot == null) continue;
|
||||
if (slot.CharaEntry != null && slot.CharaEntry.Id > 0) used.Add(slot.CharaEntry.Id);
|
||||
if (slot.CharaEntry == null || slot.CharaEntry.Id <= 0 || string.IsNullOrEmpty(slot.CostumeId)) needsDefaults = true;
|
||||
}
|
||||
if (!needsDefaults) return true;
|
||||
|
||||
var defaults = GetWinningCostumes(main, fallbackIcon);
|
||||
var singerIds = GetSingerIds(main, live.MusicId);
|
||||
var singers = new List<Candidate>();
|
||||
var others = new List<Candidate>();
|
||||
foreach (var character in main.Characters)
|
||||
{
|
||||
if (character == null || character.IsMob || !defaults.TryGetValue(character.Id, out var candidate)) continue;
|
||||
candidate.Character = character;
|
||||
(singerIds.Contains(character.Id) ? singers : others).Add(candidate);
|
||||
}
|
||||
Shuffle(singers);
|
||||
Shuffle(others);
|
||||
|
||||
foreach (var slot in slots)
|
||||
{
|
||||
if (slot == null) continue;
|
||||
bool missingCharacter = slot.CharaEntry == null || slot.CharaEntry.Id <= 0;
|
||||
bool missingCostume = string.IsNullOrEmpty(slot.CostumeId);
|
||||
if (!missingCharacter && !missingCostume) continue;
|
||||
|
||||
Candidate selected;
|
||||
if (missingCharacter)
|
||||
{
|
||||
selected = FindCandidate(main, singers, used, slot.CostumeId, true)
|
||||
?? FindCandidate(main, others, used, slot.CostumeId, true)
|
||||
?? FindCandidate(main, singers, used, slot.CostumeId, false)
|
||||
?? FindCandidate(main, others, used, slot.CostumeId, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
defaults.TryGetValue(slot.CharaEntry.Id, out selected);
|
||||
if (slot.CharaEntry.IsMob) selected = null;
|
||||
}
|
||||
if (selected == null) return false;
|
||||
|
||||
if (missingCharacter) slot.CharaEntry = selected.Character;
|
||||
if (missingCostume) slot.CostumeId = selected.CostumeId;
|
||||
used.Add(slot.CharaEntry.Id);
|
||||
if (slot.CharaImage != null)
|
||||
{
|
||||
slot.CharaImage.enabled = true;
|
||||
slot.CharaImage.sprite = slot.CharaEntry.Icon;
|
||||
}
|
||||
if (missingCostume && slot.CostumeImage != null)
|
||||
slot.CostumeImage.sprite = selected.Icon;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private static Dictionary<int, Candidate> GetWinningCostumes(UmaViewerMain main, Sprite fallbackIcon)
|
||||
{
|
||||
var result = new Dictionary<int, Candidate>();
|
||||
var rows = UmaDatabaseController.Instance.DressData;
|
||||
if (rows == null) return result;
|
||||
foreach (DataRow row in rows)
|
||||
{
|
||||
if (Convert.ToInt32(row["costume_type"]) != 1) continue;
|
||||
int characterId = Convert.ToInt32(row["chara_id"]);
|
||||
int subtype = Convert.ToInt32(row["body_type_sub"]);
|
||||
string costumeId = subtype.ToString("D2", CultureInfo.InvariantCulture);
|
||||
string body = UmaDatabaseController.BodyPath + $"bdy{characterId}_{costumeId}/pfb_bdy{characterId}_{costumeId}";
|
||||
if (characterId <= 0 || !main.AbList.TryGetValue(body, out var entry) || entry == null) continue;
|
||||
if (result.TryGetValue(characterId, out var previous) && previous.BodyTypeSub <= subtype) continue;
|
||||
Sprite icon = fallbackIcon;
|
||||
foreach (var costume in main.Costumes)
|
||||
{
|
||||
if (costume.CharaId != characterId || costume.BodyTypeSub != subtype) continue;
|
||||
if (costume.Icon != null) icon = costume.Icon;
|
||||
break;
|
||||
}
|
||||
result[characterId] = new Candidate { CostumeId = costumeId, Icon = icon, BodyTypeSub = subtype };
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static HashSet<int> GetSingerIds(UmaViewerMain main, int musicId)
|
||||
{
|
||||
string song = musicId.ToString("D4", CultureInfo.InvariantCulture);
|
||||
string prefix = $"sound/l/{song}/snd_bgm_live_{song}_chara_";
|
||||
var result = new HashSet<int>();
|
||||
foreach (var sound in main.AbSounds)
|
||||
{
|
||||
string name = sound.Name;
|
||||
if (!name.StartsWith(prefix, StringComparison.Ordinal) || !name.EndsWith("awb", StringComparison.OrdinalIgnoreCase)) continue;
|
||||
int separator = name.IndexOf('_', prefix.Length);
|
||||
if (separator < 0 || !name.Substring(separator).StartsWith("_01", StringComparison.Ordinal)) continue;
|
||||
if (int.TryParse(name.Substring(prefix.Length, separator - prefix.Length), out int characterId))
|
||||
result.Add(characterId);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static Candidate FindCandidate(UmaViewerMain main, List<Candidate> candidates,
|
||||
HashSet<int> used, string costumeId, bool distinct)
|
||||
{
|
||||
if (candidates.Count == 0) return null;
|
||||
int start = distinct ? 0 : UnityEngine.Random.Range(0, candidates.Count);
|
||||
for (int i = 0; i < candidates.Count; i++)
|
||||
{
|
||||
var candidate = candidates[(start + i) % candidates.Count];
|
||||
if (distinct && used.Contains(candidate.Character.Id)) continue;
|
||||
if (string.IsNullOrEmpty(costumeId) || HasBody(main, candidate.Character, costumeId)) return candidate;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static bool HasBody(UmaViewerMain main, CharaEntry character, string costumeId)
|
||||
{
|
||||
if (costumeId.Length < 4)
|
||||
return main.AbList.ContainsKey(UmaDatabaseController.BodyPath + $"bdy{character.Id}_{costumeId}/pfb_bdy{character.Id}_{costumeId}");
|
||||
int separator = costumeId.LastIndexOf('_');
|
||||
if (separator < 0) return false;
|
||||
var rows = UmaDatabaseController.Instance.CharaData;
|
||||
if (rows == null) return false;
|
||||
foreach (var row in rows)
|
||||
{
|
||||
if (Convert.ToInt32(row["id"]) != character.Id) continue;
|
||||
string shortId = costumeId.Substring(0, separator);
|
||||
string body = UmaDatabaseController.BodyPath + $"bdy{shortId}/pfb_bdy{costumeId}_{row["height"]}_{row["shape"]}_{row["bust"]}";
|
||||
return main.AbList.ContainsKey(body);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void Shuffle(List<Candidate> candidates)
|
||||
{
|
||||
for (int i = candidates.Count - 1; i > 0; i--)
|
||||
{
|
||||
int other = UnityEngine.Random.Range(0, i + 1);
|
||||
var candidate = candidates[i];
|
||||
candidates[i] = candidates[other];
|
||||
candidates[other] = candidate;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e208e92f2051441da44fe056b39ee550
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Collections;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
@@ -23,7 +23,6 @@ public class LiveViewerUI : MonoBehaviour
|
||||
public List<UmaLyricsData> CurrentLyrics = new List<UmaLyricsData>();
|
||||
|
||||
private UnityEngine.UI.Text progressSeconds;
|
||||
private UnityEngine.UI.Text dofButtonLabel;
|
||||
private int displayedCurrentTenth = -1;
|
||||
private int displayedTotalTenth = -1;
|
||||
|
||||
@@ -36,6 +35,8 @@ public class LiveViewerUI : MonoBehaviour
|
||||
new Config();
|
||||
}
|
||||
ApplyFrameRateOptions();
|
||||
UISettingsGraphics.Build(FrameRateDropDown);
|
||||
RuntimeGraphicsSettings.Apply();
|
||||
UmaViewerMain.ApplyFrameRateLimit();
|
||||
|
||||
height = BottonUITransform.rect.height;
|
||||
@@ -59,32 +60,6 @@ public class LiveViewerUI : MonoBehaviour
|
||||
progressSeconds.alignment = TextAnchor.MiddleRight;
|
||||
progressSeconds.text = "0.0s / 0.0s";
|
||||
|
||||
var buttonObject = new GameObject("DofDiagnosticToggle", typeof(RectTransform),
|
||||
typeof(UnityEngine.UI.Image), typeof(UnityEngine.UI.Button));
|
||||
buttonObject.layer = BottonUITransform.gameObject.layer;
|
||||
var buttonRect = (RectTransform)buttonObject.transform;
|
||||
buttonRect.SetParent(BottonUITransform, false);
|
||||
buttonRect.anchorMin = buttonRect.anchorMax = new Vector2(0, 0.5f);
|
||||
buttonRect.pivot = new Vector2(0, 0.5f);
|
||||
buttonRect.anchoredPosition = new Vector2(8, 0);
|
||||
buttonRect.sizeDelta = new Vector2(176, 24);
|
||||
var image = buttonObject.GetComponent<UnityEngine.UI.Image>();
|
||||
image.color = new Color(0.08f, 0.08f, 0.08f, 0.9f);
|
||||
var button = buttonObject.GetComponent<UnityEngine.UI.Button>();
|
||||
button.targetGraphic = image;
|
||||
button.navigation = new UnityEngine.UI.Navigation { mode = UnityEngine.UI.Navigation.Mode.None };
|
||||
button.onClick.AddListener(() =>
|
||||
{
|
||||
Gallop.GallopImageEffect.SetUserDofEnabled(!Gallop.GallopImageEffect.UserDofEnabled);
|
||||
RefreshDofLabel();
|
||||
OnMouse(true);
|
||||
OnMouse(false);
|
||||
});
|
||||
dofButtonLabel = CreateDiagnosticText("Label", buttonRect);
|
||||
dofButtonLabel.rectTransform.anchorMin = Vector2.zero;
|
||||
dofButtonLabel.rectTransform.anchorMax = Vector2.one;
|
||||
dofButtonLabel.rectTransform.sizeDelta = Vector2.zero;
|
||||
RefreshDofLabel();
|
||||
}
|
||||
|
||||
private UnityEngine.UI.Text CreateDiagnosticText(string name, RectTransform parent)
|
||||
@@ -106,11 +81,6 @@ public class LiveViewerUI : MonoBehaviour
|
||||
return text;
|
||||
}
|
||||
|
||||
private void RefreshDofLabel()
|
||||
{
|
||||
if (dofButtonLabel != null)
|
||||
dofButtonLabel.text = Gallop.GallopImageEffect.UserDofEnabled ? "DOF: ON (test)" : "DOF: OFF";
|
||||
}
|
||||
|
||||
private void LateUpdate()
|
||||
{
|
||||
@@ -157,7 +127,7 @@ public class LiveViewerUI : MonoBehaviour
|
||||
|
||||
public void SetFrameRate(int fps)
|
||||
{
|
||||
Config.Instance.TargetFrameRate = fps == 1 ? 30 : 60;
|
||||
Config.Instance.TargetFrameRate = UISettingsGraphics.FrameRateAt(fps);
|
||||
Config.Instance.UpdateConfig(false);
|
||||
UmaViewerMain.ApplyFrameRateLimit();
|
||||
}
|
||||
@@ -167,8 +137,8 @@ public class LiveViewerUI : MonoBehaviour
|
||||
if (FrameRateDropDown == null) return;
|
||||
|
||||
FrameRateDropDown.ClearOptions();
|
||||
FrameRateDropDown.AddOptions(new List<string> { "60", "30" });
|
||||
FrameRateDropDown.SetValueWithoutNotify(Config.Instance.GetTargetFrameRate() == 30 ? 1 : 0);
|
||||
FrameRateDropDown.AddOptions(UISettingsGraphics.FrameRateLabels());
|
||||
FrameRateDropDown.SetValueWithoutNotify(UISettingsGraphics.FrameRateIndex());
|
||||
FrameRateDropDown.RefreshShownValue();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
|
||||
// Quality changes affect an in-memory copy, never the authored pipeline asset.
|
||||
public static class RuntimeGraphicsSettings
|
||||
{
|
||||
private static UniversalRenderPipelineAsset source;
|
||||
private static UniversalRenderPipelineAsset runtime;
|
||||
private static readonly int[] Samples = { 1, 2, 4, 8 };
|
||||
|
||||
public static void Apply()
|
||||
{
|
||||
var config = Config.Instance;
|
||||
if (config == null) return;
|
||||
int samples = Samples[Mathf.Clamp(config.AntiAliasing, 0, 3)];
|
||||
QualitySettings.antiAliasing = samples == 1 ? 0 : samples;
|
||||
QualitySettings.anisotropicFiltering = (AnisotropicFiltering)Mathf.Clamp(config.AnisotropicFiltering, 0, 2);
|
||||
QualitySettings.globalTextureMipmapLimit = Mathf.Clamp(config.TextureMipmapLimit, 0, 3);
|
||||
QualitySettings.lodBias = Mathf.Clamp(config.LodBias, 0.3f, 2f);
|
||||
|
||||
var active = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset;
|
||||
if (active == null) return;
|
||||
if (active != runtime)
|
||||
{
|
||||
if (active != source || runtime == null)
|
||||
{
|
||||
if (runtime != null) Object.Destroy(runtime);
|
||||
source = active;
|
||||
runtime = Object.Instantiate(active);
|
||||
runtime.name = active.name + " (Runtime Graphics)";
|
||||
runtime.hideFlags = HideFlags.DontSave;
|
||||
}
|
||||
// A quality-level override takes precedence over the default pipeline.
|
||||
if (QualitySettings.renderPipeline != null) QualitySettings.renderPipeline = runtime;
|
||||
else GraphicsSettings.renderPipelineAsset = runtime;
|
||||
}
|
||||
runtime.msaaSampleCount = samples;
|
||||
runtime.renderScale = Mathf.Clamp(config.RenderScalePercent / 100f, 0.5f, 2f);
|
||||
runtime.shadowDistance = Mathf.Clamp(config.ShadowDistance, 0f, 150f);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a07c0541500d4eae8c5910a73925a6c3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -122,14 +122,12 @@ public class UISettingsCamera : MonoBehaviour
|
||||
/// <summary> Converts values 1-4 to valid AA values </summary>
|
||||
public void ChangeAntiAliasing(int value)
|
||||
{
|
||||
int[] aaValues = { 0, 2, 4, 8 };
|
||||
|
||||
QualitySettings.antiAliasing = aaValues[value];
|
||||
|
||||
if (Config.Instance.AntiAliasing != value)
|
||||
{
|
||||
Config.Instance.AntiAliasing = value;
|
||||
Config.Instance.UpdateConfig(false);
|
||||
}
|
||||
RuntimeGraphicsSettings.Apply();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public static class UISettingsGraphics
|
||||
{
|
||||
private static readonly int[] Rates = { 60, 30, 90, 120, 144, 165, 240, 0 };
|
||||
|
||||
public static List<string> FrameRateLabels()
|
||||
{
|
||||
var labels = new List<string>();
|
||||
foreach (int rate in Rates) labels.Add(rate == 0 ? "Unlimited" : rate + " FPS");
|
||||
if (FrameRateIndex() == Rates.Length) labels.Add(Config.Instance.TargetFrameRate + " FPS");
|
||||
return labels;
|
||||
}
|
||||
|
||||
public static int FrameRateIndex()
|
||||
{
|
||||
int rate = Math.Max(0, Config.Instance.TargetFrameRate);
|
||||
int index = Array.IndexOf(Rates, rate);
|
||||
return index < 0 ? Rates.Length : index;
|
||||
}
|
||||
|
||||
public static int FrameRateAt(int index)
|
||||
{
|
||||
return index >= 0 && index < Rates.Length ? Rates[index] : Config.Instance.TargetFrameRate;
|
||||
}
|
||||
|
||||
public static InputField AddFrameRateInput(Transform parent, Action refresh, Font font = null)
|
||||
{
|
||||
return AddNumber(parent, "Custom FPS (0 = unlimited)", Config.Instance.TargetFrameRate.ToString(), true,
|
||||
text =>
|
||||
{
|
||||
if (!int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out int rate) || rate < 0)
|
||||
return Config.Instance.TargetFrameRate.ToString();
|
||||
Config.Instance.TargetFrameRate = rate;
|
||||
Config.Instance.UpdateConfig(false);
|
||||
UmaViewerMain.ApplyFrameRateLimit();
|
||||
refresh();
|
||||
return rate.ToString();
|
||||
}, font);
|
||||
}
|
||||
|
||||
public static void Build(Dropdown frameRate)
|
||||
{
|
||||
if (frameRate == null) return;
|
||||
var template = (RectTransform)frameRate.transform.parent;
|
||||
var parent = (RectTransform)template.parent;
|
||||
if (parent.Find("GraphicsOptions") != null) return;
|
||||
var window = parent.parent as RectTransform;
|
||||
if (window != null) window.sizeDelta = new Vector2(340, 400);
|
||||
var layout = parent.GetComponent<VerticalLayoutGroup>();
|
||||
if (layout != null)
|
||||
{
|
||||
layout.childControlWidth = true;
|
||||
layout.childForceExpandWidth = true;
|
||||
}
|
||||
var font = frameRate.captionText.font;
|
||||
FitDropdown(template, frameRate, "Frame Rate");
|
||||
|
||||
// Keep the original camera/lyrics controls and put quality rows in their parent.
|
||||
// Scrolling keeps all options reachable on smaller windows.
|
||||
var scrollObject = new GameObject("GraphicsOptions", typeof(RectTransform), typeof(Image), typeof(ScrollRect), typeof(LayoutElement));
|
||||
scrollObject.transform.SetParent(parent, false);
|
||||
scrollObject.layer = parent.gameObject.layer;
|
||||
var scrollRect = (RectTransform)scrollObject.transform;
|
||||
scrollRect.sizeDelta = new Vector2(320, 280);
|
||||
scrollObject.GetComponent<LayoutElement>().preferredHeight = 280;
|
||||
scrollObject.GetComponent<Image>().color = new Color(0, 0, 0, 0.1f);
|
||||
var viewport = new GameObject("Viewport", typeof(RectTransform), typeof(RectMask2D));
|
||||
viewport.transform.SetParent(scrollRect, false);
|
||||
Stretch((RectTransform)viewport.transform, 0, 1, 0, 0);
|
||||
var contentObject = new GameObject("Content", typeof(RectTransform), typeof(VerticalLayoutGroup), typeof(ContentSizeFitter));
|
||||
contentObject.transform.SetParent(viewport.transform, false);
|
||||
var content = (RectTransform)contentObject.transform;
|
||||
content.anchorMin = new Vector2(0, 1);
|
||||
content.anchorMax = Vector2.one;
|
||||
content.pivot = new Vector2(0.5f, 1);
|
||||
content.sizeDelta = Vector2.zero;
|
||||
var contentLayout = contentObject.GetComponent<VerticalLayoutGroup>();
|
||||
contentLayout.spacing = 5;
|
||||
contentLayout.childControlHeight = false;
|
||||
contentLayout.childForceExpandHeight = false;
|
||||
contentLayout.childControlWidth = true;
|
||||
contentObject.GetComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||
var scroll = scrollObject.GetComponent<ScrollRect>();
|
||||
scroll.viewport = (RectTransform)viewport.transform;
|
||||
scroll.content = content;
|
||||
scroll.horizontal = false;
|
||||
scroll.movementType = ScrollRect.MovementType.Clamped;
|
||||
scroll.scrollSensitivity = 30;
|
||||
|
||||
var customFps = AddFrameRateInput(content, () => RefreshFrameRate(frameRate), font);
|
||||
frameRate.onValueChanged.AddListener(index => customFps.SetTextWithoutNotify(FrameRateAt(index).ToString()));
|
||||
AddChoice(content, template, "MSAA", new[] { "Off", "2x", "4x", "8x" }, Config.Instance.AntiAliasing,
|
||||
value => Config.Instance.AntiAliasing = value);
|
||||
AddNumber(content, "Render Scale (%)", Config.Instance.RenderScalePercent.ToString(), true, text =>
|
||||
{
|
||||
if (int.TryParse(text, out int value) && value >= 50 && value <= 200)
|
||||
Config.Instance.RenderScalePercent = value;
|
||||
SaveGraphics();
|
||||
return Config.Instance.RenderScalePercent.ToString();
|
||||
}, font);
|
||||
AddChoice(content, template, "Anisotropic Filter", new[] { "Off", "Per Texture", "Force On" }, Config.Instance.AnisotropicFiltering,
|
||||
value => Config.Instance.AnisotropicFiltering = value);
|
||||
AddChoice(content, template, "Texture Quality", new[] { "Full", "Half", "Quarter", "Eighth" }, Config.Instance.TextureMipmapLimit,
|
||||
value => Config.Instance.TextureMipmapLimit = value);
|
||||
AddNumber(content, "LOD Bias (0.3 - 2)", Config.Instance.LodBias.ToString(CultureInfo.InvariantCulture), false, text =>
|
||||
{
|
||||
if (float.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out float value) && value >= 0.3f && value <= 2f)
|
||||
Config.Instance.LodBias = value;
|
||||
SaveGraphics();
|
||||
return Config.Instance.LodBias.ToString(CultureInfo.InvariantCulture);
|
||||
}, font);
|
||||
AddNumber(content, "Shadow Distance", Config.Instance.ShadowDistance.ToString(CultureInfo.InvariantCulture), false, text =>
|
||||
{
|
||||
if (float.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out float value) && value >= 0 && value <= 150)
|
||||
Config.Instance.ShadowDistance = value;
|
||||
SaveGraphics();
|
||||
return Config.Instance.ShadowDistance.ToString(CultureInfo.InvariantCulture);
|
||||
}, font);
|
||||
}
|
||||
|
||||
private static void RefreshFrameRate(Dropdown dropdown)
|
||||
{
|
||||
dropdown.ClearOptions();
|
||||
dropdown.AddOptions(FrameRateLabels());
|
||||
dropdown.SetValueWithoutNotify(FrameRateIndex());
|
||||
dropdown.RefreshShownValue();
|
||||
}
|
||||
|
||||
private static void SaveGraphics()
|
||||
{
|
||||
Config.Instance.UpdateConfig(false);
|
||||
RuntimeGraphicsSettings.Apply();
|
||||
if (UmaViewerUI.Instance != null && UmaViewerUI.Instance.CameraSettings != null)
|
||||
UmaViewerUI.Instance.CameraSettings.AAModeDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing);
|
||||
}
|
||||
|
||||
private static void AddChoice(Transform parent, RectTransform template, string label, string[] options, int value, Action<int> change)
|
||||
{
|
||||
var row = UnityEngine.Object.Instantiate(template.gameObject, parent);
|
||||
row.name = label;
|
||||
var dropdown = row.GetComponentInChildren<Dropdown>();
|
||||
dropdown.onValueChanged = new Dropdown.DropdownEvent();
|
||||
dropdown.ClearOptions();
|
||||
dropdown.AddOptions(new List<string>(options));
|
||||
dropdown.SetValueWithoutNotify(Mathf.Clamp(value, 0, options.Length - 1));
|
||||
dropdown.onValueChanged.AddListener(index => { change(index); SaveGraphics(); });
|
||||
FitDropdown((RectTransform)row.transform, dropdown, label);
|
||||
}
|
||||
|
||||
private static void FitDropdown(RectTransform row, Dropdown dropdown, string label)
|
||||
{
|
||||
row.sizeDelta = new Vector2(320, 30);
|
||||
Stretch((RectTransform)dropdown.transform, 0.58f, 1, 0, 0);
|
||||
foreach (var text in row.GetComponentsInChildren<Text>(true))
|
||||
{
|
||||
if (text.transform.IsChildOf(dropdown.transform)) continue;
|
||||
text.text = label;
|
||||
text.fontSize = 14;
|
||||
text.alignment = TextAnchor.MiddleLeft;
|
||||
Stretch(text.rectTransform, 0, 0.56f, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
private static InputField AddNumber(Transform parent, string label, string value, bool integer, Func<string, string> submit, Font font)
|
||||
{
|
||||
var row = new GameObject(label, typeof(RectTransform), typeof(LayoutElement));
|
||||
row.transform.SetParent(parent, false);
|
||||
row.layer = parent.gameObject.layer;
|
||||
((RectTransform)row.transform).sizeDelta = new Vector2(320, 30);
|
||||
row.GetComponent<LayoutElement>().preferredHeight = 30;
|
||||
var caption = AddText(row.transform, "Label", label, font);
|
||||
Stretch(caption.rectTransform, 0, 0.58f, 0, 0);
|
||||
var field = new GameObject("Input", typeof(RectTransform), typeof(Image), typeof(InputField));
|
||||
field.transform.SetParent(row.transform, false);
|
||||
field.layer = row.layer;
|
||||
Stretch((RectTransform)field.transform, 0.6f, 1, 0, 0);
|
||||
field.GetComponent<Image>().color = Color.white;
|
||||
var text = AddText(field.transform, "Text", value, font);
|
||||
text.color = Color.black;
|
||||
Stretch(text.rectTransform, 0, 1, 6, -6);
|
||||
var input = field.GetComponent<InputField>();
|
||||
input.targetGraphic = field.GetComponent<Image>();
|
||||
input.textComponent = text;
|
||||
input.contentType = integer ? InputField.ContentType.IntegerNumber : InputField.ContentType.DecimalNumber;
|
||||
input.text = value;
|
||||
input.onEndEdit.AddListener(raw => input.SetTextWithoutNotify(submit(raw)));
|
||||
return input;
|
||||
}
|
||||
|
||||
private static Text AddText(Transform parent, string name, string value, Font font)
|
||||
{
|
||||
var go = new GameObject(name, typeof(RectTransform), typeof(Text));
|
||||
go.transform.SetParent(parent, false);
|
||||
go.layer = parent.gameObject.layer;
|
||||
var text = go.GetComponent<Text>();
|
||||
text.font = font != null ? font : Resources.GetBuiltinResource<Font>("LegacyRuntime.ttf");
|
||||
text.fontSize = 14;
|
||||
text.color = Color.white;
|
||||
text.alignment = TextAnchor.MiddleLeft;
|
||||
text.raycastTarget = false;
|
||||
text.text = value;
|
||||
return text;
|
||||
}
|
||||
|
||||
private static void Stretch(RectTransform rect, float left, float right, float insetLeft, float insetRight)
|
||||
{
|
||||
rect.anchorMin = new Vector2(left, 0);
|
||||
rect.anchorMax = new Vector2(right, 1);
|
||||
rect.offsetMin = new Vector2(insetLeft, 0);
|
||||
rect.offsetMax = new Vector2(insetRight, 0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2ff4d9bec2d640c58a313788b1e66813
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -23,6 +23,7 @@ public class UISettingsOther : MonoBehaviour
|
||||
public TMP_Dropdown LanguageDropdown;
|
||||
public TMP_Dropdown FrameRateDropdown;
|
||||
private GameObject _runtimeFrameRateRow;
|
||||
private InputField _customFrameRateInput;
|
||||
private IEnumerator _updateResVerCoroutine;
|
||||
|
||||
public void ApplySettings()
|
||||
@@ -32,8 +33,8 @@ public class UISettingsOther : MonoBehaviour
|
||||
WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode);
|
||||
RegionDropdown.SetValueWithoutNotify((int)Config.Instance.Region);
|
||||
LanguageDropdown.SetValueWithoutNotify(LanguageToDropdownValue(Config.Instance.Language));
|
||||
FrameRateDropdown?.SetValueWithoutNotify(FrameRateToDropdownValue(Config.Instance.GetTargetFrameRate()));
|
||||
FrameRateDropdown?.RefreshShownValue();
|
||||
if (FrameRateDropdown != null) RefreshFrameRateOptions();
|
||||
if (_customFrameRateInput != null) _customFrameRateInput.SetTextWithoutNotify(Config.Instance.TargetFrameRate.ToString());
|
||||
UmaViewerMain.ApplyFrameRateLimit();
|
||||
UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone);
|
||||
}
|
||||
@@ -120,32 +121,27 @@ public class UISettingsOther : MonoBehaviour
|
||||
FrameRateDropdown = _runtimeFrameRateRow.GetComponentInChildren<TMP_Dropdown>(true);
|
||||
FrameRateDropdown.name = "FrameRateDropdown";
|
||||
FrameRateDropdown.ClearOptions();
|
||||
FrameRateDropdown.AddOptions(new List<string> { "60 FPS", "30 FPS" });
|
||||
FrameRateDropdown.AddOptions(UISettingsGraphics.FrameRateLabels());
|
||||
FrameRateDropdown.onValueChanged = new TMP_Dropdown.DropdownEvent();
|
||||
FrameRateDropdown.onValueChanged.AddListener(ChangeFrameRate);
|
||||
var customInput = UISettingsGraphics.AddFrameRateInput(parent, RefreshFrameRateOptions);
|
||||
_customFrameRateInput = customInput;
|
||||
FrameRateDropdown.onValueChanged.AddListener(index => customInput.SetTextWithoutNotify(UISettingsGraphics.FrameRateAt(index).ToString()));
|
||||
customInput.transform.parent.SetSiblingIndex(_runtimeFrameRateRow.transform.GetSiblingIndex() + 1);
|
||||
|
||||
var parentRect = parent as RectTransform;
|
||||
var sourceRect = sourceRow as RectTransform;
|
||||
if (parentRect != null && sourceRect != null)
|
||||
{
|
||||
parentRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, parentRect.rect.height + sourceRect.rect.height);
|
||||
parentRect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, parentRect.rect.height + sourceRect.rect.height + 30);
|
||||
LayoutRebuilder.MarkLayoutForRebuild(parentRect);
|
||||
}
|
||||
}
|
||||
|
||||
private int FrameRateToDropdownValue(int frameRate)
|
||||
{
|
||||
return frameRate == 30 ? 1 : 0;
|
||||
}
|
||||
|
||||
private int DropdownValueToFrameRate(int value)
|
||||
{
|
||||
return value == 1 ? 30 : 60;
|
||||
}
|
||||
|
||||
public void ChangeFrameRate(int value)
|
||||
{
|
||||
var frameRate = DropdownValueToFrameRate(value);
|
||||
var frameRate = UISettingsGraphics.FrameRateAt(value);
|
||||
if (Config.Instance.TargetFrameRate != frameRate)
|
||||
{
|
||||
Config.Instance.TargetFrameRate = frameRate;
|
||||
@@ -154,6 +150,14 @@ public class UISettingsOther : MonoBehaviour
|
||||
UmaViewerMain.ApplyFrameRateLimit();
|
||||
}
|
||||
|
||||
private void RefreshFrameRateOptions()
|
||||
{
|
||||
FrameRateDropdown.ClearOptions();
|
||||
FrameRateDropdown.AddOptions(UISettingsGraphics.FrameRateLabels());
|
||||
FrameRateDropdown.SetValueWithoutNotify(UISettingsGraphics.FrameRateIndex());
|
||||
FrameRateDropdown.RefreshShownValue();
|
||||
}
|
||||
|
||||
public void ChangeLanguage(int lang)
|
||||
{
|
||||
Language language = DropdownValueToLanguage(lang);
|
||||
|
||||
@@ -88,6 +88,110 @@ public class UmaContainerCharacter : UmaContainer
|
||||
private Material[] _faceMaterials;
|
||||
private bool _faceLightInitialized;
|
||||
|
||||
private readonly HashSet<Renderer> _mirrorHeadRenderers = new HashSet<Renderer>();
|
||||
private GameObject[] _mirrorAllRendererObjects = Array.Empty<GameObject>();
|
||||
private GameObject[] _mirrorBodyRendererObjects = Array.Empty<GameObject>();
|
||||
private GameObject[] _mirrorChangedObjects = Array.Empty<GameObject>();
|
||||
private int[] _mirrorOriginalLayers = Array.Empty<int>();
|
||||
private int _mirrorChangedCount;
|
||||
private bool _mirrorLayerCacheDirty = true;
|
||||
private bool _mirrorLayerCacheReady;
|
||||
|
||||
private void RegisterMirrorHeadRenderers(GameObject source)
|
||||
{
|
||||
RestoreMirrorChangedLayers();
|
||||
if (source != null)
|
||||
{
|
||||
var renderers = source.GetComponentsInChildren<Renderer>(true);
|
||||
for (int i = 0; i < renderers.Length; i++)
|
||||
_mirrorHeadRenderers.Add(renderers[i]);
|
||||
}
|
||||
InvalidateMirrorLayerCache();
|
||||
}
|
||||
|
||||
private void InvalidateMirrorLayerCache()
|
||||
{
|
||||
RestoreMirrorChangedLayers();
|
||||
_mirrorLayerCacheDirty = true;
|
||||
if (_mirrorLayerCacheReady)
|
||||
PrepareMirrorLayerCache();
|
||||
}
|
||||
|
||||
internal void PrepareMirrorLayerCache()
|
||||
{
|
||||
if (!_mirrorLayerCacheDirty)
|
||||
return;
|
||||
|
||||
RestoreMirrorChangedLayers();
|
||||
var renderers = GetComponentsInChildren<Renderer>(true);
|
||||
var all = new List<GameObject>(renderers.Length);
|
||||
var body = new List<GameObject>(renderers.Length);
|
||||
var seen = new HashSet<GameObject>();
|
||||
var headObjects = new HashSet<GameObject>();
|
||||
for (int i = 0; i < renderers.Length; i++)
|
||||
if (renderers[i] != null && _mirrorHeadRenderers.Contains(renderers[i]))
|
||||
headObjects.Add(renderers[i].gameObject);
|
||||
for (int i = 0; i < renderers.Length; i++)
|
||||
{
|
||||
var renderer = renderers[i];
|
||||
if (renderer == null || !seen.Add(renderer.gameObject))
|
||||
continue;
|
||||
all.Add(renderer.gameObject);
|
||||
if (!headObjects.Contains(renderer.gameObject))
|
||||
body.Add(renderer.gameObject);
|
||||
}
|
||||
_mirrorAllRendererObjects = all.ToArray();
|
||||
_mirrorBodyRendererObjects = body.ToArray();
|
||||
if (_mirrorChangedObjects.Length < all.Count)
|
||||
{
|
||||
_mirrorChangedObjects = new GameObject[all.Count];
|
||||
_mirrorOriginalLayers = new int[all.Count];
|
||||
}
|
||||
_mirrorLayerCacheDirty = false;
|
||||
_mirrorLayerCacheReady = true;
|
||||
}
|
||||
|
||||
internal void SetLayerBeforeMirrorCameraRendering(bool bodyBit, bool headBit, int layer)
|
||||
{
|
||||
if (!bodyBit || layer < 0)
|
||||
return;
|
||||
|
||||
RestoreMirrorChangedLayers();
|
||||
var objects = headBit ? _mirrorAllRendererObjects : _mirrorBodyRendererObjects;
|
||||
for (int i = 0; i < objects.Length; i++)
|
||||
{
|
||||
var obj = objects[i];
|
||||
if (obj == null)
|
||||
continue;
|
||||
_mirrorChangedObjects[_mirrorChangedCount] = obj;
|
||||
_mirrorOriginalLayers[_mirrorChangedCount] = obj.layer;
|
||||
_mirrorChangedCount++;
|
||||
obj.layer = layer;
|
||||
}
|
||||
}
|
||||
|
||||
internal void RestoreMirrorChangedLayers()
|
||||
{
|
||||
while (_mirrorChangedCount > 0)
|
||||
{
|
||||
int index = --_mirrorChangedCount;
|
||||
var obj = _mirrorChangedObjects[index];
|
||||
_mirrorChangedObjects[index] = null;
|
||||
if (obj != null)
|
||||
obj.layer = _mirrorOriginalLayers[index];
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
RestoreMirrorChangedLayers();
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
RestoreMirrorChangedLayers();
|
||||
}
|
||||
|
||||
private static readonly int ID_FaceCenterPos = Shader.PropertyToID("_FaceCenterPos");
|
||||
private static readonly int ID_FaceUp = Shader.PropertyToID("_FaceUp");
|
||||
private static readonly int ID_FaceForward = Shader.PropertyToID("_FaceForward");
|
||||
@@ -184,6 +288,10 @@ public class UmaContainerCharacter : UmaContainer
|
||||
public void MergeModel()
|
||||
{
|
||||
if (!Body) return;
|
||||
RestoreMirrorChangedLayers();
|
||||
// Capture source identity before MergeModel reparents Head/Hair children.
|
||||
RegisterMirrorHeadRenderers(Head);
|
||||
RegisterMirrorHeadRenderers(Hair);
|
||||
var bodySkinnedMeshRenderer = Body.GetComponentInChildren<SkinnedMeshRenderer>();
|
||||
var bodyBones = bodySkinnedMeshRenderer.bones.ToDictionary(bone => bone.name, bone => bone.transform);
|
||||
List<Transform> emptyBones = new List<Transform>();
|
||||
@@ -300,12 +408,16 @@ public class UmaContainerCharacter : UmaContainer
|
||||
}
|
||||
}
|
||||
}
|
||||
InvalidateMirrorLayerCache();
|
||||
PrepareMirrorLayerCache();
|
||||
|
||||
}
|
||||
|
||||
public void MergeHairModel()
|
||||
{
|
||||
if (!Head || !Hair) return;
|
||||
RestoreMirrorChangedLayers();
|
||||
RegisterMirrorHeadRenderers(Hair);
|
||||
|
||||
var bodyBones = Head.GetComponentInChildren<SkinnedMeshRenderer>().bones.ToDictionary(bone => bone.name, bone => bone.transform);
|
||||
List<Transform> emptyBones = new List<Transform>();
|
||||
@@ -326,6 +438,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
Hair.gameObject.SetActive(false);
|
||||
|
||||
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
|
||||
InvalidateMirrorLayerCache();
|
||||
}
|
||||
|
||||
public void SetHeight(int scale = 0)
|
||||
@@ -1048,6 +1161,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
BodyShaderEffectData.Initialize();
|
||||
}
|
||||
}
|
||||
InvalidateMirrorLayerCache();
|
||||
}
|
||||
|
||||
public void LoadHead(UmaDatabaseEntry entry)
|
||||
@@ -1055,6 +1169,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
var textures = MobHeadTextures;
|
||||
GameObject head = InstantiateEntry(entry, transform);
|
||||
Head = head;
|
||||
RegisterMirrorHeadRenderers(head);
|
||||
|
||||
AssetTable table = null;
|
||||
if (!IsMini)
|
||||
@@ -1229,6 +1344,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
{
|
||||
GameObject hair = InstantiateEntry(entry, transform);
|
||||
Hair = hair;
|
||||
RegisterMirrorHeadRenderers(hair);
|
||||
var textures = MobHeadTextures;
|
||||
foreach (Renderer r in hair.GetComponentsInChildren<Renderer>())
|
||||
{
|
||||
@@ -1282,6 +1398,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
{
|
||||
GameObject go = entry.Get<GameObject>();
|
||||
Tail = Instantiate(go, transform);
|
||||
InvalidateMirrorLayerCache();
|
||||
}
|
||||
|
||||
|
||||
@@ -1305,6 +1422,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
}
|
||||
}
|
||||
}
|
||||
InvalidateMirrorLayerCache();
|
||||
}
|
||||
|
||||
public void LoadTear(UmaDatabaseEntry entry)
|
||||
@@ -1897,6 +2015,8 @@ public class UmaContainerCharacter : UmaContainer
|
||||
emotionDriven.FaceDrivenKeyTarget = faceDriven;
|
||||
emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData;
|
||||
emotionDriven.Initialize();
|
||||
// Facial attachments are explicit head renderers, including inactive manga/tears.
|
||||
RegisterMirrorHeadRenderers(headBone);
|
||||
}
|
||||
|
||||
public void SetupBoneHandles()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Gallop;
|
||||
using System;
|
||||
@@ -111,39 +111,36 @@ public class PartEntry
|
||||
public int SingerCount = 0;
|
||||
public PartEntry(string data)
|
||||
{
|
||||
string[] lines = data.Split('\n');
|
||||
|
||||
string[] names = lines[0].Split(',');
|
||||
|
||||
foreach (var name in names)
|
||||
var lines = data.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
var names = lines[0].Split(',');
|
||||
var columns = new Dictionary<string, int>(StringComparer.Ordinal);
|
||||
for (int j = 0; j < names.Length; j++)
|
||||
{
|
||||
var temp = name;
|
||||
temp.Replace("lleft", "left2");
|
||||
temp.Replace("rright", "right2");
|
||||
temp.Replace("llleft", "left3");
|
||||
temp.Replace("rrright", "right3");
|
||||
PartSettings[temp] = new List<float>();
|
||||
string name = names[j].Trim();
|
||||
int suffix = name.IndexOf('_');
|
||||
string part = suffix < 0 ? name : name.Substring(0, suffix);
|
||||
switch (part)
|
||||
{
|
||||
case "lleft": part = "left2"; break;
|
||||
case "rright": part = "right2"; break;
|
||||
case "llleft": part = "left3"; break;
|
||||
case "rrright": part = "right3"; break;
|
||||
}
|
||||
name = part + (suffix < 0 ? "" : name.Substring(suffix));
|
||||
columns[name] = j;
|
||||
PartSettings[name] = new List<float>();
|
||||
}
|
||||
|
||||
for (int i = 1; i < lines.Length - 1; i++)
|
||||
for (int i = 1; i < lines.Length; i++)
|
||||
{
|
||||
var values = lines[i].Split(',');
|
||||
for (int j = 0; j < names.Length; j++)
|
||||
{
|
||||
PartSettings[names[j]].Add((float)Convert.ToDouble(values[j]));
|
||||
}
|
||||
foreach (var column in columns)
|
||||
PartSettings[column.Key].Add(float.Parse(values[column.Value], System.Globalization.CultureInfo.InvariantCulture));
|
||||
}
|
||||
|
||||
foreach(var part in PartSettings)
|
||||
foreach (var part in PartSettings)
|
||||
{
|
||||
if (part.Key != "time" && !part.Key.Contains("_"))
|
||||
{
|
||||
if (part.Value.FindAll(v => v > 0).Count > 0)
|
||||
{
|
||||
SingerCount += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (part.Key != "time" && !part.Key.Contains("_") && part.Value.Exists(v => v > 0f))
|
||||
SingerCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ public class UmaViewerAudio
|
||||
{
|
||||
if (cur_active_source == index && !forceUpdate) return;
|
||||
cur_active_source = index;
|
||||
activeSource = null;
|
||||
for(int i = 0; i < sourceList.Count; i++)
|
||||
{
|
||||
if (i + 1 == index)
|
||||
@@ -46,16 +47,14 @@ public class UmaViewerAudio
|
||||
|
||||
public void SetVolume(float volume)
|
||||
{
|
||||
if (volume == this.volume || !activeSource) return;
|
||||
this.volume = volume;
|
||||
activeSource.volume = volume;
|
||||
if (activeSource) activeSource.volume = volume;
|
||||
}
|
||||
|
||||
public void SetPanStereo(float pan)
|
||||
{
|
||||
if (pan == this.pan || !activeSource) return;
|
||||
this.pan = pan;
|
||||
activeSource.panStereo = pan;
|
||||
if (activeSource) activeSource.panStereo = pan;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,111 +131,70 @@ public class UmaViewerAudio
|
||||
right3 = 6,
|
||||
}
|
||||
|
||||
// Original .cctor 0x1b8ea00, GetVolume 0x1b8d670 and GetPartData 0x1b8d290.
|
||||
static readonly float[] DefaultVolumes = { 0f, .79f, .89f, 1f, 1.12f, 1.26f };
|
||||
static readonly float[] DefaultVolumeRates = { 0f, .79f, .79f, .56f, .53f, .47f, .42f, .37f };
|
||||
static readonly int[][] DefaultVolumeIndices = {
|
||||
new[] { 0 }, new[] { 5 }, new[] { 2, 2 }, new[] { 3, 5, 3 },
|
||||
new[] { 3, 3, 3, 3 }, new[] { 1, 2, 4, 2, 1 },
|
||||
new[] { 3, 3, 3, 3, 3, 3 }, new[] { 1, 1, 2, 4, 2, 1, 1 }
|
||||
};
|
||||
static readonly float[][] DefaultPans = {
|
||||
new[] { 0f }, new[] { 0f }, new[] { -.15f, .15f }, new[] { -.3f, 0f, .3f },
|
||||
new[] { -.3f, -.1f, .1f, .3f }, new[] { -.3f, -.15f, 0f, .15f, .3f },
|
||||
new[] { -.3f, -.2f, -.1f, .1f, .2f, .3f }, new[] { -.3f, -.2f, -.1f, 0f, .1f, .2f, .3f }
|
||||
};
|
||||
static readonly string[] OrderedParts = { "left3", "left2", "left", "center", "right", "right2", "right3" };
|
||||
|
||||
static public void AlterUpdate(float _liveCurrentTime, PartEntry partInfo, List<CuteAudioSource> liveVocal, bool forceUpdate = false)
|
||||
{
|
||||
|
||||
var timeLineData = partInfo.PartSettings["time"];
|
||||
|
||||
var targetIndex = 0;
|
||||
for (int i = timeLineData.Count - 1; i >= 0; i--)
|
||||
{
|
||||
if (_liveCurrentTime >= (double)timeLineData[i] / 1000)
|
||||
{
|
||||
targetIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (LastAudioPartIndex == targetIndex) return;
|
||||
if (partInfo == null || liveVocal == null ||
|
||||
!partInfo.PartSettings.TryGetValue("time", out var times)) return;
|
||||
int targetIndex = times.Count - 1;
|
||||
while (targetIndex >= 0 && _liveCurrentTime < times[targetIndex] / 1000.0) targetIndex--;
|
||||
if (targetIndex < 0 || (!forceUpdate && LastAudioPartIndex == targetIndex)) return;
|
||||
LastAudioPartIndex = targetIndex;
|
||||
|
||||
|
||||
float volume_rate = 1;
|
||||
if (partInfo.PartSettings.ContainsKey("volume_rate"))
|
||||
int activeCount = 0;
|
||||
foreach (string part in OrderedParts)
|
||||
{
|
||||
volume_rate = partInfo.PartSettings["volume_rate"][targetIndex];
|
||||
var vocal = FindVocal(liveVocal, part);
|
||||
if (vocal != null && PartValue(partInfo, part, targetIndex, 0f) > 0f) activeCount++;
|
||||
}
|
||||
|
||||
if (volume_rate == 999) //chorus
|
||||
// Original AlterUpdate 0x1b8c31d and 0x1b8c562: >=900 means default,
|
||||
// not zero. An explicit zero remains authored silence.
|
||||
float rate = PartValue(partInfo, "volume_rate", targetIndex, 901f);
|
||||
if (rate >= 900f) rate = activeCount < DefaultVolumeRates.Length ? DefaultVolumeRates[activeCount] : 1f;
|
||||
int rank = 0;
|
||||
foreach (string part in OrderedParts)
|
||||
{
|
||||
var activeVocal = new List<CuteAudioSource>();
|
||||
for (int i = 0; i < liveVocal.Count; i++)
|
||||
{
|
||||
var vocal = liveVocal[i];
|
||||
var partName = vocal.tag;
|
||||
var active_index = (int)partInfo.PartSettings[partName][targetIndex];
|
||||
vocal.SwitchActiveSource(active_index, forceUpdate);
|
||||
|
||||
if (partInfo.PartSettings.ContainsKey(partName + "_pan"))
|
||||
{
|
||||
var part = partInfo.PartSettings[partName + "_pan"];
|
||||
var pan = part[targetIndex];
|
||||
vocal.SetPanStereo(pan == 999 ? 0 : pan);
|
||||
}
|
||||
|
||||
if (active_index > 0)
|
||||
{
|
||||
activeVocal.Add(vocal);
|
||||
}
|
||||
}
|
||||
|
||||
switch(activeVocal.Count)
|
||||
{
|
||||
case 1:
|
||||
activeVocal[0].SetVolume(0.9954f);
|
||||
break;
|
||||
case 2:
|
||||
activeVocal[0].SetVolume(0.7031f);
|
||||
activeVocal[1].SetVolume(0.7031f);
|
||||
break;
|
||||
case 3:
|
||||
activeVocal[0].SetVolume(0.7056f);
|
||||
activeVocal[1].SetVolume(0.56f);
|
||||
activeVocal[1].SetVolume(0.56f);
|
||||
break;
|
||||
default:
|
||||
var per_vol = CalculateApproximateDBValues(0.9954f, activeVocal.Count);
|
||||
activeVocal.ForEach(v => v.SetVolume(per_vol));
|
||||
break;
|
||||
}
|
||||
var vocal = FindVocal(liveVocal, part);
|
||||
if (vocal == null) continue;
|
||||
int index = (int)PartValue(partInfo, part, targetIndex, 0f);
|
||||
vocal.SwitchActiveSource(index, forceUpdate);
|
||||
bool active = index > 0;
|
||||
int row = activeCount < DefaultVolumeIndices.Length ? activeCount : 0;
|
||||
int column = active && row > 0 ? rank++ : 0;
|
||||
if (!active) row = 0;
|
||||
float volume = PartValue(partInfo, part + "_vol", targetIndex, 901f);
|
||||
float pan = PartValue(partInfo, part + "_pan", targetIndex, 901f);
|
||||
if (volume >= 900f) volume = DefaultVolumes[DefaultVolumeIndices[row][column]];
|
||||
if (pan >= 900f) pan = DefaultPans[row][column];
|
||||
vocal.SetVolume(volume * rate);
|
||||
vocal.SetPanStereo(pan);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < liveVocal.Count; i++)
|
||||
{
|
||||
var vocal = liveVocal[i];
|
||||
var partName = vocal.tag;
|
||||
var active_index = (int)partInfo.PartSettings[partName][targetIndex];
|
||||
vocal.SwitchActiveSource(active_index, forceUpdate);
|
||||
|
||||
if (partInfo.PartSettings.ContainsKey(partName))
|
||||
{
|
||||
|
||||
if (partInfo.PartSettings.ContainsKey(partName + "_vol"))
|
||||
{
|
||||
var part = partInfo.PartSettings[partName + "_vol"];
|
||||
var volume = part[targetIndex];
|
||||
vocal.SetVolume(volume == 999 ? 0 : volume);
|
||||
}
|
||||
|
||||
if (partInfo.PartSettings.ContainsKey(partName + "_pan"))
|
||||
{
|
||||
var part = partInfo.PartSettings[partName + "_pan"];
|
||||
var pan = part[targetIndex];
|
||||
vocal.SetPanStereo(pan == 999 ? 0 : pan);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static public float CalculateApproximateDBValues(float total_volume, int num_sounds)
|
||||
static CuteAudioSource FindVocal(List<CuteAudioSource> vocals, string part)
|
||||
{
|
||||
var total_db = 15f;
|
||||
var P0 = total_volume * (Math.Pow(10, total_db / 10));
|
||||
var P_per_sound = P0 / num_sounds;
|
||||
var per_volume = 10 * Math.Log10(P_per_sound / total_volume);
|
||||
return (float)(per_volume / total_db);
|
||||
for (int i = 0; i < vocals.Count; i++)
|
||||
if (vocals[i].tag == part) return vocals[i];
|
||||
return null;
|
||||
}
|
||||
|
||||
static float PartValue(PartEntry data, string column, int row, float fallback)
|
||||
{
|
||||
return data.PartSettings.TryGetValue(column, out var values) && row < values.Count
|
||||
? values[row] : fallback;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using CriWareFormats;
|
||||
using CriWareFormats;
|
||||
using Gallop;
|
||||
using Gallop.Live;
|
||||
using Gallop.Live.Cutt;
|
||||
@@ -841,20 +841,18 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he
|
||||
|
||||
public void LoadLive(LiveEntry live, List<LiveCharacterSelect> characters)
|
||||
{
|
||||
characters.ForEach(a =>
|
||||
if (!LiveAutoSelection.FillMissing(Main, live, characters, UI.CostumeIconDefault))
|
||||
{
|
||||
if (a.CharaEntry == null || string.IsNullOrEmpty(a.CostumeId))
|
||||
{
|
||||
a.CharaEntry = Main.Characters[Random.Range(0, Main.Characters.Count / 2)];
|
||||
a.CostumeId = "0002_00_00";
|
||||
}
|
||||
});
|
||||
UI.ShowMessage("Cannot fill the live selection: no available character-owned winning costume matches an empty slot.", UIMessageType.Error);
|
||||
return;
|
||||
}
|
||||
|
||||
// 在旧 UI 场景卸载前复制成普通 C# 数据。后续异步加载不会丢角色选择。
|
||||
List<LiveCharacterLoadData> liveCharacters =
|
||||
LiveCharacterLoadData.CaptureAll(characters);
|
||||
|
||||
bool requireStage = UI.isRequireStage;
|
||||
int liveMode = UI.LiveMode;
|
||||
// Opt-in diagnostics begin before root registration, then follow the
|
||||
// exact dependency-expanded request count shown by the progress UI.
|
||||
LiveRuntimeDiagnostics.BeginPreload(live, liveCharacters, requireStage);
|
||||
@@ -912,26 +910,20 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he
|
||||
|
||||
controller.Initialize();
|
||||
LiveRuntimeDiagnostics.RecordPhase("director_initialized", controller);
|
||||
|
||||
int actualMemberCount = controller
|
||||
._liveTimelineControl
|
||||
.data
|
||||
.worksheetList[0]
|
||||
.charaMotSeqList
|
||||
.Count;
|
||||
|
||||
if (actualMemberCount > liveCharacters.Count && liveCharacters.Count > 0)
|
||||
// Native full-mode callback (RVA 0x1ba8981..0x1ba8b76) cycles
|
||||
// selected identities through the raw authored channel count.
|
||||
// Simple mode uses only the UI's basic-motion selection capacity.
|
||||
int motionChannelCount = controller._liveTimelineControl.data.worksheetList[0].charaMotSeqList.Count;
|
||||
if (liveMode == 1 && liveCharacters.Count > 0 && motionChannelCount > liveCharacters.Count)
|
||||
{
|
||||
Debug.LogWarning(
|
||||
$"actual member count is {actualMemberCount} current {liveCharacters.Count}");
|
||||
|
||||
var expandedCharacters = new List<LiveCharacterLoadData>();
|
||||
for (int i = 0; i < actualMemberCount; i++)
|
||||
expandedCharacters.Add(liveCharacters[i % liveCharacters.Count]);
|
||||
|
||||
liveCharacters = expandedCharacters;
|
||||
var channelCharacters = new List<LiveCharacterLoadData>(motionChannelCount);
|
||||
for (int i = 0; i < motionChannelCount; i++)
|
||||
channelCharacters.Add(liveCharacters[i % liveCharacters.Count]);
|
||||
liveCharacters = channelCharacters;
|
||||
}
|
||||
|
||||
|
||||
|
||||
LoadLiveUma(liveCharacters);
|
||||
LiveRuntimeDiagnostics.RecordPhase("characters_loaded", controller);
|
||||
|
||||
@@ -989,7 +981,7 @@ public string[] NormalBodyKeywords = new[] { "skin", "body", "bdy", "face", "he
|
||||
{
|
||||
if (director == null) return;
|
||||
director.InitializeUI();
|
||||
director.InitializeTimeline(liveCharacters, UI.LiveMode);
|
||||
director.InitializeTimeline(liveCharacters, liveMode);
|
||||
director.InitializeMusic(live.MusicId, liveCharacters);
|
||||
LiveRuntimeDiagnostics.RecordPhase("timeline_music_initialized", director);
|
||||
director.Play();
|
||||
|
||||
@@ -85,17 +85,18 @@ public class UmaViewerMain : MonoBehaviour
|
||||
|
||||
|
||||
|
||||
// Online English names take priority. LocalizeEn remains the offline fallback.
|
||||
// Reuse downloaded English names; only fetch when no usable cache exists.
|
||||
bool downloadTranslations = false;
|
||||
string cachePath = Path.Combine(Application.persistentDataPath, EnglishNamesCacheFileName);
|
||||
if (Config.Instance.Language == Language.En)
|
||||
downloadTranslations = !TryLoadEnglishNamesCache(cachePath);
|
||||
|
||||
loadingUI.LoadingProgressChange(
|
||||
loadingStep++,
|
||||
loadingStepsTotal,
|
||||
Config.Instance.Language == Language.En ? "Downloading Translations" : "Loading Translations");
|
||||
if (Config.Instance.Language == Language.En)
|
||||
downloadTranslations ? "Downloading Translations" : "Loading Translations");
|
||||
if (downloadTranslations)
|
||||
{
|
||||
string cachePath = Path.Combine(
|
||||
Application.persistentDataPath,
|
||||
EnglishNamesCacheFileName);
|
||||
TryLoadEnglishNamesCache(cachePath);
|
||||
|
||||
yield return UmaViewerDownload.DownloadText(LocalizeEn.TranslationUrl, json =>
|
||||
{
|
||||
@@ -284,9 +285,9 @@ public class UmaViewerMain : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private static void TryLoadEnglishNamesCache(string cachePath)
|
||||
private static bool TryLoadEnglishNamesCache(string cachePath)
|
||||
{
|
||||
if (!File.Exists(cachePath)) return;
|
||||
if (!File.Exists(cachePath)) return false;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -301,13 +302,17 @@ public class UmaViewerMain : MonoBehaviour
|
||||
|
||||
Dictionary<int, string> charaNames = ReadEnglishNameTable(reader);
|
||||
Dictionary<int, string> mobNames = ReadEnglishNameTable(reader);
|
||||
if (charaNames.Count == 0 || mobNames.Count == 0)
|
||||
throw new InvalidDataException("English name cache is missing required name tables.");
|
||||
ApplyEnglishNames(charaNames, mobNames);
|
||||
Debug.Log($"Loaded cached English names: {charaNames.Count} characters, {mobNames.Count} mobs.");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogWarning($"Could not load the cached English names. Using LocalizeEn fallback: {ex.Message}");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+48
-101
@@ -189,8 +189,9 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public IEnumerator ApplyGraphicsSettings()
|
||||
{
|
||||
yield return 0;
|
||||
CameraSettings.ChangeAntiAliasing(Config.Instance.AntiAliasing);
|
||||
CameraSettings.AAModeDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing);
|
||||
GraphicsSettings.renderPipelineAsset = Config.Instance.Region == Region.Global ? null : UmaViewerMain.Instance.DefaultRenderPipeline;
|
||||
RuntimeGraphicsSettings.Apply();
|
||||
}
|
||||
|
||||
public void HighlightChildImage(Transform mainObject, UmaUIContainer child)
|
||||
@@ -867,61 +868,60 @@ public class UmaViewerUI : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
void ShowLiveSelectPanel(LiveEntry entry)
|
||||
void ShowLiveSelectPanel(LiveEntry entry, bool loadPreview = true)
|
||||
{
|
||||
LiveSelectPannel.SetActive(true);
|
||||
Builder.loadLivePreviewSound(entry.MusicId);
|
||||
for (int i = LiveSelectList.content.childCount - 1; i >= 0; i--)
|
||||
if (loadPreview) Builder.loadLivePreviewSound(entry.MusicId);
|
||||
bool keepSelections = currentLive == entry;
|
||||
CurrentSeletChara = null;
|
||||
if (!keepSelections)
|
||||
{
|
||||
Destroy(LiveSelectList.content.GetChild(i).gameObject);
|
||||
for (int i = LiveSelectList.content.childCount - 1; i >= 0; i--)
|
||||
{
|
||||
var child = LiveSelectList.content.GetChild(i);
|
||||
child.SetParent(null);
|
||||
Destroy(child.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
if(LiveMode == 1)
|
||||
currentLive = entry;
|
||||
LiveSelectImage.sprite = entry.Icon;
|
||||
int memberCount = entry.MemberCount;
|
||||
if (LiveMode == 0)
|
||||
{
|
||||
currentLive = entry;
|
||||
LiveSelectImage.sprite = entry.Icon;
|
||||
LiveSelectInfoText.text = $"{entry.SongName}\nMembers Count: {entry.MemberCount}";
|
||||
for (int i = 0; i < entry.MemberCount; i++)
|
||||
memberCount = Main.AbMotions.Count(a => a.Name.StartsWith($"3d/motion/live/body/son{entry.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4);
|
||||
LiveSelectInfoText.text = $"{entry.SongName}\nMain Members Count: {memberCount}";
|
||||
}
|
||||
else
|
||||
{
|
||||
LiveSelectInfoText.text = $"{entry.SongName}\nMembers Count: {memberCount}";
|
||||
}
|
||||
|
||||
var selections = new List<LiveCharacterSelect>(LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>());
|
||||
for (int i = selections.Count - 1; i >= memberCount; i--)
|
||||
{
|
||||
selections[i].transform.SetParent(null);
|
||||
Destroy(selections[i].gameObject);
|
||||
selections.RemoveAt(i);
|
||||
}
|
||||
for (int i = selections.Count; i < memberCount; i++)
|
||||
{
|
||||
var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent<LiveCharacterSelect>();
|
||||
chara.IndexText.text = (i + 1).ToString();
|
||||
chara.GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent<LiveCharacterSelect>();
|
||||
chara.IndexText.text = (i + 1).ToString();
|
||||
chara.GetComponent<Button>().onClick.AddListener(() =>
|
||||
chara.SelectChara(this);
|
||||
foreach (var t in LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>())
|
||||
{
|
||||
chara.SelectChara(this);
|
||||
foreach (var t in LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>())
|
||||
{
|
||||
t.GetComponentInChildren<Text>().color = (t == chara ? Color.green : Color.black);
|
||||
}
|
||||
});
|
||||
}
|
||||
t.GetComponentInChildren<Text>().color = (t == chara ? (LiveMode == 1 ? Color.green : Color.white) : Color.black);
|
||||
}
|
||||
});
|
||||
selections.Add(chara);
|
||||
}
|
||||
else if(LiveMode == 0)
|
||||
{
|
||||
currentLive = entry;
|
||||
LiveSelectImage.sprite = entry.Icon;
|
||||
|
||||
int mainCount = 0;
|
||||
foreach (var motion in Main.AbMotions.Where(a => a.Name.StartsWith($"3d/motion/live/body/son{entry.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4))
|
||||
{
|
||||
mainCount += 1;
|
||||
}
|
||||
|
||||
LiveSelectInfoText.text = $"{entry.SongName}\nMain Members Count: {mainCount}";
|
||||
for (int i = 0; i < mainCount; i++)
|
||||
{
|
||||
var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent<LiveCharacterSelect>();
|
||||
chara.IndexText.text = (i + 1).ToString();
|
||||
chara.GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
chara.SelectChara(this);
|
||||
foreach (var t in LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>())
|
||||
{
|
||||
t.GetComponentInChildren<Text>().color = (t == chara ? Color.white : Color.black);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var selection in selections)
|
||||
selection.GetComponentInChildren<Text>().color = Color.black;
|
||||
if (!LiveAutoSelection.FillMissing(Main, entry, selections, CostumeIconDefault))
|
||||
ShowMessage("Cannot fill the live selection: no available character-owned winning costume matches an empty slot.", UIMessageType.Warning);
|
||||
}
|
||||
|
||||
void ListCostumes(CharaEntry chara, bool mini)
|
||||
@@ -1390,60 +1390,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
{
|
||||
LiveMode = val;
|
||||
if (LiveSelectPannel.activeSelf && currentLive != null)
|
||||
{
|
||||
foreach (var select in LiveSelectList.content.GetComponentsInChildren<Transform>())
|
||||
{
|
||||
if (select != LiveSelectList.content.transform)
|
||||
{
|
||||
Destroy(select.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
switch (LiveMode)
|
||||
{
|
||||
case 0:
|
||||
LiveSelectImage.sprite = currentLive.Icon;
|
||||
int mainCount = 0;
|
||||
foreach (var motion in Main.AbMotions.Where(a => a.Name.StartsWith($"3d/motion/live/body/son{currentLive.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4))
|
||||
{
|
||||
mainCount += 1;
|
||||
}
|
||||
|
||||
LiveSelectInfoText.text = $"{currentLive.SongName}\nMain Members Count: {mainCount}";
|
||||
for (int i = 0; i < mainCount; i++)
|
||||
{
|
||||
var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent<LiveCharacterSelect>();
|
||||
chara.IndexText.text = (i + 1).ToString();
|
||||
chara.GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
chara.SelectChara(this);
|
||||
foreach (var t in LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>())
|
||||
{
|
||||
t.GetComponentInChildren<Text>().color = (t == chara ? Color.white : Color.black);
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
LiveSelectImage.sprite = currentLive.Icon;
|
||||
LiveSelectInfoText.text = $"{currentLive.SongName}\nMembers Count: {currentLive.MemberCount}";
|
||||
for (int i = 0; i < currentLive.MemberCount; i++)
|
||||
{
|
||||
var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent<LiveCharacterSelect>();
|
||||
chara.IndexText.text = (i + 1).ToString();
|
||||
chara.GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
chara.SelectChara(this);
|
||||
foreach (var t in LiveSelectList.content.GetComponentsInChildren<LiveCharacterSelect>())
|
||||
{
|
||||
t.GetComponentInChildren<Text>().color = (t == chara ? Color.white : Color.black);
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
ShowLiveSelectPanel(currentLive, false);
|
||||
}
|
||||
|
||||
public void SetLiveRecordMode(bool val) { isRecordVMD = val; }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Gallop.ImageEffect;
|
||||
using Gallop.ImageEffect;
|
||||
using Gallop.RenderPipeline;
|
||||
using UnityEngine;
|
||||
|
||||
@@ -14,6 +14,15 @@ namespace Gallop
|
||||
|
||||
public DofDiffusionBloomOverlayParam DofDiffusionBloomOverlayParam => _dofDiffusionBloomOverlayParam;
|
||||
public bool IsInitialized { get; private set; }
|
||||
private CameraData _cameraData;
|
||||
public PostImageEffectFeature.Parameter RenderParameter
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!IsInitialized) InitializeVolume();
|
||||
return _cameraData.Parameter;
|
||||
}
|
||||
}
|
||||
|
||||
// 子系统 A7b:原生 GallopImageEffect.get_ExposureParam(RVA=0x19a97b0) /
|
||||
// get_ToneCurveParam(RVA=0x19a9930) 的 master7 等价属性。原生 getter 返回
|
||||
@@ -39,10 +48,16 @@ namespace Gallop
|
||||
if (adapter != null) adapter.ApplyBloomParameter();
|
||||
}
|
||||
|
||||
private void Awake() { InitializeVolume(); }
|
||||
protected void Awake() { InitializeVolume(); }
|
||||
|
||||
// Retained for existing callers; no spatial Volume is created.
|
||||
public void InitializeVolume() { IsInitialized = true; }
|
||||
public virtual void InitializeVolume()
|
||||
{
|
||||
if (IsInitialized) return;
|
||||
if (!TryGetComponent(out _cameraData))
|
||||
_cameraData = gameObject.AddComponent<CameraData>();
|
||||
IsInitialized = true;
|
||||
}
|
||||
|
||||
public void ApplyBloomParameter()
|
||||
{
|
||||
@@ -50,24 +65,18 @@ namespace Gallop
|
||||
if (director == null || director.MainRenderCamera == null ||
|
||||
director.MainRenderCamera.gameObject != gameObject) return;
|
||||
|
||||
var parameter = PostImageEffectFeature.RuntimeParameter;
|
||||
var parameter = RenderParameter;
|
||||
PostImageEffectFeature.RuntimeParameter = parameter;
|
||||
parameter.DofDiffuionBloomOverlay.Setup(_dofDiffusionBloomOverlayParam);
|
||||
if (!UserDofEnabled)
|
||||
{
|
||||
parameter.DofDiffuionBloomOverlay.IsEnableDof = false;
|
||||
parameter.DofDiffuionBloomOverlay.IsEnableOldDof = false;
|
||||
}
|
||||
parameter.DofDiffuionBloomOverlay.DecideDrawType(
|
||||
UserDofEnabled && _dofDiffusionBloomOverlayParam.IsEnableDof);
|
||||
_cameraData.UpdateImageEffectParameter();
|
||||
parameter.TargetCamera = director.MainRenderCamera;
|
||||
|
||||
// 子系统 A7b:原生 CameraData.UpdateImageEffectParameter(RVA=0x1a0da30)
|
||||
// 末尾 jmp Parameter.DecideDrawType,把 GallopImageEffect 的参数块
|
||||
//(DOF + Exposure + ToneCurve…)统一交给渲染侧。master7 的
|
||||
// PostImageEffectFeature.Parameter 还没有 Exposure/ToneCurve 的
|
||||
// pass 消费字段,因此先挂在运行时参数对象上供后续
|
||||
// ExposurePass/ToneCurvePass(原生 RVA=0x1a22e10/0x1a527d0)接入,
|
||||
// 数据已随时间轴逐帧刷新,不会比原生缺帧。
|
||||
// Exposure and tone curves publish into the same camera-owned render state.
|
||||
parameter.ExposureParam.Setup(ExposureParam);
|
||||
parameter.ToneCurveParam.Setup(ToneCurveParam);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace Gallop
|
||||
{
|
||||
// Serialized Live camera subtype. The base image effect is also used outside Live.
|
||||
public class LiveImageEffect : GallopImageEffect
|
||||
{
|
||||
public override void InitializeVolume()
|
||||
{
|
||||
if (IsInitialized) return;
|
||||
base.InitializeVolume();
|
||||
// Actual game Initialize RVA 0x7395c80 calls the base initializer,
|
||||
// then writes render Parameter+0x1b=true (0x7395ced). Not source Setup.
|
||||
RenderParameter.DofDiffuionBloomOverlay.IsEnableDofAutoDisable = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 428adbfbca84b7e49a12cc841c2928b3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System.Linq;
|
||||
@@ -331,7 +331,7 @@ namespace Gallop.Live.Cutt
|
||||
public event HdrBloomUpdateInfoDelegate OnUpdateHdrBloom;
|
||||
|
||||
public event Action<PostEffectUpdateInfo_BloomDiffusion> OnUpdatePostEffect_BloomDiffusion;
|
||||
public event Action<LiveTimelineKeyPostEffectDOFData> OnUpdatePostEffect_Dof;
|
||||
public event Action<LiveTimelineKeyPostEffectDOFData, Vector3?> OnUpdatePostEffect_Dof;
|
||||
public bool HasDofCameraLookAt { get; private set; }
|
||||
public Vector3 DofCameraLookAt { get; private set; }
|
||||
public Camera DofTrackCamera { get; private set; }
|
||||
@@ -395,6 +395,7 @@ namespace Gallop.Live.Cutt
|
||||
public event Action RecordUma;
|
||||
|
||||
public Dictionary<string, GameObject> StageObjectMap = new Dictionary<string, GameObject>();
|
||||
public Dictionary<string, StageObjectUnit> StageObjectUnitMap = new Dictionary<string, StageObjectUnit>();
|
||||
|
||||
public float currentLiveTime
|
||||
{
|
||||
@@ -553,16 +554,18 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public void InitCharaMotionSequence(int[] motionSequence)
|
||||
{
|
||||
//Create Animation
|
||||
foreach (var obj in Director.instance.charaObjs)
|
||||
var director = Director.instance;
|
||||
// Native InitCharaMotionSequence retains an entry for each physical slot.
|
||||
foreach (var obj in director.charaObjs)
|
||||
{
|
||||
var container = obj.GetComponentInChildren<UmaContainer>();
|
||||
if (container)
|
||||
var container = obj != null ? obj.GetComponentInChildren<UmaContainer>() : null;
|
||||
Animation animation = null;
|
||||
if (container != null)
|
||||
{
|
||||
EnsureMicMotionTransforms(container.transform);
|
||||
var animation = container.gameObject.AddComponent<Animation>();
|
||||
Director.instance.charaAnims.Add(animation);
|
||||
animation = container.gameObject.AddComponent<Animation>();
|
||||
}
|
||||
director.charaAnims.Add(animation);
|
||||
}
|
||||
|
||||
//Get KeyArray
|
||||
@@ -578,14 +581,14 @@ namespace Gallop.Live.Cutt
|
||||
if (Director.instance.liveMode == 1)
|
||||
{
|
||||
//Set Motion
|
||||
int CharaPositionMax = Director.instance.allowCount;
|
||||
int CharaPositionMax = Mathf.Max(0, Mathf.Min(director.allowCount,
|
||||
Mathf.Min(director.charaObjs.Count, motionSequence != null ? motionSequence.Length : 0)));
|
||||
|
||||
_motionSequenceArray = new LiveTimelineMotionSequence[CharaPositionMax];
|
||||
|
||||
|
||||
for (int i = 0; i < CharaPositionMax; i++)
|
||||
{
|
||||
Debug.Log(i);
|
||||
_motionSequenceArray[i] = new LiveTimelineMotionSequence();
|
||||
_motionSequenceArray[i].Initialize(Director.instance.charaObjs[i], i, motionSequence[i], this);
|
||||
}
|
||||
@@ -597,7 +600,10 @@ namespace Gallop.Live.Cutt
|
||||
foreach (var motion in UmaViewerMain.Instance.AbMotions.Where(a => a.Name.StartsWith($"3d/motion/live/body/son{Director.instance.live.MusicId}") && Path.GetFileName(a.Name).Split('_').Length == 4))
|
||||
{
|
||||
AssetBundle motionAB = UmaAssetManager.LoadAssetBundle(motion);
|
||||
AnimationClip motionAnim = motionAB.LoadAsset<AnimationClip>(Path.GetFileName(motion.Name).Split('.')[0]);
|
||||
AnimationClip motionAnim = motionAB != null
|
||||
? motionAB.LoadAsset<AnimationClip>(Path.GetFileName(motion.Name).Split('.')[0]) : null;
|
||||
if (motionAnim == null)
|
||||
Debug.LogError("[LiveTimelineControl] Basic motion clip load failed: " + motion.Name);
|
||||
if (Gallop.Live.LiveRuntimeDiagnostics.Enabled)
|
||||
Gallop.Live.LiveRuntimeDiagnostics.RecordAssetLoad(motion.Name, "LoadAsset", typeof(AnimationClip),
|
||||
new UnityEngine.Object[] { motionAnim }, motionAnim, Path.GetFileName(motion.Name).Split('.')[0]);
|
||||
@@ -605,7 +611,8 @@ namespace Gallop.Live.Cutt
|
||||
}
|
||||
|
||||
//Set Motion
|
||||
int CharaPositionMax = Director.instance.allowCount;
|
||||
int CharaPositionMax = Mathf.Max(0, Mathf.Min(director.allowCount,
|
||||
Mathf.Min(director.charaObjs.Count, Mathf.Min(director.charaAnims.Count, Anims.Count))));
|
||||
|
||||
_motionSequenceArray = new LiveTimelineMotionSequence[CharaPositionMax];
|
||||
|
||||
@@ -613,7 +620,7 @@ namespace Gallop.Live.Cutt
|
||||
for (int i = 0; i < CharaPositionMax; i++)
|
||||
{
|
||||
_motionSequenceArray[i] = new LiveTimelineMotionSequence();
|
||||
_motionSequenceArray[i].Initialize(Director.instance.charaObjs[i], i, motionSequence[i], this, Anims);
|
||||
_motionSequenceArray[i].Initialize(director.charaObjs[i], i, i, this, Anims);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1585,26 +1592,15 @@ namespace Gallop.Live.Cutt
|
||||
LiveTimelineKeyCameraPositionData liveTimelineKeyCameraPositionData = curKey as LiveTimelineKeyCameraPositionData;
|
||||
camera.camera.nearClipPlane = liveTimelineKeyCameraPositionData.nearClip;
|
||||
camera.camera.farClipPlane = liveTimelineKeyCameraPositionData.farClip;
|
||||
// Native AlterUpdate_CameraPos (0x1acd38c..0x1acd3f4) preserves unflagged state.
|
||||
if (((int)liveTimelineKeyCameraPositionData.attribute & 0x20000) != 0)
|
||||
camera.camera.cullingMask = liveTimelineKeyCameraPositionData.GetCullingMask();
|
||||
if (((int)liveTimelineKeyCameraPositionData.attribute & 0x40000) != 0)
|
||||
camera.camera.backgroundColor = liveTimelineKeyCameraPositionData.BgColor;
|
||||
if (CalculateCameraPos(out var pos, sheet, curKey, nextKey, currentFrame))
|
||||
{
|
||||
camera.cacheTransform.position = pos;
|
||||
|
||||
// TODO 锟斤拷锟斤拷锟矫的伙拷锟斤拷CGSS锟斤拷layer枚锟劫o拷要锟斤拷锟斤拷锟芥换
|
||||
/*
|
||||
int num = liveTimelineKeyCameraPositionData.GetCullingMask();
|
||||
if (num == 0)
|
||||
{
|
||||
num = LiveTimelineKeyCameraPositionData.GetDefaultCullingMask();
|
||||
}
|
||||
camera.camera.cullingMask = num;
|
||||
if (OnUpdateCameraPos != null)
|
||||
{
|
||||
CameraPosUpdateInfo updateInfo = default(CameraPosUpdateInfo);
|
||||
updateInfo.outlineZOffset = liveTimelineKeyCameraPositionData.outlineZOffset;
|
||||
updateInfo.characterLODMask = (int)liveTimelineKeyCameraPositionData.characterLODMask;
|
||||
OnUpdateCameraPos(ref updateInfo);
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2440,7 +2436,7 @@ namespace Gallop.Live.Cutt
|
||||
private void AlterUpdate_MobControl(LiveTimelineWorkSheet sheet, float currentFrame)
|
||||
{
|
||||
AlterUpdate_MobCyalumeControl(
|
||||
sheet != null ? sheet.mobControlList : null,
|
||||
sheet != null ? sheet.MobControlKeys : null,
|
||||
currentFrame,
|
||||
OnUpdateMobControl);
|
||||
}
|
||||
@@ -2448,7 +2444,7 @@ namespace Gallop.Live.Cutt
|
||||
private void AlterUpdate_CyalumeControl(LiveTimelineWorkSheet sheet, float currentFrame)
|
||||
{
|
||||
AlterUpdate_MobCyalumeControl(
|
||||
sheet != null ? sheet.cyalumeControlList : null,
|
||||
sheet != null ? sheet.CyalumeControlKeys : null,
|
||||
currentFrame,
|
||||
OnUpdateCyalumeControl);
|
||||
}
|
||||
@@ -2465,10 +2461,10 @@ namespace Gallop.Live.Cutt
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
var controlData = dataList[i];
|
||||
if (controlData == null || controlData.keys == null)
|
||||
if (controlData == null || controlData.Keys == null || (uint)controlData.GroupIndex >= 11u)
|
||||
continue;
|
||||
|
||||
var keys = controlData.keys;
|
||||
var keys = controlData.Keys;
|
||||
if (keys.Count <= 0)
|
||||
continue;
|
||||
if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable))
|
||||
@@ -2485,22 +2481,22 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
MobCyalumeUpdateInfo info = default;
|
||||
info.data = controlData;
|
||||
info.unk0 = (uint)keys.unk48 < 11u ? keys.unk48 : i;
|
||||
info.unk0 = controlData.GroupIndex;
|
||||
info.currentFrame = currentFrame;
|
||||
info.currentLiveTime = currentLiveTime;
|
||||
|
||||
if (next != null && next.interpolateType != 0)
|
||||
{
|
||||
float t = CalculateInterpolationValue(current, next, currentFrame);
|
||||
info.position = Vector3.Lerp(current.position, next.position, t);
|
||||
info.position = Vector3.Lerp(current.Position, next.Position, t);
|
||||
info.rotation = Quaternion.Lerp(current.GetRotation(), next.GetRotation(), t);
|
||||
info.scale = Vector3.Lerp(current.scale, next.scale, t);
|
||||
info.scale = Vector3.Lerp(current.Scale, next.Scale, t);
|
||||
}
|
||||
else
|
||||
{
|
||||
info.position = current.position;
|
||||
info.position = current.Position;
|
||||
info.rotation = current.GetRotation();
|
||||
info.scale = current.scale;
|
||||
info.scale = current.Scale;
|
||||
}
|
||||
|
||||
callback.Invoke(ref info);
|
||||
@@ -2975,7 +2971,8 @@ namespace Gallop.Live.Cutt
|
||||
continue;
|
||||
}
|
||||
|
||||
if (StageObjectMap == null || !StageObjectMap.ContainsKey(objectEntry.name))
|
||||
if ((StageObjectMap == null || !StageObjectMap.ContainsKey(objectEntry.name)) &&
|
||||
(StageObjectUnitMap == null || !StageObjectUnitMap.ContainsKey(objectEntry.name)))
|
||||
continue;
|
||||
|
||||
FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame);
|
||||
@@ -3207,6 +3204,27 @@ namespace Gallop.Live.Cutt
|
||||
}
|
||||
}
|
||||
|
||||
private Vector3? ResolveDofWorldFocus(LiveTimelineKeyPostEffectDOFData key)
|
||||
{
|
||||
if (((int)key.attribute & (1 << 16)) != 0)
|
||||
return HasDofCameraLookAt ? DofCameraLookAt : (Vector3?)null;
|
||||
bool valid = key.charactor == 0;
|
||||
for (int i = 0; !valid && i < liveCharactorLocators.Length && i < liveCharaPositionMax; ++i)
|
||||
valid = (key.charactor & (1 << i)) != 0 && liveCharactorLocators[i] != null;
|
||||
return valid ? GetPositionWithCharacters(key.FocusCharacters, LiveCameraCharaParts.Face,
|
||||
Vector3.zero, Vector3.zero) : (Vector3?)null;
|
||||
}
|
||||
|
||||
private Vector3? SetupDofWorldFocus(LiveTimelineKeyPostEffectDOFData current,
|
||||
LiveTimelineKeyPostEffectDOFData next, float progress)
|
||||
{
|
||||
var start = ResolveDofWorldFocus(current);
|
||||
if (ReferenceEquals(current, next)) return start;
|
||||
var end = ResolveDofWorldFocus(next);
|
||||
return start.HasValue && end.HasValue
|
||||
? Vector3.LerpUnclamped(start.Value, end.Value, progress) : (Vector3?)null;
|
||||
}
|
||||
|
||||
private void AlterUpdate_PostEffect_Dof(LiveTimelineWorkSheet sheet, int frame)
|
||||
{
|
||||
DofTrackCamera = GetCamera(sheet.targetCameraIndex)?.camera;
|
||||
@@ -3214,32 +3232,32 @@ namespace Gallop.Live.Cutt
|
||||
if (keys == null || keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) ||
|
||||
!keys.EnablePlayModeTimeline(_playMode))
|
||||
{
|
||||
OnUpdatePostEffect_Dof?.Invoke(null);
|
||||
OnUpdatePostEffect_Dof?.Invoke(null, null);
|
||||
return;
|
||||
}
|
||||
FindTimelineKey(out var currentBase, out var nextBase, keys, frame);
|
||||
var current = currentBase as LiveTimelineKeyPostEffectDOFData;
|
||||
var next = nextBase as LiveTimelineKeyPostEffectDOFData;
|
||||
if (current == null) { OnUpdatePostEffect_Dof?.Invoke(null); return; }
|
||||
if (current == null) { OnUpdatePostEffect_Dof?.Invoke(null, null); return; }
|
||||
float t = next != null && next.IsInterpolateKey()
|
||||
? CalculateInterpolationValue(current, next, frame) : 0f;
|
||||
if (next == null) next = current;
|
||||
if (next == null || !next.IsInterpolateKey()) next = current;
|
||||
var sample = _dofSample;
|
||||
sample.frame = current.frame;
|
||||
sample.attribute = current.attribute;
|
||||
sample.charactor = current.charactor;
|
||||
sample.dofBlurType = current.dofBlurType;
|
||||
sample.dofQuality = current.dofQuality;
|
||||
sample.forcalSize = Mathf.Lerp(current.forcalSize, next.forcalSize, t);
|
||||
sample.blurSpread = Mathf.Lerp(current.blurSpread, next.blurSpread, t);
|
||||
sample.dofForegroundSize = Mathf.Lerp(current.dofForegroundSize, next.dofForegroundSize, t);
|
||||
sample.dofFocalPoint = Mathf.Lerp(current.dofFocalPoint, next.dofFocalPoint, t);
|
||||
sample.dofSmoothness = Mathf.Lerp(current.dofSmoothness, next.dofSmoothness, t);
|
||||
sample.BallBlurPowerFactor = Mathf.Lerp(current.BallBlurPowerFactor, next.BallBlurPowerFactor, t);
|
||||
sample.BallBlurBrightnessThreshhold = Mathf.Lerp(current.BallBlurBrightnessThreshhold, next.BallBlurBrightnessThreshhold, t);
|
||||
sample.BallBlurBrightnessIntensity = Mathf.Lerp(current.BallBlurBrightnessIntensity, next.BallBlurBrightnessIntensity, t);
|
||||
sample.BallBlurSpread = Mathf.Lerp(current.BallBlurSpread, next.BallBlurSpread, t);
|
||||
OnUpdatePostEffect_Dof?.Invoke(sample);
|
||||
sample.forcalSize = LerpWithoutClamp(current.forcalSize, next.forcalSize, t);
|
||||
sample.blurSpread = LerpWithoutClamp(current.blurSpread, next.blurSpread, t);
|
||||
sample.dofForegroundSize = LerpWithoutClamp(current.dofForegroundSize, next.dofForegroundSize, t);
|
||||
sample.dofFocalPoint = LerpWithoutClamp(current.dofFocalPoint, next.dofFocalPoint, t);
|
||||
sample.dofSmoothness = LerpWithoutClamp(current.dofSmoothness, next.dofSmoothness, t);
|
||||
sample.BallBlurPowerFactor = LerpWithoutClamp(current.BallBlurPowerFactor, next.BallBlurPowerFactor, t);
|
||||
sample.BallBlurBrightnessThreshhold = LerpWithoutClamp(current.BallBlurBrightnessThreshhold, next.BallBlurBrightnessThreshhold, t);
|
||||
sample.BallBlurBrightnessIntensity = LerpWithoutClamp(current.BallBlurBrightnessIntensity, next.BallBlurBrightnessIntensity, t);
|
||||
sample.BallBlurSpread = LerpWithoutClamp(current.BallBlurSpread, next.BallBlurSpread, t);
|
||||
OnUpdatePostEffect_Dof?.Invoke(sample, SetupDofWorldFocus(current, next, t));
|
||||
}
|
||||
|
||||
private void AlterUpdate_PostEffect_BloomDiffusion( LiveTimelineWorkSheet sheet, int currentFrame)
|
||||
|
||||
@@ -225,6 +225,9 @@ namespace Gallop.Live.Cutt
|
||||
public float maxForcalSize;
|
||||
public bool isUseMirrorScanMotionDictionary;
|
||||
public bool isUseGameSettingToParticle;
|
||||
public bool IsChangedCharaLayerOnlyMirrorRendering;
|
||||
public bool IsRenderMirrorObjectOnlyOnBaseCamera;
|
||||
public bool UseDepthOnlyCube;
|
||||
public LiveTimelineStageObjectsSettings stageObjectsSettings;
|
||||
public LiveTimelineDebugSettings debugSettings;
|
||||
}
|
||||
|
||||
+6
-6
@@ -10,9 +10,9 @@ namespace Gallop.Live.Cutt
|
||||
{
|
||||
get{return LiveTimelineKeyDataType.CyalumeControl;}
|
||||
}
|
||||
public Vector3 position;
|
||||
public Vector3 angle;
|
||||
public Vector3 scale = Vector3.one;
|
||||
public Vector3 Position;
|
||||
public Vector3 Angle;
|
||||
public Vector3 Scale = Vector3.one;
|
||||
|
||||
[NonSerialized]
|
||||
private Quaternion _rotationCache = Quaternion.identity;
|
||||
@@ -24,7 +24,7 @@ namespace Gallop.Live.Cutt
|
||||
{
|
||||
if (!_hasRotationCache)
|
||||
{
|
||||
_rotationCache = Quaternion.Euler(angle);
|
||||
_rotationCache = Quaternion.Euler(Angle);
|
||||
_hasRotationCache = true;
|
||||
}
|
||||
|
||||
@@ -35,13 +35,13 @@ namespace Gallop.Live.Cutt
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyMobCyalumeControlDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyMobCyalumeControlData>
|
||||
{
|
||||
public int unk48;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineMobCyalumeControlData : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
public LiveTimelineKeyMobCyalumeControlDataList keys;
|
||||
public int GroupIndex;
|
||||
public LiveTimelineKeyMobCyalumeControlDataList Keys;
|
||||
}
|
||||
|
||||
public delegate void MobCyalumeUpdateInfoDelegate(ref MobCyalumeUpdateInfo updateInfo);
|
||||
|
||||
+5
-11
@@ -34,17 +34,11 @@ namespace Gallop.Live.Cutt
|
||||
/// </summary>
|
||||
public LiveCharaPositionFlag FocusCharacters => (LiveCharaPositionFlag)charactor;
|
||||
|
||||
// High `attribute` bits are per-track flags (same convention as
|
||||
// LiveTimelineMonitorData). Across the 4427 authored keys only bits 16..19
|
||||
// appear, in the combinations 0x50000 (3117), 0x70000 (923), 0x60000 (108),
|
||||
// 0x10000 (106), 0x40000 (77), 0x30000 (72), 0x20000 (22), 0x00000 (1) and
|
||||
// 0xF0000 (1). Bit 17 covaries with an authored dofFocalPoint: 95.1% of the
|
||||
// 3301 bit17-clear keys leave it at the 1.0 default, while 88.1% of the 1126
|
||||
// bit17-set keys carry a real distance. Bit 16 covaries the other way with
|
||||
// `charactor`: only 1.4% of the 4219 bit16-set keys move it off Center,
|
||||
// against 56.7% of the 208 bit16-clear keys. The flag names are still
|
||||
// unknown. Timeline mode tests the inferred bit17=metric / bit16=camera
|
||||
// target mapping; see docs/LIVE_DOF_TIMELINE_2026-09-06.md for pixel evidence.
|
||||
// Actual game metadata and SetupDOFUpdateInfo RVA 0x726a610 confirm:
|
||||
// bit16 ATTR_USE_LOOKAT; bit17 ATTR_USE_FOCAL_POINT;
|
||||
// bit18 ATTR_ENABLE_DOF; bit19 ATTR_IS_POINT_BALL_BLUR.
|
||||
// Current-key flags select the mode; both endpoints resolve world focus
|
||||
// independently before the next key's unclamped interpolation is applied.
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using UnityEngine;
|
||||
using RootMotion.FinalIK;
|
||||
|
||||
@@ -43,56 +44,96 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public void Initialize(Transform target, int targetIndex, int seqDataIndex, LiveTimelineControl timelineControl, List<AnimationClip> animclips = null)
|
||||
{
|
||||
if(animclips != null)
|
||||
{
|
||||
if (targetIndex < Director.instance.charaAnims.Count)
|
||||
{
|
||||
_targetAnim = animclips[targetIndex];
|
||||
|
||||
_tempAnim = Director.instance.charaAnims[targetIndex];
|
||||
_tempAnim.AddClip(_targetAnim, _targetAnim.name);
|
||||
}
|
||||
var animations = Director.instance.charaAnims;
|
||||
if (targetIndex < 0 || targetIndex >= animations.Count || animations[targetIndex] == null)
|
||||
return;
|
||||
}
|
||||
|
||||
_tempTarget = target;
|
||||
_targetIndex = targetIndex;
|
||||
|
||||
charaIndex = targetIndex;
|
||||
_tempAnim = animations[targetIndex];
|
||||
|
||||
if (animclips != null)
|
||||
{
|
||||
if (targetIndex >= animclips.Count) return;
|
||||
_targetAnim = animclips[targetIndex];
|
||||
if (_targetAnim != null) _tempAnim.AddClip(_targetAnim, _targetAnim.name);
|
||||
return;
|
||||
}
|
||||
|
||||
_keyArray = timelineControl._keyArray;
|
||||
|
||||
if (seqDataIndex < _keyArray.Length)
|
||||
if (seqDataIndex < 0 || seqDataIndex >= _keyArray.Length) return;
|
||||
_currentKey = _keyArray[seqDataIndex];
|
||||
_sampleIk = _tempAnim.GetComponent<BipedIK>();
|
||||
if (_sampleIk != null)
|
||||
{
|
||||
_currentKey = _keyArray[seqDataIndex];
|
||||
// SolverManager.Update otherwise restores the bind pose after our manual sample.
|
||||
_resetIkBeforeSample = _sampleIk.fixTransforms;
|
||||
if (_resetIkBeforeSample) _sampleIk.fixTransforms = false;
|
||||
}
|
||||
|
||||
if (targetIndex < Director.instance.charaAnims.Count)
|
||||
{
|
||||
_tempAnim = Director.instance.charaAnims[targetIndex];
|
||||
_sampleIk = _tempAnim.GetComponent<BipedIK>();
|
||||
if (_sampleIk != null)
|
||||
{
|
||||
// SolverManager.Update otherwise restores the bind pose after our manual sample.
|
||||
_resetIkBeforeSample = _sampleIk.fixTransforms;
|
||||
if (_resetIkBeforeSample) _sampleIk.fixTransforms = false;
|
||||
}
|
||||
}
|
||||
|
||||
if(_currentKey != null && _tempAnim != null)
|
||||
if (_currentKey != null)
|
||||
{
|
||||
foreach (var key in _currentKey.thisList)
|
||||
{
|
||||
if(key.clip != null)
|
||||
{
|
||||
_tempAnim.AddClip(key.clip, key.clip.name);
|
||||
}
|
||||
}
|
||||
SetupAnimationClip(key);
|
||||
}
|
||||
_tempAnim.wrapMode = WrapMode.Clamp;
|
||||
_tempAnim.enabled = false;
|
||||
}
|
||||
|
||||
private void SetupAnimationClip(LiveTimelineKeyCharaMotionData key)
|
||||
{
|
||||
// Native SetupAnimationClip (0x1af9ed0) ignores unnamed main-motion keys.
|
||||
if (key == null || string.IsNullOrEmpty(key.motionName)) return;
|
||||
// Native LoadAnimationClip (0x1ae4780) uses the existing clip triplet first.
|
||||
if (key.clip == null)
|
||||
{
|
||||
key.clip = LoadLiveAnimationClip(key.motionName, key.clip);
|
||||
key.clip2 = LoadLiveAnimationClip(key.motionName2, key.clip2);
|
||||
key.clip3 = LoadLiveAnimationClip(key.motionName3, key.clip3);
|
||||
}
|
||||
if (key.clip != null) _tempAnim.AddClip(key.clip, key.clip.name);
|
||||
if (key.clip2 != null) _tempAnim.AddClip(key.clip2, key.clip2.name);
|
||||
if (key.clip3 != null) _tempAnim.AddClip(key.clip3, key.clip3.name);
|
||||
}
|
||||
|
||||
private static AnimationClip LoadLiveAnimationClip(string motionName, AnimationClip existingClip)
|
||||
{
|
||||
if (existingClip != null || string.IsNullOrEmpty(motionName)) return existingClip;
|
||||
// ResourcePath.GetLiveAnimationClipPath: original body motion, not a substitute action.
|
||||
string path = "3d/motion/live/body/" + motionName;
|
||||
var entry = LiveEffectController.FindResourceEntry(path);
|
||||
if (entry == null)
|
||||
{
|
||||
Debug.LogError("[LiveTimelineMotionSequence] Motion resource not found: " + path);
|
||||
return null;
|
||||
}
|
||||
var bundle = UmaAssetManager.LoadAssetBundle(entry);
|
||||
if (bundle == null)
|
||||
{
|
||||
Debug.LogError("[LiveTimelineMotionSequence] Motion bundle load failed: " + path);
|
||||
return null;
|
||||
}
|
||||
string assetName = Path.GetFileNameWithoutExtension(entry.Name);
|
||||
var clip = bundle.LoadAsset<AnimationClip>(assetName);
|
||||
if (clip == null)
|
||||
{
|
||||
foreach (string asset in bundle.GetAllAssetNames())
|
||||
{
|
||||
if (!string.Equals(Path.GetFileNameWithoutExtension(asset), assetName, StringComparison.OrdinalIgnoreCase))
|
||||
continue;
|
||||
clip = bundle.LoadAsset<AnimationClip>(asset);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (LiveRuntimeDiagnostics.Enabled)
|
||||
LiveRuntimeDiagnostics.RecordAssetLoad(entry.Name, "LoadAsset", typeof(AnimationClip),
|
||||
new UnityEngine.Object[] { clip }, clip, assetName);
|
||||
if (clip == null)
|
||||
Debug.LogError("[LiveTimelineMotionSequence] Motion clip load failed: " + path + " (" + assetName + ")");
|
||||
return clip;
|
||||
}
|
||||
|
||||
public void AlterUpdate(float currentTime, LiveTimelineKeyTimescaleDataList timescaleKeys)
|
||||
{
|
||||
var director = Director.instance;
|
||||
@@ -122,6 +163,7 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
_curIndex = curKey.index;
|
||||
LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData;
|
||||
if (arg == null || string.IsNullOrEmpty(arg.motionName) || arg.clip == null) return;
|
||||
AnimationClip anim = arg.clip;
|
||||
|
||||
double start;
|
||||
|
||||
@@ -172,13 +172,11 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public bool newBezierCalcMethod;
|
||||
|
||||
public CullingLayer cullingMask = defCameraCullingLayer;
|
||||
|
||||
public float outlineZOffset = 1f;
|
||||
|
||||
public CharacterLOD characterLODMask = (CharacterLOD)((uint)outlineLODMask + (uint)shaderLODMask);
|
||||
|
||||
protected const CullingLayer defCameraCullingLayer = (CullingLayer)0x7FE;
|
||||
|
||||
protected const CharacterLOD outlineLODMask = (CharacterLOD)0x3FF;
|
||||
|
||||
@@ -186,92 +184,21 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public int GetCullingMask()
|
||||
{
|
||||
return GetCullingMask(cullingMask);
|
||||
}
|
||||
|
||||
protected static int GetCullingMask(CullingLayer layer)
|
||||
{
|
||||
int num = 257;
|
||||
if ((layer & CullingLayer.TransparentFX) != 0)
|
||||
{
|
||||
num |= 2;
|
||||
}
|
||||
if ((layer & CullingLayer.Background3D_NotReflect) != 0)
|
||||
{
|
||||
num |= 0x80000;
|
||||
}
|
||||
if ((layer & CullingLayer.Background3d) != 0)
|
||||
{
|
||||
num |= 0x100000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d) != 0)
|
||||
{
|
||||
num |= 0x200000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d_0) != 0)
|
||||
{
|
||||
num |= 0x400000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d_1) != 0)
|
||||
{
|
||||
num |= 0x800000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d_2) != 0)
|
||||
{
|
||||
num |= 0x1000000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d_3) != 0)
|
||||
{
|
||||
num |= 0x2000000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3d_4) != 0)
|
||||
{
|
||||
num |= 0x4000000;
|
||||
}
|
||||
if ((layer & CullingLayer.Character3D_NotReflect) != 0)
|
||||
{
|
||||
num |= 0x8000000;
|
||||
}
|
||||
if ((layer & CullingLayer.Background3D_Other) != 0)
|
||||
{
|
||||
num |= 0x40000;
|
||||
}
|
||||
return num;
|
||||
|
||||
/*
|
||||
uint bittest = (uint)layer;
|
||||
|
||||
uint result = (uint)LayerMask.GetMask("Default");
|
||||
|
||||
if ((bittest & (uint)CullingLayer.TransparentFX) > 0)
|
||||
result |= (uint)LayerMask.GetMask("TransparentFX");
|
||||
if ((bittest & (uint)CullingLayer.Background3D_NotReflect) > 0)
|
||||
result |= (uint)LayerMask.GetMask("background_NotReflect");
|
||||
if ((bittest & (uint)CullingLayer.Background3d) > 0)
|
||||
result |= (uint)LayerMask.GetMask("background");
|
||||
if ((bittest & (uint)CullingLayer.Character3d) > 0)
|
||||
result |= (uint)LayerMask.GetMask("charas");
|
||||
if ((bittest & (uint)CullingLayer.Character3d_0) > 0)
|
||||
result |= (uint)LayerMask.GetMask("chara1");
|
||||
if ((bittest & (uint)CullingLayer.Character3d_1) > 0)
|
||||
result |= (uint)LayerMask.GetMask("chara2");
|
||||
if ((bittest & (uint)CullingLayer.Character3d_2) > 0)
|
||||
result |= (uint)LayerMask.GetMask("chara3");
|
||||
if ((bittest & (uint)CullingLayer.Character3d_3) > 0)
|
||||
result |= (uint)LayerMask.GetMask("chara4");
|
||||
if ((bittest & (uint)CullingLayer.Character3d_4) > 0)
|
||||
result |= (uint)LayerMask.GetMask("chara5");
|
||||
if ((bittest & (uint)CullingLayer.Character3D_NotReflect) > 0)
|
||||
result |= (uint)LayerMask.GetMask("otherChara");
|
||||
if ((bittest & (uint)CullingLayer.Background3D_Other) > 0)
|
||||
result |= (uint)LayerMask.GetMask("background_Other");
|
||||
return (int)result;
|
||||
*/
|
||||
}
|
||||
|
||||
public static int GetDefaultCullingMask()
|
||||
{
|
||||
return GetCullingMask(defCameraCullingLayer);
|
||||
// Native GetCullingMask (0x1af50a0) reads cullingLayer, not the legacy CGSS mask.
|
||||
int mask = 0;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.TransparentFX) != 0) mask |= 1 << 1;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Effect) != 0) mask |= 1 << 11;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Background3d_NotReflect) != 0) mask |= 1 << 25;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Background3d) != 0) mask |= 1 << 12;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Character3d) != 0) mask |= 1 << 13;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Character3d_0) != 0) mask |= 1 << 27;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Character3d_1) != 0) mask |= 1 << 28;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.Character3d_NotReflect) != 0) mask |= 1 << 26;
|
||||
if ((cullingLayer & LiveCameraCullingLayer.NotLayerDefault) == 0)
|
||||
mask |= GraphicSettings.GetCullingLayer(GraphicSettings.LayerIndex.LayerDefault);
|
||||
if ((cullingLayer & LiveCameraCullingLayer.NotLayer3d) == 0)
|
||||
mask |= GraphicSettings.GetCullingLayer(GraphicSettings.LayerIndex.Layer3D);
|
||||
return mask;
|
||||
}
|
||||
|
||||
public virtual Vector3 GetValue(LiveTimelineControl timelineControl)
|
||||
@@ -498,8 +425,8 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
[SerializeField] public List<LiveTimelineTransformData> transformList;
|
||||
[SerializeField] public List<LiveTimelineObjectData> objectList;
|
||||
[SerializeField] public List<LiveTimelineMobCyalumeControlData> mobControlList;
|
||||
[SerializeField] public List<LiveTimelineMobCyalumeControlData> cyalumeControlList;
|
||||
[SerializeField] public List<LiveTimelineMobCyalumeControlData> MobControlKeys;
|
||||
[SerializeField] public List<LiveTimelineMobCyalumeControlData> CyalumeControlKeys;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
|
||||
@@ -303,6 +303,7 @@ namespace Gallop.Live.Cyalume
|
||||
_mobShadowController = mobRoot.AddComponent<MobShadowController>();
|
||||
|
||||
_mobShadowController.Initialize(mobRoot);
|
||||
_mobShadowController.FlushGroupMatrix();
|
||||
_mobShadowController.SetMobColor(_mobColor);
|
||||
_mobShadowController.SetAmbientColor(_mobAmbientColor);
|
||||
|
||||
@@ -340,8 +341,8 @@ namespace Gallop.Live.Cyalume
|
||||
if ((uint)info.unk0 < 11u)
|
||||
return info.unk0;
|
||||
|
||||
if (info.data != null && info.data.keys != null && (uint)info.data.keys.unk48 < 11u)
|
||||
return info.data.keys.unk48;
|
||||
if (info.data != null && (uint)info.data.GroupIndex < 11u)
|
||||
return info.data.GroupIndex;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -19,10 +19,11 @@ namespace Gallop.Live
|
||||
[SerializeField]
|
||||
private GameObject[] _cameraNodes;
|
||||
private Camera[] _cameraObjects;
|
||||
private GallopImageEffect[] _cameraImageEffects;
|
||||
private Transform[] _cameraTransforms;
|
||||
[SerializeField]
|
||||
private CameraLookAt _cameraLookAt;
|
||||
private int _activeCameraIndex = 1;
|
||||
private int _activeCameraIndex = 1;
|
||||
private readonly int[] kTimelineCameraIndices = new int[3] { 1, 2, 3 };
|
||||
[SerializeField] private bool _enableMirrorReflection = true;
|
||||
[SerializeField] private List<MirrorReflection> _mirrorReflections = new List<MirrorReflection>();
|
||||
@@ -280,9 +281,10 @@ namespace Gallop.Live
|
||||
}
|
||||
|
||||
Builder.LoadAssetPath(stagePath, transform);
|
||||
|
||||
|
||||
|
||||
_liveTimelineControl.StageObjectMap = _stageController.StageObjectMap;
|
||||
_liveTimelineControl.StageObjectUnitMap = _stageController.StageObjectUnitMap;
|
||||
}
|
||||
|
||||
|
||||
@@ -308,7 +310,8 @@ namespace Gallop.Live
|
||||
charaObjs.Add(newObj.transform);
|
||||
counter++;
|
||||
}
|
||||
};
|
||||
}
|
||||
;
|
||||
|
||||
|
||||
//Get live parts info
|
||||
@@ -397,20 +400,20 @@ namespace Gallop.Live
|
||||
foreach (var renderer in container.Renderers)
|
||||
{
|
||||
renderer.GetPropertyBlock(propertyBlock);
|
||||
propertyBlock.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate);
|
||||
propertyBlock.SetColor("_RimColor", updateInfo.rimColor);
|
||||
propertyBlock.SetFloat("_RimStep", updateInfo.rimStep);
|
||||
propertyBlock.SetFloat("_RimFeather", updateInfo.rimFeather);
|
||||
propertyBlock.SetFloat("_RimSpecRate", updateInfo.rimSpecRate);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2);
|
||||
propertyBlock.SetColor("_RimColor2", updateInfo.rimColor2);
|
||||
propertyBlock.SetFloat("_RimStep2", updateInfo.rimStep2);
|
||||
propertyBlock.SetFloat("_RimFeather2", updateInfo.rimFeather2);
|
||||
propertyBlock.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2);
|
||||
propertyBlock.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2);
|
||||
propertyBlock.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate);
|
||||
propertyBlock.SetColor("_RimColor", updateInfo.rimColor);
|
||||
propertyBlock.SetFloat("_RimStep", updateInfo.rimStep);
|
||||
propertyBlock.SetFloat("_RimFeather", updateInfo.rimFeather);
|
||||
propertyBlock.SetFloat("_RimSpecRate", updateInfo.rimSpecRate);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2);
|
||||
propertyBlock.SetColor("_RimColor2", updateInfo.rimColor2);
|
||||
propertyBlock.SetFloat("_RimStep2", updateInfo.rimStep2);
|
||||
propertyBlock.SetFloat("_RimFeather2", updateInfo.rimFeather2);
|
||||
propertyBlock.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2);
|
||||
propertyBlock.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2);
|
||||
propertyBlock.SetFloat("_UseOriginalDirectionalLight", 1f);
|
||||
propertyBlock.SetVector("_OriginalDirectionalLightDir", tmpPos);
|
||||
renderer.SetPropertyBlock(propertyBlock);
|
||||
@@ -436,11 +439,11 @@ namespace Gallop.Live
|
||||
foreach (var renderer in container.Renderers)
|
||||
{
|
||||
renderer.GetPropertyBlock(propertyBlock);
|
||||
propertyBlock.SetColor("_CharaColor", updateInfo.color * updateInfo.colorPower);
|
||||
propertyBlock.SetColor("_ToonDarkColor", updateInfo.toonDarkColor);
|
||||
propertyBlock.SetColor("_ToonBrightColor", updateInfo.toonBrightColor);
|
||||
propertyBlock.SetColor("_OutlineColor", updateInfo.outlineColor);
|
||||
propertyBlock.SetFloat("_Saturation", updateInfo.Saturation);
|
||||
propertyBlock.SetColor("_CharaColor", updateInfo.color * updateInfo.colorPower);
|
||||
propertyBlock.SetColor("_ToonDarkColor", updateInfo.toonDarkColor);
|
||||
propertyBlock.SetColor("_ToonBrightColor", updateInfo.toonBrightColor);
|
||||
propertyBlock.SetColor("_OutlineColor", updateInfo.outlineColor);
|
||||
propertyBlock.SetFloat("_Saturation", updateInfo.Saturation);
|
||||
renderer.SetPropertyBlock(propertyBlock);
|
||||
}
|
||||
}
|
||||
@@ -527,6 +530,7 @@ namespace Gallop.Live
|
||||
_stageController != null ? _stageController.transform : null,
|
||||
flareSetting != null ? flareSetting.lightStandard : 3f,
|
||||
flareSetting != null ? flareSetting.underLimit : 0f);
|
||||
_livePropsController.RegisterStageLighting(_stageController, _stageFlares);
|
||||
foreach (var sheet in _liveTimelineControl.data.worksheetList)
|
||||
{
|
||||
if (sheet.bgColor1List != null)
|
||||
@@ -573,7 +577,7 @@ namespace Gallop.Live
|
||||
}
|
||||
UpdateMainCamera();
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void InitializeCamera()
|
||||
@@ -595,6 +599,21 @@ namespace Gallop.Live
|
||||
_cameraTransforms[i] = camera.transform;
|
||||
}
|
||||
}
|
||||
if (_cameraImageEffects == null)
|
||||
{
|
||||
_cameraImageEffects = new GallopImageEffect[_cameraObjects.Length];
|
||||
for (int i = 0; i < _cameraObjects.Length; ++i)
|
||||
{
|
||||
var camera = _cameraObjects[i];
|
||||
if (camera == null) continue;
|
||||
var effect = camera.GetComponent<GallopImageEffect>();
|
||||
if (effect == null) effect = camera.gameObject.AddComponent<LiveImageEffect>();
|
||||
// Actual Director.InitializeCamera dispatches Initialize slot5
|
||||
// before author enable/bloom state; do not rely on Awake.
|
||||
effect.InitializeVolume();
|
||||
_cameraImageEffects[i] = effect;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void InitializeMultiCamera(LiveTimelineControl control)
|
||||
@@ -780,6 +799,7 @@ namespace Gallop.Live
|
||||
parameter.SunShafts = _volumeLightController.SunShafts;
|
||||
parameter.LightShafts = _volumeLightController.LightShafts;
|
||||
}
|
||||
UpdateDofMaxFocalSize();
|
||||
_lateTimelineAppliedThisFrame = true;
|
||||
}
|
||||
|
||||
@@ -799,7 +819,7 @@ namespace Gallop.Live
|
||||
|
||||
if (_syncTime == false)
|
||||
{
|
||||
if(liveMusic.sourceList.Count == 0)
|
||||
if (liveMusic.sourceList.Count == 0)
|
||||
{
|
||||
_syncTime = true;
|
||||
}
|
||||
@@ -899,7 +919,7 @@ namespace Gallop.Live
|
||||
{
|
||||
ApplyTimelineLateUpdate();
|
||||
}
|
||||
|
||||
|
||||
if (_enableMirrorReflection && _mirrorRenderInLateUpdate)
|
||||
{
|
||||
UpdateMirrorReflections();
|
||||
@@ -998,7 +1018,7 @@ namespace Gallop.Live
|
||||
|
||||
public static List<UmaDatabaseEntry> GetLiveAllVoiceEntry(int songid, List<LiveCharacterLoadData> characters)
|
||||
{
|
||||
List<UmaDatabaseEntry> entryList = new List <UmaDatabaseEntry>();
|
||||
List<UmaDatabaseEntry> entryList = new List<UmaDatabaseEntry>();
|
||||
for (int i = 0; i < characters.Count; i++)
|
||||
{
|
||||
if (characters[i].CharaEntry.Name != "")
|
||||
@@ -1138,10 +1158,11 @@ namespace Gallop.Live
|
||||
}
|
||||
private void InitializeMirrorReflections()
|
||||
{
|
||||
_stageController?.DestroyMirrorReflections();
|
||||
_mirrorReflections.Clear();
|
||||
if (!_enableMirrorReflection)
|
||||
return;
|
||||
|
||||
_mirrorReflections.Clear();
|
||||
|
||||
AddMirrorReflections(_mirrorReflections, GetComponentsInChildren<MirrorReflection>(true));
|
||||
|
||||
@@ -1164,13 +1185,20 @@ namespace Gallop.Live
|
||||
if (mainCam == null)
|
||||
mainCam = Camera.main;
|
||||
|
||||
for (int i = 0; i < _mirrorReflections.Count; i++)
|
||||
if (_stageController != null)
|
||||
{
|
||||
var mirror = _mirrorReflections[i];
|
||||
if (mirror == null) continue;
|
||||
|
||||
mirror.Initialize(mainCam, i, false);
|
||||
mirror.SetupBaseCamera(mainCam, GetMainCameraFovFactor);
|
||||
_stageController.InitializeMirrorReflections(_mirrorReflections, mainCam,
|
||||
GetMainCameraFovFactor, _liveTimelineControl, CharaContainerScript);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < _mirrorReflections.Count; i++)
|
||||
{
|
||||
var mirror = _mirrorReflections[i];
|
||||
if (mirror == null) continue;
|
||||
mirror.Initialize(mainCam, i, false);
|
||||
mirror.SetupBaseCamera(mainCam, GetMainCameraFovFactor);
|
||||
}
|
||||
}
|
||||
|
||||
Debug.Log($"[Mirror] Initialized {_mirrorReflections.Count} mirrors.");
|
||||
@@ -1198,6 +1226,7 @@ namespace Gallop.Live
|
||||
|
||||
private void UpdateMirrorReflections()
|
||||
{
|
||||
_stageController?.PrepareMirrorCharacters();
|
||||
if (_mirrorReflections == null || _mirrorReflections.Count == 0)
|
||||
return;
|
||||
|
||||
@@ -1245,14 +1274,39 @@ namespace Gallop.Live
|
||||
{
|
||||
_mainGallopImageEffect =
|
||||
mainCamera.gameObject
|
||||
.AddComponent<GallopImageEffect>();
|
||||
.AddComponent<LiveImageEffect>();
|
||||
}
|
||||
|
||||
return _mainGallopImageEffect;
|
||||
}
|
||||
private string _lastDofBypassReason;
|
||||
|
||||
private void OnUpdatePostEffect_Dof(LiveTimelineKeyPostEffectDOFData key)
|
||||
private float GetMaxForcalSize()
|
||||
{
|
||||
// Actual game RVA 0x71439d0 / AlterLateUpdate 0x713ec50.
|
||||
// 0x0da24260 is the native 1e-30 fallback; never accumulate sampled sizes.
|
||||
var data = _liveTimelineControl != null ? _liveTimelineControl.data : null;
|
||||
return Mathf.Max(1e-30f, data != null ? data.maxForcalSize : 0f);
|
||||
}
|
||||
|
||||
private void UpdateDofMaxFocalSize()
|
||||
{
|
||||
float maximum = GetMaxForcalSize();
|
||||
if (_cameraImageEffects != null)
|
||||
for (int i = 0; i < _cameraImageEffects.Length; ++i)
|
||||
if (_cameraImageEffects[i] != null)
|
||||
{
|
||||
_cameraImageEffects[i].DofDiffusionBloomOverlayParam.DofMaxFocalSize = maximum;
|
||||
_cameraImageEffects[i].RenderParameter.DofDiffuionBloomOverlay.DofMaxFocalSize = maximum;
|
||||
}
|
||||
if (_multiCameras != null)
|
||||
for (int i = 0; i < _multiCameras.Length; ++i)
|
||||
if (_multiCameras[i] != null)
|
||||
_multiCameras[i].PostEffectParameter.DofDiffuionBloomOverlay.DofMaxFocalSize = maximum;
|
||||
GetActivePostEffect()?.ApplyBloomParameter();
|
||||
}
|
||||
|
||||
private void OnUpdatePostEffect_Dof(LiveTimelineKeyPostEffectDOFData key, Vector3? worldFocus)
|
||||
{
|
||||
var effect = GetActivePostEffect();
|
||||
if (effect == null) return;
|
||||
@@ -1271,60 +1325,28 @@ namespace Gallop.Live
|
||||
bypassReason = "no render camera available for DOF evaluation";
|
||||
if (key != null && bypassReason == null)
|
||||
{
|
||||
// master5's screenshot-tested inference; official flag names remain unknown.
|
||||
// Actual game SetupDOFUpdateInfo RVA 0x726a610: bit18 enables DOF;
|
||||
// bit16 selects camera look-at, bit17 a metric focal point.
|
||||
bool metric = ((int)key.attribute & (1 << 17)) != 0;
|
||||
bool cameraTarget = ((int)key.attribute & (1 << 16)) != 0;
|
||||
Vector3 focus = Vector3.zero;
|
||||
bool valid = metric;
|
||||
if (!metric && cameraTarget)
|
||||
{
|
||||
valid = _liveTimelineControl.HasDofCameraLookAt &&
|
||||
_liveTimelineControl.DofLookAtCamera == renderCamera;
|
||||
focus = _liveTimelineControl.DofCameraLookAt;
|
||||
}
|
||||
else if (!metric)
|
||||
{
|
||||
int count = 0;
|
||||
var locators = _liveTimelineControl.liveCharactorLocators;
|
||||
for (int i = 0; i < locators.Length && i < 18; ++i)
|
||||
if ((key.charactor & (1 << i)) != 0 && locators[i] != null)
|
||||
{ focus += locators[i].liveCharaHeadPosition; ++count; }
|
||||
valid = count > 0;
|
||||
if (valid) focus /= count;
|
||||
}
|
||||
// Validate before the backend normalizes depth. In particular, do
|
||||
// not clamp a behind-camera target to zero and render a full-frame blur.
|
||||
// [REPORT §10.3-B3/§4.4] 原生 PrepareDofParam 只做 focal01<0→0 的下限夹紧
|
||||
// (§4.4:只夹下限,无 Clamp01、无 farClipPlane 上限判定)。master7 曾把
|
||||
// metric 焦距再减 nearClipPlane 且要求 focusDepth<farClipPlane,使
|
||||
// 0<d<near 的近距焦点与超远焦点被二次关闭 DOF。对齐后只要求焦点在相机
|
||||
// 前方(>0);相机背后目标仍按下述原注释保持关闭(不还原 focal01=0 全屏模糊)。
|
||||
Vector3 focus = worldFocus.GetValueOrDefault();
|
||||
bool valid = metric || worldFocus.HasValue;
|
||||
// Native PrepareDofParam clamps normalized negative depth, not the
|
||||
// authored focal point. Missing targets remain a DOF-only bypass.
|
||||
float focusDepth = metric ? key.dofFocalPoint
|
||||
: renderCamera.WorldToViewportPoint(focus).z;
|
||||
valid = valid && !float.IsNaN(focusDepth) && !float.IsInfinity(focusDepth) &&
|
||||
focusDepth > 0.0001f;
|
||||
valid = valid && !float.IsNaN(focusDepth) && !float.IsInfinity(focusDepth);
|
||||
if (!valid) bypassReason = "missing or invalid focus depth";
|
||||
param.IsEnableDof = valid;
|
||||
param.DofFocalPosition = focus;
|
||||
param.DofFocalTransfrom = null;
|
||||
// [REPORT §10.3-B4/§4.4] 原生 PrepareDofParam(RVA 0x1a20030) 不钳制
|
||||
// DofFocalPoint 本身,只在后端对归一化 focalDistance01<0 夹 0
|
||||
// (DofDiffusionBloomOverlayPass.cs:433-434)。删除 master7 自加的
|
||||
// Max(0.01f)——它把 0~0.01m 的合法近距焦点系统性抬高到 0.01m,
|
||||
// 近距离特写 DOF 焦点被推远;setter 无隐藏钳制(直接存值)。
|
||||
param.DofFocalPoint = key.dofFocalPoint;
|
||||
// Unlike master5's render Parameter, these source-property setters
|
||||
// select Position/Transform/Point as a side effect. Restore the
|
||||
// resolved mode LAST, or the default 1m point overwrites look-at
|
||||
// and character focus before GallopImageEffect copies the state.
|
||||
param.DofFocalType = metric ? DepthBlurAndBloom.DofFocalType.Point : DepthBlurAndBloom.DofFocalType.Position;
|
||||
param.DofQualityType = key.dofQuality == 5 ? DepthBlurAndBloom.DofQuality.BackgroundAndForeground : DepthBlurAndBloom.DofQuality.OnlyBackground;
|
||||
param.DofFocalSize = Mathf.Max(0f, key.forcalSize);
|
||||
param.DofMaxFocalSize = Mathf.Max(param.DofMaxFocalSize, param.DofFocalSize);
|
||||
param.DofMaxBlurSpread = Mathf.Max(0f, key.blurSpread);
|
||||
param.DofForegroundSize = Mathf.Max(0f, key.dofForegroundSize);
|
||||
param.DofSmoothness = Mathf.Max(0.1f, key.dofSmoothness);
|
||||
param.DofBlurType = (DepthBlurAndBloom.DofBlur)Mathf.Clamp(key.dofBlurType, 0, 3);
|
||||
param.IsEnableDof = valid && ((int)key.attribute & (1 << 18)) != 0;
|
||||
// Source setters select the mode; write only the selected coordinate.
|
||||
if (metric) param.DofFocalPoint = key.dofFocalPoint;
|
||||
else param.DofFocalPosition = focus;
|
||||
param.DofQualityType = (DepthBlurAndBloom.DofQuality)key.dofQuality;
|
||||
param.DofFocalSize = key.forcalSize;
|
||||
param.DofMaxFocalSize = GetMaxForcalSize();
|
||||
param.DofMaxBlurSpread = key.blurSpread;
|
||||
param.DofForegroundSize = key.dofForegroundSize;
|
||||
param.DofSmoothness = key.dofSmoothness;
|
||||
param.DofBlurType = (DepthBlurAndBloom.DofBlur)key.dofBlurType;
|
||||
param.BallBlurPowerFactor = key.BallBlurPowerFactor;
|
||||
param.BallBlurBrightnessThreshhold = key.BallBlurBrightnessThreshhold;
|
||||
param.BallBlurBrightnessIntensity = key.BallBlurBrightnessIntensity;
|
||||
@@ -1386,18 +1408,18 @@ namespace Gallop.Live
|
||||
// Distance fog: apply via RenderSettings when isDistance is true.
|
||||
// Either branch enables scene fog; both false disables it.
|
||||
bool applyDistanceFog = key.isDistance && !key.isHeight;
|
||||
bool applyHeightFog = key.isHeight;
|
||||
bool applyHeightFog = key.isHeight;
|
||||
|
||||
RenderSettings.fog = applyDistanceFog || applyHeightFog;
|
||||
RenderSettings.fog = applyDistanceFog || applyHeightFog;
|
||||
RenderSettings.fogColor = key.color;
|
||||
|
||||
if (applyHeightFog)
|
||||
{
|
||||
RenderSettings.fogMode = FogMode.ExponentialSquared;
|
||||
RenderSettings.fogMode = FogMode.ExponentialSquared;
|
||||
RenderSettings.fogDensity = key.heightDensity;
|
||||
// Forward height and fog length as globals so stage shaders can consume them.
|
||||
float fogLength = Mathf.Max(0.001f, key.end - key.start);
|
||||
Shader.SetGlobalFloat("_Global_FogHeight", key.height);
|
||||
Shader.SetGlobalFloat("_Global_FogHeight", key.height);
|
||||
Shader.SetGlobalFloat("_Global_FogHeightDensity", key.heightDensity);
|
||||
Shader.SetGlobalVector("_Global_FogLength",
|
||||
new Vector4(fogLength, fogLength, fogLength, fogLength));
|
||||
@@ -1408,16 +1430,16 @@ namespace Gallop.Live
|
||||
switch (key.fogMode)
|
||||
{
|
||||
case 1:
|
||||
RenderSettings.fogMode = FogMode.Linear;
|
||||
RenderSettings.fogMode = FogMode.Linear;
|
||||
RenderSettings.fogStartDistance = key.start + key.startDistance;
|
||||
RenderSettings.fogEndDistance = key.end;
|
||||
RenderSettings.fogEndDistance = key.end;
|
||||
break;
|
||||
case 2:
|
||||
RenderSettings.fogMode = FogMode.Exponential;
|
||||
RenderSettings.fogMode = FogMode.Exponential;
|
||||
RenderSettings.fogDensity = key.expDensity;
|
||||
break;
|
||||
default:
|
||||
RenderSettings.fogMode = FogMode.ExponentialSquared;
|
||||
RenderSettings.fogMode = FogMode.ExponentialSquared;
|
||||
RenderSettings.fogDensity = key.expDensity;
|
||||
break;
|
||||
}
|
||||
@@ -1439,7 +1461,7 @@ namespace Gallop.Live
|
||||
private void OnUpdatePostEffect_BloomDiffusion(PostEffectUpdateInfo_BloomDiffusion updateInfo)
|
||||
{
|
||||
GallopImageEffect imageEffect = GetActivePostEffect();
|
||||
|
||||
|
||||
|
||||
if (imageEffect == null) return;
|
||||
|
||||
@@ -1483,9 +1505,9 @@ namespace Gallop.Live
|
||||
updateInfo.diffusionContrast;
|
||||
|
||||
imageEffect.ApplyBloomParameter();
|
||||
// Debug.Log(
|
||||
// $"[BloomDirector] activeCameraIndex={_activeCameraIndex}, " +
|
||||
// $"imageEffect={(imageEffect != null ? imageEffect.name : "null")}");
|
||||
// Debug.Log(
|
||||
// $"[BloomDirector] activeCameraIndex={_activeCameraIndex}, " +
|
||||
// $"imageEffect={(imageEffect != null ? imageEffect.name : "null")}");
|
||||
}
|
||||
private void OnUpdateVolumeLight(LiveVolumeLightTimeline.VolumeUpdateInfo info)
|
||||
{
|
||||
@@ -1499,6 +1521,7 @@ namespace Gallop.Live
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
_stageController?.DestroyMirrorReflections();
|
||||
UnbindTimelineEvents();
|
||||
_footLightRuntime?.Dispose();
|
||||
_footLightRuntime = null;
|
||||
|
||||
@@ -25,6 +25,9 @@ namespace Gallop.Live
|
||||
private readonly List<RuntimeProp> instances = new List<RuntimeProp>();
|
||||
private readonly HashSet<string> warnings = new HashSet<string>(StringComparer.Ordinal);
|
||||
private bool disposed;
|
||||
private StageController registeredStage;
|
||||
private StageBlinkLightDriver registeredBlinkDriver;
|
||||
private Gallop.RenderPipeline.RecoveredLensFlareController registeredFlares;
|
||||
|
||||
// Same predicate used by LiveEffectController. Gated tracks are not silently
|
||||
// enabled when the Director has not supplied a variation selection.
|
||||
@@ -72,6 +75,8 @@ namespace Gallop.Live
|
||||
public bool DefaultPropParent;
|
||||
public readonly Dictionary<string, Transform> Nodes = new Dictionary<string, Transform>(StringComparer.Ordinal);
|
||||
public RendererState[] Renderers;
|
||||
public Props[] StageProps;
|
||||
public string NameSuffixToken;
|
||||
public LiveTimelineKeyPropsData Appearance, NextAppearance;
|
||||
public LiveTimelineKeyPropsAttachData Attachment, NextAttachment;
|
||||
public float AppearanceRatio, AttachmentRatio;
|
||||
@@ -139,8 +144,11 @@ namespace Gallop.Live
|
||||
var instance = Object.Instantiate(prefab, anchor, false);
|
||||
var runtime = new RuntimeProp
|
||||
{
|
||||
CharacterIndex = c, PropsId = id, Setting = setting,
|
||||
Instance = instance, Anchor = anchor,
|
||||
CharacterIndex = c,
|
||||
PropsId = id,
|
||||
Setting = setting,
|
||||
Instance = instance,
|
||||
Anchor = anchor,
|
||||
Animator = instance.GetComponentInChildren<Animator>(true)
|
||||
};
|
||||
CacheNodes(runtime);
|
||||
@@ -154,9 +162,42 @@ namespace Gallop.Live
|
||||
{
|
||||
ResolveDefaultAttachment(prop);
|
||||
if (prop.DefaultTarget != null) ApplyAttachment(prop);
|
||||
var character = characters[prop.CharacterIndex];
|
||||
prop.StageProps = prop.Instance.GetComponentsInChildren<Props>(true);
|
||||
prop.NameSuffixToken = "_" + prop.CharacterIndex.ToString(CultureInfo.InvariantCulture);
|
||||
foreach (var component in prop.StageProps)
|
||||
component.SetScale(character.HeadBone.transform, character.Position, character.BodyScale,
|
||||
prop.Setting.isInfluenceOfCharaHeight);
|
||||
// Animation transitions restore the initialized pose, not the prefab's
|
||||
// unadjusted stand height. Native CreateProps scales once before playback.
|
||||
CacheNodes(prop);
|
||||
}
|
||||
}
|
||||
|
||||
// Actual-game Director.CreateProps registers all three stage work arrays
|
||||
// after creating/scaling props (Komoe RVA 0x7154755..0x71547ea).
|
||||
internal void RegisterStageLighting(StageController stage,
|
||||
Gallop.RenderPipeline.RecoveredLensFlareController flares)
|
||||
{
|
||||
if (stage == null) return;
|
||||
registeredStage = stage;
|
||||
registeredBlinkDriver = stage.GetComponent<StageBlinkLightDriver>();
|
||||
registeredFlares = flares;
|
||||
foreach (var prop in instances)
|
||||
foreach (var component in prop.StageProps)
|
||||
{
|
||||
var transforms = component.StageObjectTransformArray;
|
||||
if (transforms != null)
|
||||
foreach (var node in transforms)
|
||||
if (node != null) stage.RegisterObjectTransform(node, prop.NameSuffixToken);
|
||||
flares?.AddSources(component.transform, prop.NameSuffixToken);
|
||||
var roots = component.BlinkLightRootObjectArray;
|
||||
if (roots != null && registeredBlinkDriver != null)
|
||||
foreach (var root in roots)
|
||||
if (root != null) registeredBlinkDriver.RegisterRoot(root, prop.NameSuffixToken, flares);
|
||||
}
|
||||
}
|
||||
|
||||
public static void CollectResourcePaths(LiveTimelinePropsSettings settings,
|
||||
IList<UmaContainerCharacter> characters, ISet<string> output)
|
||||
{
|
||||
@@ -464,6 +505,7 @@ namespace Gallop.Live
|
||||
ApplyAppearance(prop);
|
||||
ApplyAttachment(prop);
|
||||
}
|
||||
registeredBlinkDriver?.UpdateRegisteredRoots();
|
||||
}
|
||||
|
||||
private void DiagnoseRequestedResource(LiveTimelineKeyPropsData key)
|
||||
@@ -691,6 +733,19 @@ namespace Gallop.Live
|
||||
disposed = true;
|
||||
foreach (var prop in instances)
|
||||
{
|
||||
foreach (var component in prop.StageProps)
|
||||
{
|
||||
if (component == null) continue;
|
||||
var transforms = component.StageObjectTransformArray;
|
||||
if (transforms != null && registeredStage != null)
|
||||
foreach (var node in transforms)
|
||||
if (node != null) registeredStage.UnregisterObjectTransform(node, prop.NameSuffixToken);
|
||||
var roots = component.BlinkLightRootObjectArray;
|
||||
if (roots != null && registeredBlinkDriver != null)
|
||||
foreach (var root in roots)
|
||||
if (root != null) registeredBlinkDriver.UnregisterRoot(root, prop.NameSuffixToken);
|
||||
registeredFlares?.RemoveSources(component.transform, prop.NameSuffixToken);
|
||||
}
|
||||
if (prop.Graph.IsValid()) prop.Graph.Destroy();
|
||||
// Destroy separately: a prop-to-prop parent may already have been removed.
|
||||
if (prop.Instance != null) Object.Destroy(prop.Instance);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
@@ -79,6 +80,8 @@ public class MirrorReflection : MonoBehaviour
|
||||
private event Action<ScriptableRenderContext, Camera> _endCameraRenderingCallbacks;
|
||||
|
||||
private bool _isRenderingNow;
|
||||
private readonly Stack<int> _mirrorObjectLayers = new Stack<int>(4);
|
||||
internal Live.StageController LifecycleOwner { get; set; }
|
||||
|
||||
private readonly UniversalRenderPipeline.SingleCameraRequest _singleCameraRequest =
|
||||
new UniversalRenderPipeline.SingleCameraRequest();
|
||||
@@ -194,6 +197,8 @@ public class MirrorReflection : MonoBehaviour
|
||||
private void OnDisable()
|
||||
{
|
||||
_isEnabled = false;
|
||||
LifecycleOwner?.RestoreMirrorActorLayers(_mirrorCamera);
|
||||
RestoreMirrorObjectLayers();
|
||||
ClearMirrorMaterialBindingOnDisable();
|
||||
}
|
||||
|
||||
@@ -222,6 +227,8 @@ public class MirrorReflection : MonoBehaviour
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
LifecycleOwner?.ReleaseMirrorReflection(this);
|
||||
RestoreMirrorObjectLayers();
|
||||
ReleaseMirrorTexture();
|
||||
|
||||
if (_mirrorCamera != null)
|
||||
@@ -304,6 +311,9 @@ public class MirrorReflection : MonoBehaviour
|
||||
|
||||
private void TryAutoInitializeIfPossible()
|
||||
{
|
||||
// During live playback StageController is the sole initialization owner.
|
||||
if (Live.Director.instance != null || GetComponentInParent<Live.StageController>() != null)
|
||||
return;
|
||||
EnsureSelfReferences();
|
||||
|
||||
if (!EnsureBaseCamera())
|
||||
@@ -314,6 +324,8 @@ public class MirrorReflection : MonoBehaviour
|
||||
|
||||
public void Initialize(Camera baseCamera, int mirrorIndex = -1, bool isUseBaseCameraTextureSize = false)
|
||||
{
|
||||
LifecycleOwner?.PrepareMirrorReinitialization(this);
|
||||
RestoreMirrorObjectLayers();
|
||||
_isInitialized = false;
|
||||
|
||||
EnsureSelfReferences();
|
||||
@@ -356,6 +368,7 @@ public class MirrorReflection : MonoBehaviour
|
||||
UpdateMirrorParams();
|
||||
|
||||
_isInitialized = true;
|
||||
LifecycleOwner?.CompleteMirrorReinitialization(this);
|
||||
Log($"Initialize success. mirrorIndex={_mirrorIndex}, useBaseCameraTextureSize={_isUseBaseCameraTextureSize}");
|
||||
}
|
||||
|
||||
@@ -430,13 +443,32 @@ public class MirrorReflection : MonoBehaviour
|
||||
|
||||
public void SetMirrorObjectLayer(int layer)
|
||||
{
|
||||
_objectLayer = layer;
|
||||
gameObject.layer = layer;
|
||||
if (!_isInitialized || layer < 0)
|
||||
return;
|
||||
_objectLayer = gameObject.layer;
|
||||
_mirrorObjectLayers.Push(_objectLayer);
|
||||
SetMirrorObjectLayerRecursively(transform, layer);
|
||||
}
|
||||
|
||||
public void ResetMirrorObjectLayer()
|
||||
{
|
||||
_objectLayer = gameObject.layer;
|
||||
if (_mirrorObjectLayers.Count == 0)
|
||||
return;
|
||||
_objectLayer = _mirrorObjectLayers.Pop();
|
||||
SetMirrorObjectLayerRecursively(transform, _objectLayer);
|
||||
}
|
||||
|
||||
internal void RestoreMirrorObjectLayers()
|
||||
{
|
||||
while (_mirrorObjectLayers.Count > 0)
|
||||
ResetMirrorObjectLayer();
|
||||
}
|
||||
|
||||
private static void SetMirrorObjectLayerRecursively(Transform root, int layer)
|
||||
{
|
||||
root.gameObject.layer = layer;
|
||||
for (int i = 0; i < root.childCount; i++)
|
||||
SetMirrorObjectLayerRecursively(root.GetChild(i), layer);
|
||||
}
|
||||
|
||||
public void SetActive(bool active)
|
||||
@@ -448,8 +480,11 @@ public class MirrorReflection : MonoBehaviour
|
||||
|
||||
public void SetLightMirrorShader(bool isEnable)
|
||||
{
|
||||
// �ٷ����������Լҵ� _mirrorCameraData ��д���ء�
|
||||
// �����ڲ��ùٷ����� RenderPipeline���������ﱣ�ֿ�ʵ�����ӿڼ��ݡ�
|
||||
// Native RVA 0x19b7f90 writes CameraData.MirrorCasterQuality (0/1).
|
||||
// GallopRenderer replaces both forward queues with SimpleMirrorCaster
|
||||
// when quality is 1; renderer slot 1 is installed by LiveRenderSetup.
|
||||
if (_mirrorCamera != null)
|
||||
_mirrorCamera.GetUniversalAdditionalCameraData().SetRenderer(isEnable ? 1 : -1);
|
||||
}
|
||||
|
||||
public void SetMirrorVisibleOfficialStyle(bool visible, bool pauseRenderWhenHidden = true)
|
||||
@@ -911,6 +946,8 @@ public class MirrorReflection : MonoBehaviour
|
||||
return;
|
||||
|
||||
_isRenderingNow = true;
|
||||
bool oldInvert = GL.invertCulling;
|
||||
int receiverLayerDepth = _mirrorObjectLayers.Count;
|
||||
try
|
||||
{
|
||||
UpdateRenderTexture();
|
||||
@@ -924,25 +961,9 @@ public class MirrorReflection : MonoBehaviour
|
||||
OnPreDraw?.Invoke(this);
|
||||
_beginCameraRenderingCallbacks?.Invoke(default, _mirrorCamera);
|
||||
|
||||
bool oldInvert = GL.invertCulling;
|
||||
try
|
||||
{
|
||||
GL.invertCulling = !oldInvert;
|
||||
|
||||
if (!TrySubmitSingleCameraRequest())
|
||||
_mirrorCamera.Render();
|
||||
}
|
||||
finally
|
||||
{
|
||||
GL.invertCulling = oldInvert;
|
||||
|
||||
if (_mirrorCamera != null)
|
||||
{
|
||||
_mirrorCamera.ResetWorldToCameraMatrix();
|
||||
_mirrorCamera.ResetProjectionMatrix();
|
||||
_mirrorCamera.ResetCullingMatrix();
|
||||
}
|
||||
}
|
||||
GL.invertCulling = !oldInvert;
|
||||
if (!TrySubmitSingleCameraRequest())
|
||||
_mirrorCamera.Render();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -950,9 +971,57 @@ public class MirrorReflection : MonoBehaviour
|
||||
}
|
||||
finally
|
||||
{
|
||||
OnPostDraw?.Invoke(this);
|
||||
_endCameraRenderingCallbacks?.Invoke(default, _mirrorCamera);
|
||||
_isRenderingNow = false;
|
||||
try
|
||||
{
|
||||
GL.invertCulling = oldInvert;
|
||||
if (_mirrorCamera != null)
|
||||
{
|
||||
_mirrorCamera.ResetWorldToCameraMatrix();
|
||||
_mirrorCamera.ResetProjectionMatrix();
|
||||
_mirrorCamera.ResetCullingMatrix();
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
OnPostDraw?.Invoke(this);
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
_endCameraRenderingCallbacks?.Invoke(default, _mirrorCamera);
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
LifecycleOwner?.RestoreMirrorActorLayers(_mirrorCamera);
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
// Preserve a parent ordinary-camera scope during a nested mirror draw.
|
||||
while (_mirrorObjectLayers.Count > receiverLayerDepth)
|
||||
ResetMirrorObjectLayer();
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
GL.invertCulling = oldInvert;
|
||||
}
|
||||
finally
|
||||
{
|
||||
_isRenderingNow = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
@@ -269,12 +269,16 @@ namespace Gallop.Live
|
||||
[SerializeField] private bool _lastLoadSucceeded;
|
||||
[SerializeField] private int _lastSyncedStageInstanceId;
|
||||
[SerializeField] private int _lastContextSlotHash;
|
||||
private bool _hasResolvedContextSlots;
|
||||
|
||||
public int LoadedMusicId => _loadedMusicId;
|
||||
public string LoadedRootPath => _loadedRootPath;
|
||||
public bool HasTriedLoad => _hasTriedLoad;
|
||||
public bool LastLoadSucceeded => _lastLoadSucceeded;
|
||||
public int ContextSlotCount => contextSlots != null ? contextSlots.Count : 0;
|
||||
// A loaded table may legitimately contain no UVMovie rows. Completion
|
||||
// is independent of slot availability, so that case is not retried each frame.
|
||||
public bool HasResolvedContextSlots => _hasResolvedContextSlots;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
@@ -432,10 +436,12 @@ namespace Gallop.Live
|
||||
|
||||
_lastSyncedStageInstanceId = 0;
|
||||
_lastContextSlotHash = 0;
|
||||
_hasResolvedContextSlots = false;
|
||||
}
|
||||
|
||||
public bool RebuildContextSlotsFromLiveSettings(LiveTimelineControl timelineControl, int musicId, bool force = false)
|
||||
{
|
||||
_hasResolvedContextSlots = false;
|
||||
string csvText = ResolveLiveSettingsCsvText(musicId);
|
||||
if (string.IsNullOrWhiteSpace(csvText))
|
||||
{
|
||||
@@ -447,6 +453,7 @@ namespace Gallop.Live
|
||||
List<LiveSettingsUvMovieRow> sourceRows = ParseLiveSettingsUvMovieRows(csvText);
|
||||
if (sourceRows.Count == 0)
|
||||
{
|
||||
_hasResolvedContextSlots = true;
|
||||
if (verboseLog)
|
||||
Debug.LogWarning("[MonitorUvMovieProvider] liveSettings csv contains no type=4 UVMovie rows.");
|
||||
return false;
|
||||
@@ -502,6 +509,7 @@ namespace Gallop.Live
|
||||
int slotHash = ComputeSlotHash(resolvedSlots);
|
||||
if (!force && _lastContextSlotHash == slotHash && contextSlots.Count == resolvedSlots.Count)
|
||||
{
|
||||
_hasResolvedContextSlots = true;
|
||||
if (verboseLog)
|
||||
Debug.Log($"[MonitorUvMovieProvider] liveSettings slots unchanged: total={resolvedSlots.Count}, musicId={musicId}");
|
||||
return false;
|
||||
@@ -510,6 +518,7 @@ namespace Gallop.Live
|
||||
contextSlots = resolvedSlots;
|
||||
_lastSyncedStageInstanceId = musicId;
|
||||
_lastContextSlotHash = slotHash;
|
||||
_hasResolvedContextSlots = true;
|
||||
|
||||
if (verboseLog)
|
||||
{
|
||||
|
||||
@@ -168,7 +168,7 @@ namespace Gallop.Live
|
||||
// updates these only on flagged keys; CopyFrom must not erase their state.
|
||||
if (((int)positionKey.attribute & 0x20000) != 0)
|
||||
{
|
||||
_timelineCullingMask = GetMonitorCullingMask(positionKey.cullingLayer);
|
||||
_timelineCullingMask = positionKey.GetCullingMask();
|
||||
_hasTimelineCullingMask = true;
|
||||
}
|
||||
if (((int)positionKey.attribute & 0x40000) != 0)
|
||||
@@ -241,24 +241,6 @@ namespace Gallop.Live
|
||||
return _texture.IsCreated() || _texture.Create();
|
||||
}
|
||||
|
||||
private static int GetMonitorCullingMask(LiveCameraCullingLayer layers)
|
||||
{
|
||||
// LiveCameraCullingLayer_Helper.GetCullingMask RVA 0x1af2220.
|
||||
int mask = 0;
|
||||
if ((layers & LiveCameraCullingLayer.TransparentFX) != 0) mask |= 1 << 1;
|
||||
if ((layers & LiveCameraCullingLayer.Effect) != 0) mask |= 1 << 11;
|
||||
if ((layers & LiveCameraCullingLayer.Background3d_NotReflect) != 0) mask |= 1 << 25;
|
||||
if ((layers & LiveCameraCullingLayer.Background3d) != 0) mask |= 1 << 12;
|
||||
if ((layers & LiveCameraCullingLayer.Character3d) != 0) mask |= 1 << 13;
|
||||
if ((layers & LiveCameraCullingLayer.Character3d_0) != 0) mask |= 1 << 27;
|
||||
if ((layers & LiveCameraCullingLayer.Character3d_1) != 0) mask |= 1 << 28;
|
||||
if ((layers & LiveCameraCullingLayer.Character3d_NotReflect) != 0) mask |= 1 << 26;
|
||||
if ((layers & LiveCameraCullingLayer.NotLayerDefault) == 0)
|
||||
mask |= GraphicSettings.GetCullingLayer(GraphicSettings.LayerIndex.LayerDefault);
|
||||
if ((layers & LiveCameraCullingLayer.NotLayer3d) == 0)
|
||||
mask |= GraphicSettings.GetCullingLayer(GraphicSettings.LayerIndex.Layer3D);
|
||||
return mask;
|
||||
}
|
||||
|
||||
private static bool FindKeys<T>(ILiveTimelineKeyDataList keys, LiveTimelineControl timeline, float frame,
|
||||
out T current, out T next) where T : LiveTimelineKey
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using Gallop.Live.Cutt;
|
||||
@@ -31,7 +31,7 @@ namespace Gallop.Live
|
||||
public string baseColorProperty = "_BaseColor";
|
||||
public string monitorWidthProperty = "_MonitorWidth";
|
||||
public string monitorHeightProperty = "_MonitorHeight";
|
||||
public string crossFadeRateProperty = "_CrossFadeRate";
|
||||
public string blendFactorProperty = "_BlendFactor";
|
||||
public string srcBlendModeProperty = "_SrcBlendMode";
|
||||
public string dstBlendModeProperty = "_DstBlendMode";
|
||||
public string srcBlendProperty = "_SrcBlend";
|
||||
@@ -45,6 +45,7 @@ namespace Gallop.Live
|
||||
public Vector2 baseMainScale;
|
||||
public Vector2 baseMainOffset;
|
||||
public bool cameraAppliedThisFrame;
|
||||
public bool cameraTextureBound;
|
||||
public string rendererKey;
|
||||
public string materialKey;
|
||||
public string rendererCompact;
|
||||
@@ -82,7 +83,7 @@ namespace Gallop.Live
|
||||
public float alpha;
|
||||
public Color colorFade;
|
||||
public Color baseColor;
|
||||
public float crossFadeRate;
|
||||
public float blendFactor;
|
||||
public float filterTexScale;
|
||||
public int srcBlendMode;
|
||||
public int dstBlendMode;
|
||||
@@ -312,10 +313,11 @@ namespace Gallop.Live
|
||||
_lastPreparedMusicId = musicId;
|
||||
|
||||
bool synced = false;
|
||||
if (!_providerContextReady || stageChanged || _provider.ContextSlotCount == 0)
|
||||
if (!_providerContextReady || stageChanged ||
|
||||
(_provider.ContextSlotCount == 0 && !_provider.HasResolvedContextSlots))
|
||||
{
|
||||
synced = _provider.RebuildContextSlotsFromLiveSettings(_ctl, musicId, force: stageChanged || musicChanged);
|
||||
_providerContextReady = synced || _provider.ContextSlotCount > 0;
|
||||
_providerContextReady = synced || _provider.ContextSlotCount > 0 || _provider.HasResolvedContextSlots;
|
||||
}
|
||||
|
||||
if (_stage != null)
|
||||
@@ -685,14 +687,14 @@ namespace Gallop.Live
|
||||
if (assignMaskTextureToFilterTex && state.hasMainTexture)
|
||||
state.filterTexture = state.main.maskTexture;
|
||||
|
||||
// 保持 _Alpha 为材质原本的值
|
||||
// 时间轴的监视器数据没有提供专用的透明度字段;
|
||||
// colorFade 和 BaseColor 会分别传递给对应的着色器参数
|
||||
state.alpha = 0f;
|
||||
// Native UpdateMonitor (0x1a93a70) applies these even when neither
|
||||
// movie slot resolves. An empty slot is not an absent control key:
|
||||
// ColorFade=(0,0,0,0) must still turn the authored white screen black.
|
||||
state.alpha = crossFadeRate;
|
||||
state.colorFade = colorFade;
|
||||
state.useBaseColor = !IsColorEffectivelyClear(baseColor);
|
||||
state.baseColor = state.useBaseColor ? baseColor : Color.white;
|
||||
state.crossFadeRate = crossFadeRate;
|
||||
state.blendFactor = blendFactor;
|
||||
state.filterTexScale = filterTexScale;
|
||||
state.srcBlendMode = curKey.SrcBlendMode;
|
||||
state.dstBlendMode = curKey.DstBlendMode;
|
||||
@@ -700,7 +702,7 @@ namespace Gallop.Live
|
||||
state.renderQueue = curKey.RenderQueueNo;
|
||||
state.hasRenderQueue = curKey.IsRenderQueue != 0;
|
||||
|
||||
return state.hasMainTexture;
|
||||
return true;
|
||||
}
|
||||
|
||||
private MonitorUvMovieContextSlot ResolvePrimarySlot(
|
||||
@@ -1043,7 +1045,7 @@ namespace Gallop.Live
|
||||
for (int i = 0; i < _bindings.Count; i++)
|
||||
{
|
||||
MonitorMaterialBinding binding = _bindings[i];
|
||||
if (!binding.hasAppliedState || !binding.appliedState.useMonitorCamera ||
|
||||
if (!binding.cameraTextureBound ||
|
||||
(!force && binding.cameraAppliedThisFrame))
|
||||
continue;
|
||||
Material material = binding.material;
|
||||
@@ -1056,6 +1058,7 @@ namespace Gallop.Live
|
||||
if (binding.hasUvAdjust)
|
||||
material.SetVector("_UVAdjust", binding.baseUvAdjust);
|
||||
}
|
||||
binding.cameraTextureBound = false;
|
||||
binding.hasAppliedState = false;
|
||||
}
|
||||
}
|
||||
@@ -1066,7 +1069,11 @@ namespace Gallop.Live
|
||||
if (material == null)
|
||||
return;
|
||||
|
||||
binding.cameraAppliedThisFrame = state.useMonitorCamera;
|
||||
// An empty movie slot leaves the current texture untouched, as native
|
||||
// UpdateMonitorInMovie does. Keep ownership until a real replacement
|
||||
// arrives, so disabling/rebinding still detaches the capture RT.
|
||||
binding.cameraAppliedThisFrame = state.useMonitorCamera ||
|
||||
(!state.hasMainTexture && binding.cameraTextureBound);
|
||||
|
||||
if (state.hasMainTexture && HasTextureProperty(material, mainTexProperty))
|
||||
{
|
||||
@@ -1079,6 +1086,7 @@ namespace Gallop.Live
|
||||
material.SetTextureScale(mainTexProperty, state.main.scale);
|
||||
material.SetTextureOffset(mainTexProperty, state.main.offset);
|
||||
}
|
||||
binding.cameraTextureBound = state.useMonitorCamera;
|
||||
}
|
||||
|
||||
if (HasTextureProperty(material, fadeTexProperty))
|
||||
@@ -1124,7 +1132,11 @@ namespace Gallop.Live
|
||||
}
|
||||
}
|
||||
|
||||
float appliedAlpha = state.useMonitorCamera ? 0f : binding.baseAlpha;
|
||||
// Native movie mode maps CrossFadeRate to _Alpha; capture mode does
|
||||
// not overwrite it. Retain the last value across capture transitions.
|
||||
float appliedAlpha = state.useMonitorCamera
|
||||
? (binding.hasAppliedState ? binding.appliedState.alpha : binding.baseAlpha)
|
||||
: state.alpha;
|
||||
Color appliedColorFade = state.colorFade;
|
||||
Color appliedBaseColor = state.useBaseColor ? state.baseColor : binding.baseColor;
|
||||
|
||||
@@ -1161,8 +1173,8 @@ namespace Gallop.Live
|
||||
}
|
||||
material.SetVector("_UVAdjust", uvAdjust);
|
||||
}
|
||||
if (!binding.hasAppliedState || !Approximately(binding.appliedState.crossFadeRate, state.crossFadeRate))
|
||||
TrySetFloat(material, crossFadeRateProperty, state.crossFadeRate);
|
||||
if (!binding.hasAppliedState || !Approximately(binding.appliedState.blendFactor, state.blendFactor))
|
||||
TrySetFloat(material, blendFactorProperty, state.blendFactor);
|
||||
|
||||
if (applyBlendModeProperties)
|
||||
{
|
||||
|
||||
@@ -192,6 +192,8 @@ namespace Gallop.Live
|
||||
RenderCamera.nearClipPlane = current.nearClip;
|
||||
RenderCamera.farClipPlane = current.farClip;
|
||||
RenderCamera.fieldOfView = Mathf.LerpUnclamped(current.fov, next.fov, t);
|
||||
if (((int)current.attribute & 0x40000) != 0)
|
||||
RenderCamera.backgroundColor = current.BgColor;
|
||||
}
|
||||
if (current.maskType == LiveTimelineKeyMultiCameraPositionData.MaskType.Single && transitioning)
|
||||
{
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live
|
||||
{
|
||||
// Serialized contract from common prop000/001 TypeTrees (assembly: umamusume).
|
||||
// Height adjustment follows the actual game Props.SetScale (Komoe RVA 0x71daed0).
|
||||
public sealed class Props : MonoBehaviour
|
||||
{
|
||||
[Serializable]
|
||||
public sealed class AdjustmentData
|
||||
{
|
||||
public Transform Transform;
|
||||
public Vector3 OffsetRange;
|
||||
public Vector3 TransformRate;
|
||||
public int TargetNode;
|
||||
public Vector3 TargetOffset;
|
||||
|
||||
public Vector3 TargetPosition { get; internal set; }
|
||||
}
|
||||
|
||||
[SerializeField] private AdjustmentData[] _adjustmentDataArray;
|
||||
[SerializeField] private bool _isInfluenceOfCharaHeight;
|
||||
[SerializeField] private GameObject[] _blinkLightRootObjectArray;
|
||||
[SerializeField] private Transform[] _stageObjectTransformArray;
|
||||
|
||||
internal GameObject[] BlinkLightRootObjectArray => _blinkLightRootObjectArray;
|
||||
internal Transform[] StageObjectTransformArray => _stageObjectTransformArray;
|
||||
|
||||
internal void SetScale(Transform headTransform, Transform positionNode, float bodyScale,
|
||||
bool isInfluenceOfCharaHeight)
|
||||
{
|
||||
_isInfluenceOfCharaHeight = isInfluenceOfCharaHeight;
|
||||
if (_adjustmentDataArray == null || _adjustmentDataArray.Length == 0) return;
|
||||
|
||||
// Native Head target: world-space Y difference only. Neither the authored
|
||||
// local position nor head X/Z participates, and the result is not clamped.
|
||||
Vector3 targetPosition = new Vector3(0f, headTransform.position.y - positionNode.position.y, 0f);
|
||||
for (int i = 0; i < _adjustmentDataArray.Length; i++)
|
||||
{
|
||||
var adjustment = _adjustmentDataArray[i];
|
||||
if (adjustment.Transform == null) continue;
|
||||
adjustment.TargetPosition = targetPosition;
|
||||
Vector3 position = _isInfluenceOfCharaHeight ? targetPosition / bodyScale : targetPosition;
|
||||
adjustment.Transform.localPosition = Vector3.Scale(
|
||||
position + adjustment.TargetOffset - adjustment.OffsetRange, adjustment.TransformRate);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8ba55f9f4016407da01e39622a086b67
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Text.RegularExpressions;
|
||||
@@ -106,11 +106,11 @@ namespace Gallop.Live
|
||||
public float powerDiff;
|
||||
|
||||
public int loopCountMax;
|
||||
public float waitTime;
|
||||
public float waitTime;
|
||||
public float turnOnTime;
|
||||
public float turnOffTime;
|
||||
public float keepTime;
|
||||
public float intervalTime;
|
||||
public float intervalTime;
|
||||
public float loopTime;
|
||||
|
||||
public float currentPower;
|
||||
@@ -161,6 +161,10 @@ namespace Gallop.Live
|
||||
|
||||
private readonly Dictionary<string, RootCache> _rootCache = new Dictionary<string, RootCache>(256);
|
||||
private readonly Dictionary<string, BlinkRootRuntime> _runtime = new Dictionary<string, BlinkRootRuntime>(256);
|
||||
private readonly Dictionary<string, List<RootCache>> _registeredRoots =
|
||||
new Dictionary<string, List<RootCache>>(StringComparer.Ordinal);
|
||||
private Gallop.RenderPipeline.RecoveredLensFlareController _registeredFlares;
|
||||
private int _registeredUpdateFrame = -1;
|
||||
|
||||
private enum IndexMode
|
||||
{
|
||||
@@ -200,6 +204,7 @@ namespace Gallop.Live
|
||||
public bool wantsMpb;
|
||||
|
||||
// 官方 RendererData 层
|
||||
public Gallop.RenderPipeline.CustomLensFlare customLensFlare;
|
||||
public WashLightController washLightController;
|
||||
public UnityLensFlareController unityLensFlareController;
|
||||
public Material material;
|
||||
@@ -225,6 +230,16 @@ namespace Gallop.Live
|
||||
private static readonly Regex ReSuffixNumber = new Regex(@"_(\d+)$", RegexOptions.Compiled);
|
||||
private static readonly Regex ReLastDigits = new Regex(@"(\d+)(?!.*\d)", RegexOptions.Compiled);
|
||||
private readonly List<Material> _sharedMaterialScratch = new List<Material>(4);
|
||||
private readonly List<Material> _blendMaterialScratch = new List<Material>(4);
|
||||
|
||||
private struct BlendMaterialClassification
|
||||
{
|
||||
public Shader shader;
|
||||
public bool isTarget;
|
||||
}
|
||||
|
||||
private readonly Dictionary<Material, BlendMaterialClassification> _blendMaterialClassification =
|
||||
new Dictionary<Material, BlendMaterialClassification>();
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@@ -238,6 +253,8 @@ namespace Gallop.Live
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
_blendMaterialScratch.Clear();
|
||||
_blendMaterialClassification.Clear();
|
||||
Unbind();
|
||||
}
|
||||
|
||||
@@ -275,9 +292,60 @@ namespace Gallop.Live
|
||||
_groundChosen.Clear();
|
||||
}
|
||||
|
||||
private static bool IsBlinkRootName(string name)
|
||||
internal void RegisterRoot(GameObject root, string nameSuffixToken,
|
||||
Gallop.RenderPipeline.RecoveredLensFlareController flares)
|
||||
{
|
||||
string name = root.name.Replace("(Clone)", string.Empty) + nameSuffixToken;
|
||||
_registeredFlares = flares;
|
||||
if (!_registeredRoots.TryGetValue(name, out var roots))
|
||||
{
|
||||
roots = new List<RootCache>();
|
||||
_registeredRoots.Add(name, roots);
|
||||
}
|
||||
string runtimeKey = name + "__U" + root.GetInstanceID();
|
||||
var cache = GetOrBuildRootCache(runtimeKey, root);
|
||||
roots.Add(cache);
|
||||
ApplyRootOffCached(runtimeKey, root);
|
||||
}
|
||||
|
||||
internal void UpdateRegisteredRoots()
|
||||
{
|
||||
foreach (var entry in _registeredRoots)
|
||||
{
|
||||
if (!_latest.TryGetValue(entry.Key, out var item)) continue;
|
||||
var info = item.updateInfo;
|
||||
info.progressTime = Mathf.Max(0f, info.progressTime) * Mathf.Max(0.0001f, localTimeScale);
|
||||
foreach (var root in entry.Value)
|
||||
if (root.rootGo != null)
|
||||
ApplyToRootCached(root.rootName, root.rootGo, info, item.currentLiveTime);
|
||||
}
|
||||
_registeredUpdateFrame = Time.frameCount;
|
||||
}
|
||||
|
||||
internal void UnregisterRoot(GameObject root, string nameSuffixToken)
|
||||
{
|
||||
string name = root.name.Replace("(Clone)", string.Empty) + nameSuffixToken;
|
||||
if (!_registeredRoots.TryGetValue(name, out var roots)) return;
|
||||
for (int i = roots.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var cache = roots[i];
|
||||
if (cache.rootGo != root) continue;
|
||||
_rootCache.Remove(cache.rootName);
|
||||
_runtime.Remove(cache.rootName);
|
||||
_rootBase.Remove(cache.rootName);
|
||||
roots.RemoveAt(i);
|
||||
}
|
||||
if (roots.Count == 0)
|
||||
{
|
||||
_registeredRoots.Remove(name);
|
||||
_latest.Remove(name);
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsBlinkRootName(string name)
|
||||
{
|
||||
if (string.IsNullOrEmpty(name)) return false;
|
||||
if (_registeredRoots.ContainsKey(NormalizeRuntimeRootName(name))) return true;
|
||||
if (name.IndexOf("_spotlight3d_controller", StringComparison.OrdinalIgnoreCase) >= 0) return false;
|
||||
if (name.IndexOf("ledlight", StringComparison.OrdinalIgnoreCase) >= 0) return false;
|
||||
|
||||
@@ -435,7 +503,7 @@ namespace Gallop.Live
|
||||
return false;
|
||||
}
|
||||
|
||||
private void OnBlinkLight(LiveTimelineBlinkLightData data,ref BlinkLightUpdateInfo info,float currentLiveTime)
|
||||
private void OnBlinkLight(LiveTimelineBlinkLightData data, ref BlinkLightUpdateInfo info, float currentLiveTime)
|
||||
{
|
||||
string rootName = (data != null) ? data.name : null;
|
||||
if (string.IsNullOrEmpty(rootName)) return;
|
||||
@@ -525,26 +593,37 @@ namespace Gallop.Live
|
||||
|
||||
float liveNow = item.currentLiveTime;
|
||||
|
||||
if (_stage.StageObjectUnitMap.TryGetValue(rootName, out var unit) &&
|
||||
unit != null && unit.ChildObjects != null && unit.ChildObjects.Length > 0)
|
||||
if (_registeredRoots.TryGetValue(rootName, out var registeredRoots))
|
||||
{
|
||||
for (int i = 0; i < unit.ChildObjects.Length; i++)
|
||||
if (_registeredUpdateFrame == Time.frameCount) continue;
|
||||
for (int i = 0; i < registeredRoots.Count; i++)
|
||||
{
|
||||
var childPrefab = unit.ChildObjects[i];
|
||||
if (childPrefab == null)
|
||||
continue;
|
||||
|
||||
if (_stage.StageObjectMap.TryGetValue(childPrefab.name, out var realGo) && realGo != null)
|
||||
{
|
||||
string runtimeKey = rootName + "__U" + i;
|
||||
ApplyToRootCached(runtimeKey, realGo, updateInfo, liveNow);
|
||||
}
|
||||
var root = registeredRoots[i];
|
||||
if (root.rootGo != null)
|
||||
ApplyToRootCached(root.rootName, root.rootGo, updateInfo, liveNow);
|
||||
}
|
||||
}
|
||||
else if (_stage.StageObjectMap.TryGetValue(rootName, out var rootGo) && rootGo != null)
|
||||
{
|
||||
ApplyToRootCached(rootName, rootGo, updateInfo, liveNow);
|
||||
}
|
||||
else
|
||||
if (_stage.StageObjectUnitMap.TryGetValue(rootName, out var unit) &&
|
||||
unit != null && unit.ChildObjects != null && unit.ChildObjects.Length > 0)
|
||||
{
|
||||
for (int i = 0; i < unit.ChildObjects.Length; i++)
|
||||
{
|
||||
var childPrefab = unit.ChildObjects[i];
|
||||
if (childPrefab == null)
|
||||
continue;
|
||||
|
||||
if (_stage.StageObjectMap.TryGetValue(childPrefab.name, out var realGo) && realGo != null)
|
||||
{
|
||||
string runtimeKey = rootName + "__U" + i;
|
||||
ApplyToRootCached(runtimeKey, realGo, updateInfo, liveNow);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (_stage.StageObjectMap.TryGetValue(rootName, out var rootGo) && rootGo != null)
|
||||
{
|
||||
ApplyToRootCached(rootName, rootGo, updateInfo, liveNow);
|
||||
}
|
||||
}
|
||||
|
||||
// Exclusivity must be enforced AFTER the cached timeline update:
|
||||
@@ -639,6 +718,7 @@ namespace Gallop.Live
|
||||
|
||||
var wash = go.GetComponent<WashLightController>();
|
||||
var flare = go.GetComponent<UnityLensFlareController>();
|
||||
var customFlare = go.GetComponent<Gallop.RenderPipeline.CustomLensFlare>();
|
||||
var runtimeMat = r.material;
|
||||
var mats = r.sharedMaterials;
|
||||
pendingRenderers.Add(new RendererEntry
|
||||
@@ -659,6 +739,7 @@ namespace Gallop.Live
|
||||
|
||||
washLightController = wash,
|
||||
unityLensFlareController = flare,
|
||||
customLensFlare = customFlare,
|
||||
material = runtimeMat,
|
||||
isWashLight = false,
|
||||
isWashLightProjection = false,
|
||||
@@ -866,7 +947,7 @@ namespace Gallop.Live
|
||||
return b;
|
||||
}
|
||||
|
||||
private void ApplyToRootCached(string runtimeKey,GameObject rootGo,BlinkLightUpdateInfo updateInfo,float liveNow)
|
||||
private void ApplyToRootCached(string runtimeKey, GameObject rootGo, BlinkLightUpdateInfo updateInfo, float liveNow)
|
||||
{
|
||||
var rc = GetOrBuildRootCache(runtimeKey, rootGo);
|
||||
if (rc.slotCount <= 0) return;
|
||||
@@ -970,6 +1051,10 @@ namespace Gallop.Live
|
||||
}
|
||||
|
||||
Color currentColor = new Color(slotColor.x, slotColor.y, slotColor.z, 1f);
|
||||
// Native Blink.Update writes its power-weighted current color directly
|
||||
// to the flare, with shader-color reading disabled (Komoe 0x7192856).
|
||||
if (e.customLensFlare != null)
|
||||
_registeredFlares?.SetBlinkColor(e.customLensFlare, currentColor * p);
|
||||
|
||||
int uvBias = (rc.rootIsUv || e.isUvAlphaMask) ? uvSortingBias : 0;
|
||||
r.sortingOrder = baseOrder + uvBias + e.stableSlot * stride;
|
||||
@@ -1281,6 +1366,8 @@ namespace Gallop.Live
|
||||
{
|
||||
var e = rc.renderers[i];
|
||||
var r = e.r;
|
||||
if (e.customLensFlare != null)
|
||||
_registeredFlares?.SetBlinkColor(e.customLensFlare, Color.black);
|
||||
if (r == null)
|
||||
{
|
||||
rc.dirty = true;
|
||||
@@ -1288,7 +1375,7 @@ namespace Gallop.Live
|
||||
}
|
||||
|
||||
|
||||
EnsureLightBlinkBlendState(r, ref e,(int)fallbackLightBlendMode);
|
||||
EnsureLightBlinkBlendState(r, ref e, (int)fallbackLightBlendMode);
|
||||
|
||||
if (e.wantsMpb)
|
||||
{
|
||||
@@ -1336,7 +1423,18 @@ namespace Gallop.Live
|
||||
{
|
||||
if (m == null) return false;
|
||||
|
||||
string sn = (m.shader != null) ? (m.shader.name ?? "") : "";
|
||||
Shader shader = m.shader;
|
||||
if (_blendMaterialClassification.TryGetValue(m, out var cached) && cached.shader == shader)
|
||||
return cached.isTarget;
|
||||
|
||||
bool isTarget = ClassifyBlinkBlendMaterial(m, shader);
|
||||
_blendMaterialClassification[m] = new BlendMaterialClassification { shader = shader, isTarget = isTarget };
|
||||
return isTarget;
|
||||
}
|
||||
|
||||
private static bool ClassifyBlinkBlendMaterial(Material m, Shader shader)
|
||||
{
|
||||
string sn = shader != null ? (shader.name ?? "") : "";
|
||||
|
||||
if (sn.IndexOf("LightBlinkBlend", StringComparison.OrdinalIgnoreCase) >= 0)
|
||||
return true;
|
||||
@@ -1401,19 +1499,17 @@ namespace Gallop.Live
|
||||
|
||||
int modeId = (int)mode;
|
||||
|
||||
// 不要再提前 return。
|
||||
// 官方 Update 末尾每帧都会 TrySetLightBlendModeMaterialProperty。
|
||||
// 你这里如果 cache return,材质被 timeline / prefab / 其他脚本改回 One/One 后就不会再修。
|
||||
// if (e.blendConfigured && e.blendConfiguredMode == modeId)
|
||||
// return;
|
||||
// Preserve the native per-frame blend override, including recovery
|
||||
// after another controller changes the material's blend properties.
|
||||
|
||||
var mats = r.materials;
|
||||
if (mats == null || mats.Length == 0)
|
||||
r.GetMaterials(_blendMaterialScratch);
|
||||
var mats = _blendMaterialScratch;
|
||||
if (mats.Count == 0)
|
||||
return;
|
||||
|
||||
bool touched = false;
|
||||
|
||||
for (int i = 0; i < mats.Length; i++)
|
||||
for (int i = 0; i < mats.Count; i++)
|
||||
{
|
||||
var m = mats[i];
|
||||
if (!IsTargetBlinkBlendMaterial(m))
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
|
||||
namespace Gallop.Live
|
||||
{
|
||||
@@ -131,7 +132,7 @@ namespace Gallop.Live
|
||||
[Tooltip("レーザーマテリアル")]
|
||||
private Material[] _laserMaterials;
|
||||
|
||||
|
||||
|
||||
private bool _laserSetupDone = false;
|
||||
private LiveTimelineControl _laserSetupTimelineControl;
|
||||
private readonly Dictionary<object, int> _laserDataIndexMap =
|
||||
@@ -177,6 +178,237 @@ namespace Gallop.Live
|
||||
private readonly Dictionary<int, MirrorReflection> _mirrorByTimelineHash = new Dictionary<int, MirrorReflection>();
|
||||
private LiveTimelineControl _boundTimelineControl;
|
||||
|
||||
private const int MirrorCharacterSlotCount = 20;
|
||||
private sealed class MirrorCameraTarget
|
||||
{
|
||||
internal MirrorReflection Mirror;
|
||||
internal int BodyMask;
|
||||
internal int HeadMask;
|
||||
internal readonly Stack<Camera> ReceiverCameras = new Stack<Camera>(4);
|
||||
}
|
||||
|
||||
private readonly List<MirrorCameraTarget> _mirrorCameraTargets = new List<MirrorCameraTarget>();
|
||||
private readonly UmaContainerCharacter[] _mirrorBoundCharacters = new UmaContainerCharacter[MirrorCharacterSlotCount];
|
||||
private IList<UmaContainerCharacter> _mirrorCharacters;
|
||||
private LiveTimelineData _mirrorTimelineData;
|
||||
private Camera _activeMirrorRenderingCamera;
|
||||
private bool _mirrorRenderingCallbacksBound;
|
||||
|
||||
internal void InitializeMirrorReflections(IReadOnlyList<MirrorReflection> mirrors, Camera baseCamera,
|
||||
Func<float> fovFactor, LiveTimelineControl timeline, IList<UmaContainerCharacter> characters)
|
||||
{
|
||||
DestroyMirrorReflections();
|
||||
_mirrorTimelineData = timeline != null ? timeline.data : null;
|
||||
_mirrorCharacters = characters;
|
||||
_environmentMirrorTargets.Clear();
|
||||
_mirrorByTimelineHash.Clear();
|
||||
for (int i = 0; i < mirrors.Count; i++)
|
||||
{
|
||||
var mirror = mirrors[i];
|
||||
if (mirror == null)
|
||||
continue;
|
||||
mirror.Initialize(baseCamera, i, false);
|
||||
mirror.SetupBaseCamera(baseCamera, fovFactor);
|
||||
mirror.LifecycleOwner = this;
|
||||
// Native MirrorCameraTarget construction leaves both actor masks zero.
|
||||
_mirrorCameraTargets.Add(new MirrorCameraTarget { Mirror = mirror });
|
||||
RegisterMirrorReflection(mirror);
|
||||
}
|
||||
PrepareMirrorCharacters();
|
||||
BindMirrorRenderingCallbacks();
|
||||
}
|
||||
|
||||
internal void PrepareMirrorCharacters()
|
||||
{
|
||||
for (int i = 0; i < MirrorCharacterSlotCount; i++)
|
||||
{
|
||||
var character = _mirrorCharacters != null && i < _mirrorCharacters.Count ? _mirrorCharacters[i] : null;
|
||||
if (_mirrorBoundCharacters[i] == character)
|
||||
continue;
|
||||
if (_mirrorBoundCharacters[i] != null)
|
||||
_mirrorBoundCharacters[i].RestoreMirrorChangedLayers();
|
||||
_mirrorBoundCharacters[i] = character;
|
||||
if (character != null)
|
||||
character.PrepareMirrorLayerCache();
|
||||
}
|
||||
}
|
||||
|
||||
private void BindMirrorRenderingCallbacks()
|
||||
{
|
||||
if (_mirrorRenderingCallbacksBound || !isActiveAndEnabled || _mirrorTimelineData == null ||
|
||||
!_mirrorTimelineData.IsChangedCharaLayerOnlyMirrorRendering)
|
||||
return;
|
||||
|
||||
_mirrorRenderingCallbacksBound = true;
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
CompleteMirrorReinitialization(_mirrorCameraTargets[i].Mirror);
|
||||
RenderPipelineManager.beginCameraRendering += OnBeginCameraRendering;
|
||||
RenderPipelineManager.endCameraRendering += OnEndCameraRendering;
|
||||
Camera.onPreCull += OnBeginBuiltInCameraRendering;
|
||||
Camera.onPostRender += OnEndBuiltInCameraRendering;
|
||||
}
|
||||
|
||||
private void UnbindMirrorRenderingCallbacks()
|
||||
{
|
||||
if (_mirrorRenderingCallbacksBound)
|
||||
{
|
||||
RenderPipelineManager.beginCameraRendering -= OnBeginCameraRendering;
|
||||
RenderPipelineManager.endCameraRendering -= OnEndCameraRendering;
|
||||
Camera.onPreCull -= OnBeginBuiltInCameraRendering;
|
||||
Camera.onPostRender -= OnEndBuiltInCameraRendering;
|
||||
_mirrorRenderingCallbacksBound = false;
|
||||
}
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
PrepareMirrorReinitialization(_mirrorCameraTargets[i].Mirror);
|
||||
RestoreMirrorActorLayers();
|
||||
}
|
||||
|
||||
internal void DestroyMirrorReflections()
|
||||
{
|
||||
UnbindMirrorRenderingCallbacks();
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
if (_mirrorCameraTargets[i].Mirror != null)
|
||||
_mirrorCameraTargets[i].Mirror.LifecycleOwner = null;
|
||||
_mirrorCameraTargets.Clear();
|
||||
_mirrorCharacters = null;
|
||||
_mirrorTimelineData = null;
|
||||
for (int i = 0; i < MirrorCharacterSlotCount; i++)
|
||||
_mirrorBoundCharacters[i] = null;
|
||||
}
|
||||
|
||||
internal void PrepareMirrorReinitialization(MirrorReflection mirror)
|
||||
{
|
||||
if (mirror == null)
|
||||
return;
|
||||
mirror.RemoveBeginCameraRenderingCallback(OnBeginMirrorCameraRendering);
|
||||
mirror.RemoveEndCameraRenderingCallback(OnEndMirrorCameraRendering);
|
||||
RestoreMirrorActorLayers(mirror.MirrorCamera);
|
||||
mirror.RestoreMirrorObjectLayers();
|
||||
var target = GetMirrorCameraTarget(mirror);
|
||||
if (target != null)
|
||||
{
|
||||
target.BodyMask = 0;
|
||||
target.HeadMask = 0;
|
||||
target.ReceiverCameras.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
internal void CompleteMirrorReinitialization(MirrorReflection mirror)
|
||||
{
|
||||
if (!_mirrorRenderingCallbacksBound || mirror == null || !mirror.IsInitialized)
|
||||
return;
|
||||
mirror.RemoveBeginCameraRenderingCallback(OnBeginMirrorCameraRendering);
|
||||
mirror.RemoveEndCameraRenderingCallback(OnEndMirrorCameraRendering);
|
||||
mirror.AddBeginCameraRenderingCallback(OnBeginMirrorCameraRendering);
|
||||
mirror.AddEndCameraRenderingCallback(OnEndMirrorCameraRendering);
|
||||
}
|
||||
|
||||
internal void ReleaseMirrorReflection(MirrorReflection mirror)
|
||||
{
|
||||
PrepareMirrorReinitialization(mirror);
|
||||
for (int i = _mirrorCameraTargets.Count - 1; i >= 0; i--)
|
||||
if (_mirrorCameraTargets[i].Mirror == mirror)
|
||||
_mirrorCameraTargets.RemoveAt(i);
|
||||
mirror.LifecycleOwner = null;
|
||||
}
|
||||
|
||||
private MirrorCameraTarget GetMirrorCameraTarget(MirrorReflection mirror)
|
||||
{
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
if (_mirrorCameraTargets[i].Mirror == mirror)
|
||||
return _mirrorCameraTargets[i];
|
||||
return null;
|
||||
}
|
||||
|
||||
private MirrorCameraTarget GetMirrorCameraTarget(Camera camera)
|
||||
{
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
{
|
||||
var mirror = _mirrorCameraTargets[i].Mirror;
|
||||
if (mirror != null && mirror.MirrorCamera == camera)
|
||||
return _mirrorCameraTargets[i];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private void OnBeginMirrorCameraRendering(ScriptableRenderContext context, Camera camera)
|
||||
{
|
||||
var target = GetMirrorCameraTarget(camera);
|
||||
if (target == null)
|
||||
return;
|
||||
RestoreMirrorActorLayers();
|
||||
_activeMirrorRenderingCamera = camera;
|
||||
int layer = GraphicSettings.GetLayer(GraphicSettings.LayerIndex.LayerCharacter3D_NotReflect);
|
||||
for (int i = 0; i < MirrorCharacterSlotCount; i++)
|
||||
if (_mirrorBoundCharacters[i] != null)
|
||||
_mirrorBoundCharacters[i].SetLayerBeforeMirrorCameraRendering(
|
||||
(target.BodyMask & (1 << i)) != 0, (target.HeadMask & (1 << i)) != 0, layer);
|
||||
}
|
||||
|
||||
private void OnEndMirrorCameraRendering(ScriptableRenderContext context, Camera camera)
|
||||
{
|
||||
RestoreMirrorActorLayers(camera);
|
||||
}
|
||||
|
||||
internal void RestoreMirrorActorLayers(Camera camera)
|
||||
{
|
||||
if (_activeMirrorRenderingCamera == camera)
|
||||
RestoreMirrorActorLayers();
|
||||
}
|
||||
|
||||
private void RestoreMirrorActorLayers()
|
||||
{
|
||||
for (int i = 0; i < MirrorCharacterSlotCount; i++)
|
||||
if (_mirrorBoundCharacters[i] != null)
|
||||
_mirrorBoundCharacters[i].RestoreMirrorChangedLayers();
|
||||
_activeMirrorRenderingCamera = null;
|
||||
}
|
||||
|
||||
private void OnBeginCameraRendering(ScriptableRenderContext context, Camera camera)
|
||||
{
|
||||
// Mirror cameras already have their own callbacks. Never overwrite a parent receiver scope.
|
||||
if (!_mirrorRenderingCallbacksBound || GetMirrorCameraTarget(camera) != null)
|
||||
return;
|
||||
int layer = GraphicSettings.GetLayer(GraphicSettings.LayerIndex.LayerNO_VISIBLE);
|
||||
if (layer < 0)
|
||||
return;
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
{
|
||||
var target = _mirrorCameraTargets[i];
|
||||
if (target.Mirror == null || !target.Mirror.IsInitialized || target.Mirror.BaseCamera == camera)
|
||||
continue;
|
||||
target.Mirror.SetMirrorObjectLayer(layer);
|
||||
target.ReceiverCameras.Push(camera);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnEndCameraRendering(ScriptableRenderContext context, Camera camera)
|
||||
{
|
||||
if (GetMirrorCameraTarget(camera) != null)
|
||||
return;
|
||||
for (int i = 0; i < _mirrorCameraTargets.Count; i++)
|
||||
{
|
||||
var target = _mirrorCameraTargets[i];
|
||||
if (target.ReceiverCameras.Count == 0 || target.ReceiverCameras.Peek() != camera)
|
||||
continue;
|
||||
target.ReceiverCameras.Pop();
|
||||
if (target.Mirror != null)
|
||||
target.Mirror.ResetMirrorObjectLayer();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnBeginBuiltInCameraRendering(Camera camera)
|
||||
{
|
||||
if (GraphicsSettings.currentRenderPipeline == null)
|
||||
OnBeginCameraRendering(default, camera);
|
||||
}
|
||||
|
||||
private void OnEndBuiltInCameraRendering(Camera camera)
|
||||
{
|
||||
if (GraphicsSettings.currentRenderPipeline == null)
|
||||
OnEndCameraRendering(default, camera);
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_stageColorBlock = new UnityEngine.MaterialPropertyBlock();
|
||||
@@ -204,6 +436,7 @@ namespace Gallop.Live
|
||||
Director.instance._stageController = this;
|
||||
|
||||
TryBindTimelineCallbacks();
|
||||
BindMirrorRenderingCallbacks();
|
||||
}
|
||||
|
||||
// Laser 的 AlterUpdate 必须在 LiveTimelineControl 下发本帧 UpdateInfo 之后执行。
|
||||
@@ -651,7 +884,7 @@ namespace Gallop.Live
|
||||
return;
|
||||
}
|
||||
|
||||
LaserController controller =_laserControllerArray[index];
|
||||
LaserController controller = _laserControllerArray[index];
|
||||
|
||||
controller?.UpdateInfo(ref updateInfo);
|
||||
}
|
||||
@@ -833,7 +1066,7 @@ namespace Gallop.Live
|
||||
return obj != null ? System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(obj) : 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void AutoAddDriver(string shortTypeName)
|
||||
{
|
||||
Type t = null;
|
||||
@@ -867,12 +1100,14 @@ namespace Gallop.Live
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
UnbindMirrorRenderingCallbacks();
|
||||
UnbindTimelineCallbacks(_boundTimelineControl);
|
||||
_boundTimelineControl = null;
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
DestroyMirrorReflections();
|
||||
UnbindTimelineCallbacks(_boundTimelineControl);
|
||||
_boundTimelineControl = null;
|
||||
}
|
||||
@@ -1126,6 +1361,16 @@ namespace Gallop.Live
|
||||
mirror.SetLightMirrorShader(!updateInfo.IsToonMirror);
|
||||
mirror.MirrorReflectionRate = updateInfo.MirrorReflectionRate;
|
||||
|
||||
if (_mirrorRenderingCallbacksBound && updateInfo.EnableMirror)
|
||||
{
|
||||
var target = GetMirrorCameraTarget(mirror);
|
||||
if (target != null)
|
||||
{
|
||||
target.BodyMask = (int)updateInfo.TargetChara;
|
||||
target.HeadMask = (int)(updateInfo.EnableCharaHead ? updateInfo.TargetCharaHead : updateInfo.TargetChara);
|
||||
}
|
||||
}
|
||||
|
||||
mirror.ResetCullingMask();
|
||||
|
||||
if (_mirrorBgLayerMask != 0)
|
||||
@@ -1169,33 +1414,10 @@ namespace Gallop.Live
|
||||
|
||||
foreach (var child in instance.GetComponentsInChildren<Transform>(true))
|
||||
{
|
||||
string objectName = child.name.Replace("(Clone)", "");
|
||||
if (!StageObjectMap.ContainsKey(objectName))
|
||||
{
|
||||
if (child.name.IndexOf("light", StringComparison.OrdinalIgnoreCase) >= 0)
|
||||
child.gameObject.SetActive(true);
|
||||
StageObjectMap.Add(objectName, child.gameObject);
|
||||
StageParentMap.Add(objectName, child.parent);
|
||||
}
|
||||
|
||||
int objectHash = FNVHash.Generate(objectName);
|
||||
if (!_objectsWorkInfoDictionary.TryGetValue(objectHash, out var works))
|
||||
{
|
||||
works = new List<StageObjectWorkInfo>();
|
||||
_objectsWorkInfoDictionary.Add(objectHash, works);
|
||||
}
|
||||
works.Add(new StageObjectWorkInfo
|
||||
{
|
||||
transform = child,
|
||||
originalParent = child.parent,
|
||||
startTransform = new TransformBaseData
|
||||
{
|
||||
position = child.localPosition,
|
||||
rotation = child.localRotation,
|
||||
scale = child.localScale
|
||||
},
|
||||
renderers = child.GetComponents<Renderer>()
|
||||
});
|
||||
if (child.name.IndexOf("light", StringComparison.OrdinalIgnoreCase) >= 0 &&
|
||||
!StageObjectMap.ContainsKey(child.name.Replace("(Clone)", "")))
|
||||
child.gameObject.SetActive(true);
|
||||
RegisterObjectTransform(child, string.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1214,6 +1436,67 @@ namespace Gallop.Live
|
||||
washBeams.Initialize();
|
||||
}
|
||||
|
||||
internal void RegisterObjectTransform(Transform child, string nameSuffixToken)
|
||||
{
|
||||
string objectName = child.name.Replace("(Clone)", "") + nameSuffixToken;
|
||||
if (!StageObjectMap.ContainsKey(objectName))
|
||||
{
|
||||
StageObjectMap.Add(objectName, child.gameObject);
|
||||
StageParentMap.Add(objectName, child.parent);
|
||||
}
|
||||
int objectHash = FNVHash.Generate(objectName);
|
||||
if (!_objectsWorkInfoDictionary.TryGetValue(objectHash, out var works))
|
||||
{
|
||||
works = new List<StageObjectWorkInfo>();
|
||||
_objectsWorkInfoDictionary.Add(objectHash, works);
|
||||
}
|
||||
var renderers = child.GetComponents<Renderer>();
|
||||
for (int i = 0; i < renderers.Length; i++) CacheBgColor1Renderer(renderers[i]);
|
||||
works.Add(new StageObjectWorkInfo
|
||||
{
|
||||
transform = child,
|
||||
originalParent = child.parent,
|
||||
startTransform = new TransformBaseData
|
||||
{
|
||||
position = child.localPosition,
|
||||
rotation = child.localRotation,
|
||||
scale = child.localScale
|
||||
},
|
||||
renderers = renderers
|
||||
});
|
||||
}
|
||||
|
||||
internal void UnregisterObjectTransform(Transform child, string nameSuffixToken)
|
||||
{
|
||||
string objectName = child.name.Replace("(Clone)", "") + nameSuffixToken;
|
||||
int hash = FNVHash.Generate(objectName);
|
||||
if (!_objectsWorkInfoDictionary.TryGetValue(hash, out var works)) return;
|
||||
for (int i = works.Count - 1; i >= 0; i--)
|
||||
{
|
||||
if (works[i].transform != child) continue;
|
||||
foreach (var renderer in works[i].renderers)
|
||||
{
|
||||
_bgColor1RendererProperties.Remove(renderer);
|
||||
_ambientColorRenderers.Remove(renderer);
|
||||
}
|
||||
works.RemoveAt(i);
|
||||
}
|
||||
if (works.Count == 0) _objectsWorkInfoDictionary.Remove(hash);
|
||||
if (StageObjectMap.TryGetValue(objectName, out var mapped) && mapped == child.gameObject)
|
||||
{
|
||||
if (works.Count > 0)
|
||||
{
|
||||
StageObjectMap[objectName] = works[0].transform.gameObject;
|
||||
StageParentMap[objectName] = works[0].originalParent;
|
||||
}
|
||||
else
|
||||
{
|
||||
StageObjectMap.Remove(objectName);
|
||||
StageParentMap.Remove(objectName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private StageObjectUnit FindStageObjectUnit(int hash)
|
||||
{
|
||||
if (_stageObjectUnits == null) return null;
|
||||
@@ -1594,19 +1877,7 @@ namespace Gallop.Live
|
||||
if (r == null) continue;
|
||||
_allStageRenderers.Add(r);
|
||||
IndexRendererSharedMaterials(r);
|
||||
int stageColorProperties = 0;
|
||||
bool hasAmbient = false;
|
||||
var materials = r.sharedMaterials;
|
||||
for (int m = 0; m < materials.Length; m++)
|
||||
{
|
||||
var material = materials[m];
|
||||
if (material == null) continue;
|
||||
if (material.HasProperty(BgColor1MulColor0Id)) stageColorProperties |= 1;
|
||||
if (material.HasProperty(BgColor1ColorPowerId)) stageColorProperties |= 2;
|
||||
if (material.HasProperty(BgColor1AmbientColorId)) hasAmbient = true;
|
||||
}
|
||||
if (stageColorProperties != 0) _bgColor1RendererProperties.Add(r, stageColorProperties);
|
||||
if (hasAmbient) _ambientColorRenderers.Add(r);
|
||||
CacheBgColor1Renderer(r);
|
||||
|
||||
if (RendererHasAnyBgColorProps(r))
|
||||
_bgColorAllEligibleRenderers.Add(r);
|
||||
@@ -1620,6 +1891,23 @@ namespace Gallop.Live
|
||||
}
|
||||
}
|
||||
|
||||
private void CacheBgColor1Renderer(Renderer r)
|
||||
{
|
||||
int stageColorProperties = 0;
|
||||
bool hasAmbient = false;
|
||||
var materials = r.sharedMaterials;
|
||||
for (int m = 0; m < materials.Length; m++)
|
||||
{
|
||||
var material = materials[m];
|
||||
if (material == null) continue;
|
||||
if (material.HasProperty(BgColor1MulColor0Id)) stageColorProperties |= 1;
|
||||
if (material.HasProperty(BgColor1ColorPowerId)) stageColorProperties |= 2;
|
||||
if (material.HasProperty(BgColor1AmbientColorId)) hasAmbient = true;
|
||||
}
|
||||
if (stageColorProperties != 0) _bgColor1RendererProperties[r] = stageColorProperties;
|
||||
if (hasAmbient && !_ambientColorRenderers.Contains(r)) _ambientColorRenderers.Add(r);
|
||||
}
|
||||
|
||||
private void IndexRendererSharedMaterials(Renderer r)
|
||||
{
|
||||
var mats = r.sharedMaterials;
|
||||
|
||||
@@ -30,6 +30,16 @@ namespace Gallop.RenderPipeline
|
||||
_parameter = new PostImageEffectFeature.Parameter();
|
||||
}
|
||||
|
||||
public void UpdateImageEffectParameter()
|
||||
{
|
||||
// Native RVA 0x1a0da30; recomputed again before each render.
|
||||
ref var dof = ref Parameter.DofDiffuionBloomOverlay;
|
||||
dof.IsDisableDofTemporary = dof.IsEnableDofAutoDisable &&
|
||||
dof.DofFocalSize >= dof.DofMaxFocalSize;
|
||||
dof.DecideDrawType(dof.IsEnableDof && !dof.IsDisableDofTemporary &&
|
||||
GallopImageEffect.UserDofEnabled);
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Initialize(false);
|
||||
|
||||
@@ -59,8 +59,8 @@ namespace Gallop.RenderPipeline
|
||||
set => _enableRendering = value;
|
||||
}
|
||||
|
||||
// Shared live state. Director updates this object from the timeline;
|
||||
// each camera's CameraData points at the same state before Setup runs.
|
||||
// Active-camera publication alias, not storage shared by every camera.
|
||||
// GallopImageEffect / MultiCamera retain their own CameraData parameters.
|
||||
private static Parameter _runtimeParameter = new Parameter();
|
||||
|
||||
public static Parameter RuntimeParameter
|
||||
@@ -71,6 +71,7 @@ namespace Gallop.RenderPipeline
|
||||
_runtimeParameter = new Parameter();
|
||||
return _runtimeParameter;
|
||||
}
|
||||
internal set => _runtimeParameter = value;
|
||||
}
|
||||
|
||||
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
|
||||
@@ -220,12 +221,14 @@ namespace Gallop.RenderPipeline
|
||||
if (!camera.TryGetComponent(out cameraData))
|
||||
cameraData = camera.gameObject.AddComponent<CameraData>();
|
||||
|
||||
// The recovered feature expects CameraData.Parameter. Keep it
|
||||
// bound to the timeline-owned object and refresh the active camera
|
||||
// every frame because CameraSwitcher can replace it.
|
||||
var cameraParameter = multiCamera != null ? multiCamera.PostEffectParameter : RuntimeParameter;
|
||||
// Bind this camera's owned state before deciding draw type.
|
||||
// Live auto-disable must never leak through the active-camera alias.
|
||||
var imageEffect = camera.GetComponent<GallopImageEffect>();
|
||||
var cameraParameter = multiCamera != null ? multiCamera.PostEffectParameter
|
||||
: imageEffect != null ? imageEffect.RenderParameter : RuntimeParameter;
|
||||
cameraData.Parameter = cameraParameter;
|
||||
cameraParameter.TargetCamera = camera;
|
||||
cameraData.UpdateImageEffectParameter();
|
||||
|
||||
Parameter parameter = ResolveFeatureParameter(cameraData);
|
||||
if (parameter == null)
|
||||
|
||||
@@ -16,16 +16,21 @@ namespace Gallop.RenderPipeline
|
||||
public Vector3 InitialPosition;
|
||||
public int NameHash;
|
||||
public Material Material;
|
||||
public MeshRenderer Renderer;
|
||||
public bool HasColorPower, HasMulColor0;
|
||||
public Color ColorFactor = Color.white;
|
||||
public float BrightnessFactor = 1f;
|
||||
public bool AutoBrightness = true;
|
||||
public bool ScreenFit;
|
||||
public bool HasBlinkColor;
|
||||
public Color BlinkColor;
|
||||
}
|
||||
|
||||
private readonly Dictionary<int, List<Target>> _groups = new Dictionary<int, List<Target>>();
|
||||
private readonly List<Target> _targets = new List<Target>();
|
||||
private readonly Dictionary<CustomLensFlare, Target> _bySource = new Dictionary<CustomLensFlare, Target>();
|
||||
private readonly Plane[] _frustumPlanes = new Plane[6];
|
||||
private readonly MaterialPropertyBlock _lightProperties = new MaterialPropertyBlock();
|
||||
private readonly float _standard;
|
||||
private readonly float _under;
|
||||
private readonly int _colorPowerId;
|
||||
@@ -38,6 +43,11 @@ namespace Gallop.RenderPipeline
|
||||
_under = under;
|
||||
_colorPowerId = ShaderManager.GetPropertyId(ShaderManager.PropertyId._ColorPower);
|
||||
_mulColor0Id = ShaderManager.GetPropertyId(ShaderManager.PropertyId._MulColor0);
|
||||
AddSources(root, nameSuffixToken);
|
||||
}
|
||||
|
||||
public void AddSources(Transform root, string nameSuffixToken)
|
||||
{
|
||||
if (root == null) return;
|
||||
foreach (var flare in root.GetComponentsInChildren<CustomLensFlare>(true))
|
||||
{
|
||||
@@ -52,10 +62,12 @@ namespace Gallop.RenderPipeline
|
||||
InitialPosition = sourceTransform.localPosition,
|
||||
NameHash = FNVHash.Generate(flare.name + nameSuffixToken),
|
||||
Material = material,
|
||||
Renderer = renderer,
|
||||
HasColorPower = material != null && material.HasProperty(_colorPowerId),
|
||||
HasMulColor0 = material != null && material.HasProperty(_mulColor0Id)
|
||||
};
|
||||
_targets.Add(target);
|
||||
_bySource.Add(flare, target);
|
||||
if (sourceTransform.parent == null) continue;
|
||||
// Native strips every literal Clone token from the parent only.
|
||||
int parentHash = FNVHash.Generate(sourceTransform.parent.name.Replace("(Clone)", string.Empty) + nameSuffixToken);
|
||||
@@ -68,6 +80,34 @@ namespace Gallop.RenderPipeline
|
||||
}
|
||||
}
|
||||
|
||||
public void RemoveSources(Transform root, string nameSuffixToken)
|
||||
{
|
||||
for (int i = _targets.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var target = _targets[i];
|
||||
if (target.Transform == null || !target.Transform.IsChildOf(root)) continue;
|
||||
var parent = target.Transform.parent;
|
||||
if (parent != null)
|
||||
{
|
||||
int hash = FNVHash.Generate(parent.name.Replace("(Clone)", string.Empty) + nameSuffixToken);
|
||||
if (_groups.TryGetValue(hash, out var group))
|
||||
{
|
||||
group.Remove(target);
|
||||
if (group.Count == 0) _groups.Remove(hash);
|
||||
}
|
||||
}
|
||||
_targets.RemoveAt(i);
|
||||
_bySource.Remove(target.Flare);
|
||||
}
|
||||
}
|
||||
|
||||
internal void SetBlinkColor(CustomLensFlare flare, Color color)
|
||||
{
|
||||
if (flare == null || !_bySource.TryGetValue(flare, out var target)) return;
|
||||
target.HasBlinkColor = true;
|
||||
target.BlinkColor = color;
|
||||
}
|
||||
|
||||
public void Apply(ref LensFlareUpdateInfo info)
|
||||
{
|
||||
if (_groups.TryGetValue(info.TimelineNameHash, out var group))
|
||||
@@ -110,8 +150,23 @@ namespace Gallop.RenderPipeline
|
||||
Color color = target.ColorFactor;
|
||||
if (target.Material != null)
|
||||
{
|
||||
Color materialColor = target.HasMulColor0 ? target.Material.GetColor(_mulColor0Id) : Color.white;
|
||||
float colorPower = target.HasColorPower ? target.Material.GetFloat(_colorPowerId) : 1f;
|
||||
// Stage lighting uses property blocks instead of changing the material.
|
||||
// Read the same first-slot values that the authored source mesh draws.
|
||||
_lightProperties.Clear();
|
||||
if (target.Renderer != null)
|
||||
{
|
||||
target.Renderer.GetPropertyBlock(_lightProperties, 0);
|
||||
if (_lightProperties.isEmpty)
|
||||
target.Renderer.GetPropertyBlock(_lightProperties);
|
||||
}
|
||||
Color materialColor = target.HasBlinkColor ? target.BlinkColor : target.HasMulColor0
|
||||
? _lightProperties.HasColor(_mulColor0Id)
|
||||
? _lightProperties.GetColor(_mulColor0Id) : target.Material.GetColor(_mulColor0Id)
|
||||
: Color.white;
|
||||
float colorPower = target.HasColorPower
|
||||
? _lightProperties.HasFloat(_colorPowerId)
|
||||
? _lightProperties.GetFloat(_colorPowerId) : target.Material.GetFloat(_colorPowerId)
|
||||
: 1f;
|
||||
color *= materialColor * (colorPower * 2f);
|
||||
}
|
||||
bool visibleColor = color.r > 0.000001f || color.g > 0.000001f || color.b > 0.000001f;
|
||||
|
||||
Reference in New Issue
Block a user