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

ULTIMA8: Add get item location to minimap to avoid calculation in gump

Browse Source
This commit is contained in:
Matthew Jimenez 2023-01-02 11:19:31 -06:00
parent 655a9774c0
commit 56bb953dd7
5 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engines/ultima/ultima8/gumps/minimap_gump.cpp
View File

@ -62,27 +62,23 @@ void MiniMapGump::run() {
if (!actor || actor->isDead())
return;
int32 ax, ay, az;
actor->getLocation(ax, ay, az);
ax = ax / (mapChunkSize / MINMAPGUMP_SCALE);
ay = ay / (mapChunkSize / MINMAPGUMP_SCALE);
// Skip map update if location has not changed
if (ax == _ax && ay == _ay)
return;
_ax = ax;
_ay = ay;
uint32 mapNum = currentmap->getNum();
MiniMap *minimap = _minimaps[mapNum];
if (!minimap) {
minimap = new MiniMap(mapNum);
_minimaps[mapNum] = minimap;
}
minimap->update(currentmap);
Common::Point p = minimap->getItemLocation(*actor, mapChunkSize);
// Skip map update if location has not changed
if (p.x == _ax && p.y == _ay)
return;
_ax = p.x;
_ay = p.y;
minimap->update(*currentmap);
}
void MiniMapGump::generate() {
@ -97,7 +93,7 @@ void MiniMapGump::generate() {
minimap = new MiniMap(mapNum);
_minimaps[mapNum] = minimap;
}
minimap->update(currentmap);
minimap->update(*currentmap);
}
void MiniMapGump::clear() {

2
engines/ultima/ultima8/world/current_map.cpp
View File

@ -1253,7 +1253,7 @@ bool CurrentMap::sweepTest(const int32 start[3], const int32 end[3],
}
const Item *CurrentMap::traceTopItem(int32 x, int32 y, int32 ztop, int32 zbot, ObjId ignore, uint32 shflags) {
const Item *CurrentMap::traceTopItem(int32 x, int32 y, int32 ztop, int32 zbot, ObjId ignore, uint32 shflags) const {
const Item *top = nullptr;
if (ztop < zbot) {

2
engines/ultima/ultima8/world/current_map.h
View File

@ -204,7 +204,7 @@ public:
}
// A simple trace to find the top item at a specific xy point
const Item *traceTopItem(int32 x, int32 y, int32 ztop, int32 zbot, ObjId ignore, uint32 shflags);
const Item *traceTopItem(int32 x, int32 y, int32 ztop, int32 zbot, ObjId ignore, uint32 shflags) const;
// Set the entire map as being 'fast'
void setWholeMapFast();

39
engines/ultima/ultima8/world/minimap.cpp
View File

@ -41,8 +41,8 @@ MiniMap::~MiniMap() {
_surface.free();
}
void MiniMap::update(CurrentMap *currentmap) {
int mapChunkSize = currentmap->getChunkSize();
void MiniMap::update(const CurrentMap &map) {
int mapChunkSize = map.getChunkSize();
// Draw into the map surface
for (int x = 0; x < _surface.w; x++) {
@ -51,7 +51,7 @@ void MiniMap::update(CurrentMap *currentmap) {
if (val == 0) {
int cx = x / MINMAPGUMP_SCALE;
int cy = y / MINMAPGUMP_SCALE;
if (currentmap->isChunkFast(cx, cy)) {
if (map.isChunkFast(cx, cy)) {
int mx = (x * mapChunkSize) / MINMAPGUMP_SCALE;
int my = (y * mapChunkSize) / MINMAPGUMP_SCALE;
@ -59,7 +59,7 @@ void MiniMap::update(CurrentMap *currentmap) {
mx += mapChunkSize / (MINMAPGUMP_SCALE * 2);
my += mapChunkSize / (MINMAPGUMP_SCALE * 2);
val = sampleAtPoint(currentmap, mx, my);
val = sampleAtPoint(map, mx, my);
_surface.setPixel(x, y, val);
}
}
@ -67,15 +67,24 @@ void MiniMap::update(CurrentMap *currentmap) {
}
}
uint32 MiniMap::sampleAtPoint(CurrentMap *currentmap, int x, int y) {
Common::Point MiniMap::getItemLocation(const Item &item, unsigned int chunkSize) {
int32 x, y, z;
item.getLocation(x, y, z);
x = x / (chunkSize / MINMAPGUMP_SCALE);
y = y / (chunkSize / MINMAPGUMP_SCALE);
return Common::Point(x, y);
}
uint32 MiniMap::sampleAtPoint(const CurrentMap &map, int x, int y) {
uint32 val = 0;
const Item *item = currentmap->traceTopItem(x, y, 1 << 15, -1, 0, ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA);
const Item *item = map.traceTopItem(x, y, 1 << 15, -1, 0, ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA);
if (item) {
val = sampleAtPoint(item, x, y);
val = sampleAtPoint(*item, x, y);
if (val == 0) {
item = currentmap->traceTopItem(x, y, 1 << 15, -1, item->getObjId(), ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA);
item = map.traceTopItem(x, y, 1 << 15, -1, item->getObjId(), ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA);
if (item) {
val = sampleAtPoint(item, x, y);
val = sampleAtPoint(*item, x, y);
}
}
@ -87,19 +96,19 @@ uint32 MiniMap::sampleAtPoint(CurrentMap *currentmap, int x, int y) {
return val;
}
uint32 MiniMap::sampleAtPoint(const Item *item, int x, int y) {
uint32 MiniMap::sampleAtPoint(const Item &item, int x, int y) {
int32 ix, iy, iz, idx, idy, idz;
item->getLocation(ix, iy, iz);
item->getFootpadWorld(idx, idy, idz);
item.getLocation(ix, iy, iz);
item.getFootpadWorld(idx, idy, idz);
ix -= x;
iy -= y;
const Shape *sh = item->getShapeObject();
const Shape *sh = item.getShapeObject();
if (!sh)
return 0;
const ShapeFrame *frame = sh->getFrame(item->getFrame());
const ShapeFrame *frame = sh->getFrame(item.getFrame());
if (!frame)
return 0;
@ -107,7 +116,7 @@ uint32 MiniMap::sampleAtPoint(const Item *item, int x, int y) {
if (!pal)
return 0;
if (item->canDrag())
if (item.canDrag())
return 0;
// Screenspace bounding box bottom x_ coord (RNB x_ coord)

7
engines/ultima/ultima8/world/minimap.h
View File

@ -38,15 +38,16 @@ private:
uint32 _mapNum;
Graphics::Surface _surface;
uint32 sampleAtPoint(CurrentMap *map, int x, int y);
uint32 sampleAtPoint(const Item *item, int x, int y);
uint32 sampleAtPoint(const CurrentMap &map, int x, int y);
uint32 sampleAtPoint(const Item &item, int x, int y);
const Common::Rect getCropBounds() const;
public:
MiniMap(uint32 mapNum);
~MiniMap();
void update(CurrentMap *map);
void update(const CurrentMap &map);
Common::Point getItemLocation(const Item &item, unsigned int chunkSize);
uint32 getMapNum() const { return _mapNum; }
Graphics::Surface *getSurface() { return &_surface; }