fix baseScale never being included in GetZoomed/GetUnzoomedWidth()
(It seems to belong in both.)
This commit is contained in:
@@ -103,10 +103,10 @@ public:
|
|||||||
void SetXY( float x, float y ) { DestTweenState().pos.x = x; DestTweenState().pos.y = y; };
|
void SetXY( float x, float y ) { DestTweenState().pos.x = x; DestTweenState().pos.y = y; };
|
||||||
|
|
||||||
// height and width vary depending on zoom
|
// height and width vary depending on zoom
|
||||||
float GetUnzoomedWidth() { return m_size.x; }
|
float GetUnzoomedWidth() { return m_size.x * m_baseScale.x; }
|
||||||
float GetUnzoomedHeight() { return m_size.y; }
|
float GetUnzoomedHeight() { return m_size.y * m_baseScale.y; }
|
||||||
float GetZoomedWidth() { return m_size.x * DestTweenState().scale.x; }
|
float GetZoomedWidth() { return m_size.x * m_baseScale.x * DestTweenState().scale.x; }
|
||||||
float GetZoomedHeight() { return m_size.y * DestTweenState().scale.y; }
|
float GetZoomedHeight() { return m_size.y * m_baseScale.y * DestTweenState().scale.y; }
|
||||||
void SetWidth( float width ) { m_size.x = width; }
|
void SetWidth( float width ) { m_size.x = width; }
|
||||||
void SetHeight( float height ) { m_size.y = height; }
|
void SetHeight( float height ) { m_size.y = height; }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user