summaryrefslogtreecommitdiff
path: root/prenderer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'prenderer.cpp')
-rw-r--r--prenderer.cpp39
1 files changed, 2 insertions, 37 deletions
diff --git a/prenderer.cpp b/prenderer.cpp
index 76e76cf..cf5990e 100644
--- a/prenderer.cpp
+++ b/prenderer.cpp
@@ -51,41 +51,6 @@ Layer_GetDimensions(memory *Memory, block_layer *Layer, int *Width, int *Height)
}
}
-// static v2
-// Layer_SlowTreeTraverse(project_data *File, memory *Memory, block_layer *Layer, v2 Point)
-// {
-// }
-
-/*
-static v2
-Layer_Transform_ScreenSpaceToLocal_Recurse(project_data *File, memory *Memory, block_layer *Layer, v2 Point)
-{
- uint32 Recurse[4];
- real32 Idx = 0;
- Recurse[0] = Idx = Layer->Block_Composition_Index;
- v2 LayerUV = Point;
- int i = 1;
- do {
- // block_layer *OuterLayer = (block_layer *)Memory_Block_AddressAtIndex(Memory, F_Layers, Idx);
- block_composition *Comp = (block_composition *)Memory_Block_AddressAtIndex(Memory, F_Precomps, Idx);
- Recurse[i++] = Idx;
- Idx = OuterLayer->Block_Composition_Index;
- } while (Idx != File->PrincipalCompIndex);
- for (int a = i-2; a >= 0; a--) {
- block_layer *OuterLayer = (block_layer *)Memory_Block_AddressAtIndex(Memory, F_Layers, Recurse[a-1]);
- int OuterWidth = 0, OuterHeight = 0;
- Layer_GetDimensions(Memory, OuterLayer, &OuterWidth, &OuterHeight);
- layer_transforms T = Layer_GetTransforms(OuterLayer);
- block_layer *InnerLayer = (block_layer *)Memory_Block_AddressAtIndex(Memory, F_Layers, Recurse[a]);
- int InnerWidth = 0, InnerHeight = 0;
- Layer_GetDimensions(Memory, InnerLayer, &InnerWidth, &InnerHeight);
- LayerUV = T_CompUVToLayerUV(T, OuterWidth, OuterHeight, InnerWidth, InnerHeight, LayerUV);
- }
- // return V2(LayerUV.x * SourceWidth, LayerUV.y * SourceHeight);
- return V2(LayerUV.x, LayerUV.y);
-}
-*/
-
// Transform given data based on state's Interact data.
static void
Transform_ApplyInteractive(interact_transform Interact, real32 *OutputX, real32 *OutputY, real32 *OutputRotation, real32 *OutputScale)
@@ -284,7 +249,7 @@ Layer_LocalToScreenSpace(project_state *State, memory *Memory, block_layer *Laye
layer_transforms T = Layer_GetTransforms(Layer);
- if (State->Interact_Active == interact_type_viewport_transform && Layer->IsSelected) {
+ if (State->Interact_Active == interact_type_viewport_transform && Layer->IsSelected == 1) {
Transform_ApplyInteractive(*(interact_transform *)&State->Interact_Offset[0], &T.x, &T.y, &T.rotation, &T.scale);
}
@@ -385,7 +350,7 @@ Transform_Calculate(project_state *State, memory *Memory, project_data *File, bl
real32 s = Layer->scale.CurrentValue;
blend_mode BlendMode = Layer->BlendMode;
- if (State->Interact_Active == interact_type_viewport_transform && Layer->IsSelected) {
+ if (State->Interact_Active == interact_type_viewport_transform && Layer->IsSelected == 1) {
Transform_ApplyInteractive(*(interact_transform *)&State->Interact_Offset[0], &X, &Y, &Rotation, &s);
}