fix cached brush face centroid tracking

This commit is contained in:
Garux
2018-12-02 19:10:15 +03:00
parent 70167de13b
commit 389030e05d
2 changed files with 26 additions and 26 deletions

View File

@@ -82,9 +82,12 @@ struct Skew{
}
Skew( std::size_t index_, float amount_ ) : index( index_ ), amount( amount_ ){
}
bool operator!= ( const Skew& other ){
bool operator!= ( const Skew& other ) const {
return index != other.index || amount != other.amount;
}
bool operator== ( const Skew& other ) const {
return index == other.index && amount == other.amount;
}
};
@@ -142,6 +145,7 @@ Callback m_changed;
Callback m_apply;
TransformModifierType m_type;
public:
bool m_transformFrozen = true;
TransformModifier( const Callback& changed, const Callback& apply ) :
m_translation( c_translation_identity ),
@@ -175,17 +179,16 @@ void setSkew( const Skew& value ){
m_changed();
}
void freezeTransform(){
if ( m_translation != c_translation_identity
|| m_rotation != c_rotation_identity
|| m_scale != c_scale_identity
|| m_skew != c_skew_identity ) {
if ( !isIdentity() ) {
m_apply();
m_translation = c_translation_identity;
m_rotation = c_rotation_identity;
m_scale = c_scale_identity;
m_skew = c_skew_identity;
m_transformFrozen = true;
m_changed();
}
m_transformFrozen = true;
}
const Translation& getTranslation() const {
return m_translation;
@@ -202,6 +205,12 @@ const Skew& getSkew() const {
Matrix4 calculateTransform() const {
return matrix4_transform_for_components( getTranslation(), getRotation(), getScale(), getSkew() );
}
bool isIdentity() const {
return m_translation == c_translation_identity
&& m_rotation == c_rotation_identity
&& m_scale == c_scale_identity
&& m_skew == c_skew_identity;
}
};