Clamped Animation Clips to the timeline
This commit is contained in:
parent
8f94aea56a
commit
dc36d44cd2
|
@ -154,12 +154,19 @@ OPERATION_RENDER_PROC(UpdateDragAnimationClip)
|
||||||
r32 TimeOffset = TimeAtMouseX - TimeAtMouseDownX;
|
r32 TimeOffset = TimeAtMouseX - TimeAtMouseDownX;
|
||||||
|
|
||||||
animation_block* AnimationBlock = State->AnimationSystem.Blocks.GetElementWithHandle(State->SelectedAnimationBlockHandle);
|
animation_block* AnimationBlock = State->AnimationSystem.Blocks.GetElementWithHandle(State->SelectedAnimationBlockHandle);
|
||||||
|
if (!AnimationBlock)
|
||||||
|
{
|
||||||
|
EndCurrentOperationMode(State, {}, Mouse);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO(Peter): This should really be in pixels so we can zoom in and out on the timeline
|
// TODO(Peter): This should really be in pixels so we can zoom in and out on the timeline
|
||||||
r32 SnapDistance = .25f;
|
r32 SnapDistance = .25f;
|
||||||
if (GSAbs(Mouse.DownPos.x - ClipInitialStartTimeXPosition) < CLICK_ANIMATION_BLOCK_EDGE_MAX_SCREEN_DISTANCE)
|
if (GSAbs(Mouse.DownPos.x - ClipInitialStartTimeXPosition) < CLICK_ANIMATION_BLOCK_EDGE_MAX_SCREEN_DISTANCE)
|
||||||
{
|
{
|
||||||
r32 NewStartTime = OpState->SelectedClip_InitialStartTime + TimeOffset;
|
r32 NewStartTime = OpState->SelectedClip_InitialStartTime + TimeOffset;
|
||||||
|
if (TimeOffset < 0)
|
||||||
|
{
|
||||||
for (u32 i = 0; i < State->AnimationSystem.Blocks.Used; i++)
|
for (u32 i = 0; i < State->AnimationSystem.Blocks.Used; i++)
|
||||||
{
|
{
|
||||||
gs_list_entry<animation_block>* OtherBlockEntry = State->AnimationSystem.Blocks.GetEntryAtIndex(i);
|
gs_list_entry<animation_block>* OtherBlockEntry = State->AnimationSystem.Blocks.GetEntryAtIndex(i);
|
||||||
|
@ -167,11 +174,21 @@ OPERATION_RENDER_PROC(UpdateDragAnimationClip)
|
||||||
animation_block OtherBlock = OtherBlockEntry->Value;
|
animation_block OtherBlock = OtherBlockEntry->Value;
|
||||||
NewStartTime = AttemptToSnapPosition(NewStartTime, OtherBlock.EndTime);
|
NewStartTime = AttemptToSnapPosition(NewStartTime, OtherBlock.EndTime);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (NewStartTime >= AnimationBlock->EndTime)
|
||||||
|
{
|
||||||
|
NewStartTime = AnimationBlock->EndTime - State->AnimationSystem.SecondsPerFrame;
|
||||||
|
}
|
||||||
|
}
|
||||||
AnimationBlock->StartTime = NewStartTime;
|
AnimationBlock->StartTime = NewStartTime;
|
||||||
}
|
}
|
||||||
else if (GSAbs(Mouse.DownPos.x - ClipInitialEndTimeXPosition) < CLICK_ANIMATION_BLOCK_EDGE_MAX_SCREEN_DISTANCE)
|
else if (GSAbs(Mouse.DownPos.x - ClipInitialEndTimeXPosition) < CLICK_ANIMATION_BLOCK_EDGE_MAX_SCREEN_DISTANCE)
|
||||||
{
|
{
|
||||||
r32 NewEndTime = OpState->SelectedClip_InitialEndTime + TimeOffset;
|
r32 NewEndTime = OpState->SelectedClip_InitialEndTime + TimeOffset;
|
||||||
|
if (TimeOffset > 0)
|
||||||
|
{
|
||||||
for (u32 i = 0; i < State->AnimationSystem.Blocks.Used; i++)
|
for (u32 i = 0; i < State->AnimationSystem.Blocks.Used; i++)
|
||||||
{
|
{
|
||||||
gs_list_entry<animation_block>* OtherBlockEntry = State->AnimationSystem.Blocks.GetEntryAtIndex(i);
|
gs_list_entry<animation_block>* OtherBlockEntry = State->AnimationSystem.Blocks.GetEntryAtIndex(i);
|
||||||
|
@ -179,6 +196,14 @@ OPERATION_RENDER_PROC(UpdateDragAnimationClip)
|
||||||
animation_block OtherBlock = OtherBlockEntry->Value;
|
animation_block OtherBlock = OtherBlockEntry->Value;
|
||||||
NewEndTime = AttemptToSnapPosition(NewEndTime, OtherBlock.StartTime);
|
NewEndTime = AttemptToSnapPosition(NewEndTime, OtherBlock.StartTime);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(NewEndTime <= AnimationBlock->StartTime)
|
||||||
|
{
|
||||||
|
NewEndTime = AnimationBlock->StartTime + State->AnimationSystem.SecondsPerFrame;
|
||||||
|
}
|
||||||
|
}
|
||||||
AnimationBlock->EndTime = NewEndTime;
|
AnimationBlock->EndTime = NewEndTime;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -208,6 +233,10 @@ OPERATION_RENDER_PROC(UpdateDragAnimationClip)
|
||||||
AnimationBlock->StartTime = NewStartTime;
|
AnimationBlock->StartTime = NewStartTime;
|
||||||
AnimationBlock->EndTime = NewEndTime;
|
AnimationBlock->EndTime = NewEndTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r32 TimelineEndTime = OpState->AnimationPanel_EndFrame * State->AnimationSystem.SecondsPerFrame;
|
||||||
|
AnimationBlock->StartTime = GSClamp(0.f, AnimationBlock->StartTime, TimelineEndTime);
|
||||||
|
AnimationBlock->EndTime = GSClamp(0.f, AnimationBlock->EndTime, TimelineEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
input_command DragAnimationClipCommands [] = {
|
input_command DragAnimationClipCommands [] = {
|
||||||
|
@ -232,7 +261,6 @@ SelectAndBeginDragAnimationBlock(gs_list_handle BlockHandle, s32 PanelStartFrame
|
||||||
OpState->SelectedClip_InitialStartTime = SelectedBlock->StartTime;
|
OpState->SelectedClip_InitialStartTime = SelectedBlock->StartTime;
|
||||||
OpState->SelectedClip_InitialEndTime = SelectedBlock->EndTime;
|
OpState->SelectedClip_InitialEndTime = SelectedBlock->EndTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------
|
// -------------------
|
||||||
|
|
||||||
FOLDHAUS_INPUT_COMMAND_PROC(AddAnimationBlockCommand)
|
FOLDHAUS_INPUT_COMMAND_PROC(AddAnimationBlockCommand)
|
||||||
|
|
Loading…
Reference in New Issue