mirror of
https://github.com/whoahq/whoa.git
synced 2026-03-18 21:51:06 +03:00
Compare commits
2 Commits
856bb72e1a
...
aa22dd952a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa22dd952a | ||
|
|
534e05be93 |
@ -332,6 +332,10 @@ void CLayoutFrame::GetFirstPointY(const FRAMEPOINT* const pointarray, int32_t el
|
||||
}
|
||||
}
|
||||
|
||||
float CLayoutFrame::GetHeight() {
|
||||
return this->m_height;
|
||||
}
|
||||
|
||||
CLayoutFrame* CLayoutFrame::GetLayoutFrameByName(const char* name) {
|
||||
return nullptr;
|
||||
}
|
||||
@ -353,8 +357,20 @@ int32_t CLayoutFrame::GetRect(CRect* rect) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
float CLayoutFrame::GetHeight() {
|
||||
return this->m_height;
|
||||
void CLayoutFrame::GetSize(float& width, float& height, int32_t a4) {
|
||||
width = this->GetWidth();
|
||||
height = this->GetHeight();
|
||||
|
||||
if (!a4 && (width == 0.0f || height == 0.0f)) {
|
||||
if (this->m_flags & FLAG_RESIZE_PENDING) {
|
||||
this->Resize(1);
|
||||
}
|
||||
|
||||
if (this->m_flags & 0x1) {
|
||||
width = (this->m_rect.maxX - this->m_rect.minX) / this->m_layoutScale;
|
||||
height = (this->m_rect.maxY - this->m_rect.minY) / this->m_layoutScale;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
float CLayoutFrame::GetWidth() {
|
||||
|
||||
@ -51,6 +51,7 @@ class CLayoutFrame {
|
||||
virtual void SetHeight(float height);
|
||||
virtual float GetWidth();
|
||||
virtual float GetHeight();
|
||||
virtual void GetSize(float& width, float& height, int32_t a4);
|
||||
virtual void GetClampRectInsets(float& a1, float& a2, float& a3, float& a4);
|
||||
virtual int32_t IsAttachmentOrigin();
|
||||
virtual CLayoutFrame* GetLayoutFrameByName(const char* name);
|
||||
|
||||
@ -28,6 +28,16 @@ void CSimpleStatusBar::RegisterScriptMethods(lua_State* L) {
|
||||
FrameScript_Object::FillScriptMethodTable(L, SimpleStatusBarMethods, NUM_SIMPLE_STATUS_BAR_SCRIPT_METHODS);
|
||||
}
|
||||
|
||||
float CSimpleStatusBar::GetAnimValue() const {
|
||||
auto range = this->m_maxValue - this->m_minValue;
|
||||
|
||||
if (range <= 0.0f) {
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
return (this->m_value - this->m_minValue) / range;
|
||||
}
|
||||
|
||||
FrameScript_Object::ScriptIx* CSimpleStatusBar::GetScriptByName(const char* name, ScriptData& data) {
|
||||
auto script = this->CSimpleFrame::GetScriptByName(name, data);
|
||||
|
||||
@ -129,6 +139,46 @@ void CSimpleStatusBar::LoadXML(const XMLNode* node, CStatus* status) {
|
||||
}
|
||||
}
|
||||
|
||||
void CSimpleStatusBar::OnLayerUpdate(float elapsedSec) {
|
||||
this->CSimpleFrame::OnLayerUpdate(elapsedSec);
|
||||
|
||||
if (!this->m_changed || !this->m_rangeSet || !this->m_valueSet || !this->m_barTexture) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto animValue = this->GetAnimValue();
|
||||
|
||||
if (animValue <= 0.0f) {
|
||||
this->m_barTexture->Hide();
|
||||
this->m_changed = false;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
float width, height;
|
||||
this->GetSize(width, height, false);
|
||||
|
||||
auto fill = 1.0f - animValue;
|
||||
|
||||
this->m_barTexture->Show();
|
||||
|
||||
if (this->m_orientation == ORIENTATION_VERTICAL) {
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_BOTTOMLEFT, this, FRAMEPOINT_BOTTOMLEFT, 0.0f, 0.0f, true);
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_BOTTOMRIGHT, this, FRAMEPOINT_BOTTOMRIGHT, 0.0f, 0.0f, true);
|
||||
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_TOPLEFT, this, FRAMEPOINT_TOPLEFT, 0.0f, -(fill * height), true);
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_TOPRIGHT, this, FRAMEPOINT_TOPRIGHT, 0.0f, -(fill * height), true);
|
||||
} else {
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_TOPLEFT, this, FRAMEPOINT_TOPLEFT, 0.0f, 0.0f, true);
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_BOTTOMLEFT, this, FRAMEPOINT_BOTTOMLEFT, 0.0f, 0.0f, true);
|
||||
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_TOPRIGHT, this, FRAMEPOINT_TOPRIGHT, -(fill * width), 0.0f, true);
|
||||
this->m_barTexture->SetPoint(FRAMEPOINT_BOTTOMRIGHT, this, FRAMEPOINT_BOTTOMRIGHT, -(fill * width), 0.0f, true);
|
||||
}
|
||||
|
||||
this->m_changed = false;
|
||||
}
|
||||
|
||||
void CSimpleStatusBar::RunOnMinMaxChangedScript() {
|
||||
if (!this->m_onMinMaxChanged.luaRef) {
|
||||
return;
|
||||
|
||||
@ -19,6 +19,8 @@ class CSimpleStatusBar : public CSimpleFrame {
|
||||
virtual ScriptIx* GetScriptByName(const char* name, ScriptData& data);
|
||||
virtual bool IsA(int32_t type);
|
||||
// TODO
|
||||
virtual void OnLayerUpdate(float elapsedSec);
|
||||
// TODO
|
||||
virtual void SetValue(float value);
|
||||
virtual void LoadXML(const XMLNode* node, CStatus* status);
|
||||
|
||||
@ -28,6 +30,7 @@ class CSimpleStatusBar : public CSimpleFrame {
|
||||
, m_changed(false)
|
||||
, m_rangeSet(false)
|
||||
, m_valueSet(false) {};
|
||||
float GetAnimValue() const;
|
||||
float GetMaxValue() const;
|
||||
float GetMinValue() const;
|
||||
float GetValue() const;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user