feat: SongCreator 씬 완성 — Beat Sage URL 지원, info.dat 메타데이터 자동 추출
- BeatSageUploader: audio_url 지원(UploadFromUrl), PollAndDownload 공통화, ZIP 500 오류 3회 재시도 - BeatSageConverter: info.dat 파싱(SongMetadata), BPM 자동 감지 → 노트 타이밍 변환에 적용 - SongCreatorManager: title/BPM 필수 입력 제거, 난이도 4개 자동 선택, GenerateFlowFromUrl 버그 수정 - NasPublisher: audioPath null 허용(URL 흐름에서 로컬 파일 없는 경우 스킵) - .gitignore/.gitattributes 초기 설정 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 68aa9e14dd028c748a612675dd98d63c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e8ae55ed26ad3cd4aa229ed752b4f8f8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a3ec821b0dfed9a459b982b4d184143b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEditor.SceneManagement;
|
||||
|
||||
|
||||
namespace VRSDK.EditorCode
|
||||
{
|
||||
[CustomEditor(typeof(HandVisualizerTool))]
|
||||
public class I_HandVisualizerTool : Editor
|
||||
{
|
||||
private static VR_Controller activeController = null;
|
||||
private VR_Grabbable grabbableClone = null;
|
||||
private VR_Grabbable grabbable = null;
|
||||
|
||||
private HandVisualizerTool targetScript = null;
|
||||
|
||||
private static string returnScenePath = null;
|
||||
private static Scene returnScene;
|
||||
private static bool inPreviewMode = false;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
/*
|
||||
targetScript = (HandVisualizerTool)target;
|
||||
|
||||
if (activeController == null || grabbableClone == null)
|
||||
{
|
||||
grabbable = targetScript.GetComponent<VR_Grabbable>();
|
||||
grabbableClone = Instantiate( grabbable, grabbable.transform.position, grabbable.transform.rotation );
|
||||
DestroyImmediate(grabbableClone.GetComponent<HandVisualizerTool>());
|
||||
activeController = Instantiate( VR_Manager.instance.RightController, grabbable.RightInteractPoint.position, Quaternion.identity );
|
||||
|
||||
//try this
|
||||
//EditorSceneManager.NewPreviewScene();
|
||||
EditorSceneManager.MoveGameObjectToScene()
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
|
||||
public override void OnInspectorGUI()
|
||||
{
|
||||
base.OnInspectorGUI();
|
||||
|
||||
if (!HandPreviewManager.IsPreviewModeEnable)
|
||||
{
|
||||
if (GUILayout.Button( "Enter Preview Mode Right Hand" ))
|
||||
{
|
||||
EnterPreviewMode(VR_Manager.instance.Player.RightController);
|
||||
}
|
||||
|
||||
if (GUILayout.Button( "Enter Preview Mode Left Hand" ))
|
||||
{
|
||||
EnterPreviewMode( VR_Manager.instance.Player.LeftController );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GUILayout.Button( "Save and Exit Preview Mode" ))
|
||||
{
|
||||
HandPreviewManager.SaveAndExit();
|
||||
}
|
||||
|
||||
if (GUILayout.Button( "Exit Preview Mode" ))
|
||||
{
|
||||
HandPreviewManager.ExitPreviewMode();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void EnterPreviewMode(VR_Controller controller)
|
||||
{
|
||||
targetScript = (HandVisualizerTool) target;
|
||||
|
||||
grabbable = targetScript.GetComponent<VR_Grabbable>();
|
||||
grabbable.gameObject.AddComponent<GameObjectMarker>();
|
||||
EditorSceneManager.MarkAllScenesDirty();
|
||||
EditorSceneManager.SaveOpenScenes();
|
||||
|
||||
grabbableClone = Instantiate( grabbable , grabbable.transform.position, grabbable.transform.rotation );
|
||||
activeController = Instantiate( controller , grabbable.RightInteractPoint.position , Quaternion.identity );
|
||||
|
||||
grabbableClone.SetEditorGrabPositionAndRotation( activeController );
|
||||
|
||||
|
||||
|
||||
|
||||
HandPreviewManager.EnterPreviewMode(grabbableClone.transform.root.gameObject);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa1e7be944d512d4f8e363a91d654dac
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 168243
|
||||
packageName: VR Beats Kit
|
||||
packageVersion: 2.0
|
||||
assetPath: Assets/VRBeatsKit/Modules/VRSDK/Experimental/Tools/HandVisualizer/Editor/I_HandVisualizerTool.cs
|
||||
uploadId: 546658
|
||||
@@ -0,0 +1,16 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class GameObjectMarker : MonoBehaviour {
|
||||
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update () {
|
||||
|
||||
}
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3b4724e1bc367a34eac6a65d01a79251
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 168243
|
||||
packageName: VR Beats Kit
|
||||
packageVersion: 2.0
|
||||
assetPath: Assets/VRBeatsKit/Modules/VRSDK/Experimental/Tools/HandVisualizer/GameObjectMarker.cs
|
||||
uploadId: 546658
|
||||
+134
@@ -0,0 +1,134 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
using UnityEditor.SceneManagement;
|
||||
using UnityEditor;
|
||||
#endif
|
||||
|
||||
namespace VRSDK.EditorCode
|
||||
{
|
||||
public static class HandPreviewManager
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
private static string originalScenePath = null;
|
||||
private static bool previewModeEnable = false;
|
||||
private static VR_Grabbable inspectedGrabbable = null;
|
||||
private static VR_Controller activeController = null;
|
||||
private static HandPreviewSave handPreviewSave = null;
|
||||
|
||||
|
||||
public static bool IsPreviewModeEnable { get { return previewModeEnable; } }
|
||||
|
||||
public static void EnterPreviewMode(GameObject clone)
|
||||
{
|
||||
|
||||
Scene originalScene = EditorSceneManager.GetActiveScene();
|
||||
originalScenePath = EditorApplication.currentScene;
|
||||
|
||||
Scene previewScene = EditorSceneManager.NewScene( NewSceneSetup.DefaultGameObjects, NewSceneMode.Additive );
|
||||
EditorSceneManager.MoveGameObjectToScene( clone, previewScene );
|
||||
|
||||
EditorSceneManager.UnloadSceneAsync( originalScene );
|
||||
previewModeEnable = true;
|
||||
inspectedGrabbable = GameObject.FindObjectOfType<VR_Grabbable>();
|
||||
activeController = GameObject.FindObjectOfType<VR_Controller>();
|
||||
|
||||
OverrideGrabAnimation();
|
||||
|
||||
activeController.Animator.SetBool("IsGrabbing" , true);
|
||||
|
||||
EditorApplication.update += Update;
|
||||
|
||||
}
|
||||
|
||||
public static void ExitPreviewMode()
|
||||
{
|
||||
previewModeEnable = false;
|
||||
EditorSceneManager.OpenScene(originalScenePath);
|
||||
EditorApplication.update -= Update;
|
||||
}
|
||||
|
||||
public static void SaveAndExit()
|
||||
{
|
||||
handPreviewSave = new HandPreviewSave( inspectedGrabbable );
|
||||
ExitPreviewMode();
|
||||
GameObjectMarker marker = GameObject.FindObjectOfType<GameObjectMarker>();
|
||||
handPreviewSave.LoadInto(marker.GetComponent<VR_Grabbable>());
|
||||
GameObject.DestroyImmediate(marker);
|
||||
}
|
||||
|
||||
private static void Update()
|
||||
{
|
||||
activeController.Animator.Update(1.0f/30.0f);
|
||||
inspectedGrabbable.SetEditorGrabPositionAndRotation(activeController);
|
||||
|
||||
OverrideGrabAnimation();
|
||||
}
|
||||
|
||||
private static void OverrideGrabAnimation()
|
||||
{
|
||||
VR_HandInteractSettings settings = inspectedGrabbable.GetHandInteractionSettings( activeController );
|
||||
//AnimationClip clip = settings.animation;
|
||||
|
||||
//activeController.OverrideInteractAnimation( settings.animation );
|
||||
}
|
||||
}
|
||||
|
||||
public class HandPreviewSave
|
||||
{
|
||||
public VR_HandInteractSettings handSettings = null;
|
||||
public VR_HandInteractSettings leftSettings = null;
|
||||
public VR_HandInteractSettings rightSettings = null;
|
||||
public Vector3 handSettingsInteractPointLocalPosition = Vector3.zero;
|
||||
public Vector3 rightHandSettingsInteractPointLocalPosition = Vector3.zero;
|
||||
public Vector3 leftHandSettingsInteractPointLocalPosition = Vector3.zero;
|
||||
|
||||
public HandPreviewSave(VR_Grabbable grabbable)
|
||||
{
|
||||
handSettings = grabbable.HandSettings;
|
||||
leftSettings = grabbable.LeftHandSettings;
|
||||
rightSettings = grabbable.RightHandSettings;
|
||||
|
||||
handSettingsInteractPointLocalPosition = handSettings.interactPoint.localPosition;
|
||||
leftHandSettingsInteractPointLocalPosition = leftSettings.interactPoint.localPosition;
|
||||
rightHandSettingsInteractPointLocalPosition = rightSettings.interactPoint.localPosition;
|
||||
}
|
||||
|
||||
public void LoadInto(VR_Grabbable grabbable)
|
||||
{
|
||||
CopyTo(handSettings , grabbable.HandSettings);
|
||||
CopyTo(rightSettings , grabbable.RightHandSettings);
|
||||
CopyTo(leftSettings , grabbable.LeftHandSettings);
|
||||
|
||||
if (grabbable.HandSettings.interactPoint != null)
|
||||
{
|
||||
Debug.Log( grabbable.HandSettings.interactPoint.localPosition );
|
||||
Debug.Log( handSettingsInteractPointLocalPosition );
|
||||
grabbable.HandSettings.interactPoint.localPosition = handSettingsInteractPointLocalPosition;
|
||||
}
|
||||
|
||||
|
||||
if (grabbable.LeftHandSettings.interactPoint != null)
|
||||
grabbable.LeftHandSettings.interactPoint.localPosition = leftHandSettingsInteractPointLocalPosition;
|
||||
|
||||
if (grabbable.RightHandSettings.interactPoint != null)
|
||||
grabbable.RightHandSettings.interactPoint.localPosition = rightHandSettingsInteractPointLocalPosition;
|
||||
|
||||
}
|
||||
|
||||
private void CopyTo(VR_HandInteractSettings from , VR_HandInteractSettings to)
|
||||
{
|
||||
//to.animation = from.animation;
|
||||
to.canInteract = from.canInteract;
|
||||
to.rotationOffset = from.rotationOffset;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cc8c956f7ac50bb48a414e7ed997168d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 168243
|
||||
packageName: VR Beats Kit
|
||||
packageVersion: 2.0
|
||||
assetPath: Assets/VRBeatsKit/Modules/VRSDK/Experimental/Tools/HandVisualizer/HandPreviewManager.cs
|
||||
uploadId: 546658
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace VRSDK
|
||||
{
|
||||
public class HandVisualizerTool : MonoBehaviour
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7b64809843e26e54bab447966e86bd4e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 168243
|
||||
packageName: VR Beats Kit
|
||||
packageVersion: 2.0
|
||||
assetPath: Assets/VRBeatsKit/Modules/VRSDK/Experimental/Tools/HandVisualizer/HandVisualizerTool.cs
|
||||
uploadId: 546658
|
||||
@@ -0,0 +1,36 @@
|
||||
namespace VRSDK
|
||||
{
|
||||
public class VR_HandSnapPoint : VR_Grabbable
|
||||
{
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
base.Start();
|
||||
preventDefault = true;
|
||||
}
|
||||
|
||||
|
||||
private void LateUpdate()
|
||||
{
|
||||
if (currentGrabState != GrabState.Grab)
|
||||
return;
|
||||
|
||||
activeController.transform.position = GetCurrentHandInteractSettings().interactPoint.position;
|
||||
}
|
||||
|
||||
public override void OnGrabSuccess(VR_Controller controller)
|
||||
{
|
||||
activeController = controller;
|
||||
currentGrabState = GrabState.Grab;
|
||||
RaiseOnGrabStateChangeEvent( GrabState.Grab );
|
||||
|
||||
GrabController.SetVisibility( !GetCurrentHandAnimationSettings().hideHandOnGrab );
|
||||
|
||||
activeController.SetPositionControlMode( MotionControlMode.Free );
|
||||
activeController.SetRotationControlMode( MotionControlMode.Free );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 10b0b76b98de95145b90a5f67064f0f0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 168243
|
||||
packageName: VR Beats Kit
|
||||
packageVersion: 2.0
|
||||
assetPath: Assets/VRBeatsKit/Modules/VRSDK/Experimental/VR_HandSnapPoint.cs
|
||||
uploadId: 546658
|
||||
Reference in New Issue
Block a user