mirror of
https://github.com/tildearrow/furnace.git
synced 2024-11-26 22:43:01 +00:00
GUI: and here is some animation
This commit is contained in:
parent
e4ef9f46f7
commit
662a5c5c61
1 changed files with 4 additions and 3 deletions
|
@ -77,14 +77,14 @@ void FurnaceGUI::drawMobileControls() {
|
||||||
if (mobileEditButtonPos.y>1) mobileEditButtonPos.y=1;
|
if (mobileEditButtonPos.y>1) mobileEditButtonPos.y=1;
|
||||||
|
|
||||||
if (mobileEdit) {
|
if (mobileEdit) {
|
||||||
mobileEditAnim+=ImGui::GetIO().DeltaTime*2.0;
|
mobileEditAnim+=ImGui::GetIO().DeltaTime*2.4;
|
||||||
if (mobileEditAnim>1.0f) {
|
if (mobileEditAnim>1.0f) {
|
||||||
mobileEditAnim=1.0f;
|
mobileEditAnim=1.0f;
|
||||||
} else {
|
} else {
|
||||||
WAKE_UP;
|
WAKE_UP;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
mobileEditAnim-=ImGui::GetIO().DeltaTime*2.0;
|
mobileEditAnim-=ImGui::GetIO().DeltaTime*2.4;
|
||||||
if (mobileEditAnim<0.0f) {
|
if (mobileEditAnim<0.0f) {
|
||||||
mobileEditAnim=0.0f;
|
mobileEditAnim=0.0f;
|
||||||
} else {
|
} else {
|
||||||
|
@ -115,9 +115,10 @@ void FurnaceGUI::drawMobileControls() {
|
||||||
int buttonLayout=0;
|
int buttonLayout=0;
|
||||||
|
|
||||||
for (int i=0; i<8; i++) {
|
for (int i=0; i<8; i++) {
|
||||||
float anim=(mobileEditAnim*5)-(float)i*0.5;
|
float anim=(mobileEditAnim*1.5)-(float)i*0.05;
|
||||||
if (anim<0.0f) anim=0.0f;
|
if (anim<0.0f) anim=0.0f;
|
||||||
if (anim>1.0f) anim=1.0f;
|
if (anim>1.0f) anim=1.0f;
|
||||||
|
anim=5*anim-7*pow(anim,2.0f)+3*pow(anim,3.0f);
|
||||||
|
|
||||||
buttonDir=mobileButtonAngles[buttonLayout][curButtonPos];
|
buttonDir=mobileButtonAngles[buttonLayout][curButtonPos];
|
||||||
buttonDist=mobileButtonDistances[buttonLayout][curButtonPos]*mobileEditButtonSize.x*1.6f;
|
buttonDist=mobileButtonDistances[buttonLayout][curButtonPos]*mobileEditButtonSize.x*1.6f;
|
||||||
|
|
Loading…
Reference in a new issue