Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use certain methods from std namespace

Browse Source
This commit is contained in:
Erwin Coumans
2019-03-23 12:45:59 -07:00
parent 3768bbcae3
commit 0409478152
6 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/ThirdPartyLibs/Gwen/Anim.cpp
View File

@@ -5,8 +5,9 @@
*/
#include "Gwen/Anim.h"
#include "Gwen/Utility.h"
#include <math.h>
#include <cmath>
#include "Gwen/Utility.h"
using namespace Gwen;
@@ -123,13 +124,12 @@ void Gwen::Anim::TimedAnimation::Think()
if (fDelta < 0.0f) fDelta = 0.0f;
if (fDelta > 1.0f) fDelta = 1.0f;
Run(pow(fDelta, m_fEase));
Run(std::pow(fDelta, m_fEase));
if (fDelta == 1.0f)
{
m_bFinished = true;
OnFinish();
}
if (fDelta == 1.0f) {
m_bFinished = true;
OnFinish();
}
}
bool Gwen::Anim::TimedAnimation::Finished()

8
examples/ThirdPartyLibs/Gwen/Controls/TextBox.cpp
View File

@@ -11,6 +11,7 @@
#include "Gwen/Platform.h"
#include <math.h>
#include <cmath>
using namespace Gwen;
using namespace Gwen::Controls;
@@ -89,9 +90,10 @@ void TextBox::Render(Skin::Base* skin)
}
// Draw caret
if (fmod(Gwen::Platform::GetTimeInSeconds() - m_fLastInputTime, 1.0f) > 0.5f)
skin->GetRender()->SetDrawColor(Gwen::Color(255, 255, 255, 255));
else
if (std::fmod(Gwen::Platform::GetTimeInSeconds() - m_fLastInputTime,
1.0f) > 0.5f)
skin->GetRender()->SetDrawColor(Gwen::Color(255, 255, 255, 255));
else
skin->GetRender()->SetDrawColor(Gwen::Color(0, 0, 0, 255));
skin->GetRender()->DrawFilledRect(m_rectCaretBounds);