From 8e7009ec91b52dc3cfba1824381f6d8cd4efd318 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 21 Mar 2017 13:23:13 +0100 Subject: [PATCH] [psd] #532 Fixed text position when animating. --- modules/psd/psd_scene_producer.cpp | 69 ++++++++++++++---------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/modules/psd/psd_scene_producer.cpp b/modules/psd/psd_scene_producer.cpp index 89c410f59..099930281 100644 --- a/modules/psd/psd_scene_producer.cpp +++ b/modules/psd/psd_scene_producer.cpp @@ -131,9 +131,9 @@ public: spl::shared_ptr scene() { return scene_; } - void add(caspar::core::scene::layer* layer, layer_tag tags, double adjustment_x, double adjustment_y, bool vector_mask) + void add(caspar::core::scene::layer* layer, layer_tag tags, bool vector_mask) { - layer_record rec{ layer, tags, adjustment_x, adjustment_y, 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 @@ -271,26 +271,27 @@ void create_timelines( const spl::shared_ptr& 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->timeline_frame() < boost::rational_cast(start_frame) || scene->timeline_frame() > boost::rational_cast(end_frame); + layer.hidden = + scene->timeline_frame() < boost::rational_cast(start_frame) + || scene->timeline_frame() > boost::rational_cast(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) { @@ -300,14 +301,13 @@ void create_timelines( { for (auto& key : track.second.get_child(L"keyList")) { - bool tween = key.second.get(L"animInterpStyle") - == L"Lnr "; - auto time = get_rational(key.second.get_child(L"time")); - auto hrzn = key.second.get(L"animKey.Hrzn"); - auto vrtc = key.second.get(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(L"animInterpStyle") == L"Lnr "; + auto time = get_rational(key.second.get_child(L"time")); + auto hrzn = key.second.get(L"animKey.Hrzn"); + auto vrtc = key.second.get(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) { @@ -335,11 +335,10 @@ void create_timelines( for (auto& key : track.second.get_child(L"keyList")) { - bool tween = key.second.get(L"animInterpStyle") - == L"Lnr "; - auto time = get_rational(key.second.get_child(L"time")); - auto opct = key.second.get(L"animKey.Opct.#Prc") / 100.0; - auto frame = get_frame_number(format_desc, time); + bool tween = key.second.get(L"animInterpStyle") == L"Lnr "; + auto time = get_rational(key.second.get_child(L"time")); + auto opct = key.second.get(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); @@ -404,10 +403,10 @@ spl::shared_ptr create_psd_scene_producer(const core::fram scene_layer.hidden.set(!psd_layer->is_visible()); if (psd_layer->has_timeline()) - create_timelines(root, 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(), 0, 0, false); + 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."; @@ -437,8 +436,6 @@ spl::shared_ptr create_psd_scene_producer(const core::fram caspar::core::scene::layer* scene_layer = nullptr; std::shared_ptr layer_producer; auto layer_name = psd_layer->name(); - int adjustment_x = 0, - adjustment_y = 0; if(psd_layer->is_text() && !psd_layer->is_static()) { @@ -456,10 +453,8 @@ spl::shared_ptr create_psd_scene_producer(const core::fram //text_producer->pixel_constraints().height.set(psd_layer->size().height); core::text::string_metrics metrics = text_producer->measure_string(str); - //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 - //adjustment_y = metrics.bearingY; layer_producer = text_producer; - scene_layer = ¤t.scene()->create_layer(spl::make_shared_ptr(layer_producer), static_cast(psd_layer->text_pos().x) + adjustment_x, static_cast(psd_layer->text_pos().y) + adjustment_y, layer_name); + scene_layer = ¤t.scene()->create_layer(spl::make_shared_ptr(layer_producer), static_cast(psd_layer->text_pos().x), static_cast(psd_layer->text_pos().y), layer_name); int justification = psd_layer->text_data().get(L"EngineDict.ParagraphRun.RunArray..ParagraphSheet.Properties.Justification", 0); @@ -515,7 +510,7 @@ spl::shared_ptr create_psd_scene_producer(const core::fram } if(layer_producer) - scene_layer = ¤t.scene()->create_layer(spl::make_shared_ptr(layer_producer), psd_layer->location().x + adjustment_x, psd_layer->location().y + adjustment_y, layer_name); + 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) @@ -580,10 +575,10 @@ spl::shared_ptr create_psd_scene_producer(const core::fram } if (psd_layer->has_timeline()) - create_timelines(root, dependencies.format_desc, *scene_layer, psd_layer, adjustment_x, adjustment_y); + create_timelines(root, dependencies.format_desc, *scene_layer, psd_layer); if (psd_layer->is_movable() || psd_layer->is_resizable() || (psd_layer->is_text() && !psd_layer->is_static())) - current.add(scene_layer, psd_layer->tags(), -adjustment_x, -adjustment_y, psd_layer->mask().has_vector()); + current.add(scene_layer, psd_layer->tags(), psd_layer->mask().has_vector()); if (psd_layer->is_placeholder()) scene_layer->use_mipmap.set(true); -- 2.39.2