Fixed bug with changing timeline length

This commit is contained in:
AbstractConcept 2022-11-03 18:32:19 -05:00
parent 876ffe65d0
commit 39f771a720
86 changed files with 94 additions and 93 deletions

View file

@ -92,8 +92,8 @@ namespace RimWorldAnimationStudio
{
foreach (PawnKeyframe keyframe in clip.Keyframes)
{
keyframe.TickDuration = Mathf.RoundToInt(keyframe.TickDuration * scale);
keyframe.atTick = null;
keyframe.atTick = Mathf.CeilToInt((float)keyframe.atTick.Value * scale);
keyframe.TickDuration = 0;
}
clip.BuildSimpleCurves();

View file

@ -21,6 +21,7 @@ namespace RimWorldAnimationStudio
EventsManager.onAnimationTimelinesChanged.AddListener(delegate { UpdateGUI(); });
EventsManager.onKeyframeCountChanged.AddListener(delegate { UpdateGUI(); });
EventsManager.onActorIDChanged.AddListener(delegate { UpdateTimelineSelection(); });
EventsManager.onStageWindowSizeChanged.AddListener(delegate { UpdateGUI(); });
UpdateTimelineSelection();
UpdateGUI();

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -115,7 +115,7 @@ MonoBehaviour:
m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14002, y: 14042}
vertical: 0
controlID: 10829
controlID: 2473
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -140,7 +140,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 10830
controlID: 2478
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -165,7 +165,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
controlID: 10831
controlID: 2479
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -398,7 +398,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 7479fdff8879fdff2a7afdff62fbffff063b0000143c00000c3d00008c3d0000d43d000068400000ac4200008a44000028450000be4500002c460000
m_ExpandedIDs: 28a2feff3ca2feffe2a2feff62fbffff7a3d0000a83d000010410000b4420000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -460,7 +460,7 @@ MonoBehaviour:
m_Position:
m_Target: {x: 515.9874, y: 315.84717, z: -105.8125}
speed: 2
m_Value: {x: 168.57666, y: 619.2633, z: -1}
m_Value: {x: 515.9874, y: 315.84717, z: -105.8125}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -512,7 +512,7 @@ MonoBehaviour:
m_Size:
m_Target: 347.46002
speed: 2
m_Value: 117.21351
m_Value: 347.46002
m_Ortho:
m_Target: 1
speed: 2
@ -1115,9 +1115,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 143}
m_SelectedIDs: 3a4e0000
m_LastClickedID: 20026
m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b
m_SelectedIDs: 464e0000
m_LastClickedID: 20038
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1145,7 +1145,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1172,7 +1172,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100
m_RenameOverlay:
m_UserAcceptedRename: 0
@ -1295,4 +1295,4 @@ MonoBehaviour:
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastVerticalScrollValue: 100

View file

@ -21,10 +21,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 678, y: 321}
m_MaxSize: {x: 12003, y: 8021}
m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14002, y: 14042}
vertical: 0
controlID: 10726
controlID: 2139
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -138,10 +138,10 @@ MonoBehaviour:
y: 0
width: 1414
height: 947
m_MinSize: {x: 403, y: 321}
m_MaxSize: {x: 8003, y: 8021}
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 10727
controlID: 2140
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -166,7 +166,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
controlID: 10728
controlID: 2141
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@ -186,8 +186,8 @@ MonoBehaviour:
y: 0
width: 337
height: 671
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
@ -224,7 +224,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 62fbffff063b0000143c00000c3d00008c3d0000d43d000068400000ac4200008a44000028450000be4500002c460000
m_ExpandedIDs: 62fbffff7a3d0000a83d000010410000b4420000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -930,7 +930,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_Name: ProjectBrowser
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -939,15 +939,15 @@ MonoBehaviour:
y: 671
width: 1414
height: 276
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 12}
- {fileID: 13}
- {fileID: 14}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@ -998,9 +998,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 143}
m_SelectedIDs: 3a4e0000
m_LastClickedID: 20026
m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b
m_SelectedIDs: 464e0000
m_LastClickedID: 20038
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1028,7 +1028,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1053,8 +1053,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: f882feff
m_LastClickedInstanceID: -97544
m_SelectedInstanceIDs: ec440000
m_LastClickedInstanceID: 17644
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100
m_RenameOverlay:
@ -1203,5 +1203,5 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastInspectedObjectInstanceID: 17644
m_LastVerticalScrollValue: 100

Binary file not shown.

View file

@ -148,111 +148,111 @@ ScriptsOnlyBuild:
- Class: 114
Script: {instanceID: 11734}
- Class: 114
Script: {instanceID: 11758}
- Class: 114
Script: {instanceID: 11762}
Script: {instanceID: 11760}
- Class: 114
Script: {instanceID: 11764}
- Class: 114
Script: {instanceID: 11772}
Script: {instanceID: 11766}
- Class: 114
Script: {instanceID: 11782}
Script: {instanceID: 11774}
- Class: 114
Script: {instanceID: 11804}
Script: {instanceID: 11784}
- Class: 114
Script: {instanceID: 11868}
Script: {instanceID: 11806}
- Class: 114
Script: {instanceID: 11874}
Script: {instanceID: 11870}
- Class: 114
Script: {instanceID: 12142}
Script: {instanceID: 11876}
- Class: 114
Script: {instanceID: 12178}
Script: {instanceID: 12144}
- Class: 114
Script: {instanceID: 12322}
Script: {instanceID: 12180}
- Class: 114
Script: {instanceID: 12346}
Script: {instanceID: 12324}
- Class: 114
Script: {instanceID: 12362}
Script: {instanceID: 12348}
- Class: 114
Script: {instanceID: 12432}
Script: {instanceID: 12364}
- Class: 114
Script: {instanceID: 12612}
Script: {instanceID: 12434}
- Class: 114
Script: {instanceID: 12636}
Script: {instanceID: 12614}
- Class: 114
Script: {instanceID: 12754}
Script: {instanceID: 12638}
- Class: 114
Script: {instanceID: 12878}
Script: {instanceID: 12756}
- Class: 114
Script: {instanceID: 12922}
Script: {instanceID: 12880}
- Class: 114
Script: {instanceID: 13172}
Script: {instanceID: 12924}
- Class: 114
Script: {instanceID: 13198}
Script: {instanceID: 13174}
- Class: 114
Script: {instanceID: 13238}
Script: {instanceID: 13200}
- Class: 114
Script: {instanceID: 13248}
Script: {instanceID: 13240}
- Class: 114
Script: {instanceID: 13258}
Script: {instanceID: 13250}
- Class: 114
Script: {instanceID: 13268}
Script: {instanceID: 13260}
- Class: 114
Script: {instanceID: 13370}
Script: {instanceID: 13270}
- Class: 114
Script: {instanceID: 13388}
Script: {instanceID: 13372}
- Class: 114
Script: {instanceID: 13390}
- Class: 114
Script: {instanceID: 13422}
Script: {instanceID: 13392}
- Class: 114
Script: {instanceID: 13462}
Script: {instanceID: 13426}
- Class: 114
Script: {instanceID: 13478}
Script: {instanceID: 13466}
- Class: 114
Script: {instanceID: 13494}
Script: {instanceID: 13482}
- Class: 114
Script: {instanceID: 13506}
Script: {instanceID: 13498}
- Class: 114
Script: {instanceID: 13510}
- Class: 114
Script: {instanceID: 13546}
Script: {instanceID: 13514}
- Class: 114
Script: {instanceID: 13678}
Script: {instanceID: 13550}
- Class: 114
Script: {instanceID: 13704}
Script: {instanceID: 13682}
- Class: 114
Script: {instanceID: 13836}
Script: {instanceID: 13708}
- Class: 114
Script: {instanceID: 13910}
Script: {instanceID: 13840}
- Class: 114
Script: {instanceID: 13914}
- Class: 114
Script: {instanceID: 14104}
Script: {instanceID: 13918}
- Class: 114
Script: {instanceID: 14200}
Script: {instanceID: 14046}
- Class: 114
Script: {instanceID: 14350}
Script: {instanceID: 14110}
- Class: 114
Script: {instanceID: 14498}
Script: {instanceID: 14206}
- Class: 114
Script: {instanceID: 14524}
Script: {instanceID: 14356}
- Class: 114
Script: {instanceID: 14526}
Script: {instanceID: 14504}
- Class: 114
Script: {instanceID: 14558}
Script: {instanceID: 14530}
- Class: 114
Script: {instanceID: 14580}
Script: {instanceID: 14532}
- Class: 114
Script: {instanceID: 14582}
Script: {instanceID: 14564}
- Class: 114
Script: {instanceID: 14622}
Script: {instanceID: 14586}
- Class: 114
Script: {instanceID: 14588}
- Class: 114
Script: {instanceID: 14628}
- Class: 114
Script: {instanceID: 14670}
Script: {instanceID: 14634}
- Class: 114
Script: {instanceID: 23916}
Script: {instanceID: 14676}
- Class: 115
Script: {instanceID: 0}
- Class: 128
@ -896,6 +896,12 @@ ScriptsOnlyBuild:
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: SelectActorLayerButton
- hash:
serializedVersion: 2
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: AudioController
- hash:
serializedVersion: 2
Hash: d8843cd76e941805c38da8b9219529b2
@ -1046,12 +1052,6 @@ ScriptsOnlyBuild:
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: DropdownMenu
- hash:
serializedVersion: 2
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: AudioController
platform: 5
scenePathNames:
- Assets/Scenes/MainScene.unity

Binary file not shown.