3 Commits

Author SHA1 Message Date
MrUnknownDE 689ceca124 add AudioLink BPM Detector 2026-04-11 10:44:03 +02:00
MrUnknownDE 185f1cc96a remove sync project ^^ 2026-04-10 22:08:08 +02:00
MrUnknownDE 32a428502d add audio source fade 2026-04-10 22:05:33 +02:00
4 changed files with 210 additions and 220 deletions
+64
View File
@@ -0,0 +1,64 @@
using UdonSharp;
using UnityEngine;
using AudioLink;
public class AudioLinkBeatDetector : UdonSharpBehaviour
{
public AudioLink.AudioLink audioLinkInstance;
[Header("Settings")]
[Range(0, 1)] public float threshold = 0.5f;
public float minBpm = 70f;
public float maxBpm = 210f; // Alles darüber wird als Fehler ignoriert
[Header("Output")]
public float bpm = 128f;
public float instantBpm = 128f;
public bool isBeat;
private float lastBeatTime;
void Update()
{
if (audioLinkInstance == null || !audioLinkInstance.AudioDataIsAvailable()) return;
Vector2 bassPos = AudioLink.AudioLink.GetALPassAudioBass();
Vector4 data = audioLinkInstance.GetDataAtPixel((int)bassPos.x, (int)bassPos.y);
float currentLevel = data.x;
// Prüfen auf Threshold
if (currentLevel > threshold)
{
float currentTime = Time.time;
float timeDiff = currentTime - lastBeatTime;
// Der "Debounce" Check:
// 0.27s entspricht ca. 222 BPM. Alles was schneller kommt, ist Rauschen.
if (timeDiff > 0.27f)
{
if (lastBeatTime > 0)
{
float detected = 60f / timeDiff;
// Nur plausible Werte übernehmen
if (detected >= minBpm && detected <= maxBpm)
{
instantBpm = detected;
// Glättung: 0.5 sorgt für schnelles Folgen, aber filtert Ausreißer
bpm = Mathf.Lerp(bpm, instantBpm, 0.5f);
}
}
lastBeatTime = currentTime;
isBeat = true;
}
else
{
isBeat = false;
}
}
else
{
isBeat = false;
}
}
}
+43
View File
@@ -0,0 +1,43 @@
using UdonSharp;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
public class BeatDetectorDisplay : UdonSharpBehaviour
{
public AudioLinkBeatDetector engine;
public TextMeshProUGUI bpmText;
public Image beatIndicator;
public Color activeColor = Color.cyan;
private float flashTimer;
void Update()
{
if (engine == null) return;
// Wenn die Engine einen Beat erkennt...
if (engine.isBeat)
{
// ...aktualisieren wir SOFORT den Text mit der instantBpm
if (bpmText != null)
{
bpmText.text = engine.instantBpm.ToString("F0"); // "F0" für ganze Zahlen ohne Lag-Gefühl
}
// Visueller Kick
flashTimer = 0.1f;
if (beatIndicator != null) beatIndicator.color = activeColor;
}
// Timer für das Abklingen der LED
if (flashTimer > 0)
{
flashTimer -= Time.deltaTime;
if (flashTimer <= 0 && beatIndicator != null)
{
beatIndicator.color = new Color(0.1f, 0.1f, 0.1f, 1f);
}
}
}
}
-218
View File
@@ -1,218 +0,0 @@
using UnityEditor;
using UnityEngine;
using System;
using System.Text;
using System.Threading;
using System.Net.WebSockets;
using System.Threading.Tasks;
public class LiveSyncPanel : EditorWindow
{
private string wsUrl = "ws://localhost:8080";
private static ClientWebSocket ws;
private static bool isConnected = false;
private static CancellationTokenSource cts;
private Transform lastSelected;
private bool isNetworkApplying = false;
[Serializable]
private class SyncMessage
{
public string type;
public string objectName;
public Vector3 position;
public Vector3 eulerAngles;
public Vector3 localScale;
}
[MenuItem("Tools/MrUnknownDE/Live Sync Bridge")]
public static void ShowWindow()
{
GetWindow<LiveSyncPanel>("Live Sync Bridge").minSize = new Vector2(320, 350);
}
private void OnEnable()
{
wsUrl = EditorPrefs.GetString("LiveSync_WS_URL", "ws://localhost:8080");
EditorApplication.update += EditorUpdate;
Selection.selectionChanged += OnSelectionChanged;
}
private void OnDisable()
{
EditorApplication.update -= EditorUpdate;
Selection.selectionChanged -= OnSelectionChanged;
}
private void OnGUI()
{
GUILayout.Space(5);
// --- 🚧 DICK & FETT: WIP WARNING 🚧 ---
EditorGUILayout.HelpBox(
"🚧 WORK IN PROGRESS 🚧\n\n" +
"This feature is highly experimental and in active development!\n" +
"Expect bugs, network desyncs, or unexpected behavior.\n\n" +
"ALWAYS backup your project before starting a Live Session!",
MessageType.Warning);
GUILayout.Space(10);
GUILayout.Label("REAL-TIME MULTI-USER SYNC", EditorStyles.boldLabel);
GUILayout.Space(10);
EditorGUI.BeginChangeCheck();
wsUrl = EditorGUILayout.TextField("WebSocket Server:", wsUrl);
if (EditorGUI.EndChangeCheck())
{
EditorPrefs.SetString("LiveSync_WS_URL", wsUrl);
}
GUILayout.Space(15);
if (!isConnected)
{
GUI.backgroundColor = new Color(0.2f, 0.6f, 0.2f);
if (GUILayout.Button("🔌 Connect Session", GUILayout.Height(40))) Connect();
}
else
{
GUI.backgroundColor = new Color(0.8f, 0.3f, 0.3f);
if (GUILayout.Button("🛑 Disconnect", GUILayout.Height(40))) Disconnect();
GUILayout.Space(15);
EditorGUILayout.HelpBox("🟢 Connected!\nTransforms are tracked in real-time.\nListening for Git updates...", MessageType.Info);
}
GUI.backgroundColor = Color.white;
}
private async void Connect()
{
if (ws != null && ws.State == WebSocketState.Open) return;
ws = new ClientWebSocket();
cts = new CancellationTokenSource();
try
{
await ws.ConnectAsync(new Uri(wsUrl), cts.Token);
isConnected = true;
UnityEngine.Debug.Log("Live Sync: Connected to Server!");
_ = ReceiveLoop();
}
catch (Exception e)
{
UnityEngine.Debug.LogError("Live Sync: Connection failed. Is the server running? " + e.Message);
}
}
private async void Disconnect()
{
if (ws != null)
{
cts?.Cancel();
if (ws.State == WebSocketState.Open) await ws.CloseAsync(WebSocketCloseStatus.NormalClosure, "Client disconnecting", CancellationToken.None);
ws.Dispose();
}
isConnected = false;
UnityEngine.Debug.Log("Live Sync: Disconnected.");
}
private void EditorUpdate()
{
if (!isConnected || isNetworkApplying) return;
if (lastSelected != null && lastSelected.hasChanged)
{
SyncMessage msg = new SyncMessage
{
type = "TRANSFORM",
objectName = lastSelected.name,
position = lastSelected.position,
eulerAngles = lastSelected.eulerAngles,
localScale = lastSelected.localScale
};
SendMessage(JsonUtility.ToJson(msg));
lastSelected.hasChanged = false;
}
}
private void OnSelectionChanged()
{
if (Selection.activeTransform != null)
{
lastSelected = Selection.activeTransform;
lastSelected.hasChanged = false;
}
}
public static void BroadcastGitUpdate()
{
if (!isConnected || ws == null || ws.State != WebSocketState.Open) return;
SyncMessage msg = new SyncMessage { type = "GIT_PULL" };
SendMessage(JsonUtility.ToJson(msg));
UnityEngine.Debug.Log("Live Sync: Broadcasted Git Update signal to team.");
}
private static async void SendMessage(string json)
{
if (ws == null || ws.State != WebSocketState.Open) return;
byte[] bytes = Encoding.UTF8.GetBytes(json);
await ws.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, cts.Token);
}
private async Task ReceiveLoop()
{
byte[] buffer = new byte[2048];
while (ws.State == WebSocketState.Open)
{
try
{
var result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), cts.Token);
if (result.MessageType == WebSocketMessageType.Text)
{
string json = Encoding.UTF8.GetString(buffer, 0, result.Count);
EditorApplication.delayCall += () => ProcessIncoming(json);
}
}
catch { break; }
}
isConnected = false;
}
private void ProcessIncoming(string json)
{
try
{
SyncMessage msg = JsonUtility.FromJson<SyncMessage>(json);
if (msg.type == "TRANSFORM")
{
GameObject target = GameObject.Find(msg.objectName);
if (target != null)
{
isNetworkApplying = true;
target.transform.position = msg.position;
target.transform.eulerAngles = msg.eulerAngles;
target.transform.localScale = msg.localScale;
target.transform.hasChanged = false;
isNetworkApplying = false;
}
}
else if (msg.type == "GIT_PULL")
{
UnityEngine.Debug.LogWarning("Live Sync: Teammate pushed new files! Starting auto-pull...");
GitPanel.RunGitCommand("pull --rebase origin HEAD");
AssetDatabase.Refresh();
UnityEngine.Debug.Log("Live Sync: Auto-pull complete. Files updated.");
}
}
catch (Exception e)
{
UnityEngine.Debug.LogWarning("Live Sync: Failed to parse incoming message. " + e.Message);
}
}
}
+103 -2
View File
@@ -19,12 +19,35 @@ public class ProTVRoomZone : UdonSharpBehaviour
{
[Header("Der Videoplayer für diesen Raum")]
public GameObject localVideoPlayer;
[Space(10)]
[Header("Fade Settings")]
[Tooltip("Wie lange soll das Ein-/Ausblenden in Sekunden dauern?")]
public float fadeDuration = 1.5f;
[Tooltip("Ziehe hier die AudioSources des ProTVs rein - damit die Lautstärke smooth gefadet wird.")]
public AudioSource[] audioSources;
private BoxCollider roomCollider;
private float fadeProgress = 0f;
private int fadeState = 0;
// Hier speichern wir die echte Lautstärke, bevor sie verfälscht wird
private float[] savedVolumes;
void Start()
{
roomCollider = GetComponent<BoxCollider>();
// Arrays initialisieren und Basis-Lautstärke beim Start sichern
if (audioSources != null && audioSources.Length > 0)
{
savedVolumes = new float[audioSources.Length];
for (int i = 0; i < audioSources.Length; i++)
{
if (audioSources[i] != null) savedVolumes[i] = audioSources[i].volume;
}
}
SendCustomEventDelayedSeconds(nameof(CheckSpawnPosition), 2.0f);
}
@@ -32,13 +55,18 @@ public class ProTVRoomZone : UdonSharpBehaviour
{
VRCPlayerApi player = Networking.LocalPlayer;
if (!Utilities.IsValid(player)) return;
if (roomCollider != null && roomCollider.bounds.Contains(player.GetPosition()))
{
if (localVideoPlayer != null) localVideoPlayer.SetActive(true);
fadeProgress = 1f;
}
else
{
UpdateSavedVolumes();
if (localVideoPlayer != null) localVideoPlayer.SetActive(false);
fadeProgress = 0f;
}
}
@@ -46,11 +74,84 @@ public class ProTVRoomZone : UdonSharpBehaviour
{
if (!Utilities.IsValid(player) || !player.isLocal) return;
if (localVideoPlayer != null) localVideoPlayer.SetActive(true);
fadeProgress = 0f;
fadeState = 1;
}
public override void OnPlayerTriggerExit(VRCPlayerApi player)
{
if (!Utilities.IsValid(player) || !player.isLocal) return;
if (localVideoPlayer != null) localVideoPlayer.SetActive(false);
UpdateSavedVolumes();
fadeProgress = 1f;
fadeState = -1; // Starte Fade Out
}
void Update()
{
if (fadeState == 0) return;
if (fadeState == 1) // FADE IN
{
fadeProgress += Time.deltaTime / fadeDuration;
if (fadeProgress >= 1f)
{
fadeProgress = 1f;
fadeState = 0;
}
ApplyFadedVolume();
}
else if (fadeState == -1) // FADE OUT
{
fadeProgress -= Time.deltaTime / fadeDuration;
if (fadeProgress <= 0f)
{
fadeProgress = 0f;
fadeState = 0;
// DER PRO-TV FIX:
RestoreOriginalVolume();
if (localVideoPlayer != null) localVideoPlayer.SetActive(false);
}
else
{
ApplyFadedVolume();
}
}
}
private void UpdateSavedVolumes()
{
if (audioSources == null) return;
for (int i = 0; i < audioSources.Length; i++)
{
if (audioSources[i] != null && audioSources[i].volume > 0.05f)
{
savedVolumes[i] = audioSources[i].volume;
}
}
}
private void ApplyFadedVolume()
{
if (audioSources == null || savedVolumes == null) return;
for (int i = 0; i < audioSources.Length; i++)
{
if (audioSources[i] != null)
{
audioSources[i].volume = savedVolumes[i] * fadeProgress;
}
}
}
private void RestoreOriginalVolume()
{
if (audioSources == null || savedVolumes == null) return;
for (int i = 0; i < audioSources.Length; i++)
{
if (audioSources[i] != null)
{
audioSources[i].volume = savedVolumes[i];
}
}
}
}