libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 19:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Replace minimap sample top item trace with a sweeep test.

Browse Source 
Sweep test largely samples the same items as top item trace, but this appears to be preferrable when different.
This commit is contained in:
Matthew Jimenez 2023-01-02 14:07:13 -06:00
parent b808457b2b
commit 906379789d
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "ultima/ultima8/world/minimap.h"
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/item.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/graphics/shape.h"
#include "ultima/ultima8/graphics/shape_frame.h"
@ -77,23 +78,30 @@ Common::Point MiniMap::getItemLocation(const Item &item, unsigned int chunkSize)
}
uint32 MiniMap::sampleAtPoint(const CurrentMap &map, int x, int y) {
uint32 val = 0;
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);
if (val == 0) {
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);
}
}
int32 start[3] = {x, y, 1 << 15};
int32 end[3] = {x, y, -1};
int32 dims[3] = {0, 0, 0};
uint32 shflags = ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA;
Std::list<CurrentMap::SweepItem> collisions;
if (!map.sweepTest(start, end, dims, shflags, 0, false, &collisions))
return 0;
if (val == 0) {
// set to avoid reprocessing
val = _surface.format.RGBToColor(0x00, 0x00, 0x00);
Std::list<CurrentMap::SweepItem>::const_iterator it;
for (it = collisions.begin(); it != collisions.end(); it++) {
const Item *item = getItem(it->_item);
if (item) {
const ShapeInfo *si = item->getShapeInfo();
if (!(si->_flags & shflags) || si->is_editor() || si->is_translucent())
continue;
uint32 val = sampleAtPoint(*item, x, y);
if (val != 0)
return val;
}
}
return val;
// set to avoid reprocessing
return _surface.format.RGBToColor(0x00, 0x00, 0x00);
}
uint32 MiniMap::sampleAtPoint(const Item &item, int x, int y) {