Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically forward masks passed as channel to Layer<T>::m_LayerMask #110

Merged
merged 5 commits into from
Oct 5, 2024
Merged

Automatically forward masks passed as channel to Layer<T>::m_LayerMask #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa3533b
Fix ImageLayer not automatically forwarding mask to parameters
EmilDohne Oct 3, 2024
e403319
fix isCollapsed parameter being unused in ctor of GroupLayer
EmilDohne Oct 3, 2024
27c4294
add isVisible parm to Layer<T>::Params
EmilDohne Oct 3, 2024
558ef0b
Add tests for forwarding of ImageLayer
EmilDohne Oct 3, 2024
a1a7e96
Fix #69 by making channel calculation more in-line with what photosho…
EmilDohne Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions PhotoshopAPI/src/LayeredFile/LayerTypes/GroupLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,35 +202,22 @@ struct GroupLayer : public Layer<T>
/// \brief Constructs a GroupLayer with the given layer parameters and collapse state.
/// \param layerParameters The parameters for the group layer.
/// \param isCollapsed Specifies whether the group layer is initially collapsed.
GroupLayer(Layer<T>::Params& layerParameters, bool isCollapsed = false)
GroupLayer(Layer<T>::Params& parameters, bool isCollapsed = false)
{
PROFILE_FUNCTION();
Layer<T>::m_LayerName = layerParameters.layerName;
Layer<T>::m_BlendMode = layerParameters.blendMode;
Layer<T>::m_Opacity = layerParameters.opacity;
Layer<T>::m_IsVisible = true;
Layer<T>::m_CenterX = layerParameters.posX;
Layer<T>::m_CenterY = layerParameters.posY;
Layer<T>::m_Width = layerParameters.width;
Layer<T>::m_Height = layerParameters.height;
Layer<T>::m_LayerName = parameters.layerName;
Layer<T>::m_BlendMode = parameters.blendMode;
Layer<T>::m_Opacity = parameters.opacity;
Layer<T>::m_IsVisible = parameters.isVisible;
Layer<T>::m_CenterX = parameters.posX;
Layer<T>::m_CenterY = parameters.posY;
Layer<T>::m_Width = parameters.width;
Layer<T>::m_Height = parameters.height;

m_isCollapsed = isCollapsed;

// Set the layer mask if present
if (layerParameters.layerMask.has_value())
{
LayerMask mask{};
Enum::ChannelIDInfo info{ .id = Enum::ChannelID::UserSuppliedLayerMask, .index = -2 };
std::unique_ptr<ImageChannel> maskChannel = std::make_unique<ImageChannel>(
layerParameters.compression,
layerParameters.layerMask.value(),
info,
layerParameters.width,
layerParameters.height,
static_cast<float>(layerParameters.posX),
static_cast<float>(layerParameters.posY));
mask.maskData = std::move(maskChannel);
Layer<T>::m_LayerMask = std::move(mask);
}
Layer<T>::parseLayerMask(parameters);
}


Expand Down
Loading
Loading