projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename get_param_vocab to get_children_vocab and use a wrapper for the pure virtual...
[synfig.git]
/
synfig-core
/
src
/
synfig
/
layer_composite.h
diff --git
a/synfig-core/src/synfig/layer_composite.h
b/synfig-core/src/synfig/layer_composite.h
index
458bae7
..
46a07b6
100644
(file)
--- a/
synfig-core/src/synfig/layer_composite.h
+++ b/
synfig-core/src/synfig/layer_composite.h
@@
-49,21
+49,14
@@
class Layer_Composite : public Layer
{
private:
//! The amount of composite
{
private:
//! The amount of composite
- float amount
_
;
+ float amount;
//! The blend method for the composition
//! The blend method for the composition
- Color::BlendMethod blend_method
_
;
+ Color::BlendMethod blend_method;
protected:
//! Default constructor. Not used directly.
protected:
//! Default constructor. Not used directly.
- Layer_Composite(
- float amount=1.0,
- Color::BlendMethod blend_method=Color::BLEND_COMPOSITE
- ):
- amount_ (amount),
- blend_method_ (blend_method),
- converted_blend_ (false),
- transparent_color_ (false)
- { }
+ Layer_Composite(float amount=1.0, Color::BlendMethod blend_method=Color::BLEND_COMPOSITE);
+
//! Converted blend is used to check if an old version of canvas
//! is used in the composition. Old Straight was used as new Composite
//! \todo verify this
//! Converted blend is used to check if an old version of canvas
//! is used in the composition. Old Straight was used as new Composite
//! \todo verify this
@@
-74,17
+67,17
@@
protected:
public:
//! Gets the amount of the layer
public:
//! Gets the amount of the layer
- float get_amount()const { return amount
_
; }
+ float get_amount()const { return amount; }
//! Sets the amount of the layer and returns this layer
//! Sets the amount of the layer and returns this layer
- Layer_Composite& set_amount(float x) { amount
_
=x; return *this; }
+ Layer_Composite& set_amount(float x) { amount=x; return *this; }
//! Gets the blend method of the layer
//! Gets the blend method of the layer
- Color::BlendMethod get_blend_method()const { return blend_method
_
; }
+ Color::BlendMethod get_blend_method()const { return blend_method; }
//! Sets the blend method of the layer and returns this layer
//! Sets the blend method of the layer and returns this layer
- Layer_Composite& set_blend_method(Color::BlendMethod x) { blend_method
_
=x; return *this; }
+ Layer_Composite& set_blend_method(Color::BlendMethod x) { blend_method=x; return *this; }
//! Returns true is amount is 1 and blend method is straight
//! Returns true is amount is 1 and blend method is straight
- virtual bool is_solid_color()const { return amount
_==1.0f && blend_method_
==Color::BLEND_STRAIGHT; }
+ virtual bool is_solid_color()const { return amount
==1.0f && blend_method
==Color::BLEND_STRAIGHT; }
//! Returns true if the amount is zero.
//! Returns true if the amount is zero.
- bool is_disabled()const { return amount
_
==0.0f; }
+ bool is_disabled()const { return amount==0.0f; }
//! Gets the parameter vocabulary. To be overrided by the derived.
virtual Vocab get_param_vocab()const;
//! Sets the value for the given parameter.
//! Gets the parameter vocabulary. To be overrided by the derived.
virtual Vocab get_param_vocab()const;
//! Sets the value for the given parameter.