MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More maps api refactoring and renaming. 

getBlockAbs is a very confusing name; getTileBlock is better.
develop
Alexander Gavrilov 2012-04-11 12:01:27 +04:00
parent 59ddbfacb7
commit c7b922250b
13 changed files with 123 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/include/modules/MapCache.h
Unescape Escape View File

@ -170,6 +170,7 @@ public:
bool Write(); bool Write();
df::coord2d biomeRegionAt(df::coord2d p);
int16_t GeoIndexAt(df::coord2d p); int16_t GeoIndexAt(df::coord2d p);
bool GetGlobalFeature(t_feature *out); bool GetGlobalFeature(t_feature *out);
@ -385,7 +386,7 @@ private:
uint32_t x_tmax; uint32_t x_tmax;
uint32_t y_tmax; uint32_t y_tmax;
uint32_t z_max; uint32_t z_max;
std::vector<int16_t> geoidx; std::vector<df::coord2d> geoidx;
std::vector< std::vector <int16_t> > layer_mats; std::vector< std::vector <int16_t> > layer_mats;
std::map<DFCoord, Block *> blocks; std::map<DFCoord, Block *> blocks;
}; };

26
library/include/modules/Maps.h
Unescape Escape View File

@ -49,6 +49,7 @@ distribution.
#include "df/tile_liquid.h" #include "df/tile_liquid.h"
#include "df/tile_dig_designation.h" #include "df/tile_dig_designation.h"
#include "df/tile_traffic.h" #include "df/tile_traffic.h"
#include "df/world_data.h"
/** /**
* \defgroup grp_maps Maps module and its types * \defgroup grp_maps Maps module and its types
@ -188,7 +189,7 @@ void DfMap::applyGeoMatgloss(Block * b)
* @endcode * @endcode
*/ */
extern DFHACK_EXPORT bool ReadGeology(std::vector<std::vector<int16_t> > *layer_mats, extern DFHACK_EXPORT bool ReadGeology(std::vector<std::vector<int16_t> > *layer_mats,
std::vector<int16_t> *geoidx); std::vector<df::coord2d> *geoidx);
/** /**
* Get pointers to features of a block * Get pointers to features of a block
*/ */
@ -198,11 +199,22 @@ extern DFHACK_EXPORT bool ReadFeatures(uint32_t x, uint32_t y, uint32_t z, t_fea
*/ */
extern DFHACK_EXPORT bool ReadFeatures(df::map_block * block,t_feature * local, t_feature * global); extern DFHACK_EXPORT bool ReadFeatures(df::map_block * block,t_feature * local, t_feature * global);
/**
* Get a pointer to a specific global feature directly.
*/
DFHACK_EXPORT df::feature_init *getGlobalInitFeature(int32_t index);
/**
* Get a pointer to a specific local feature directly. rgn_coord is in the world region grid.
*/
DFHACK_EXPORT df::feature_init *getLocalInitFeature(df::coord2d rgn_coord, int32_t index);
/** /**
* Read a specific global or local feature directly * Read a specific global or local feature directly
*/ */
extern DFHACK_EXPORT bool GetGlobalFeature(t_feature &feature, int32_t index); extern DFHACK_EXPORT bool GetGlobalFeature(t_feature &feature, int32_t index);
extern DFHACK_EXPORT bool GetLocalFeature(t_feature &feature, df::coord2d coord, int32_t index); //extern DFHACK_EXPORT bool GetLocalFeature(t_feature &feature, df::coord2d rgn_coord, int32_t index);
/* /*
* BLOCK DATA * BLOCK DATA
@ -217,13 +229,12 @@ extern DFHACK_EXPORT void getPosition(int32_t& x, int32_t& y, int32_t& z);
* Get the map block or NULL if block is not valid * Get the map block or NULL if block is not valid
*/ */
extern DFHACK_EXPORT df::map_block * getBlock (int32_t blockx, int32_t blocky, int32_t blockz); extern DFHACK_EXPORT df::map_block * getBlock (int32_t blockx, int32_t blocky, int32_t blockz);
extern DFHACK_EXPORT df::map_block * getBlockAbs (int32_t x, int32_t y, int32_t z); extern DFHACK_EXPORT df::map_block * getTileBlock (int32_t x, int32_t y, int32_t z);
inline df::map_block * getBlock (df::coord pos) { return getBlock(pos.x, pos.y, pos.z); } inline df::map_block * getBlock (df::coord pos) { return getBlock(pos.x, pos.y, pos.z); }
inline df::map_block * getBlockAbs (df::coord pos) { return getBlockAbs(pos.x, pos.y, pos.z); } inline df::map_block * getTileBlock (df::coord pos) { return getTileBlock(pos.x, pos.y, pos.z); }
/// copy region offsets of a block - used for determining layer stone matgloss DFHACK_EXPORT df::world_data::T_region_map *getRegionBiome(df::coord2d rgn_pos);
extern DFHACK_EXPORT bool ReadRegionOffsets(uint32_t blockx, uint32_t blocky, uint32_t blockz, biome_indices40d *buffer);
/// sorts the block event vector into multiple vectors by type /// sorts the block event vector into multiple vectors by type
/// mineral veins, what's under ice, blood smears and mud /// mineral veins, what's under ice, blood smears and mud
@ -238,9 +249,6 @@ extern DFHACK_EXPORT bool SortBlockEvents(df::map_block *block,
/// remove a block event from the block by address /// remove a block event from the block by address
extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which ); extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which );
/// read all plants in this block
extern DFHACK_EXPORT bool ReadVegetation(uint32_t x, uint32_t y, uint32_t z, std::vector<df::plant *>*& plants);
} }
} }
#endif #endif

147
library/modules/Maps.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ df::map_block *Maps::getBlock (int32_t blockx, int32_t blocky, int32_t blockz)
return world->map.block_index[blockx][blocky][blockz]; return world->map.block_index[blockx][blocky][blockz];
} }
df::map_block *Maps::getBlockAbs (int32_t x, int32_t y, int32_t z) df::map_block *Maps::getTileBlock (int32_t x, int32_t y, int32_t z)
{ {
if (!IsValid()) if (!IsValid())
return NULL; return NULL;
@ -138,31 +138,40 @@ df::map_block *Maps::getBlockAbs (int32_t x, int32_t y, int32_t z)
return world->map.block_index[x >> 4][y >> 4][z]; return world->map.block_index[x >> 4][y >> 4][z];
} }
/* df::world_data::T_region_map *Maps::getRegionBiome(df::coord2d rgn_pos)
* Region Offsets - used for layer geology
*/
bool Maps::ReadRegionOffsets (uint32_t x, uint32_t y, uint32_t z, biome_indices40d *buffer)
{ {
df::map_block *block = getBlock(x,y,z); auto data = world->world_data;
if (block) if (!data)
{ return NULL;
memcpy(buffer, block->region_offset,sizeof(biome_indices40d));
return true; if (rgn_pos.x < 0 || rgn_pos.x >= data->world_width ||
} rgn_pos.y < 0 || rgn_pos.y >= data->world_height)
return false; return NULL;
return &data->region_map[rgn_pos.x][rgn_pos.y];
}
df::feature_init *Maps::getGlobalInitFeature(int32_t index)
{
auto data = world->world_data;
if (!data)
return NULL;
auto rgn = vector_get(data->underground_regions, index);
if (!rgn)
return NULL;
return rgn->feature_init;
} }
bool Maps::GetGlobalFeature(t_feature &feature, int32_t index) bool Maps::GetGlobalFeature(t_feature &feature, int32_t index)
{ {
feature.type = (df::feature_type)-1; feature.type = (df::feature_type)-1;
if (!world->world_data)
return false;
if ((index < 0) || (index >= world->world_data->underground_regions.size())) auto f = Maps::getGlobalInitFeature(index);
if (!f)
return false; return false;
df::feature_init *f = world->world_data->underground_regions[index]->feature_init;
feature.discovered = false; feature.discovered = false;
feature.origin = f; feature.origin = f;
feature.type = f->getType(); feature.type = f->getType();
@ -170,35 +179,38 @@ bool Maps::GetGlobalFeature(t_feature &feature, int32_t index)
return true; return true;
} }
bool Maps::GetLocalFeature(t_feature &feature, df::coord2d coord, int32_t index) df::feature_init *Maps::getLocalInitFeature(df::coord2d rgn_pos, int32_t index)
{ {
feature.type = (df::feature_type)-1; auto data = world->world_data;
if (!world->world_data) if (!data)
return false; return NULL;
// regionX and regionY are in embark squares!
// we convert to full region tiles
// this also works in adventure mode
// region X coord - whole regions
uint32_t region_x = ( (coord.x / 3) + world->map.region_x ) / 16;
// region Y coord - whole regions
uint32_t region_y = ( (coord.y / 3) + world->map.region_y ) / 16;
uint32_t bigregion_x = region_x / 16; if (rgn_pos.x < 0 || rgn_pos.x >= data->world_width ||
uint32_t bigregion_y = region_y / 16; rgn_pos.y < 0 || rgn_pos.y >= data->world_height)
return NULL;
uint32_t sub_x = region_x % 16;
uint32_t sub_y = region_y % 16;
// megaregions = 16x16 squares of regions = 256x256 squares of embark squares // megaregions = 16x16 squares of regions = 256x256 squares of embark squares
df::coord2d bigregion = rgn_pos / 16;
// bigregion is 16x16 regions. for each bigregion in X dimension: // bigregion is 16x16 regions. for each bigregion in X dimension:
if (!world->world_data->unk_204[bigregion_x][bigregion_y].features) auto fptr = data->unk_204[bigregion.x][bigregion.y].features;
return false; if (!fptr)
return NULL;
df::coord2d sub = rgn_pos & 15;
vector <df::feature_init *> &features = fptr->feature_init[sub.x][sub.y];
return vector_get(features, index);
}
static bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index)
{
feature.type = (df::feature_type)-1;
vector <df::feature_init *> &features = world->world_data->unk_204[bigregion_x][bigregion_y].features->feature_init[sub_x][sub_y]; auto f = Maps::getLocalInitFeature(rgn_pos, index);
if ((index < 0) || (index >= features.size())) if (!f)
return false; return false;
df::feature_init *f = features[index];
feature.discovered = false; feature.discovered = false;
feature.origin = f; feature.origin = f;
@ -228,7 +240,7 @@ bool Maps::ReadFeatures(df::map_block * block, t_feature * local, t_feature * gl
if (local) if (local)
{ {
if (block->local_feature != -1) if (block->local_feature != -1)
result &= GetLocalFeature(*local, block->map_pos/16, block->local_feature); result &= GetLocalFeature(*local, block->region_pos, block->local_feature);
else else
local->type = (df::feature_type)-1; local->type = (df::feature_type)-1;
} }
@ -310,7 +322,7 @@ bool Maps::RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square
/* /*
* Layer geology * Layer geology
*/ */
bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<int16_t> *geoidx) bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<df::coord2d> *geoidx)
{ {
if (!world->world_data) if (!world->world_data)
return false; return false;
@ -321,9 +333,12 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<int16_t> *ge
for (int i = 0; i < eBiomeCount; i++) for (int i = 0; i < eBiomeCount; i++)
{ {
(*layer_mats)[i].clear(); (*layer_mats)[i].clear();
(*geoidx)[i] = -1; (*geoidx)[i] = df::coord2d(-30000,-30000);
} }
int world_width = world->world_data->world_width;
int world_height = world->world_data->world_height;
// iterate over 8 surrounding regions + local region // iterate over 8 surrounding regions + local region
for (int i = eNorthWest; i < eBiomeCount; i++) for (int i = eNorthWest; i < eBiomeCount; i++)
{ {
@ -332,16 +347,18 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<int16_t> *ge
// regionX/16 is in 16x16 embark square regions // regionX/16 is in 16x16 embark square regions
// i provides -1 .. +1 offset from the current region // i provides -1 .. +1 offset from the current region
int bioRX = world->map.region_x / 16 + ((i % 3) - 1); int bioRX = world->map.region_x / 16 + ((i % 3) - 1);
if (bioRX < 0) bioRX = 0;
if (bioRX >= world->world_data->world_width) bioRX = world->world_data->world_width - 1;
int bioRY = world->map.region_y / 16 + ((i / 3) - 1); int bioRY = world->map.region_y / 16 + ((i / 3) - 1);
if (bioRY < 0) bioRY = 0;
if (bioRY >= world->world_data->world_height) bioRY = world->world_data->world_height - 1;
// get index into geoblock vector df::coord2d rgn_pos(clip_range(bioRX,0,world_width-1),clip_range(bioRX,0,world_height-1));
int16_t geoindex = world->world_data->region_map[bioRX][bioRY].geo_index;
(*geoidx)[i] = rgn_pos;
auto biome = getRegionBiome(rgn_pos);
if (!biome)
continue;
(*geoidx)[i] = geoindex; // get index into geoblock vector
int16_t geoindex = biome->geo_index;
/// geology blocks have a vector of layer descriptors /// geology blocks have a vector of layer descriptors
// get the vector with pointer to layers // get the vector with pointer to layers
@ -363,16 +380,6 @@ bool Maps::ReadGeology(vector<vector<int16_t> > *layer_mats, vector<int16_t> *ge
return true; return true;
} }
bool Maps::ReadVegetation(uint32_t x, uint32_t y, uint32_t z, std::vector<df::plant *>*& plants)
{
df::map_block *block = getBlock(x,y,z);
if (!block)
return false;
plants = &block->plants;
return true;
}
#define COPY(a,b) memcpy(&a,&b,sizeof(a)) #define COPY(a,b) memcpy(&a,&b,sizeof(a))
MapExtras::Block::Block(MapCache *parent, DFCoord _bcoord) : parent(parent) MapExtras::Block::Block(MapCache *parent, DFCoord _bcoord) : parent(parent)
@ -536,18 +543,34 @@ void MapExtras::Block::SquashRocks (df::map_block *mb, t_blockmaterials & materi
} }
} }
int16_t MapExtras::Block::GeoIndexAt(df::coord2d p) df::coord2d MapExtras::Block::biomeRegionAt(df::coord2d p)
{ {
if (!block)
return df::coord2d(-30000,-30000);
auto des = index_tile<df::tile_designation>(designation,p); auto des = index_tile<df::tile_designation>(designation,p);
uint8_t idx = des.bits.biome; uint8_t idx = des.bits.biome;
if (idx >= 9) if (idx >= 9)
return -1; return block->region_pos;
idx = block->region_offset[idx]; idx = block->region_offset[idx];
if (idx >= parent->geoidx.size()) if (idx >= parent->geoidx.size())
return -1; return block->region_pos;
return parent->geoidx[idx]; return parent->geoidx[idx];
} }
int16_t MapExtras::Block::GeoIndexAt(df::coord2d p)
{
df::coord2d biome = biomeRegionAt(p);
if (!biome.isValid())
return -1;
auto pinfo = Maps::getRegionBiome(biome);
if (!pinfo)
return -1;
return pinfo->geo_index;
}
bool MapExtras::Block::GetGlobalFeature(t_feature *out) bool MapExtras::Block::GetGlobalFeature(t_feature *out)
{ {
out->type = (df::feature_type)-1; out->type = (df::feature_type)-1;
@ -561,7 +584,7 @@ bool MapExtras::Block::GetLocalFeature(t_feature *out)
out->type = (df::feature_type)-1; out->type = (df::feature_type)-1;
if (!valid || block->local_feature < 0) if (!valid || block->local_feature < 0)
return false; return false;
return Maps::GetLocalFeature(*out, block->map_pos/16, block->local_feature); return ::GetLocalFeature(*out, block->region_pos, block->local_feature);
} }
void MapExtras::Block::init_item_counts() void MapExtras::Block::init_item_counts()

2
plugins/advtools.cpp
Unescape Escape View File

@ -780,7 +780,7 @@ command_result adv_tools (color_ostream &out, std::vector <std::string> & parame
if (!num) if (!num)
continue; continue;
df::map_block *block = Maps::getBlockAbs(item->pos); df::map_block *block = Maps::getTileBlock(item->pos);
if (!block) if (!block)
continue; continue;

2
plugins/changevein.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ command_result df_changevein (color_ostream &out, vector <string> & parameters)
return CR_FAILURE; return CR_FAILURE;
} }
df::map_block *block = Maps::getBlockAbs(cursor->x, cursor->y, cursor->z); df::map_block *block = Maps::getTileBlock(cursor->x, cursor->y, cursor->z);
if (!block) if (!block)
{ {
out.printerr("Invalid tile selected.\n"); out.printerr("Invalid tile selected.\n");

2
plugins/cleaners.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ command_result spotclean (color_ostream &out, vector <string> & parameters)
out.printerr("Map is not available.\n"); out.printerr("Map is not available.\n");
return CR_FAILURE; return CR_FAILURE;
} }
df::map_block *block = Maps::getBlockAbs(cursor->x, cursor->y, cursor->z); df::map_block *block = Maps::getTileBlock(cursor->x, cursor->y, cursor->z);
if (block == NULL) if (block == NULL)
{ {
out.printerr("Invalid map block selected!\n"); out.printerr("Invalid map block selected!\n");

2
plugins/deramp.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ command_result df_deramp (color_ostream &out, vector <string> & parameters)
for (int i = 0; i < blocks_total; i++) for (int i = 0; i < blocks_total; i++)
{ {
df::map_block *block = world->map.map_blocks[i]; df::map_block *block = world->map.map_blocks[i];
df::map_block *above = Maps::getBlockAbs(block->map_pos.x, block->map_pos.y, block->map_pos.z + 1); df::map_block *above = Maps::getTileBlock(block->map_pos + df::coord(0,0,1));
for (int x = 0; x < 16; x++) for (int x = 0; x < 16; x++)
{ {

3
plugins/fixveins.cpp
Unescape Escape View File

@ -65,8 +65,7 @@ command_result df_fixveins (color_ostream &out, vector <string> & parameters)
has_mineral[k] |= mineral->tile_bitmask[k]; has_mineral[k] |= mineral->tile_bitmask[k];
} }
t_feature local, global; t_feature local, global;
Maps::GetGlobalFeature(global, block->global_feature); Maps::ReadFeatures(block, &local, &global);
Maps::GetLocalFeature(local, df::coord2d(block->map_pos.x / 16, block->map_pos.y / 16), block->local_feature);
for (int x = 0; x < 16; x++) for (int x = 0; x < 16; x++)
{ {
for (int y = 0; y < 16; y++) for (int y = 0; y < 16; y++)

4
plugins/mapexport/mapexport.cpp
Unescape Escape View File

@ -241,9 +241,9 @@ command_result mapexport (color_ostream &out, std::vector <std::string> & parame
} }
} }
PlantList *plants; if (b->getRaw())
if (Maps::ReadVegetation(b_x, b_y, z, plants))
{ {
PlantList *plants = &b->getRaw()->plants;
for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++) for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++)
{ {
const df::plant & plant = *(*it); const df::plant & plant = *(*it);

10
plugins/plants.cpp
Unescape Escape View File

@ -125,8 +125,9 @@ static command_result immolations (color_ostream &out, do_what what, bool shrubs
int32_t x,y,z; int32_t x,y,z;
if(Gui::getCursorCoords(x,y,z)) if(Gui::getCursorCoords(x,y,z))
{ {
vector<df::plant *> * alltrees; auto block = Maps::getTileBlock(x,y,z);
if(Maps::ReadVegetation(x/16,y/16,z,alltrees)) vector<df::plant *> *alltrees = block ? &block->plants : NULL;
if(alltrees)
{ {
bool didit = false; bool didit = false;
for(size_t i = 0 ; i < alltrees->size(); i++) for(size_t i = 0 ; i < alltrees->size(); i++)
@ -206,8 +207,9 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
int32_t x,y,z; int32_t x,y,z;
if(Gui::getCursorCoords(x,y,z)) if(Gui::getCursorCoords(x,y,z))
{ {
vector<df::plant *> * alltrees; auto block = Maps::getTileBlock(x,y,z);
if(Maps::ReadVegetation(x/16,y/16,z,alltrees)) vector<df::plant *> *alltrees = block ? &block->plants : NULL;
if(alltrees)
{ {
for(size_t i = 0 ; i < alltrees->size(); i++) for(size_t i = 0 ; i < alltrees->size(); i++)
{ {

5
plugins/prospector.cpp
Unescape Escape View File

@ -544,8 +544,9 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
// and we can check visibility more easily here // and we can check visibility more easily here
if (showPlants) if (showPlants)
{ {
PlantList * plants; auto block = Maps::getBlock(b_x,b_y,z);
if (Maps::ReadVegetation(b_x, b_y, z, plants)) vector<df::plant *> *plants = block ? &block->plants : NULL;
if(plants)
{ {
for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++) for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++)
{ {

2
plugins/reveal.cpp
Unescape Escape View File

@ -290,7 +290,7 @@ command_result unreveal(color_ostream &out, vector<string> & params)
for(size_t i = 0; i < hidesaved.size();i++) for(size_t i = 0; i < hidesaved.size();i++)
{ {
hideblock & hb = hidesaved[i]; hideblock & hb = hidesaved[i];
df::map_block * b = Maps::getBlockAbs(hb.c.x,hb.c.y,hb.c.z); df::map_block * b = Maps::getTileBlock(hb.c.x,hb.c.y,hb.c.z);
for (uint32_t x = 0; x < 16;x++) for (uint32_t y = 0; y < 16;y++) for (uint32_t x = 0; x < 16;x++) for (uint32_t y = 0; y < 16;y++)
{ {
b->designation[x][y].bits.hidden = hb.hiddens[x][y]; b->designation[x][y].bits.hidden = hb.hiddens[x][y];

7
plugins/tubefill.cpp
Unescape Escape View File

@ -59,12 +59,9 @@ command_result tubefill(color_ostream &out, std::vector<std::string> & params)
for (size_t i = 0; i < world->map.map_blocks.size(); i++) for (size_t i = 0; i < world->map.map_blocks.size(); i++)
{ {
df::map_block *block = world->map.map_blocks[i]; df::map_block *block = world->map.map_blocks[i];
df::map_block *above = Maps::getBlockAbs(block->map_pos.x, block->map_pos.y, block->map_pos.z + 1); df::map_block *above = Maps::getTileBlock(block->map_pos + df::coord(0,0,1));
if (block->local_feature == -1)
continue;
DFHack::t_feature feature; DFHack::t_feature feature;
DFCoord coord(block->map_pos.x >> 4, block->map_pos.y >> 4, block->map_pos.z); if (!Maps::ReadFeatures(block, &feature, NULL))
if (!Maps::GetLocalFeature(feature, coord, block->local_feature))
continue; continue;
if (feature.type != feature_type::deep_special_tube) if (feature.type != feature_type::deep_special_tube)
continue; continue;