cpp/openttd-patchpack/source Changeset - r24852:00c1bd78d033

Changeset - r24852:00c1bd78d033

Parent rev.

Child rev.

[Not reviewed]

master

0 10 0

Patric Stout - 3 years ago 2021-02-20 10:15:15
truebrain@openttd.org

Codechange: be consistent in what CheckPaletteAnim() does and when it is called

Additionally, make sure this is a class method. Later commits
will make use of this.

10 files changed with 16 insertions and 17 deletions:

src/video/allegro_v.cpp

src/video/allegro_v.h

src/video/cocoa/cocoa_v.h

src/video/sdl2_v.cpp

src/video/sdl2_v.h

src/video/sdl_v.cpp

src/video/sdl_v.h

src/video/video_driver.hpp

src/video/win32_v.cpp

src/video/win32_v.h

0 comments (0 inline, 0 general)

src/video/allegro_v.cpp

➞

Show inline comments

@@ @@ -86,25 +86,25 @@ static void UpdatePalette(uint start, ui @@
 		pal[i].b = _cur_palette.palette[i].b / 4;
 		pal[i].filler = 0;
+	}
 	set_palette_range(pal, start, end - 1, 1);
+}
 static void InitPalette()
+{
 	UpdatePalette(0, 256);
+}
-static void CheckPaletteAnim()
+void VideoDriver_Allegro::CheckPaletteAnim()
+{
 	if (_cur_palette.count_dirty != 0) {
 		Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 		switch (blitter->UsePaletteAnimation()) {
 			case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
 				UpdatePalette(_cur_palette.first_dirty, _cur_palette.count_dirty);
 				break;
 			case Blitter::PALETTE_ANIMATION_BLITTER:
 				blitter->PaletteAnimate(_cur_palette);
 				break;
@@ @@ -475,26 +475,24 @@ void VideoDriver_Allegro::InputLoop() @@
 		(key[KEY_DOWN]  ? 8 : 0);
 	if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
+}
 void VideoDriver_Allegro::MainLoop()
+{
 	auto cur_ticks = std::chrono::steady_clock::now();
 	auto last_realtime_tick = cur_ticks;
 	auto next_game_tick = cur_ticks;
 	auto next_draw_tick = cur_ticks;
 	CheckPaletteAnim();
 	for (;;) {
 		InteractiveRandom(); // randomness
 		PollEvent();
 		if (_exit_game) return;
 		cur_ticks = std::chrono::steady_clock::now();
 		/* If more than a millisecond has passed, increase the _realtime_tick. */
 		if (cur_ticks - last_realtime_tick > std::chrono::milliseconds(1)) {
 			auto delta = std::chrono::duration_cast<std::chrono::milliseconds>(cur_ticks - last_realtime_tick);
 			_realtime_tick += delta.count();
@@ @@ -513,25 +511,25 @@ void VideoDriver_Allegro::MainLoop() @@
 			GameLoop();
+		}
 		/* Prevent drawing when switching mode, as windows can be removed when they should still appear. */
 		if (cur_ticks >= next_draw_tick && (_switch_mode == SM_NONE || HasModalProgress())) {
 			next_draw_tick += this->GetDrawInterval();
 			/* Avoid next_draw_tick getting behind more and more if it cannot keep up. */
 			if (next_draw_tick < cur_ticks - ALLOWED_DRIFT * this->GetDrawInterval()) next_draw_tick = cur_ticks;
 			this->InputLoop();
 			::InputLoop();
 			UpdateWindows();
 			CheckPaletteAnim();
+			this->CheckPaletteAnim();
 			this->Paint();
+		}
 		/* If we are not in fast-forward, create some time between calls to ease up CPU usage. */
 		if (!_fast_forward || _pause_mode) {
 			/* See how much time there is till we have to process the next event, and try to hit that as close as possible. */
 			auto next_tick = std::min(next_draw_tick, next_game_tick);
 			auto now = std::chrono::steady_clock::now();
 			if (next_tick > now) {
 				std::this_thread::sleep_for(next_tick - now);

src/video/allegro_v.h

➞

Show inline comments

@@ @@ -27,22 +27,23 @@ public: @@
 	bool ToggleFullscreen(bool fullscreen) override;
 	bool AfterBlitterChange() override;
 	bool ClaimMousePointer() override;
 	const char *GetName() const override { return "allegro"; }
 protected:
 	void InputLoop() override;
 	void Paint() override;
 	void CheckPaletteAnim() override;
 };
 /** Factory for the allegro video driver. */
 class FVideoDriver_Allegro : public DriverFactoryBase {
 public:
 	FVideoDriver_Allegro() : DriverFactoryBase(Driver::DT_VIDEO, 4, "allegro", "Allegro Video Driver") {}
 	Driver *CreateInstance() const override { return new VideoDriver_Allegro(); }
 };
 #endif /* VIDEO_ALLEGRO_H */

src/video/cocoa/cocoa_v.h

➞

Show inline comments

@@ @@ -67,36 +67,36 @@ public: @@
 	/* --- The following methods should be private, but can't be due to Obj-C limitations. --- */
 	void GameLoop();
 	void AllocateBackingStore();
 protected:
 	Dimension GetScreenSize() const override;
 	float GetDPIScale() override;
 	void InputLoop() override;
 	void Paint() override;
 	void CheckPaletteAnim() override;
 private:
 	bool PollEvent();
 	bool IsFullscreen();
 	void GameSizeChanged();
 	void UpdateVideoModes();
 	bool MakeWindow(int width, int height);
 	void UpdatePalette(uint first_color, uint num_colors);
 	void CheckPaletteAnim();
 	void BlitIndexedToView32(int left, int top, int right, int bottom);
 };
 class FVideoDriver_Cocoa : public DriverFactoryBase {
 public:
 	FVideoDriver_Cocoa() : DriverFactoryBase(Driver::DT_VIDEO, 10, "cocoa", "Cocoa Video Driver") {}
 	Driver *CreateInstance() const override { return new VideoDriver_Cocoa(); }
 };
 #endif /* VIDEO_COCOA_H */

src/video/sdl2_v.cpp

➞

Show inline comments

@@ @@ -844,26 +844,24 @@ void VideoDriver_SDL::LoopOnce() @@
 			this->LockVideoBuffer();
+		}
+	}
 #endif
+}
 void VideoDriver_SDL::MainLoop()
+{
 	cur_ticks = std::chrono::steady_clock::now();
 	last_realtime_tick = cur_ticks;
 	next_game_tick = cur_ticks;
 	this->CheckPaletteAnim();
 	if (_draw_threaded) {
 		/* Initialise the mutex first, because that's the thing we *need*
 		 * directly in the newly created thread. */
 		_draw_mutex = new std::recursive_mutex();
 		if (_draw_mutex == nullptr) {
 			_draw_threaded = false;
 		} else {
 			draw_lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex);
 			_draw_signal = new std::condition_variable_any();
 			_draw_continue = true;
 			_draw_threaded = StartNewThread(&draw_thread, "ottd:draw-sdl", &VideoDriver_SDL::PaintThreadThunk, this);

src/video/sdl2_v.h

➞

Show inline comments

@@ @@ -39,32 +39,32 @@ public: @@
 	void EditBoxLostFocus() override;
 	const char *GetName() const override { return "sdl"; }
 protected:
 	Dimension GetScreenSize() const override;
 	void InputLoop() override;
 	bool LockVideoBuffer() override;
 	void UnlockVideoBuffer() override;
 	void Paint() override;
 	void PaintThread() override;
 	void CheckPaletteAnim();
 private:
 	int PollEvent();
 	void LoopOnce();
 	void MainLoopCleanup();
 	bool CreateMainSurface(uint w, uint h, bool resize);
 	bool CreateMainWindow(uint w, uint h);
 	void CheckPaletteAnim();
 #ifdef __EMSCRIPTEN__
 	/* Convert a constant pointer back to a non-constant pointer to a member function. */
 	static void EmscriptenLoop(void *self) { ((VideoDriver_SDL *)self)->LoopOnce(); }
 #endif
 	/**
 	 * This is true to indicate that keyboard input is in text input mode, and SDL_TEXTINPUT events are enabled.
 	 */
 	bool edit_box_focused;
 	std::chrono::steady_clock::time_point cur_ticks;

src/video/sdl_v.cpp

➞

Show inline comments

@@ @@ -114,26 +114,28 @@ static void UpdatePalette(bool init = fa @@
 		SDL_UpdateRect(_sdl_realscreen, 0, 0, 0, 0);
+	}
+}
 static void InitPalette()
+{
 	_local_palette = _cur_palette;
 	_local_palette.first_dirty = 0;
 	_local_palette.count_dirty = 256;
 	UpdatePalette(true);
+}
-static void CheckPaletteAnim()
+void VideoDriver_SDL::CheckPaletteAnim()
+{
 	_local_palette = _cur_palette;
 	if (_cur_palette.count_dirty != 0) {
 		Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 		switch (blitter->UsePaletteAnimation()) {
 			case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
 				UpdatePalette();
 				break;
 			case Blitter::PALETTE_ANIMATION_BLITTER:
 				blitter->PaletteAnimate(_local_palette);
 				break;
@@ @@ -174,25 +176,24 @@ void VideoDriver_SDL::Paint() @@
+}
 void VideoDriver_SDL::PaintThread()
+{
 	/* First tell the main thread we're started */
 	std::unique_lock<std::recursive_mutex> lock(*_draw_mutex);
 	_draw_signal->notify_one();
 	/* Now wait for the first thing to draw! */
 	_draw_signal->wait(*_draw_mutex);
 	while (_draw_continue) {
 		CheckPaletteAnim();
 		/* Then just draw and wait till we stop */
 		this->Paint();
 		_draw_signal->wait(lock);
+	}
+}
 /* static */ void VideoDriver_SDL::PaintThreadThunk(VideoDriver_SDL *drv)
+{
 	drv->PaintThread();
+}
 static const Dimension _default_resolutions[] = {
@@ @@ -699,26 +700,24 @@ void VideoDriver_SDL::InputLoop() @@
 #endif
 	if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
+}
 void VideoDriver_SDL::MainLoop()
+{
 	auto cur_ticks = std::chrono::steady_clock::now();
 	auto last_realtime_tick = cur_ticks;
 	auto next_game_tick = cur_ticks;
 	auto next_draw_tick = cur_ticks;
 	CheckPaletteAnim();
 	std::thread draw_thread;
 	if (_draw_threaded) {
 		/* Initialise the mutex first, because that's the thing we *need*
 		 * directly in the newly created thread. */
 		_draw_mutex = new std::recursive_mutex();
 		if (_draw_mutex == nullptr) {
 			_draw_threaded = false;
 		} else {
 			this->draw_lock = std::unique_lock<std::recursive_mutex>(*_draw_mutex);
 			_draw_signal = new std::condition_variable_any();
 			_draw_continue = true;
@@ @@ -772,30 +771,29 @@ void VideoDriver_SDL::MainLoop() @@
 			this->LockVideoBuffer();
+		}
 		/* Prevent drawing when switching mode, as windows can be removed when they should still appear. */
 		if (cur_ticks >= next_draw_tick && (_switch_mode == SM_NONE || HasModalProgress())) {
 			next_draw_tick += this->GetDrawInterval();
 			/* Avoid next_draw_tick getting behind more and more if it cannot keep up. */
 			if (next_draw_tick < cur_ticks - ALLOWED_DRIFT * this->GetDrawInterval()) next_draw_tick = cur_ticks;
 			this->InputLoop();
 			::InputLoop();
 			UpdateWindows();
-			_local_palette = _cur_palette;
+			this->CheckPaletteAnim();
 			if (_draw_mutex != nullptr && !HasModalProgress()) {
 				_draw_signal->notify_one();
 			} else {
 				CheckPaletteAnim();
 				this->Paint();
+			}
+		}
 		/* If we are not in fast-forward, create some time between calls to ease up CPU usage. */
 		if (!_fast_forward || _pause_mode) {
 			/* See how much time there is till we have to process the next event, and try to hit that as close as possible. */
 			auto next_tick = std::min(next_draw_tick, next_game_tick);
 			auto now = std::chrono::steady_clock::now();
 			if (next_tick > now) {
 				this->UnlockVideoBuffer();

src/video/sdl_v.h

➞

Show inline comments

@@ @@ -34,24 +34,25 @@ public: @@
 	void ReleaseBlitterLock() override;
 	bool ClaimMousePointer() override;
 	const char *GetName() const override { return "sdl"; }
 protected:
 	void InputLoop() override;
 	bool LockVideoBuffer() override;
 	void UnlockVideoBuffer() override;
 	void Paint() override;
 	void PaintThread() override;
 	void CheckPaletteAnim();
 private:
 	std::unique_lock<std::recursive_mutex> draw_lock;
 	int PollEvent();
 	bool CreateMainSurface(uint w, uint h);
 	void SetupKeyboard();
 	static void PaintThreadThunk(VideoDriver_SDL *drv);
 };
 /** Factory for the SDL video driver. */

src/video/video_driver.hpp

➞

Show inline comments

@@ @@ -175,24 +175,29 @@ protected: @@
 	virtual void UnlockVideoBuffer() {}
 	/**
 	 * Paint the window.
 	 */
 	virtual void Paint() {}
 	/**
 	 * Thread function for threaded drawing.
 	 */
 	virtual void PaintThread() {}
 	/**
 	 * Process any pending palette animation.
 	 */
 	virtual void CheckPaletteAnim() {}
 	std::chrono::steady_clock::duration GetGameInterval()
+	{
 		return std::chrono::milliseconds(MILLISECONDS_PER_TICK);
+	}
 	std::chrono::steady_clock::duration GetDrawInterval()
+	{
 		return std::chrono::microseconds(1000000 / _settings_client.gui.refresh_rate);
+	}
 };
 #endif /* VIDEO_VIDEO_DRIVER_HPP */

src/video/win32_v.cpp

➞

Show inline comments

@@ @@ -1192,25 +1192,24 @@ void VideoDriver_Win32::MainLoop() @@
 				_draw_mutex = nullptr;
 				_draw_signal = nullptr;
 			} else {
 				DEBUG(driver, 1, "Threaded drawing enabled");
 				/* Wait till the draw thread has started itself. */
 				_draw_signal->wait(*_draw_mutex);
+			}
+		}
+	}
 	_wnd.running = true;
 	CheckPaletteAnim();
 	for (;;) {
 		InteractiveRandom(); // randomness
 		while (PeekMessage(&mesg, nullptr, 0, 0, PM_REMOVE)) {
 			/* Convert key messages to char messages if we want text input. */
 			if (EditBoxInGlobalFocus()) TranslateMessage(&mesg);
 			DispatchMessage(&mesg);
+		}
 		if (_exit_game) break;
 		cur_ticks = std::chrono::steady_clock::now();

src/video/win32_v.h

➞

Show inline comments

@@ @@ -40,29 +40,28 @@ public: @@
 	const char *GetName() const override { return "win32"; }
 	bool MakeWindow(bool full_screen);
 protected:
 	Dimension GetScreenSize() const override;
 	float GetDPIScale() override;
 	void InputLoop() override;
 	bool LockVideoBuffer() override;
 	void UnlockVideoBuffer() override;
 	void Paint() override;
 	void PaintThread() override;
 	void CheckPaletteAnim() override;
 private:
 	std::unique_lock<std::recursive_mutex> draw_lock;
 	void CheckPaletteAnim();
 	static void PaintThreadThunk(VideoDriver_Win32 *drv);
 };
 /** The factory for Windows' video driver. */
 class FVideoDriver_Win32 : public DriverFactoryBase {
 public:
 	FVideoDriver_Win32() : DriverFactoryBase(Driver::DT_VIDEO, 10, "win32", "Win32 GDI Video Driver") {}
 	Driver *CreateInstance() const override { return new VideoDriver_Win32(); }
 };
 #endif /* VIDEO_WIN32_H */

0 comments (0 inline, 0 general)