Merge pull request #55 from croakfang/master

add IK control for pose mode and ear blendshape export support, bux fix
This commit is contained in:
CroakFang
2024-03-05 22:45:02 +08:00
committed by GitHub
23 changed files with 488 additions and 87 deletions
+9
View File
@@ -17,6 +17,9 @@ public class GlobalValue : EditorWindow
Color _GlobalDirtToonColor;
Color _GlobalRimColor = new Color(1, 1, 1, 0);
Color _GlobalDirtColor;
Color _Global_LightmapColor = Color.white;
Color _Global_LightmapDensityAddColor = Color.clear;
Color _Global_LightmapModulateColor = Color.white;
Color _RimColor2;
List<Vector4> _MainParam = new List<Vector4>();
Vector4 _MainParam_0;
@@ -86,6 +89,9 @@ public class GlobalValue : EditorWindow
_GlobalDirtToonColor = EditorGUILayout.ColorField("_GlobalDirtToonColor", _GlobalDirtToonColor);
_GlobalRimColor = EditorGUILayout.ColorField("边缘光颜色", _GlobalRimColor);
_GlobalDirtColor = EditorGUILayout.ColorField("_GlobalDirtColor", _GlobalDirtColor);
_Global_LightmapColor = EditorGUILayout.ColorField("_Global_LightmapColor", _Global_LightmapColor);
_Global_LightmapDensityAddColor = EditorGUILayout.ColorField("_Global_LightmapDensityAddColor", _Global_LightmapDensityAddColor);
_Global_LightmapModulateColor = EditorGUILayout.ColorField("_Global_LightmapModulateColor", _Global_LightmapModulateColor);
_RimColor2 = EditorGUILayout.ColorField("_RimColor2", _RimColor2);
_AmbientColor = EditorGUILayout.ColorField("_AmbientColor", _AmbientColor);
@@ -129,6 +135,9 @@ public class GlobalValue : EditorWindow
Shader.SetGlobalColor("_GlobalDirtToonColor", _GlobalDirtToonColor);
Shader.SetGlobalColor("_GlobalRimColor", _GlobalRimColor);
Shader.SetGlobalColor("_GlobalDirtColor", _GlobalDirtColor);
Shader.SetGlobalColor("_Global_LightmapColor", _Global_LightmapColor);
Shader.SetGlobalColor("_Global_LightmapDensityAddColor", _Global_LightmapDensityAddColor);
Shader.SetGlobalColor("_Global_LightmapModulateColor", _Global_LightmapModulateColor);
Shader.SetGlobalColor("_RimColor2", _RimColor2);
//Float
Shader.SetGlobalFloat("_Global_MaxDensity", _Global_MaxDensity);
@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: b477824ce76ecac4ba9da6034f4994e0
NativeFormatImporter:
guid: fd35cb16d5e64408eb3f5b252bc0c154
folderAsset: yes
DefaultImporter:
externalObjects: {}
mainObjectFileID: 8400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c0d8b3c418dba4ac2a3443e7fcfe727c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,38 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Render Texture
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 256
m_Height: 256
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
+217 -3
View File
@@ -555,7 +555,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 912298140}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
@@ -1444,6 +1444,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 827083129}
m_CullTransparentMesh: 1
--- !u!1 &831711796
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 831711797}
- component: {fileID: 831711799}
- component: {fileID: 831711798}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &831711797
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831711796}
m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 955938935}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &831711798
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831711796}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.2830189, g: 0.22899327, b: 0.16420436, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 18
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u3013\r"
--- !u!222 &831711799
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831711796}
m_CullTransparentMesh: 1
--- !u!1 &912298139
GameObject:
m_ObjectHideFlags: 0
@@ -1473,6 +1552,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 955938935}
- {fileID: 374273518}
- {fileID: 1839609385}
- {fileID: 1378933079}
@@ -1549,6 +1629,140 @@ MonoBehaviour:
m_EditorClassIdentifier:
is_Touched: 0
is_Outed: 0
PauseButton: {fileID: 955938936}
--- !u!1 &955938934
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 955938935}
- component: {fileID: 955938938}
- component: {fileID: 955938937}
- component: {fileID: 955938936}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &955938935
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 955938934}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 831711797}
m_Father: {fileID: 912298140}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -10, y: 0.000015258789}
m_SizeDelta: {x: 40, y: 25}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &955938936
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 955938934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 955938937}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 912298139}
m_TargetAssemblyTypeName:
m_MethodName:
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &955938937
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 955938934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 3
--- !u!222 &955938938
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 955938934}
m_CullTransparentMesh: 1
--- !u!1 &993298146
GameObject:
m_ObjectHideFlags: 0
@@ -2225,7 +2439,7 @@ RectTransform:
m_Children:
- {fileID: 993298147}
m_Father: {fileID: 912298140}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -3014,7 +3228,7 @@ RectTransform:
m_Children:
- {fileID: 1006231794}
m_Father: {fileID: 912298140}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
+7 -7
View File
@@ -25079,6 +25079,7 @@ MonoBehaviour:
SavedPoses: []
HandleCanvas: {fileID: 580437086}
HelpPanel: {fileID: 745782920}
PoseIK: {fileID: 0}
--- !u!4 &776305455
Transform:
m_ObjectHideFlags: 0
@@ -43221,8 +43222,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "H - show/hide this\n\nUndo:\t\tCtrl + Z\nRedo:\t\tCtrl + Y\n\nMove only:
\tCtrl + W\nRotate only: Ctrl + E\nScale only: \tCtrl + R\nAll:\t \tCtrl + Y"
m_text: "H - show/hide this\n\nUndo:\t\tCtrl + Z\nRedo:\t\tCtrl + Y\n\nIK Mode:
Space\nMove only: \tCtrl + W\nRotate only: Ctrl + E\nScale only: \tCtrl + R\nAll:\t
\tCtrl + Y"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -45983,7 +45985,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &1468470379
Animator:
serializedVersion: 5
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -45996,12 +45998,10 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1476177399
GameObject:
m_ObjectHideFlags: 0
@@ -47983,8 +47983,8 @@ MonoBehaviour:
type: 3}
LineRendererMaterial: {fileID: 2100000, guid: 61428e99656e4544aa16be34cad7a789,
type: 2}
EnabledHandles: 03000000
EnabledLines: 1
IKMode: 0
--- !u!4 &1561038521
Transform:
m_ObjectHideFlags: 0
+12 -2
View File
@@ -20,6 +20,7 @@ public class ModelExporter
public static void ExportModel(UmaContainerCharacter container, string path)
{
container.SetDynamicBoneEnable(false);
container.EnablePhysics = false;
container.UmaFaceAnimator?.Rebind();
container.UmaAnimator?.Rebind();
container.EnableEyeTracking = false;
@@ -98,10 +99,12 @@ public class ModelExporter
if (!container.FaceDrivenKeyTarget) return;
SkinnedMeshRenderer faceMesh = null;
SkinnedMeshRenderer eyebrowMesh = null;
SkinnedMeshRenderer earMesh = null;
foreach (SkinnedMeshRenderer s in container.GetComponentsInChildren<SkinnedMeshRenderer>())
{
if (s.name.Contains("Face")) faceMesh = s;
else if (s.name.Contains("Mayu")) eyebrowMesh = s;
if (s.name.Contains("M_Face")) faceMesh = s;
else if (s.name.Contains("M_Mayu")) eyebrowMesh = s;
else if (s.name.Contains("M_Hair")) earMesh = s;
}
var facial = container.FaceDrivenKeyTarget;
@@ -138,6 +141,13 @@ public class ModelExporter
eyebrowMesh.BakeMesh(baseEyeBrowMesh);
addBlendShapePart(eyebrowMesh, facial.EyeBrowMorphs, baseEyeBrowMesh);
}
if (earMesh)
{
Mesh baseEarMesh = new Mesh();
earMesh.BakeMesh(baseEarMesh);
addBlendShapePart(earMesh, facial.EarMorphs, baseEarMesh);
}
facial.ClearAllWeights();
facial.ChangeMorph();
+26 -2
View File
@@ -1,23 +1,47 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class SliderControl : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
{
public bool is_Touched = false;
public bool is_Outed = false;
public Button PauseButton;
private void Awake()
{
PauseButton.onClick.AddListener(OnPauseButtonClick);
}
private void OnPauseButtonClick()
{
if (is_Touched)
{
OnPointerUp(null);
}
else
{
OnPointerDown(null);
}
}
public void OnPointerDown(PointerEventData eventData)
{
is_Touched = true;
Debug.Log("Dowm");
PauseButton.GetComponentInChildren<Text>().text = "¡ø";
Debug.Log("Pause");
}
public void OnPointerUp(PointerEventData eventData)
{
is_Touched = false;
is_Outed = true;
Debug.Log("Up");
PauseButton.GetComponentInChildren<Text>().text = "¡þ";
Debug.Log("Play");
}
}
+3 -2
View File
@@ -304,7 +304,8 @@ public class ManifestDB
public IEnumerator DownloadManifest(string hash)
{
UnityWebRequest www = UnityWebRequest.Get(UmaViewerDownload.GetManifestRequestUrl(hash));
var url = UmaViewerDownload.GetManifestRequestUrl(hash);
UnityWebRequest www = UnityWebRequest.Get(url);
www.timeout = 15;
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.Success)
@@ -313,7 +314,7 @@ public class ManifestDB
}
else
{
Debug.LogError("Download Manifest Failed :" + www.error);
Debug.LogError($"Download Manifest Failed :{url} {www.error}");
callback?.Invoke($"Download Manifest Failed :{www.error}", UIMessageType.Error);
isError = true;
yield break;
+40 -6
View File
@@ -11,8 +11,9 @@ public class HandleManager : MonoBehaviour
public Material LineRendererMaterial;
public List<BoneTags> EnabledHandles = new List<BoneTags>() { BoneTags.Humanoid };
public List<BoneTags> EnabledHandles { get => IKMode ? IKHandles : enabledHandles; }
public bool EnabledLines = true;
public bool IKMode = false;
public static bool InteractionInProgress;
@@ -21,6 +22,9 @@ public class HandleManager : MonoBehaviour
public static System.Action<RuntimeGizmoUndoData> RegisterRuntimeGizmoUndoAction;
public static System.Action<List<RuntimeGizmoUndoData>> RegisterRuntimeGizmoUndoActions;
private List<BoneTags> enabledHandles = new List<BoneTags>() { BoneTags.Humanoid };
private List<BoneTags> IKHandles = new List<BoneTags>() { BoneTags.IK };
public struct RuntimeGizmoUndoData
{
public Transform NewPosition;
@@ -32,10 +36,40 @@ public class HandleManager : MonoBehaviour
var camera = Camera.main;
var poseModeOn = UmaViewerUI.Instance.PoseManager.PoseModeOn;
foreach(var handle in AllHandles)
if (Input.GetKeyDown(KeyCode.Space))
{
IKMode = !IKMode;
if (IKMode)
{
var ik = UmaViewerUI.Instance.PoseManager.PoseIK;
if (ik)
{
foreach (var effector in ik.solver.effectors)
{
if (effector.target)
{
effector.target.localPosition = Vector3.zero;
effector.target.localRotation = Quaternion.identity;
}
}
ik.solver.StoreDefaultLocalState();
ik.enabled = true;
}
}
else
{
var ik = UmaViewerUI.Instance.PoseManager.PoseIK;
if (ik)
{
ik.enabled = false;
}
}
};
foreach (var handle in AllHandles)
{
handle.ForceDisplayOff(!poseModeOn);
handle.UpdateManual(camera, EnabledLines);
handle.UpdateManual(camera, EnabledLines && !IKMode);
if (handle.Popup.gameObject.activeInHierarchy)
{
@@ -85,13 +119,13 @@ public class HandleManager : MonoBehaviour
public void ToggleBonesVisible(string tag)
{
var enumTag = (BoneTags)System.Enum.Parse(typeof(BoneTags), tag);
if (EnabledHandles.Contains(enumTag))
if (enabledHandles.Contains(enumTag))
{
EnabledHandles.Remove(enumTag);
enabledHandles.Remove(enumTag);
}
else
{
EnabledHandles.Add(enumTag);
enabledHandles.Add(enumTag);
}
}
+12 -1
View File
@@ -1,4 +1,7 @@
using Newtonsoft.Json;
using RootMotion;
using RootMotion.Dynamics;
using RootMotion.FinalIK;
using System;
using System.Collections.Generic;
using System.IO;
@@ -35,6 +38,8 @@ public class PoseManager : MonoBehaviour
public GameObject HandleCanvas;
public GameObject HelpPanel;
public FullBodyBipedIK PoseIK;
private void Update()
{
if (Input.GetKeyDown(KeyCode.H))
@@ -115,8 +120,9 @@ public class PoseManager : MonoBehaviour
ui.SetDynamicBoneEnable(false);
HandleCanvas.SetActive(true);
if (builder.CurrentUMAContainer != null && builder.CurrentUMAContainer.UmaAnimator != null)
if (builder.CurrentUMAContainer && builder.CurrentUMAContainer.UmaAnimator)
{
PoseIK = builder.CurrentUMAContainer.CreatePoseIK();
builder.CurrentUMAContainer.UmaAnimator.enabled = false;
}
@@ -140,6 +146,11 @@ public class PoseManager : MonoBehaviour
builder.CurrentUMAContainer.UmaAnimator.enabled = true;
}
if (PoseIK)
{
Destroy(PoseIK);
}
PoseModeOn = false;
}
}
@@ -157,7 +157,7 @@ namespace RuntimeGizmos
UndoRedoManager.Insert(commandGroup);
};
PoseManager.SetTooltip(0, $"H - show/hide this\r\n\r\nUndo:\t\t{ActionKey} + {UndoAction}\r\nRedo:\t\t{ActionKey} + {RedoAction}\r\n\r\nMove only: \t{changeModeHotkey} + {SetMoveType}\r\nRotate only: {changeModeHotkey} + {SetRotateType}\r\nScale only: \t{changeModeHotkey} + {SetScaleType}\r\nAll:\t \t{changeModeHotkey} + {SetAllTransformType}");
PoseManager.SetTooltip(0, $"H - show/hide this\r\n\r\nUndo:\t\t{ActionKey} + {UndoAction}\r\nRedo:\t\t{ActionKey} + {RedoAction}\r\n\r\nIK Mode: \t{KeyCode.Space}\r\nMove only: \t{changeModeHotkey} + {SetMoveType}\r\nRotate only: {changeModeHotkey} + {SetRotateType}\r\nScale only: \t{changeModeHotkey} + {SetScaleType}\r\nAll:\t \t{changeModeHotkey} + {SetAllTransformType}");
PoseManager.SetTooltip(1, $"\r\n\r\nSpace Toggle:\t{changeModeHotkey} + {SetSpaceToggle}\r\nPivot Toggle:\t{changeModeHotkey} + {SetPivotModeToggle}\r\nScale type toggle: \t{changeModeHotkey} + {SetScaleTypeToggle}\r\nCenter type toggle:{changeModeHotkey} + {SetCenterTypeToggle}");
}
+2 -1
View File
@@ -52,6 +52,7 @@ public class SerializableBone
Dynamic,
Humanoid,
Finger,
Face
Face,
IK,
}
}
+68 -2
View File
@@ -1,4 +1,5 @@
using Gallop;
using RootMotion;
using RootMotion.Dynamics;
using RootMotion.FinalIK;
using System;
@@ -85,6 +86,7 @@ public class UmaContainerCharacter : UmaContainer
private BipedIK IK;
private PuppetMaster PuppetMaster;
private List<Transform> _humanoidBones;
private UIHandleCharacterRoot handleRoot;
public void Initialize(bool smile)
{
@@ -295,6 +297,15 @@ public class UmaContainerCharacter : UmaContainer
}
}
public void ResetDynamicBone()
{
if (IsMini) return;
foreach (CySpringDataContainer cySpring in cySpringDataContainers)
{
cySpring.ResetPhysics();
}
}
public void SetEyeTracking(bool isOn)
{
EnableEyeTracking = isOn;
@@ -470,6 +481,46 @@ public class UmaContainerCharacter : UmaContainer
PuppetMaster.FlattenHierarchy();
}
public FullBodyBipedIK CreatePoseIK()
{
var container = this;
BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(UmaAnimator);
BipedReferences pr = new BipedReferences();
var ik = container.gameObject.AddComponent<FullBodyBipedIK>();
pr.root = r.root;
pr.pelvis = r.hips;
pr.spine = new Transform[] { r.spine, r.chest };
pr.leftThigh = r.leftUpperLeg;
pr.leftCalf = r.leftLowerLeg;
pr.leftFoot = r.leftFoot;
pr.rightThigh = r.rightUpperLeg;
pr.rightCalf = r.rightLowerLeg;
pr.rightFoot = r.rightFoot;
pr.leftUpperArm = r.leftUpperArm;
pr.leftForearm = r.leftLowerArm;
pr.leftHand = r.leftHand;
pr.rightUpperArm = r.rightUpperArm;
pr.rightForearm = r.rightLowerArm;
pr.rightHand = r.rightHand;
pr.head = r.head;
ik.SetReferences(pr, r.hips);
foreach (var effector in ik.solver.effectors)
{
var handle = handleRoot.ChildHandles.Find(h => h.Owner.transform.parent == effector.bone && (h as UIHandleBone).Tags.Contains(BoneTags.IK));
if (handle)
{
effector.target = handle.Owner.transform;
effector.positionWeight = 1;
effector.rotationWeight = 1;
}
}
ik.enabled = false;
return ik;
}
public void LoadTextures(UmaDatabaseEntry entry)
{
foreach(Texture2D tex2D in entry.GetAll<Texture2D>())
@@ -1125,6 +1176,7 @@ public class UmaContainerCharacter : UmaContainer
if (clip.name.Contains("_cti_crd"))
{
ResetDynamicBone();
var dir = Path.GetDirectoryName(clip.name).Replace("\\", "/");
string[] param = Path.GetFileName(clip.name).Split('_');
if (param.Length > 4)
@@ -1370,13 +1422,25 @@ public class UmaContainerCharacter : UmaContainer
UIHandleCharacterRoot rootHandle = UIHandleCharacterRoot.CreateAsChild(this);
var humanBones = GetHumanBones();
foreach(var bone in humanBones)
var ikNames = new[] { "Hip", "Wrist_L", "Wrist_R", "Ankle_L", "Ankle_R" };
foreach (var bone in humanBones)
{
List<BoneTags> tags = new List<BoneTags>() { BoneTags.Humanoid };
if (bone.name.EndsWith("_L")) tags.Add(BoneTags.Left);
if (bone.name.EndsWith("_R")) tags.Add(BoneTags.Right);
if(bone.name != "Hip")
if (ikNames.Any(x => x == bone.name))
{
var go = new GameObject(bone.name + "_IK_Handle");
go.transform.parent = bone.transform;
go.transform.localPosition = Vector3.zero;
go.transform.rotation = bone.transform.rotation;
go.transform.localScale = Vector3.one;
var handle = UIHandleBone.CreateAsChild(go, new List<BoneTags>() { BoneTags.IK });
rootHandle.ChildHandles.Add(handle);
}
if (bone.name != "Hip")
{
var handle = UIHandleBone.CreateAsChild(bone, tags).WithLineRenderer();
rootHandle.ChildHandles.Add(handle);
@@ -1418,6 +1482,8 @@ public class UmaContainerCharacter : UmaContainer
var handle = UIHandleBone.CreateAsChild(bone.Bone, bone.Tags).SetColor(Color.gray).SetScale(0.15f).WithLineRenderer();
rootHandle.ChildHandles.Add(handle);
}
handleRoot = rootHandle;
}
public List<SerializableBone> SaveBones()
+2 -1
View File
@@ -179,5 +179,6 @@ public enum UmaFileType
transferevent,
teambuilding,
challengematch,
collectevent
collectevent,
ratingrace
}
@@ -112,15 +112,36 @@ public class UmaDatabaseController
UmaDatabaseEntry entry = null;
try
{
entry = new UmaDatabaseEntry
var typestr = sqlite_datareader.GetString(0);
if (Enum.TryParse<UmaFileType>(typestr, false, out var type))
{
Type = (UmaFileType)Enum.Parse(typeof(UmaFileType), sqlite_datareader.GetString(0)),
Name = sqlite_datareader.GetString(1),
Url = sqlite_datareader.GetString(2),
Prerequisites = sqlite_datareader.GetString(3)
};
var name = sqlite_datareader.GetString(1);
var url = sqlite_datareader.GetString(2);
var prerequisites = sqlite_datareader.GetString(3);
if (string.IsNullOrEmpty(name))
{
throw new Exception($"Invalid entry name {name} or URL {url}");
}
entry = new UmaDatabaseEntry
{
Type = type,
Name = name,
Url = url,
Prerequisites = prerequisites
};
}
else
{
Debug.LogWarning($"Unrecognized EntryType Enum Value :{typestr}");
}
}
catch(Exception e) { Debug.LogError("Error caught: " + e + entry.Name); }
catch(Exception e)
{
Debug.LogError($"Error caught while reading Entry : \n {e}");
}
if (entry != null) {
meta.Add(entry.Name, entry);
+6
View File
@@ -17,6 +17,9 @@ public class UmaViewerGlobalShader : MonoBehaviour
public Color _GlobalDirtToonColor;
public Color _GlobalRimColor = new Color(1, 1, 1, 0);
public Color _GlobalDirtColor;
public Color _Global_LightmapColor = Color.white;
public Color _Global_LightmapDensityAddColor = Color.clear;
public Color _Global_LightmapModulateColor = Color.white;
public Color _RimColor2;
List<Vector4> _MainParam = new List<Vector4>();
public Vector4 _MainParam_0;
@@ -65,6 +68,9 @@ public class UmaViewerGlobalShader : MonoBehaviour
Shader.SetGlobalColor("_GlobalDirtToonColor", _GlobalDirtToonColor);
Shader.SetGlobalColor("_GlobalRimColor", _GlobalRimColor);
Shader.SetGlobalColor("_GlobalDirtColor", _GlobalDirtColor);
Shader.SetGlobalColor("_Global_LightmapColor", _Global_LightmapColor);
Shader.SetGlobalColor("_Global_LightmapDensityAddColor", _Global_LightmapDensityAddColor);
Shader.SetGlobalColor("_Global_LightmapModulateColor", _Global_LightmapModulateColor);
Shader.SetGlobalColor("_RimColor2", _RimColor2);
//Float
Shader.SetGlobalFloat("_Global_MaxDensity", _Global_MaxDensity);
@@ -158,5 +158,13 @@ namespace Gallop
dynamic.enabled = isOn;
}
}
public void ResetPhysics()
{
foreach (DynamicBone dynamic in DynamicBones)
{
dynamic.ResetParticlesPosition();
}
}
}
}
@@ -973,7 +973,8 @@ namespace Gallop
MangaMorph.BindProperties[1].Value = 1;
}
var tearytype = info.tearyType;
var tearyEnable = ((int)info.attribute & LiveTimelineKeyFacialEffectData.kAttrTeary) > 0;
var tearytype = tearyEnable ? info.tearyType : 0;
StaticTearMorph.BindProperties.ForEach(p => p.Value = tearytype);
var shaderEnable = ((int)info.attribute & LiveTimelineKeyFacialEffectData.kAttrFaceShadowVisible) > 0;
@@ -105,12 +105,12 @@ namespace Gallop.Live.Cutt
LiveTimelineKeyIndex curKey = LiveTimelineControl.AlterUpdate_Key(_currentKey, currentTime);
_curIndex = curKey.index;
LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData;
AnimationClip anim = arg.clip;
if ((curKey != null && _curIndex != -1 && _curIndex != _prevIndex) || Director.instance.sliderControl.is_Touched || Director.instance._syncTime == false || director.IsRecordVMD)
{
LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData;
AnimationClip anim = arg.clip;
double start;
if(arg.isMotionHeadFrameAll)
{
@@ -124,11 +124,27 @@ namespace Gallop.Live.Cutt
_tempAnim.wrapMode = (arg.loop ? WrapMode.Loop : WrapMode.Default);
_tempAnim[anim.name].time = (float)(start + interval);
if (Mathf.Abs(_prevFrameAnimationTime - currentTime) < 0.01f)
{
if (_tempAnim.IsPlaying(anim.name))
{
_tempAnim.Stop();
}
}
else
{
_tempAnim.Play(anim.name);
}
}
else if (!_tempAnim.IsPlaying(anim.name))
{
_tempAnim.Play(anim.name);
}
_prevIndex = _curIndex;
}
_prevFrameAnimationTime = currentTime;
}
}
}
@@ -4,13 +4,21 @@ using UnityEngine;
namespace Gallop.Live.Cutt
{
[Flags]
public enum LiveTimelineKeyAttribute
{
Disable = 1,
CameraDelayEnable = 2,
CameraDelayInherit = 4,
KeyCommonBitMask = 32768
}
KeyCommonBitMask = 32768,
kAttrCheek = 65536,
kAttrTeary = 131072,
kAttrTearful = 262144,
kAttrTeardrop = 524288,
kAttrMangame = 2097152,
kAttrFaceShadow = 4194304,
kAttrFaceShadowVisible = 8388608,
}
public enum LiveTimelineKeyDataListAttr
{
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 2020.3.48f1
m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7)
m_EditorVersion: 2020.3.24f1
m_EditorVersionWithRevision: 2020.3.24f1 (79c78de19888)
+3 -3
View File
@@ -27,13 +27,13 @@ EditorUserSettings:
value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23663b3aece13811c9a809cdc217100f7634dd152f71370ddb214943de021e4b230bfc0d05f61f1d588b0dcb13dc06
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c731900122b292926237e38271427fb
value: 22424703114646680e1c05320430102019041d651e3d282424241814ebfa3937adc22ee8ea2a33390a01ea3201701431fb1e10
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c691504041125227a68252320092a
value: 22424703114646680e0b0227036c731900122b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e1c05320430102019041d651e3d282424241814ebfa3937adc22ee8ea2a33390a01ea3201701431fb1e10
value: 22424703114646680e0b0227036c691504041125227a68252320092a
flags: 0
UnityRemoteCompression:
value: 29617121