Working on pathfinding, testing the Q16.16 format
This commit is contained in:
1 parent
2fe2ee6c2a
commit
8df016c0a4
13 files changed
+664
-112
No files matched your search
+3
-7
@@ -17,10 +17,6 @@
|
||||
|
||||
namespace FRG {
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
//extern Game* Game::s_instance;
|
||||
#endif
|
||||
|
||||
// Localization
|
||||
static const std::string EMPTY_LANGUAGE_RU = u8"(пусто)";
|
||||
static const std::string EMPTY_LANGUAGE_EN = "(empty)";
|
||||
@@ -81,7 +77,7 @@ namespace FRG {
|
||||
pushWord(currentWord);
|
||||
if (!currentLine.empty()) flushLine();
|
||||
|
||||
return max(1, lines);
|
||||
return std::max(1, lines);
|
||||
}
|
||||
|
||||
static std::string trimChatPreview(const std::string& msg, int maxChars = 22) {
|
||||
@@ -2257,9 +2253,9 @@ namespace FRG {
|
||||
|
||||
float MenuManager::ToastEntry::currentAlpha() const {
|
||||
switch (state) {
|
||||
case State::FadeIn: return min(timer / TOAST_FADE_MS, 1.0f);
|
||||
case State::FadeIn: return std::min(timer / TOAST_FADE_MS, 1.0f);
|
||||
case State::Visible: return 1.0f;
|
||||
case State::FadeOut: return max(1.0f - timer / TOAST_FADE_MS, 0.0f);
|
||||
case State::FadeOut: return std::max(1.0f - timer / TOAST_FADE_MS, 0.0f);
|
||||
}
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user