cfda8b9ecd
Remap would crash SCI2.1early games with 19 remap slots, and
did not actually work in most cases in SCI2.1mid+ games.
The SCI16 implementation was moved to its own separate file but
was otherwise touched as little as possible, so may still have
similar problems to the SCI32 code.
1. Split SCI16 and SCI32 code into separate files
2. Use -32 prefixes for SCI32 code and no prefix for SCI16 code,
where possible, to match other existing code
3. Avoid accidental corruption of values from the VM that may be
valid when signed or larger than 8 bits
4. Added documentation
5. Add missing remap CelObj calls
6. Inline where possible in performance-critical code paths
7. Fix bad `matchColor` function, and move it from GfxPalette to
GfxRemap32 since it is only used by GfxRemap32
8. Fix bad capitalisation in getCycleMap
9. Remove unnecessary initialisation of SingleRemaps
10. Update architecture to more closely mirror how SSCI worked
11. Clarify the purpose of each type of remap type (and
associated variable names)
12. Split large `apply` function into smaller units
13. Fix buffer overrun when loading a SCI2.1early game with remap
14. Remove use of `#define` constants
15. Warn instead of crashing with an error on invalid input (to
match SSCI more closely)
16. Change the collision avoidance mechanism between the RemapType
enum and remap kernel functions
17. Add save/load function
124 lines
4 KiB
C++
124 lines
4 KiB
C++
/* 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 2
|
|
* 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, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#ifndef SCI_GRAPHICS_VIEW_H
|
|
#define SCI_GRAPHICS_VIEW_H
|
|
|
|
namespace Sci {
|
|
|
|
enum Sci32ViewNativeResolution {
|
|
SCI_VIEW_NATIVERES_NONE = -1,
|
|
SCI_VIEW_NATIVERES_320x200 = 0,
|
|
SCI_VIEW_NATIVERES_640x480 = 1,
|
|
SCI_VIEW_NATIVERES_640x400 = 2
|
|
};
|
|
|
|
struct CelInfo {
|
|
int16 width, height;
|
|
int16 scriptWidth, scriptHeight;
|
|
int16 displaceX;
|
|
int16 displaceY;
|
|
byte clearKey;
|
|
uint16 offsetEGA;
|
|
uint32 offsetRLE;
|
|
uint32 offsetLiteral;
|
|
byte *rawBitmap;
|
|
};
|
|
|
|
struct LoopInfo {
|
|
bool mirrorFlag;
|
|
uint16 celCount;
|
|
CelInfo *cel;
|
|
};
|
|
|
|
#define SCI_VIEW_EGAMAPPING_SIZE 16
|
|
#define SCI_VIEW_EGAMAPPING_COUNT 8
|
|
|
|
class GfxScreen;
|
|
class GfxPalette;
|
|
class Resource;
|
|
|
|
/**
|
|
* View class, handles loading of view resources and drawing contained cels to screen
|
|
* every view resource has its own instance of this class
|
|
*/
|
|
class GfxView {
|
|
public:
|
|
GfxView(ResourceManager *resMan, GfxScreen *screen, GfxPalette *palette, GuiResourceId resourceId);
|
|
~GfxView();
|
|
|
|
GuiResourceId getResourceId() const;
|
|
int16 getWidth(int16 loopNo, int16 celNo) const;
|
|
int16 getHeight(int16 loopNo, int16 celNo) const;
|
|
const CelInfo *getCelInfo(int16 loopNo, int16 celNo) const;
|
|
void getCelRect(int16 loopNo, int16 celNo, int16 x, int16 y, int16 z, Common::Rect &outRect) const;
|
|
void getCelSpecialHoyle4Rect(int16 loopNo, int16 celNo, int16 x, int16 y, int16 z, Common::Rect &outRect) const;
|
|
void getCelScaledRect(int16 loopNo, int16 celNo, int16 x, int16 y, int16 z, int16 scaleX, int16 scaleY, Common::Rect &outRect) const;
|
|
const byte *getBitmap(int16 loopNo, int16 celNo);
|
|
void draw(const Common::Rect &rect, const Common::Rect &clipRect, const Common::Rect &clipRectTranslated, int16 loopNo, int16 celNo, byte priority, uint16 EGAmappingNr, bool upscaledHires);
|
|
void drawScaled(const Common::Rect &rect, const Common::Rect &clipRect, const Common::Rect &clipRectTranslated, int16 loopNo, int16 celNo, byte priority, int16 scaleX, int16 scaleY);
|
|
uint16 getLoopCount() const { return _loopCount; }
|
|
uint16 getCelCount(int16 loopNo) const;
|
|
Palette *getPalette();
|
|
|
|
bool isScaleable();
|
|
bool isSci2Hires();
|
|
|
|
void adjustToUpscaledCoordinates(int16 &y, int16 &x);
|
|
void adjustBackUpscaledCoordinates(int16 &y, int16 &x);
|
|
|
|
private:
|
|
void initData(GuiResourceId resourceId);
|
|
void unpackCel(int16 loopNo, int16 celNo, byte *outPtr, uint32 pixelCount);
|
|
void unditherBitmap(byte *bitmap, int16 width, int16 height, byte clearKey);
|
|
|
|
ResourceManager *_resMan;
|
|
GfxCoordAdjuster *_coordAdjuster;
|
|
GfxScreen *_screen;
|
|
GfxPalette *_palette;
|
|
|
|
GuiResourceId _resourceId;
|
|
Resource *_resource;
|
|
byte *_resourceData;
|
|
int _resourceSize;
|
|
|
|
uint16 _loopCount;
|
|
LoopInfo *_loop;
|
|
bool _embeddedPal;
|
|
Palette _viewPalette;
|
|
|
|
// specifies scaling resolution for SCI2 views (see gk1/windows, Wolfgang in room 720)
|
|
Sci32ViewNativeResolution _sci2ScaleRes;
|
|
|
|
byte *_EGAmapping;
|
|
|
|
// this is set for sci0early to adjust for the getCelRect() change
|
|
int16 _adjustForSci0Early;
|
|
|
|
// this is not set for some views in laura bow 2 floppy and signals that the view shall never get scaled
|
|
// even if scaleX/Y are set (inside kAnimate)
|
|
bool _isScaleable;
|
|
};
|
|
|
|
} // End of namespace Sci
|
|
|
|
#endif
|