Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

try to fix funky timing hanging animation loops

Browse Source
This commit is contained in:
Green Sky 2023-10-04 22:49:33 +02:00
parent e12d7b1458
commit c98dd8a584
No known key found for this signature in database
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/texture_cache.cpp
View File

@ -3,10 +3,10 @@
#include <chrono> #include <chrono>
#include <array> #include <array>
void TextureEntry::doAnimation(const uint64_t ts_now) { void TextureEntry::doAnimation(const int64_t ts_now) {
if (frame_duration.size() > 1) { // is animation if (frame_duration.size() > 1) { // is animation
do { // why is this loop so ugly do { // why is this loop so ugly
const uint64_t duration = getDuration(); const int64_t duration = getDuration();
if (ts_now - timestamp_last_rendered >= duration) { if (ts_now - timestamp_last_rendered >= duration) {
timestamp_last_rendered += duration; timestamp_last_rendered += duration;
next(); next();
@ -21,7 +21,7 @@ void TextureEntry::doAnimation(const uint64_t ts_now) {
TextureEntry generateTestAnim(TextureUploaderI& tu) { TextureEntry generateTestAnim(TextureUploaderI& tu) {
TextureEntry new_entry; TextureEntry new_entry;
new_entry.timestamp_last_rendered = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); new_entry.timestamp_last_rendered = getNowMS();
new_entry.current_texture = 0; new_entry.current_texture = 0;
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
// hack // hack
@ -55,6 +55,6 @@ TextureEntry generateTestAnim(TextureUploaderI& tu) {
} }
uint64_t getNowMS(void) { uint64_t getNowMS(void) {
return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
} }

4
src/texture_cache.hpp
View File

@ -16,7 +16,7 @@ struct TextureEntry {
bool rendered_this_frame {false}; bool rendered_this_frame {false};
// or flipped for animations // or flipped for animations
uint64_t timestamp_last_rendered {0}; // ms int64_t timestamp_last_rendered {0}; // ms
TextureEntry(void) = default; TextureEntry(void) = default;
TextureEntry(const TextureEntry& other) : TextureEntry(const TextureEntry& other) :
@ -50,7 +50,7 @@ struct TextureEntry {
current_texture = (current_texture + 1) % frame_duration.size(); current_texture = (current_texture + 1) % frame_duration.size();
} }
void doAnimation(const uint64_t ts_now); void doAnimation(const int64_t ts_now);
template<typename TextureType> template<typename TextureType>
TextureType getID(void) { TextureType getID(void) {