summaryrefslogtreecommitdiff
path: root/src/sorted.cpp
diff options
context:
space:
mode:
authorFox Caminiti <fox@foxcam.net>2023-02-17 17:20:18 -0500
committerFox Caminiti <fox@foxcam.net>2023-02-17 17:20:18 -0500
commit02870398a99fab6351182fba407d7d733affa5a1 (patch)
treefb5f4744f46e9d7816072e4d01547034bca04bb2 /src/sorted.cpp
parentfffb3474ee0321d73a47db01dbc4b6b19670ddc5 (diff)
blend mode rendering halfway implemented
Diffstat (limited to 'src/sorted.cpp')
-rw-r--r--src/sorted.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sorted.cpp b/src/sorted.cpp
index 948c6f6..3ecd69e 100644
--- a/src/sorted.cpp
+++ b/src/sorted.cpp
@@ -42,7 +42,7 @@ void Property_SortAll(memory *Memory, project_state *State, property_channel *Pr
int32 Offset = (State->Interact_Active == interact_type_keyframe_move) ? (int32)State->Interact_Offset[0] : 0;
while (Block_Loop(Memory, Property, Property->Keyframe_Count, &h, &c, &i)) {
v2 PointPos[3];
- bezier_point *PointAddress = Bezier_LookupAddress(Memory, Property, i);
+ bezier_point *PointAddress = Bezier_LookupAddress(Memory, Property->Block_Bezier_Index, i);
Bezier_Interact_Evaluate(State, PointAddress, PointPos);
@@ -59,7 +59,7 @@ void Property_SortAll(memory *Memory, project_state *State, property_channel *Pr
while (SortedIndex_Playhead < CurrentSortIndex) {
uint16 TestPointEntry = PropertyArrayStart[SortedIndex_Playhead];
v2 TestPointPos[3];
- bezier_point *TestPointAddress = Bezier_LookupAddress(Memory, Property, TestPointEntry);
+ bezier_point *TestPointAddress = Bezier_LookupAddress(Memory, Property->Block_Bezier_Index, TestPointEntry);
Bezier_Interact_Evaluate(State, TestPointAddress, TestPointPos);
if (PointPos[0].x < TestPointPos[0].x ) {
break;
@@ -395,6 +395,7 @@ void LayerProperty_SortAll(project_data *File, project_state *State, memory *Mem
uint16 *ArrayLocation = SortedKeyframeArray + SortedKeyframePlayhead;
Property_SortAll(Memory, State, Property, InfoLocation, ArrayLocation);
SortedKeyframePlayhead += Property->Keyframe_Count;
+ InfoLocation->KeyframeCount = Property->Keyframe_Count;
}
SortedPropertyPlayhead++;
}
@@ -409,6 +410,7 @@ void LayerProperty_SortAll(project_data *File, project_state *State, memory *Mem
uint16 *ArrayLocation = SortedKeyframeArray + SortedKeyframePlayhead;
Property_SortAll(Memory, State, Property, InfoLocation, ArrayLocation);
SortedKeyframePlayhead += Property->Keyframe_Count;
+ InfoLocation->KeyframeCount = Property->Keyframe_Count;
}
SortedPropertyPlayhead++;
}