libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 11:36:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IMMORTAL: Sprite drawing preliminarily implemented

Browse Source
This commit is contained in:
Quote58 2022-09-06 19:18:59 -04:00 committed by Eugene Sandulenko
parent b27988471c
commit 8d9994ba56
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/immortal/immortal.cpp
View File

@ -189,8 +189,8 @@ Common::Error ImmortalEngine::run() {
//logic(); //logic();
pollKeys(); pollKeys();
if (logicFreeze() == 0) { if (logicFreeze() == 0) {
DataSprite *d = &_dataSprites[kFont]; DataSprite *d = &_dataSprites[kGoblin2];
superSprite(d, 0xC0, 0x50, 0, 0, _screenBuff, kSuperTop, kMySuperBottom); superSprite(d, 20, 0xA0, 4, kVSBMW, _screenBuff, kSuperTop, kMySuperBottom);
drawUniv(); drawUniv();
pollKeys(); pollKeys();
fixColors(); fixColors();

8
engines/immortal/immortal.h
View File

@ -232,7 +232,7 @@ public:
const int kSpriteDY = 32; const int kSpriteDY = 32;
const int kVSX = kMaxSpriteW; const int kVSX = kMaxSpriteW;
const int kVSY = kSpriteDY; const int kVSY = kSpriteDY;
const int kVSBMW = (kViewPortW + kMaxSpriteW) / 2; const uint16 kVSBMW = (kViewPortW + kMaxSpriteW) / 2;
const int kVSLen = kVSBMW * (kViewPortH + kMaxSpriteH); const int kVSLen = kVSBMW * (kViewPortH + kMaxSpriteH);
const int kVSDY = 32; // difference from top of screen to top of viewport in the virtual screen buffer const int kVSDY = 32; // difference from top of screen to top of viewport in the virtual screen buffer
const int kMySuperBottom = kVSDY + kViewPortH; const int kMySuperBottom = kVSDY + kViewPortH;
@ -584,9 +584,9 @@ GenericSprite _genSprites[6];
void initDataSprite(Common::SeekableReadStream *f, DataSprite *d, int index, uint16 cenX, uint16 cenY); // Initializes the data sprite void initDataSprite(Common::SeekableReadStream *f, DataSprite *d, int index, uint16 cenX, uint16 cenY); // Initializes the data sprite
// Main // Main
void superSprite(DataSprite *dSprite, uint16 x, uint16 y, int img, int bmw, byte *dst, int superTop, int superBottom); void superSprite(DataSprite *dSprite, uint16 x, uint16 y, int img, uint16 bmw, byte *dst, int superTop, int superBottom);
bool clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skipY, DataSprite *dSprite, uint16 &pointX, uint16 &pointY, int img, int bmw, int superTop, int superBottom); bool clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skipY, DataSprite *dSprite, uint16 &pointX, uint16 &pointY, int img, uint16 bmw, int superTop, int superBottom);
void spriteAligned(DataSprite *dSprite, Image &img, uint16 &skipY, uint16 &pointIndex, uint16 &height, int bmw, byte *dst); void spriteAligned(DataSprite *dSprite, Image &img, uint16 &skipY, uint16 &pointIndex, uint16 &height, uint16 bmw, byte *dst);
void spriteNotAligned(); void spriteNotAligned();
/* /*

53
engines/immortal/sprites.cpp
View File

@ -98,11 +98,6 @@ void ImmortalEngine::initDataSprite(Common::SeekableReadStream *f, DataSprite *d
uint16 next = 0; uint16 next = 0;
for (int j = 0; j < newImage._rectH; j++) { for (int j = 0; j < newImage._rectH; j++) {
next = f->readUint16LE(); next = f->readUint16LE();
if (next >= 0x8000) {
next = uint16 (0 - next);
} else {
debug("HUH");
}
//debug("First after RectH: %04X", next); //debug("First after RectH: %04X", next);
newImage._deltaPos.push_back(next); newImage._deltaPos.push_back(next);
next = f->readUint16LE(); next = f->readUint16LE();
@ -123,20 +118,23 @@ void ImmortalEngine::initDataSprite(Common::SeekableReadStream *f, DataSprite *d
d->_images = images; d->_images = images;
} }
bool ImmortalEngine::clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skipY, DataSprite *dSprite, uint16 &pointX, uint16 &pointY, int img, int bmw, int superTop, int superBottom) { bool ImmortalEngine::clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skipY, DataSprite *dSprite, uint16 &pointX, uint16 &pointY, int img, uint16 bmw, int superTop, int superBottom) {
// This bit is to get the base index into the screen buffer, unless that's already been done, which is _lastPoint // This bit is to get the base index into the screen buffer, unless that's already been done, which is _lastPoint
if ((pointY != _lastY) || (bmw != _lastBMW)) { if ((pointY != _lastY) || (bmw != _lastBMW)) {
_lastBMW = bmw; _lastBMW = bmw;
_lastY = pointY; _lastY = pointY;
if (pointY >= 0) { if (pointY < 0x80) {
_lastPoint = pointY * bmw; _lastPoint = pointY * bmw;
} else { } else {
pointY = !(pointY); pointY = (pointY ^ 0xFF) + 1;
_lastPoint = pointY * bmw; _lastPoint = pointY * bmw;
_lastPoint = 0 - _lastPoint;
} }
} }
pointIndex = _lastPoint; pointIndex = _lastPoint;
return false;
// Now we begin clipping, starting with totally offscreen // Now we begin clipping, starting with totally offscreen
// We do this by checking if the sprite is above the top of the screen, or below the bottom of it // We do this by checking if the sprite is above the top of the screen, or below the bottom of it
@ -155,7 +153,7 @@ bool ImmortalEngine::clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skip
} }
// Next we get the difference of overlap from the sprite if it is above the top // Next we get the difference of overlap from the sprite if it is above the top
if ((superTop - pointY) >= 0) { if ((superTop - pointY) < 0x8000) {
skipY = (superTop - pointY); skipY = (superTop - pointY);
} }
@ -165,20 +163,37 @@ bool ImmortalEngine::clipSprite(uint16 &height, uint16 &pointIndex, uint16 &skip
return false; return false;
} }
void ImmortalEngine::spriteAligned(DataSprite *dSprite, Image &img, uint16 &skipY, uint16 &pointIndex, uint16 &height, int bmw, byte *dst) { void ImmortalEngine::spriteAligned(DataSprite *dSprite, Image &img, uint16 &skipY, uint16 &pointIndex, uint16 &height, uint16 bmw, byte *dst) {
//debug("draw the sprite"); //debug("draw the sprite");
//debug("%d, %d, %d", height, skipY, pointIndex); debug("%d, %d, %04X", height, skipY, pointIndex);
byte pixel; byte pixel;
int pos; // For debug currently, align to the word by default
pointIndex &= 0xFFFE;
// Position is weird
pointIndex += 50;
debug("SPRITE START ------"); debug("SPRITE START ------");
for (int y = skipY; y < height; y++) { for (int y = 0; y < height; y++, pointIndex += (bmw * 2)) {
for (int x = 0; x < img._scanWidth[y]; x ++) {
pos = ((pointIndex + (y * kResH)) - img._deltaPos[y]) + (x * 2); //debug("%04X, %04X ", pointIndex, img._deltaPos[y]);
pixel = img._bitmap[y][x];
_screenBuff[pos] = (pixel & kMask8High) >> 4; if (img._deltaPos[y] < 0x8000) {
_screenBuff[pos + 1] = pixel & kMask8Low; pointIndex += (img._deltaPos[y] * 2);
}
else {
pointIndex -= ((0 - img._deltaPos[y]) * 2);
}
for (int x = 0; x < img._scanWidth[y]; x++, pointIndex += 2) {
//if (y > skipY) {
pixel = img._bitmap[y][x];
_screenBuff[pointIndex] = (pixel & kMask8High) >> 4;
_screenBuff[pointIndex + 1] = pixel & kMask8Low;
//}
} }
} }
debug("SPRITE END -------"); debug("SPRITE END -------");
@ -188,7 +203,7 @@ void ImmortalEngine::spriteNotAligned() {
} }
void ImmortalEngine::superSprite(DataSprite *dSprite, uint16 pointX, uint16 pointY, int img, int bmw, byte *dst, int superTop, int superBottom) { void ImmortalEngine::superSprite(DataSprite *dSprite, uint16 pointX, uint16 pointY, int img, uint16 bmw, byte *dst, int superTop, int superBottom) {
// Main image construction routine // Main image construction routine
uint16 cenX = dSprite->_cenX; uint16 cenX = dSprite->_cenX;