[Scummvm-git-logs] scummvm master -> a9a8192ff7d25b2b37d0063fca1861cbf72b9138
OMGPizzaGuy
noreply at scummvm.org
Sun Mar 24 19:53:37 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2909deb550 ULTIMA8: Move PalTransforms to a separate header
a9a8192ff7 ULTIMA8: Mark palette pointers as const
Commit: 2909deb5509a9db99a41200dba3ebfd61cc8f284
https://github.com/scummvm/scummvm/commit/2909deb5509a9db99a41200dba3ebfd61cc8f284
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-03-24T14:52:58-05:00
Commit Message:
ULTIMA8: Move PalTransforms to a separate header
Changed paths:
A engines/ultima/ultima8/graphics/pal_transforms.h
engines/ultima/ultima8/graphics/cycle_process.cpp
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/palette.h
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/graphics/palette_manager.cpp
engines/ultima/ultima8/graphics/palette_manager.h
engines/ultima/ultima8/gumps/cru_energy_gump.cpp
engines/ultima/ultima8/gumps/cru_health_gump.cpp
engines/ultima/ultima8/gumps/movie_gump.cpp
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/ultima8/graphics/cycle_process.cpp b/engines/ultima/ultima8/graphics/cycle_process.cpp
index c11f06b148d..bc362632f41 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.cpp
+++ b/engines/ultima/ultima8/graphics/cycle_process.cpp
@@ -20,6 +20,7 @@
*/
#include "ultima/ultima8/graphics/cycle_process.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/ultima8.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index 7b2de346eb0..6963a82a850 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -30,6 +30,7 @@
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/graphics/fonts/tt_font.h"
#include "ultima/ultima8/graphics/fonts/jp_font.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "common/config-manager.h"
diff --git a/engines/ultima/ultima8/graphics/pal_transforms.h b/engines/ultima/ultima8/graphics/pal_transforms.h
new file mode 100644
index 00000000000..73af3f6ea75
--- /dev/null
+++ b/engines/ultima/ultima8/graphics/pal_transforms.h
@@ -0,0 +1,62 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef ULTIMA8_GRAPHICS_PAL_TRANSFORMS_H
+#define ULTIMA8_GRAPHICS_PAL_TRANSFORMS_H
+
+namespace Ultima {
+namespace Ultima8 {
+
+enum PalTransforms {
+ // Normal untransformed palette
+ Transform_None = 0,
+
+ // O[i] = I[r]*0.375 + I[g]*0.5 + I[b]*0.125;
+ Transform_Greyscale = 1,
+
+ // O[r] = 0;
+ Transform_NoRed = 2,
+
+ // O[i] = (I[i] + Grey)*0.25 + 0.1875;
+ Transform_RainStorm = 3,
+
+ // O[r] = (I[r] + Grey)*0.5 + 0.1875;
+ // O[g] = I[g]*0.5 + Grey*0.25;
+ // O[b] = I[b]*0.5;
+ Transform_FireStorm = 4,
+
+ // O[i] = I[i]*2 -Grey;
+ Transform_Saturate = 5,
+
+ // O[g] = I[r]; O[b] = I[g]; O[r] = I[b];
+ Transform_GBR = 6,
+
+ // O[b] = I[r]; O[r] = I[g]; O[g] = I[b];
+ Transform_BRG = 7,
+
+ // Any value beyond this is invalid in savegames.
+ Transform_Invalid = 8
+};
+
+} // End of namespace Ultima8
+} // End of namespace Ultima
+
+#endif
diff --git a/engines/ultima/ultima8/graphics/palette.h b/engines/ultima/ultima8/graphics/palette.h
index c16458e05f1..7b9e0652da2 100644
--- a/engines/ultima/ultima8/graphics/palette.h
+++ b/engines/ultima/ultima8/graphics/palette.h
@@ -22,40 +22,11 @@
#ifndef ULTIMA8_GRAPHICS_PALETTE_H
#define ULTIMA8_GRAPHICS_PALETTE_H
+#include "ultima/ultima8/graphics/pal_transforms.h"
+
namespace Ultima {
namespace Ultima8 {
-enum PalTransforms {
- // Normal untransformed palette
- Transform_None = 0,
-
- // O[i] = I[r]*0.375 + I[g]*0.5 + I[b]*0.125;
- Transform_Greyscale = 1,
-
- // O[r] = 0;
- Transform_NoRed = 2,
-
- // O[i] = (I[i] + Grey)*0.25 + 0.1875;
- Transform_RainStorm = 3,
-
- // O[r] = (I[r] + Grey)*0.5 + 0.1875;
- // O[g] = I[g]*0.5 + Grey*0.25;
- // O[b] = I[b]*0.5;
- Transform_FireStorm = 4,
-
- // O[i] = I[i]*2 -Grey;
- Transform_Saturate = 5,
-
- // O[g] = I[r]; O[b] = I[g]; O[r] = I[b];
- Transform_GBR = 6,
-
- // O[b] = I[r]; O[r] = I[g]; O[g] = I[b];
- Transform_BRG = 7,
-
- // Any value beyond this is invalid in savegames.
- Transform_Invalid = 8
-};
-
struct Palette {
void load(Common::ReadStream &rs, Common::ReadStream &xformrs);
void load(Common::ReadStream &rs);
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
index 7e81d46f41e..c9977db1661 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
@@ -20,6 +20,7 @@
*/
#include "ultima/ultima8/graphics/palette_fader_process.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/ultima8.h"
diff --git a/engines/ultima/ultima8/graphics/palette_manager.cpp b/engines/ultima/ultima8/graphics/palette_manager.cpp
index 2042a089a1b..440c6816441 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.cpp
+++ b/engines/ultima/ultima8/graphics/palette_manager.cpp
@@ -22,6 +22,7 @@
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/graphics/palette_manager.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/texture.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/graphics/palette_manager.h b/engines/ultima/ultima8/graphics/palette_manager.h
index 93058889f74..997f386232b 100644
--- a/engines/ultima/ultima8/graphics/palette_manager.h
+++ b/engines/ultima/ultima8/graphics/palette_manager.h
@@ -22,13 +22,15 @@
#ifndef ULTIMA8_GRAPHICS_PALETTEMANAGER_H
#define ULTIMA8_GRAPHICS_PALETTEMANAGER_H
-#include "ultima/ultima8/graphics/palette.h"
#include "ultima/shared/std/containers.h"
#include "graphics/pixelformat.h"
+#include "ultima/ultima8/graphics/pal_transforms.h"
namespace Ultima {
namespace Ultima8 {
+struct Palette;
+
class PaletteManager {
public:
explicit PaletteManager(const Graphics::PixelFormat &format);
diff --git a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
index 5b4cf252a1b..a1ab27fb9fb 100644
--- a/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_energy_gump.cpp
@@ -22,6 +22,7 @@
#include "ultima/ultima8/gumps/cru_energy_gump.h"
#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/texture.h"
diff --git a/engines/ultima/ultima8/gumps/cru_health_gump.cpp b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
index c615e66d9e7..daa1e536ef7 100644
--- a/engines/ultima/ultima8/gumps/cru_health_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_health_gump.cpp
@@ -22,6 +22,7 @@
#include "ultima/ultima8/gumps/cru_health_gump.h"
#include "ultima/ultima8/world/actors/main_actor.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/texture.h"
diff --git a/engines/ultima/ultima8/gumps/movie_gump.cpp b/engines/ultima/ultima8/gumps/movie_gump.cpp
index 56e32378f20..c66ece1f425 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.cpp
+++ b/engines/ultima/ultima8/gumps/movie_gump.cpp
@@ -26,6 +26,7 @@
#include "ultima/ultima8/graphics/gump_shape_archive.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/graphics/texture.h"
#include "ultima/ultima8/graphics/fade_to_modal_process.h"
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 0a1d97b0c95..e20d632fec2 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -41,6 +41,7 @@
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/convert/u8/convert_shape_u8.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/usecode/usecode.h"
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index c88c542d3f4..ecc9d228b4c 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -33,6 +33,7 @@
#include "ultima/ultima8/games/start_u8_process.h"
#include "ultima/ultima8/games/start_crusader_process.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
+#include "ultima/ultima8/graphics/palette.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/world/world.h"
Commit: a9a8192ff7d25b2b37d0063fca1861cbf72b9138
https://github.com/scummvm/scummvm/commit/a9a8192ff7d25b2b37d0063fca1861cbf72b9138
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-03-24T14:52:58-05:00
Commit Message:
ULTIMA8: Mark palette pointers as const
Changed paths:
engines/ultima/ultima8/graphics/main_shape_archive.h
engines/ultima/ultima8/graphics/shape_archive.h
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/graphics/main_shape_archive.h
index aa7824ce9ef..7ace741d31b 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.h
@@ -35,10 +35,10 @@ class AnimAction;
class MainShapeArchive : public ShapeArchive {
public:
- MainShapeArchive(uint16 id, Palette *pal = 0,
+ MainShapeArchive(uint16 id, const Palette *pal = 0,
const ConvertShapeFormat *format = 0)
: ShapeArchive(id, pal, format), _typeFlags(0), _animDat(0) { }
- MainShapeArchive(Common::SeekableReadStream *rs, uint16 id, Palette *pal = 0,
+ MainShapeArchive(Common::SeekableReadStream *rs, uint16 id, const Palette *pal = 0,
const ConvertShapeFormat *format = 0)
: ShapeArchive(rs, id, pal, format), _typeFlags(0), _animDat(0) { }
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/graphics/shape_archive.h
index e59bcebcb12..c9671345546 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/graphics/shape_archive.h
@@ -33,10 +33,10 @@ struct Palette;
class ShapeArchive : public Archive {
public:
- ShapeArchive(uint16 id, Palette *pal = 0,
+ ShapeArchive(uint16 id, const Palette *pal = 0,
const ConvertShapeFormat *format = 0)
: Archive(), _id(id), _format(format), _palette(pal) { }
- ShapeArchive(Common::SeekableReadStream *rs, uint16 id, Palette *pal = 0,
+ ShapeArchive(Common::SeekableReadStream *rs, uint16 id, const Palette *pal = 0,
const ConvertShapeFormat *format = 0)
: Archive(rs), _id(id), _format(format), _palette(pal) { }
@@ -51,7 +51,7 @@ public:
protected:
uint16 _id;
const ConvertShapeFormat *_format;
- Palette *_palette;
+ const Palette *_palette;
Std::vector<Shape *> _shapes;
};
More information about the Scummvm-git-logs
mailing list