[Scummvm-git-logs] scummvm master -> 31b8ab1f2c8da6b09d958fcd77d6bd87788db678
Scorpeg
noreply at scummvm.org
Sat Nov 14 21:30:19 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
31b8ab1f2c GRAPHICS: VIEWS: Add per-engine frame rate and pumpEvents()
Commit: 31b8ab1f2c8da6b09d958fcd77d6bd87788db678
https://github.com/scummvm/scummvm/commit/31b8ab1f2c8da6b09d958fcd77d6bd87788db678
Author: Scorp (scorp at mrs.mn)
Date: 2026-11-15T00:29:29+03:00
Commit Message:
GRAPHICS: VIEWS: Add per-engine frame rate and pumpEvents()
Changed paths:
graphics/views/events.cpp
graphics/views/events.h
diff --git a/graphics/views/events.cpp b/graphics/views/events.cpp
index f56fcb3be37..fff9c9a7ae5 100644
--- a/graphics/views/events.cpp
+++ b/graphics/views/events.cpp
@@ -31,12 +31,11 @@
namespace Graphics {
namespace Views {
-#define FRAME_RATE 20
-#define FRAME_DELAY (1000 / FRAME_RATE)
-
Events *g_events;
-Events::Events(const Common::String &engineName) : UIElement("Root", nullptr), _randomSource(engineName) {
+Events::Events(const Common::String &engineName, uint frameRate) : UIElement("Root", nullptr),
+ _randomSource(engineName), _frameRate(frameRate) {
+ assert(frameRate > 0 && frameRate <= 1000);
g_events = this;
}
@@ -45,7 +44,8 @@ Events::~Events() {
}
void Events::runGame() {
- uint nextFrameTime = 0;
+ const uint frameDelay = 1000 / _frameRate;
+ _nextFrameTime = 0;
_screen = new Graphics::Screen();
// Run the game
@@ -68,7 +68,7 @@ void Events::runGame() {
// Any event other than mouse moves is followed by an immediate frame, so a
// stream of repeated events can't starve the views of being redrawn
if (e.type != Common::EVENT_MOUSEMOVE) {
- nextFrameTime = 0;
+ _nextFrameTime = 0;
break;
}
}
@@ -79,13 +79,42 @@ void Events::runGame() {
g_system->delayMillis(10);
uint currTime = g_system->getMillis();
- if (currTime >= nextFrameTime) {
- nextFrameTime = currTime + FRAME_DELAY;
+ if (currTime >= _nextFrameTime) {
+ _nextFrameTime = currTime + frameDelay;
nextFrame();
}
}
delete _screen;
+ _screen = nullptr;
+}
+
+bool Events::pumpEvents() {
+ assert(_screen);
+
+ Common::Event e;
+ while (g_system->getEventManager()->pollEvent(e)) {
+ // Leave the views alone, since the caller may be one of them
+ if (e.type == Common::EVENT_QUIT ||
+ e.type == Common::EVENT_RETURN_TO_LAUNCHER)
+ return false;
+
+ processEvent(e);
+
+ // As in runGame, events other than mouse moves force a frame
+ if (e.type != Common::EVENT_MOUSEMOVE) {
+ _nextFrameTime = 0;
+ break;
+ }
+ }
+
+ uint currTime = g_system->getMillis();
+ if (currTime >= _nextFrameTime) {
+ _nextFrameTime = currTime + 1000 / _frameRate;
+ nextFrame();
+ }
+
+ return !shouldQuit();
}
int Events::getRandomNumber(int minNumber, int maxNumber) {
@@ -361,7 +390,7 @@ int UIElement::getRandomNumber(int maxNumber) {
}
void UIElement::delaySeconds(uint seconds) {
- _timeoutCtr = seconds * FRAME_RATE;
+ _timeoutCtr = seconds * g_events->getFrameRate();
}
void UIElement::delayFrames(uint frames) {
diff --git a/graphics/views/events.h b/graphics/views/events.h
index a36da5f4eef..60122530b44 100644
--- a/graphics/views/events.h
+++ b/graphics/views/events.h
@@ -326,6 +326,8 @@ private:
Graphics::Screen *_screen = nullptr;
Common::RandomSource _randomSource;
Common::Stack<UIElement *> _views;
+ uint _frameRate;
+ uint _nextFrameTime = 0;
void nextFrame();
@@ -366,14 +368,30 @@ protected:
}
public:
- Events(const Common::String &engineName);
+ /**
+ * Constructor, with the number of frames per second
+ */
+ Events(const Common::String &engineName, uint frameRate = 20);
virtual ~Events();
+ /**
+ * Returns the frame rate
+ */
+ uint getFrameRate() const {
+ return _frameRate;
+ }
+
/**
* Main game loop
*/
void runGame();
+ /**
+ * Processes pending events and any due frame, for nested game loops.
+ * Returns false if the game is quitting
+ */
+ bool pumpEvents();
+
/**
* Returns a random number
*/
More information about the Scummvm-git-logs
mailing list