}
- class layer_link_constructor
+class dependency_resolver
+{
+ struct layer_record
{
- struct linked_layer_record
- {
- caspar::core::scene::layer* layer;
- int link_id;
- bool is_master;
- double adjustment_x;
- double adjustment_y;
- };
-
- std::vector<linked_layer_record> layers;
- std::vector<linked_layer_record> masters;
-
- public:
- void add(caspar::core::scene::layer* layer, int link_group, bool master, double adjustment_x, double adjustment_y)
+ layer_record() : layer(nullptr), tags(layer_tag::none), adjustment_x(0), adjustment_y(0), vector_mask(false)
+ {}
+ layer_record(caspar::core::scene::layer* l, caspar::psd::layer_tag t, double x, double y, bool v) :
+ layer(l), tags(t), adjustment_x(x), adjustment_y(y), vector_mask(v)
+ {}
+
+ caspar::core::scene::layer* layer;
+ layer_tag tags;
+ double adjustment_x;
+ double adjustment_y;
+ bool vector_mask;
+ };
+
+ std::list<layer_record> layers;
+ layer_record master;
+
+ spl::shared_ptr<core::scene::scene_producer> scene_;
+ bool is_root_;
+
+public:
+ dependency_resolver(const spl::shared_ptr<core::scene::scene_producer>& s) :
+ scene_(s), is_root_(false)
+ {}
+ dependency_resolver(const spl::shared_ptr<core::scene::scene_producer>& s, bool root) :
+ scene_(s), is_root_(root)
+ {}
+
+ spl::shared_ptr<core::scene::scene_producer> scene() { return scene_; }
+
+ void add(caspar::core::scene::layer* layer, layer_tag tags, bool vector_mask)
+ {
+ layer_record rec{ layer, tags, 0, 0, vector_mask };
+ layers.push_back(rec);
+
+ //if the layer is either explicitly tagged as dynamic or at least not tagged as static/rasterized we should try to set it as master
+ if((rec.tags & layer_tag::explicit_dynamic) == layer_tag::explicit_dynamic || (rec.tags & layer_tag::rasterized) == layer_tag::none)
{
- linked_layer_record rec;
- rec.layer = layer;
- rec.link_id = link_group;
- rec.is_master = master;
- rec.adjustment_x = adjustment_x;
- rec.adjustment_y = adjustment_y;
- layers.push_back(rec);
-
- if(rec.is_master)
+ //if we don't have a master already, just assign this
+ if (master.layer == nullptr)
+ master = rec;
+ else if ((rec.tags & layer_tag::explicit_dynamic) == layer_tag::explicit_dynamic)
{
- auto it = std::find_if(masters.begin(), masters.end(), [=](linked_layer_record const &r){ return r.link_id == link_group; });
- if(it == masters.end())
- masters.push_back(rec);
- else
- masters.erase(it); //ambigous, two linked layers with locked position
+ if((master.tags & layer_tag::explicit_dynamic) == layer_tag::none)
+ {
+ //if we have a master that's not explicitly tagged as dynamic but this layer is; use this as master
+ master = rec;
+ }
+ else {
+ //we have multiple layers that're tagged as dynamic, warn that the first one will be used
+ CASPAR_LOG(warning) << "Multiple explicitly dynamic layers in the same group. The first one will be used";
+ }
}
}
+ }
- void calculate()
- {
- for(auto it = masters.begin(); it != masters.end(); ++it)
- {
- auto& master = (*it);
- //std::for_each(layers.begin(), layers.end(), [&master](linked_layer_record &r) mutable {
- for (auto &r : layers) {
- if(r.link_id == master.link_id && r.layer != master.layer)
- {
- { //x-coords
- double slave_left = r.layer->position.x.get() + r.adjustment_x;
- double slave_right = slave_left + r.layer->producer.get()->pixel_constraints().width.get();
-
- double master_left = master.layer->position.x.get() + master.adjustment_x;
- double master_right = master_left + master.layer->producer.get()->pixel_constraints().width.get();
-
- if((slave_left >= master_left && slave_right <= master_right) || (slave_left <= master_left && slave_right >= master_right))
- {
- //change width of slave
- r.layer->position.x.bind(master.layer->position.x - r.adjustment_x + master.adjustment_x + (slave_left - master_left));
- r.layer->producer.get()->pixel_constraints().width.bind(master.layer->producer.get()->pixel_constraints().width + (slave_right - slave_left - master_right + master_left));
- }
- else if(slave_left >= master_right)
- {
- //push slave ahead of master
- r.layer->position.x.bind(master.layer->position.x - r.adjustment_x + master.adjustment_x + master.layer->producer.get()->pixel_constraints().width + (slave_left - master_right));
- }
- else if(slave_right <= master_left)
- {
- r.layer->position.x.bind(master.layer->position.x - r.adjustment_x + master.adjustment_x - (master_left - slave_left));
- }
- }
+ void calculate()
+ {
+ if (layers.size() == 0)
+ return;
- { //y-coords
- double slave_top = r.layer->position.y.get() + r.adjustment_y;
- double slave_bottom = slave_top + r.layer->producer.get()->pixel_constraints().height.get();
-
- double master_top = master.layer->position.y.get() + master.adjustment_y;
- double master_bottom = master_top + master.layer->producer.get()->pixel_constraints().height.get();
-
- if((slave_top >= master_top && slave_bottom <= master_bottom) || (slave_top <= master_top && slave_bottom >= master_bottom))
- {
- //change height of slave
- r.layer->position.y.bind(master.layer->position.y - r.adjustment_y + master.adjustment_y + (slave_top - master_top));
- r.layer->producer.get()->pixel_constraints().height.bind(master.layer->producer.get()->pixel_constraints().height + (slave_bottom - slave_top - master_bottom + master_top));
- }
- else if(slave_top >= master_bottom)
- {
- //push slave ahead of master
- r.layer->position.y.bind(master.layer->position.y - r.adjustment_y + master.adjustment_y + master.layer->producer.get()->pixel_constraints().height + (slave_top - master_bottom));
- }
- else if(slave_bottom <= master_top)
- {
- r.layer->position.y.bind(master.layer->position.y - r.adjustment_y + master.adjustment_y - (master_top - slave_top));
- }
- }
+ if (master.layer == nullptr) {
+ CASPAR_LOG(warning) << "Dependent layers without any dynamic layer";
+ return;
+ }
- }
+ for (auto &r : layers)
+ {
+ if (r.layer != master.layer)
+ {
+ //x-coords
+ double slave_left = r.layer->position.x.get();
+ double master_left = master.layer->position.x.get();
+ double slave_right = slave_left + r.layer->producer.get()->pixel_constraints().width.get();
+ double master_right = master_left + master.layer->producer.get()->pixel_constraints().width.get();
+
+ double slave_width = slave_right - slave_left;
+ double master_width = master_right - master_left;
+
+ double offset_start_x = slave_left - master_left;
+ double offset_end_x = slave_left - master_right;
+
+ if((r.tags & layer_tag::moveable) == layer_tag::moveable)
+ r.layer->position.x.bind(master.layer->position.x + master.layer->producer.get()->pixel_constraints().width + offset_end_x + r.adjustment_x);
+ else if ((r.tags & layer_tag::resizable) == layer_tag::resizable) {
+ r.layer->position.x.bind(master.layer->position.x + offset_start_x + r.adjustment_x);
+
+ if(r.vector_mask) //adjust crop-rect if we have a vector-mask
+ r.layer->crop.lower_right.x.bind(master.layer->producer.get()->pixel_constraints().width + ((r.layer->crop.lower_right.x.get() - r.layer->crop.upper_left.x.get()) - master_width));
+ else //just stretch the content
+ r.layer->producer.get()->pixel_constraints().width.bind(master.layer->producer.get()->pixel_constraints().width + (slave_width - master_width));
}
+
+ //no support for changes in the y-direction yet
}
}
- };
+ }
+};
-int64_t get_frame_number(
+boost::rational<int> get_frame_number(
const core::video_format_desc& format_desc,
const boost::rational<int>& at_second)
{
- return static_cast<int64_t>(
- boost::rational_cast<double>(at_second) * format_desc.fps);
+ return at_second * format_desc.framerate;
}
boost::rational<int> get_rational(const boost::property_tree::wptree& node)
for (auto& key : *keylist)
{
auto time = get_rational(key.second.get_child(L"time"));
- auto frame = get_frame_number(format_desc, time);
+ auto frame = boost::rational_cast<int64_t>(get_frame_number(format_desc, time));
auto text = key.second.get<std::wstring>(L"animKey.Vl ");
std::vector<std::wstring> marks;
boost::split(marks, text, boost::is_any_of(","));
auto time = get_rational(global_timeline.get_child(L"duration"));
auto remove_at_frame = get_frame_number(format_desc, time);
- scene->add_mark(remove_at_frame, core::scene::mark_action::remove, L"");
+ scene->add_mark(boost::rational_cast<int64_t>(remove_at_frame), core::scene::mark_action::remove, L"");
auto tracklist = global_timeline.get_child_optional(L"globalTrackList");
const spl::shared_ptr<core::scene::scene_producer>& scene,
const core::video_format_desc& format_desc,
core::scene::layer& layer,
- const layer_ptr& psd_layer,
- double adjustment_x,
- double adjustment_y)
+ const layer_ptr& psd_layer)
{
- auto timeline = psd_layer->timeline_data();
- auto start = get_rational(timeline.get_child(L"timeScope.Strt"));
- auto end_offset = get_rational(timeline.get_child(L"timeScope.outTime"));
- auto end = start + end_offset;
- auto start_frame = get_frame_number(format_desc, start);
- auto end_frame = get_frame_number(format_desc, end);
+ auto timeline = psd_layer->timeline_data();
+ auto start = get_rational(timeline.get_child(L"timeScope.Strt"));
+ auto end_offset = get_rational(timeline.get_child(L"timeScope.outTime"));
+ auto end = start + end_offset;
+ auto start_frame = get_frame_number(format_desc, start);
+ auto end_frame = get_frame_number(format_desc, end);
- layer.hidden = scene->frame() < start_frame || scene->frame() > end_frame;
+ layer.hidden =
+ scene->timeline_frame() < boost::rational_cast<int64_t>(start_frame)
+ || scene->timeline_frame() > boost::rational_cast<int64_t>(end_frame);
auto tracklist = timeline.get_child_optional(L"trackList");
if (!tracklist)
return;
- double original_pos_x = psd_layer->location().x;
- double original_pos_y = psd_layer->location().y;
+ bool is_text_field = psd_layer->is_text() && !psd_layer->is_static();
+ double original_pos_x = is_text_field ? psd_layer->text_pos().x : psd_layer->location().x;
+ double original_pos_y = is_text_field ? psd_layer->text_pos().y : psd_layer->location().y;
for (auto& track : *tracklist)
{
{
for (auto& key : track.second.get_child(L"keyList"))
{
- bool tween = key.second.get<std::wstring>(L"animInterpStyle")
- == L"Lnr ";
- auto time = get_rational(key.second.get_child(L"time"));
- auto hrzn = key.second.get<double>(L"animKey.Hrzn");
- auto vrtc = key.second.get<double>(L"animKey.Vrtc");
- auto x = original_pos_x + hrzn + adjustment_x;
- auto y = original_pos_y + vrtc + adjustment_y;
- auto frame = get_frame_number(format_desc, time);
+ bool tween = key.second.get<std::wstring>(L"animInterpStyle") == L"Lnr ";
+ auto time = get_rational(key.second.get_child(L"time"));
+ auto hrzn = key.second.get<double>(L"animKey.Hrzn");
+ auto vrtc = key.second.get<double>(L"animKey.Vrtc");
+ auto x = original_pos_x + hrzn;
+ auto y = original_pos_y + vrtc;
+ auto frame = get_frame_number(format_desc, time);
if (frame == 0) // Consider as initial value (rewind)
{
if (tween)
{
- scene->add_keyframe(layer.position.x, x, frame, L"easeOutSine");
- scene->add_keyframe(layer.position.y, y, frame, L"easeOutSine");
+ scene->add_keyframe(layer.position.x, x, boost::rational_cast<int64_t>(frame), L"easeOutSine");
+ scene->add_keyframe(layer.position.y, y, boost::rational_cast<int64_t>(frame), L"easeOutSine");
}
else
{
- scene->add_keyframe(layer.position.x, x, frame);
- scene->add_keyframe(layer.position.y, y, frame);
+ scene->add_keyframe(layer.position.x, x, boost::rational_cast<int64_t>(frame));
+ scene->add_keyframe(layer.position.y, y, boost::rational_cast<int64_t>(frame));
}
}
}
for (auto& key : track.second.get_child(L"keyList"))
{
- bool tween = key.second.get<std::wstring>(L"animInterpStyle")
- == L"Lnr ";
- auto time = get_rational(key.second.get_child(L"time"));
- auto opct = key.second.get<double>(L"animKey.Opct.#Prc") / 100.0;
- auto frame = get_frame_number(format_desc, time);
+ bool tween = key.second.get<std::wstring>(L"animInterpStyle") == L"Lnr ";
+ auto time = get_rational(key.second.get_child(L"time"));
+ auto opct = key.second.get<double>(L"animKey.Opct.#Prc") / 100.0;
+ auto frame = get_frame_number(format_desc, time);
if (frame == 0) // Consider as initial value (rewind)
opacity.set(opct);
frame = start_frame + frame; // translate to global timeline
if (tween)
- scene->add_keyframe(opacity, opct, frame, L"easeOutSine");
+ scene->add_keyframe(opacity, opct, boost::rational_cast<int64_t>(frame), L"linear");
else
- scene->add_keyframe(opacity, opct, frame);
+ scene->add_keyframe(opacity, opct, boost::rational_cast<int64_t>(frame));
}
}
+ else
+ {
+ //ignore other kinds of tracks for now
+ }
}
}
psd_document doc;
doc.parse(*found_file);
- auto root = spl::make_shared<core::scene::scene_producer>(L"psd", doc.width(), doc.height(), dependencies.format_desc);
-
- layer_link_constructor link_constructor;
+ auto root = spl::make_shared<core::scene::scene_producer>(L"psd", params.at(0), doc.width(), doc.height(), dependencies.format_desc);
std::vector<std::pair<std::wstring, spl::shared_ptr<core::text_producer>>> text_producers_by_layer_name;
- std::stack<spl::shared_ptr<core::scene::scene_producer>> current_scene_stack;
- current_scene_stack.push(root);
+ std::stack<dependency_resolver> scene_stack;
+ scene_stack.push(dependency_resolver{ root, true });
auto layers_end = doc.layers().rend();
for(auto it = doc.layers().rbegin(); it != layers_end; ++it)
{
- auto psd_layer = (*it);
- auto current_scene = current_scene_stack.top();
+ auto& psd_layer = (*it);
+ auto& current = scene_stack.top();
if (psd_layer->group_mode() == layer_type::group) {
- auto group = spl::make_shared<core::scene::scene_producer>(psd_layer->name(), doc.width(), doc.height(), dependencies.format_desc);
-
- auto& scene_layer = current_scene->create_layer(group, psd_layer->location().x, psd_layer->location().y, psd_layer->name());
+ //we've found a group. Create a new scene and add it to the scene-stack
+
+ auto format_desc = (dependencies.format_desc.field_count == 1) ? dependencies.format_desc : core::video_format_desc{ dependencies.format_desc.format,
+ dependencies.format_desc.width,
+ dependencies.format_desc.height,
+ dependencies.format_desc.square_width,
+ dependencies.format_desc.square_height,
+ core::field_mode::progressive,
+ dependencies.format_desc.time_scale*2,
+ dependencies.format_desc.duration,
+ dependencies.format_desc.name,
+ core::find_audio_cadence(dependencies.format_desc.framerate * 2) };
+
+ auto group = spl::make_shared<core::scene::scene_producer>(psd_layer->name(), L"layer group in " + params.at(0), doc.width(), doc.height(), format_desc);
+
+ auto& scene_layer = current.scene()->create_layer(group, psd_layer->location().x, psd_layer->location().y, psd_layer->name());
scene_layer.adjustments.opacity.set(psd_layer->opacity() / 255.0);
scene_layer.hidden.set(!psd_layer->is_visible());
if (psd_layer->has_timeline())
- create_timelines(current_scene, dependencies.format_desc, scene_layer, psd_layer, 0, 0);
+ create_timelines(root, dependencies.format_desc, scene_layer, psd_layer);
+
+ if (psd_layer->is_movable())
+ current.add(&scene_layer, psd_layer->tags(), false);
+
+ if (psd_layer->is_resizable()) //TODO: we could add support for resizable groups with vector masks
+ CASPAR_LOG(warning) << "Groups doesn't support the \"resizable\"-tag.";
+
+ if (psd_layer->is_placeholder())
+ CASPAR_LOG(warning) << "Groups doesn't support the \"producer\"-tag.";
- if (psd_layer->link_group_id() != 0)
- link_constructor.add(&scene_layer, psd_layer->link_group_id(), psd_layer->is_position_protected(), 0, 0);
+ if (psd_layer->is_cornerpin())
+ CASPAR_LOG(warning) << "Groups doesn't support the \"cornerpin\"-tag.";
- current_scene_stack.push(group);
+ if (psd_layer->is_explicit_dynamic())
+ CASPAR_LOG(warning) << "Groups doesn't support the \"dynamic\"-tag.";
+
+ scene_stack.push(group);
continue;
}
else if (psd_layer->group_mode() == layer_type::group_delimiter) {
- current_scene->reverse_layers();
- current_scene_stack.pop();
+ //a group-terminator. Finish the scene
+ current.scene()->reverse_layers();
+ current.calculate();
+ scene_stack.pop();
continue;
}
- if(psd_layer->is_visible())
+ if (psd_layer->is_visible())
{
- bool is_text = psd_layer->is_text();
- bool is_marked_as_dynamic = psd_layer->sheet_color() != 1;
- std::wstring layer_name = psd_layer->name();
+ caspar::core::scene::layer* scene_layer = nullptr;
+ std::shared_ptr<core::frame_producer> layer_producer;
+ auto layer_name = psd_layer->name();
- if(is_text && is_marked_as_dynamic)
+ if(psd_layer->is_text() && !psd_layer->is_static())
{
std::wstring str = psd_layer->text_data().get(L"EngineDict.Editor.Text", L"");
-
+
core::text::text_info text_info(std::move(get_text_info(psd_layer->text_data())));
- text_info.size *= psd_layer->text_scale();
+ auto max_scale = std::max(abs(psd_layer->scale().x), abs(psd_layer->scale().y));
+ text_info.size *= max_scale;
+ text_info.scale_x = psd_layer->scale().x / max_scale;
+ text_info.scale_y = psd_layer->scale().y / max_scale;
+ text_info.shear = 0;
auto text_producer = core::text_producer::create(dependencies.frame_factory, 0, 0, str, text_info, doc.width(), doc.height());
- text_producer->pixel_constraints().width.set(psd_layer->size().width);
- text_producer->pixel_constraints().height.set(psd_layer->size().height);
+ //text_producer->pixel_constraints().width.set(psd_layer->size().width);
+ //text_producer->pixel_constraints().height.set(psd_layer->size().height);
core::text::string_metrics metrics = text_producer->measure_string(str);
-
- auto adjustment_x = -2; //the 2 offset is just a hack for now. don't know why our text is rendered 2 px to the right of that in photoshop
- auto adjustment_y = metrics.bearingY;
- auto& scene_layer = current_scene->create_layer(text_producer, psd_layer->location().x + adjustment_x, psd_layer->location().y + adjustment_y, psd_layer->name());
- scene_layer.adjustments.opacity.set(psd_layer->opacity() / 255.0);
- scene_layer.hidden.set(!psd_layer->is_visible());
- if (psd_layer->has_timeline())
- create_timelines(current_scene, dependencies.format_desc, scene_layer, psd_layer, adjustment_x, adjustment_y);
+ layer_producer = text_producer;
+ scene_layer = ¤t.scene()->create_layer(spl::make_shared_ptr(layer_producer), static_cast<int>(psd_layer->text_pos().x), static_cast<int>(psd_layer->text_pos().y), layer_name);
- if(psd_layer->link_group_id() != 0)
- link_constructor.add(&scene_layer, psd_layer->link_group_id(), psd_layer->is_position_protected(), -adjustment_x, -adjustment_y);
+ int justification = psd_layer->text_data().get(L"EngineDict.ParagraphRun.RunArray..ParagraphSheet.Properties.Justification", 0);
+
+ switch (justification)
+ {
+ case 1: // Right
+ scene_layer->anchor.x = text_producer.get()->pixel_constraints().width;
+ break;
+ case 2: // Center
+ scene_layer->anchor.x = text_producer.get()->pixel_constraints().width / 2.0;
+ break;
+ }
text_producers_by_layer_name.push_back(std::make_pair(layer_name, text_producer));
}
else
{
- std::shared_ptr<core::frame_producer> layer_producer;
- if(psd_layer->is_solid())
+ if (psd_layer->is_placeholder())
+ {
+ auto hotswap = std::make_shared<core::hotswap_producer>(psd_layer->bitmap()->width(), psd_layer->bitmap()->height());
+
+ if (psd_layer->is_explicit_dynamic())
+ {
+ /*auto& var = root->create_variable<std::wstring>(boost::to_lower_copy(layer_name), true, L"");
+ var.on_change([=]() {
+ hotswap->producer().set(dependencies.producer_registry->create_producer(dependencies, root->get_variable(layer_name).as<std::wstring>().get()));
+ });*/
+
+ }
+ else
+ hotswap->producer().set(dependencies.producer_registry->create_producer(dependencies, layer_name));
+
+ layer_producer = hotswap;
+ }
+ else if(psd_layer->is_solid())
{
layer_producer = core::create_const_producer(core::create_color_frame(it->get(), dependencies.frame_factory, psd_layer->solid_color().to_uint32()), psd_layer->bitmap()->width(), psd_layer->bitmap()->height());
}
else if(psd_layer->bitmap())
{
- if (boost::algorithm::istarts_with(layer_name, L"[producer]"))
- {
- auto hotswap = std::make_shared<core::hotswap_producer>(psd_layer->bitmap()->width(), psd_layer->bitmap()->height());
- hotswap->producer().set(dependencies.producer_registry->create_producer(dependencies, layer_name.substr(10)));
- layer_producer = hotswap;
+ core::pixel_format_desc pfd(core::pixel_format::bgra);
+ pfd.planes.push_back(core::pixel_format_desc::plane(psd_layer->bitmap()->width(), psd_layer->bitmap()->height(), 4));
+
+ auto frame = dependencies.frame_factory->create_frame(it->get(), pfd, core::audio_channel_layout::invalid());
+ auto destination = frame.image_data().data();
+ auto source = psd_layer->bitmap()->data();
+ memcpy(destination, source, frame.image_data().size());
+
+ layer_producer = core::create_const_producer(core::draw_frame(std::move(frame)), psd_layer->bitmap()->width(), psd_layer->bitmap()->height());
+ }
+ else {
+ CASPAR_LOG(warning) << "Ignoring layer \"" << layer_name << "\", layer type not supported";
+ }
+
+ if(layer_producer)
+ scene_layer = ¤t.scene()->create_layer(spl::make_shared_ptr(layer_producer), psd_layer->location().x, psd_layer->location().y, layer_name);
+ }
+
+ if (layer_producer && scene_layer)
+ {
+ scene_layer->adjustments.opacity.set(psd_layer->opacity() / 255.0);
+ scene_layer->hidden.set(!psd_layer->is_visible()); //this will always evaluate to true
+ scene_layer->blend_mode.set(psd_layer->blend_mode());
+ scene_layer->rotation.set(psd_layer->angle());
+
+ if (psd_layer->mask().has_vector()) {
+
+ if (psd_layer->is_placeholder() && psd_layer->is_cornerpin()) {
+
+ psd::point<int> layer_pos{ static_cast<int>(scene_layer->position.x.get()), static_cast<int>(scene_layer->position.y.get()) };
+ auto unbind_and_set = [&layer_pos](caspar::core::scene::coord& c, const caspar::psd::point<int>& pt) {
+ c.x.unbind();
+ c.x.set(pt.x - layer_pos.x); //remap to layer-coordinates
+ c.y.unbind();
+ c.y.set(pt.y - layer_pos.y); //remap to layer-coordinates
+ };
+
+ if (!psd_layer->mask().vector()->rect().empty()) {
+ //this rectangle is in document-coordinates
+ auto& mask = psd_layer->mask().vector()->rect();
+
+ unbind_and_set(scene_layer->perspective.upper_left, mask.location);
+ unbind_and_set(scene_layer->perspective.upper_right, point<int>{mask.location.x + mask.size.width, mask.location.y});
+ unbind_and_set(scene_layer->perspective.lower_right, point<int>{mask.location.x + mask.size.width, mask.location.y + mask.size.width});
+ unbind_and_set(scene_layer->perspective.lower_left, point<int>{mask.location.x, mask.location.y + mask.size.width});
+ }
+ else if (!psd_layer->mask().vector()->knots().empty()) {
+ auto& knots = psd_layer->mask().vector()->knots();
+ unbind_and_set(scene_layer->perspective.upper_left, knots[0]);
+ unbind_and_set(scene_layer->perspective.upper_right, knots[1]);
+ unbind_and_set(scene_layer->perspective.lower_right, knots[2]);
+ unbind_and_set(scene_layer->perspective.lower_left, knots[3]);
+ }
}
- else
+ else if(!psd_layer->mask().vector()->rect().empty())
{
- core::pixel_format_desc pfd(core::pixel_format::bgra);
- pfd.planes.push_back(core::pixel_format_desc::plane(psd_layer->bitmap()->width(), psd_layer->bitmap()->height(), 4));
+ //this rectangle is in document-coordinates
+ auto mask = psd_layer->mask().vector()->rect();
+
+ //remap to layer-coordinates
+ auto left = static_cast<double>(mask.location.x) - scene_layer->position.x.get();
+ auto right = left + static_cast<double>(mask.size.width);
+ auto top = static_cast<double>(mask.location.y) - scene_layer->position.y.get();
+ auto bottom = top + static_cast<double>(mask.size.height);
+
+ scene_layer->crop.upper_left.x.unbind();
+ scene_layer->crop.upper_left.x.set(left);
+
+ scene_layer->crop.upper_left.y.unbind();
+ scene_layer->crop.upper_left.y.set(top);
- auto frame = dependencies.frame_factory->create_frame(it->get(), pfd, core::audio_channel_layout::invalid());
- auto destination = frame.image_data().data();
- auto source = psd_layer->bitmap()->data();
- memcpy(destination, source, frame.image_data().size());
+ scene_layer->crop.lower_right.x.unbind();
+ scene_layer->crop.lower_right.x.set(right);
- layer_producer = core::create_const_producer(core::draw_frame(std::move(frame)), psd_layer->bitmap()->width(), psd_layer->bitmap()->height());
+ scene_layer->crop.lower_right.y.unbind();
+ scene_layer->crop.lower_right.y.set(bottom);
}
}
- if(layer_producer)
- {
- auto& scene_layer = current_scene->create_layer(spl::make_shared_ptr(layer_producer), psd_layer->location().x, psd_layer->location().y, psd_layer->name());
- scene_layer.adjustments.opacity.set(psd_layer->opacity() / 255.0);
- scene_layer.hidden.set(!psd_layer->is_visible());
+ if (psd_layer->has_timeline())
+ create_timelines(root, dependencies.format_desc, *scene_layer, psd_layer);
- if (psd_layer->has_timeline())
- create_timelines(current_scene, dependencies.format_desc, scene_layer, psd_layer, 0, 0);
+ if (psd_layer->is_movable() || psd_layer->is_resizable() || (psd_layer->is_text() && !psd_layer->is_static()))
+ current.add(scene_layer, psd_layer->tags(), psd_layer->mask().has_vector());
- if(psd_layer->link_group_id() != 0)
- link_constructor.add(&scene_layer, psd_layer->link_group_id(), psd_layer->is_position_protected(), 0, 0);
- }
+ if (psd_layer->is_placeholder())
+ scene_layer->use_mipmap.set(true);
}
}
}
- root->reverse_layers();
- link_constructor.calculate();
+ if (scene_stack.size() != 1) {
- // Reset all dynamic text fields to empty strings and expose them as a scene parameter.
- for (auto& text_layer : text_producers_by_layer_name)
- text_layer.second->text().bind(root->create_variable<std::wstring>(boost::to_lower_copy(text_layer.first), true, L""));
+ }
+ root->reverse_layers();
+ scene_stack.top().calculate();
if (doc.has_timeline())
create_marks(root, dependencies.format_desc, doc.timeline());
+ // Reset all dynamic text fields to empty strings and expose them as a scene parameter.
+ for (auto& text_layer : text_producers_by_layer_name) {
+ text_layer.second->text().set(L"");
+ auto var = root->create_variable<std::wstring>(boost::to_lower_copy(text_layer.first), true, L"");
+ text_layer.second->text().bind(var);
+ }
+
auto params2 = params;
params2.erase(params2.begin());
return root;
}
+void describe_psd_scene_producer(core::help_sink& sink, const core::help_repository& repo)
+{
+ sink.short_description(L"A producer for dynamic graphics using Photoshops .psd files.");
+ sink.syntax(L"[.psd_filename:string] {[param1:string] [value1:string]} {[param2:string] [value2:string]} ...");
+ sink.para()->text(L"A producer that looks in the ")->code(L"templates")->text(L" folder for .psd files.");
+}
+
void init(core::module_dependencies dependencies)
{
+ dependencies.producer_registry->register_producer_factory(L"PSD Scene Producer", create_psd_scene_producer, describe_psd_scene_producer);
dependencies.cg_registry->register_cg_producer(
L"psd",
{ L".psd" },
projects / casparcg / blobdiff