root/BITFALL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CortexCore
2024-03-29 00:58:24 +08:00
parent 967ad8eacf
commit 05315ef4a8
232 changed files with 53368 additions and 8539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs
View File

@@ -497,6 +497,10 @@ namespace MagicaCloth2
{
if (sync == false)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.inertiaConstraint.anchor"));
if (cloth.SerializeData.inertiaConstraint.anchor != null)
EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.inertiaConstraint.anchorInertia"));
EditorGUILayout.Space();
EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.inertiaConstraint.worldInertia"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.inertiaConstraint.movementSpeedLimit"), new GUIContent("World Movement Speed Limit"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.inertiaConstraint.rotationSpeedLimit"), new GUIContent("World Rotation Speed Limit"));
@@ -509,6 +513,17 @@ namespace MagicaCloth2
// 同期中は操作不可
using (new EditorGUI.DisabledScope(true))
{
using (new EditorGUILayout.HorizontalScope())
{
EditorGUILayout.LabelField("Anchor");
EditorGUILayout.LabelField("(Synchronizing)");
}
using (new EditorGUILayout.HorizontalScope())
{
EditorGUILayout.LabelField("Anchor Inertia");
EditorGUILayout.LabelField("(Synchronizing)");
}
EditorGUILayout.Space();
using (new EditorGUILayout.HorizontalScope())
{
EditorGUILayout.LabelField("World Inertia");

1
Assets/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs
View File

@@ -28,6 +28,7 @@ namespace MagicaCloth2
EditorGUILayout.PropertyField(serializedObject.FindProperty("refreshMode"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("simulationFrequency"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("maxSimulationCountPerFrame"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("initializationLocation"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("updateLocation"));
}
}

2
Assets/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs
View File

@@ -14,7 +14,7 @@ namespace MagicaCloth2
[SerializeField]
private Texture2D image = null;
public const string MagicaClothVersion = "2.5.2";
public const string MagicaClothVersion = "2.6.0";
public static AboutMenu AboutWindow { get; set; }
private const float windowWidth = 300;