mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use enum class for PaletteAnimation.

pull/13384/head
Peter Nelson 2025-01-24 20:20:22 +00:00 committed by Peter Nelson
parent 161b02efda
commit 1e14fd6a0d
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blitter/32bpp_anim.cpp
View File

@ -532,7 +532,7 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)
Blitter::PaletteAnimation Blitter_32bppAnim::UsePaletteAnimation() Blitter::PaletteAnimation Blitter_32bppAnim::UsePaletteAnimation()
{ {
return Blitter::PALETTE_ANIMATION_BLITTER; return Blitter::PaletteAnimation::Blitter;
} }
void Blitter_32bppAnim::PostResize() void Blitter_32bppAnim::PostResize()

2
src/blitter/32bpp_base.cpp
View File

@ -152,5 +152,5 @@ void Blitter_32bppBase::PaletteAnimate(const Palette &)
Blitter::PaletteAnimation Blitter_32bppBase::UsePaletteAnimation() Blitter::PaletteAnimation Blitter_32bppBase::UsePaletteAnimation()
{ {
return Blitter::PALETTE_ANIMATION_NONE; return Blitter::PaletteAnimation::None;
} }

2
src/blitter/40bpp_anim.cpp
View File

@ -528,7 +528,7 @@ size_t Blitter_40bppAnim::BufferSize(uint width, uint height)
Blitter::PaletteAnimation Blitter_40bppAnim::UsePaletteAnimation() Blitter::PaletteAnimation Blitter_40bppAnim::UsePaletteAnimation()
{ {
return Blitter::PALETTE_ANIMATION_VIDEO_BACKEND; return Blitter::PaletteAnimation::VideoBackend;
} }
bool Blitter_40bppAnim::NeedsAnimationBuffer() bool Blitter_40bppAnim::NeedsAnimationBuffer()

2
src/blitter/8bpp_base.cpp
View File

@ -156,5 +156,5 @@ void Blitter_8bppBase::PaletteAnimate(const Palette &)
Blitter::PaletteAnimation Blitter_8bppBase::UsePaletteAnimation() Blitter::PaletteAnimation Blitter_8bppBase::UsePaletteAnimation()
{ {
return Blitter::PALETTE_ANIMATION_VIDEO_BACKEND; return Blitter::PaletteAnimation::VideoBackend;
} }

8
src/blitter/base.hpp
View File

@ -47,10 +47,10 @@ public:
}; };
/** Types of palette animation. */ /** Types of palette animation. */
enum PaletteAnimation { enum class PaletteAnimation : uint8_t {
PALETTE_ANIMATION_NONE, ///< No palette animation None, ///< No palette animation
PALETTE_ANIMATION_VIDEO_BACKEND, ///< Palette animation should be done by video backend (8bpp only!) VideoBackend, ///< Palette animation should be done by video backend (8bpp only!)
PALETTE_ANIMATION_BLITTER, ///< The blitter takes care of the palette animation Blitter, ///< The blitter takes care of the palette animation
}; };
/** /**

2
src/blitter/null.hpp
View File

@ -29,7 +29,7 @@ public:
void ScrollBuffer(void *, int &, int &, int &, int &, int, int) override {}; void ScrollBuffer(void *, int &, int &, int &, int &, int, int) override {};
size_t BufferSize(uint, uint) override { return 0; }; size_t BufferSize(uint, uint) override { return 0; };
void PaletteAnimate(const Palette &) override { }; void PaletteAnimate(const Palette &) override { };
Blitter::PaletteAnimation UsePaletteAnimation() override { return Blitter::PALETTE_ANIMATION_NONE; }; Blitter::PaletteAnimation UsePaletteAnimation() override { return Blitter::PaletteAnimation::None; };
std::string_view GetName() override { return "null"; } std::string_view GetName() override { return "null"; }
}; };

4
src/palette.cpp
View File

@ -257,7 +257,7 @@ void DoPaletteAnimations()
const uint old_tc = palette_animation_counter; const uint old_tc = palette_animation_counter;
uint j; uint j;
if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) { if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::None) {
palette_animation_counter = 0; palette_animation_counter = 0;
} }
@ -342,7 +342,7 @@ void DoPaletteAnimations()
if (j >= EPV_CYCLES_GLITTER_WATER) j -= EPV_CYCLES_GLITTER_WATER; if (j >= EPV_CYCLES_GLITTER_WATER) j -= EPV_CYCLES_GLITTER_WATER;
} }
if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) { if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::None) {
palette_animation_counter = old_tc; palette_animation_counter = old_tc;
} else if (_cur_palette.count_dirty == 0 && memcmp(old_val, &_cur_palette.palette[PALETTE_ANIM_START], sizeof(old_val)) != 0) { } else if (_cur_palette.count_dirty == 0 && memcmp(old_val, &_cur_palette.palette[PALETTE_ANIM_START], sizeof(old_val)) != 0) {
/* Did we changed anything on the palette? Seems so. Mark it as dirty */ /* Did we changed anything on the palette? Seems so. Mark it as dirty */

6
src/video/allegro_v.cpp
View File

@ -102,15 +102,15 @@ void VideoDriver_Allegro::CheckPaletteAnim()
Blitter *blitter = BlitterFactory::GetCurrentBlitter(); Blitter *blitter = BlitterFactory::GetCurrentBlitter();
switch (blitter->UsePaletteAnimation()) { switch (blitter->UsePaletteAnimation()) {
case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: case Blitter::PaletteAnimation::VideoBackend:
UpdatePalette(_local_palette.first_dirty, _local_palette.count_dirty); UpdatePalette(_local_palette.first_dirty, _local_palette.count_dirty);
break; break;
case Blitter::PALETTE_ANIMATION_BLITTER: case Blitter::PaletteAnimation::Blitter:
blitter->PaletteAnimate(_local_palette); blitter->PaletteAnimate(_local_palette);
break; break;
case Blitter::PALETTE_ANIMATION_NONE: case Blitter::PaletteAnimation::None:
break; break;
default: default:

2
src/video/cocoa/cocoa_ogl.mm
View File

@ -321,7 +321,7 @@ void VideoDriver_CocoaOpenGL::Paint()
/* Always push a changed palette to OpenGL. */ /* Always push a changed palette to OpenGL. */
CGLSetCurrentContext(this->gl_context); CGLSetCurrentContext(this->gl_context);
OpenGLBackend::Get()->UpdatePalette(_local_palette.palette, _local_palette.first_dirty, _local_palette.count_dirty); OpenGLBackend::Get()->UpdatePalette(_local_palette.palette, _local_palette.first_dirty, _local_palette.count_dirty);
if (blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_BLITTER) { if (blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::Blitter) {
blitter->PaletteAnimate(_local_palette); blitter->PaletteAnimate(_local_palette);
} }
} }

6
src/video/cocoa/cocoa_v.mm
View File

@ -736,15 +736,15 @@ void VideoDriver_CocoaQuartz::CheckPaletteAnim()
Blitter *blitter = BlitterFactory::GetCurrentBlitter(); Blitter *blitter = BlitterFactory::GetCurrentBlitter();
switch (blitter->UsePaletteAnimation()) { switch (blitter->UsePaletteAnimation()) {
case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: case Blitter::PaletteAnimation::VideoBackend:
this->UpdatePalette(_local_palette.first_dirty, _local_palette.count_dirty); this->UpdatePalette(_local_palette.first_dirty, _local_palette.count_dirty);
break; break;
case Blitter::PALETTE_ANIMATION_BLITTER: case Blitter::PaletteAnimation::Blitter:
blitter->PaletteAnimate(_local_palette); blitter->PaletteAnimate(_local_palette);
break; break;
case Blitter::PALETTE_ANIMATION_NONE: case Blitter::PaletteAnimation::None:
break; break;
default: default:

6
src/video/sdl2_default_v.cpp
View File

@ -101,16 +101,16 @@ void VideoDriver_SDL_Default::Paint()
Blitter *blitter = BlitterFactory::GetCurrentBlitter(); Blitter *blitter = BlitterFactory::GetCurrentBlitter();
switch (blitter->UsePaletteAnimation()) { switch (blitter->UsePaletteAnimation()) {
case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: case Blitter::PaletteAnimation::VideoBackend:
this->UpdatePalette(); this->UpdatePalette();
break; break;
case Blitter::PALETTE_ANIMATION_BLITTER: { case Blitter::PaletteAnimation::Blitter: {
blitter->PaletteAnimate(this->local_palette); blitter->PaletteAnimate(this->local_palette);
break; break;
} }
case Blitter::PALETTE_ANIMATION_NONE: case Blitter::PaletteAnimation::None:
break; break;
default: default:

2
src/video/sdl2_opengl_v.cpp
View File

@ -180,7 +180,7 @@ void VideoDriver_SDL_OpenGL::Paint()
/* Always push a changed palette to OpenGL. */ /* Always push a changed palette to OpenGL. */
OpenGLBackend::Get()->UpdatePalette(this->local_palette.palette, this->local_palette.first_dirty, this->local_palette.count_dirty); OpenGLBackend::Get()->UpdatePalette(this->local_palette.palette, this->local_palette.first_dirty, this->local_palette.count_dirty);
if (blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_BLITTER) { if (blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::Blitter) {
blitter->PaletteAnimate(this->local_palette); blitter->PaletteAnimate(this->local_palette);
} }

8
src/video/win32_v.cpp
View File

@ -1242,16 +1242,16 @@ void VideoDriver_Win32GDI::Paint()
Blitter *blitter = BlitterFactory::GetCurrentBlitter(); Blitter *blitter = BlitterFactory::GetCurrentBlitter();
switch (blitter->UsePaletteAnimation()) { switch (blitter->UsePaletteAnimation()) {
case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: case Blitter::PaletteAnimation::VideoBackend:
this->UpdatePalette(dc2, _local_palette.first_dirty, _local_palette.count_dirty); this->UpdatePalette(dc2, _local_palette.first_dirty, _local_palette.count_dirty);
break; break;
case Blitter::PALETTE_ANIMATION_BLITTER: { case Blitter::PaletteAnimation::Blitter: {
blitter->PaletteAnimate(_local_palette); blitter->PaletteAnimate(_local_palette);
break; break;
} }
case Blitter::PALETTE_ANIMATION_NONE: case Blitter::PaletteAnimation::None:
break; break;
default: default:
@ -1586,7 +1586,7 @@ void VideoDriver_Win32OpenGL::Paint()
/* Always push a changed palette to OpenGL. */ /* Always push a changed palette to OpenGL. */
OpenGLBackend::Get()->UpdatePalette(_local_palette.palette, _local_palette.first_dirty, _local_palette.count_dirty); OpenGLBackend::Get()->UpdatePalette(_local_palette.palette, _local_palette.first_dirty, _local_palette.count_dirty);
if (blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_BLITTER) { if (blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::Blitter) {
blitter->PaletteAnimate(_local_palette); blitter->PaletteAnimate(_local_palette);
} }