work in progress changes

diff --git a/.gitignore b/.gitignore
index 4a5c2c65aa08638627bdf39e8b24742e3250a806..3f6cfa02ffa420f820436d5405627099870e72b4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,8 @@
 /dependencies64/sfml
 /dependencies64/tbb
 
+/modules/psd/psd.vcxproj.user
+
+/test/psd-test/Debug
+
+/test/psd-test/psd-test.vcxproj.user

diff --git a/core/producer/binding.h b/core/producer/binding.h
index 7781e6b6d3ccd0c7381448342544b337494053b4..d2b4be4858d2ebf64510d5c9c3d27ad628914b0e 100644 (file)
--- a/core/producer/binding.h
+++ b/core/producer/binding.h
@@ -66,6 +66,7 @@ private:
                std::function<T ()> expression_;
 
                impl()
+                       : value_()
                {
                }
 

diff --git a/core/producer/scene/scene_producer.cpp b/core/producer/scene/scene_producer.cpp
index 71fbdbb0f0b04e47aef9ec0e6eca1d8154680304..d85cebb5bc65165c6aaf6b72bfbb86f900598a28 100644 (file)
--- a/core/producer/scene/scene_producer.cpp
+++ b/core/producer/scene/scene_producer.cpp
@@ -33,6 +33,11 @@ layer::layer(const spl::shared_ptr<frame_producer>& producer)
 {
 }
 
+adjustments::adjustments()
+       : opacity(1.0)
+{
+}
+
 struct scene_producer::impl
 {
        constraints pixel_constraints_;
@@ -72,6 +77,9 @@ struct scene_producer::impl
                scale[1] = static_cast<double>(layer.producer.get()->pixel_constraints().height.get())
                                / static_cast<double>(pixel_constraints_.height.get());
 
+               transform.image_transform.opacity = layer.adjustments.opacity.get();
+               transform.image_transform.is_key = layer.is_key.get();
+
                return transform;
        }
 

diff --git a/core/producer/scene/scene_producer.h b/core/producer/scene/scene_producer.h
index 785c29680f497cb502e4b4e3ca56456b9b09deaa..1e4d3472211a10361dd5963a9db3fa2f9464df30 100644 (file)
--- a/core/producer/scene/scene_producer.h
+++ b/core/producer/scene/scene_producer.h
@@ -36,6 +36,8 @@ struct coord
 struct adjustments
 {
        binding<double> opacity;
+
+       adjustments();
 };
 
 struct layer
@@ -45,6 +47,7 @@ struct layer
        adjustments adjustments;
        binding<spl::shared_ptr<frame_producer>> producer;
        binding<bool> hidden;
+       binding<bool> is_key;
 
        layer(const spl::shared_ptr<frame_producer>& producer);
 };