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

Use MapExtras more.

develop
Petr Mrázek 2011-04-10 06:17:11 +02:00
parent 4a83f07bdd
commit 4547c8c0aa
3 changed files with 136 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/include/dfhack/extra/MapExtras.h
Unescape Escape View File

@ -49,18 +49,18 @@ class Block
bcoord = _bcoord; bcoord = _bcoord;
if(m->ReadBlock40d(bcoord.x,bcoord.y,bcoord.z,&raw)) if(m->ReadBlock40d(bcoord.x,bcoord.y,bcoord.z,&raw))
{ {
SquashVeins(m,bcoord,raw,materials); SquashVeins(m,bcoord,raw,veinmats);
valid = true; valid = true;
} }
m->ReadTemperatures(bcoord.x,bcoord.y, bcoord.z,&temp1,&temp2); m->ReadTemperatures(bcoord.x,bcoord.y, bcoord.z,&temp1,&temp2);
} }
int16_t MaterialAt(DFHack::DFCoord p) int16_t veinMaterialAt(DFHack::DFCoord p)
{ {
return materials[p.x][p.y]; return veinmats[p.x][p.y];
} }
void ClearMaterialAt(DFHack::DFCoord p) void ClearMaterialAt(DFHack::DFCoord p)
{ {
materials[p.x][p.y] = -1; veinmats[p.x][p.y] = -1;
} }
uint16_t TileTypeAt(DFHack::DFCoord p) uint16_t TileTypeAt(DFHack::DFCoord p)
@ -160,7 +160,7 @@ class Block
DFHack::Maps * m; DFHack::Maps * m;
DFHack::mapblock40d raw; DFHack::mapblock40d raw;
DFHack::DFCoord bcoord; DFHack::DFCoord bcoord;
DFHack::t_blockmaterials materials; DFHack::t_blockmaterials veinmats;
DFHack::t_temperatures temp1; DFHack::t_temperatures temp1;
DFHack::t_temperatures temp2; DFHack::t_temperatures temp2;
}; };
@ -269,12 +269,12 @@ class MapCache
return false; return false;
} }
int16_t materialAt (DFHack::DFCoord tilecoord) int16_t veinMaterialAt (DFHack::DFCoord tilecoord)
{ {
Block * b= BlockAt(tilecoord / 16); Block * b= BlockAt(tilecoord / 16);
if(b && b->valid) if(b && b->valid)
{ {
return b->MaterialAt(tilecoord % 16); return b->veinMaterialAt(tilecoord % 16);
} }
return 0; return 0;
} }

33
tools/supported/probe.cpp
Unescape Escape View File

@ -11,6 +11,7 @@
#define DFHACK_WANT_MISCUTILS 1 #define DFHACK_WANT_MISCUTILS 1
#define DFHACK_WANT_TILETYPES 1 #define DFHACK_WANT_TILETYPES 1
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h>
using namespace DFHack; using namespace DFHack;
int main (int numargs, const char ** args) int main (int numargs, const char ** args)
@ -39,6 +40,15 @@ int main (int numargs, const char ** args)
DFHack::VersionInfo* mem = DF->getMemoryInfo(); DFHack::VersionInfo* mem = DF->getMemoryInfo();
DFHack::Maps *Maps = DF->getMaps(); DFHack::Maps *Maps = DF->getMaps();
DFHack::Process * p = DF->getProcess(); DFHack::Process * p = DF->getProcess();
if(!Maps->Start())
{
cerr << "Unable to access map data!" << endl;
}
else
{
MapExtras::MapCache mc (Maps);
OffsetGroup *mapsg = mem->getGroup("Maps"); OffsetGroup *mapsg = mem->getGroup("Maps");
OffsetGroup *mapblockg = mapsg->getGroup("block"); OffsetGroup *mapblockg = mapsg->getGroup("block");
@ -57,8 +67,6 @@ int main (int numargs, const char ** args)
p->readDWord (region_y_offset, (uint32_t &)regionY); p->readDWord (region_y_offset, (uint32_t &)regionY);
p->readDWord (region_z_offset, (uint32_t &)regionZ); p->readDWord (region_z_offset, (uint32_t &)regionZ);
Maps->Start();
vector<DFHack::t_feature> global_features; vector<DFHack::t_feature> global_features;
std::map <DFHack::DFCoord, std::vector<DFHack::t_feature *> > local_features; std::map <DFHack::DFCoord, std::vector<DFHack::t_feature *> > local_features;
@ -69,23 +77,28 @@ int main (int numargs, const char ** args)
Gui->getCursorCoords(cursorX,cursorY,cursorZ); Gui->getCursorCoords(cursorX,cursorY,cursorZ);
if(cursorX != -30000) if(cursorX != -30000)
{ {
DFCoord cursor (cursorX,cursorY,cursorZ);
uint32_t blockX = cursorX / 16; uint32_t blockX = cursorX / 16;
uint32_t tileX = cursorX % 16; uint32_t tileX = cursorX % 16;
uint32_t blockY = cursorY / 16; uint32_t blockY = cursorY / 16;
uint32_t tileY = cursorY % 16; uint32_t tileY = cursorY % 16;
t_temperatures tmpb1, tmpb2;
mapblock40d block; MapExtras::Block * b = mc.BlockAt(cursor/16);
if(Maps->ReadBlock40d(blockX,blockY,cursorZ,&block)) mapblock40d & block = b->raw;
if(b)
{ {
Maps->ReadTemperatures(blockX,blockY,cursorZ,&tmpb1, &tmpb2);
printf("block addr: 0x%x\n", block.origin); printf("block addr: 0x%x\n", block.origin);
int16_t tiletype = block.tiletypes[tileX][tileY]; int16_t tiletype = mc.tiletypeAt(cursor);
naked_designation &des = block.designation[tileX][tileY].bits; naked_designation &des = block.designation[tileX][tileY].bits;
uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation); uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation);
uint32_t occupr = block.origin + occup + (tileX * 16 + tileY) * sizeof(t_occupancy); uint32_t occupr = block.origin + occup + (tileX * 16 + tileY) * sizeof(t_occupancy);
printf("designation offset: 0x%x\n", designato); printf("designation offset: 0x%x\n", designato);
print_bits<uint32_t>(block.designation[tileX][tileY].whole,std::cout); print_bits<uint32_t>(block.designation[tileX][tileY].whole,std::cout);
std::cout << endl; std::cout << endl;
printf("occupancy offset: 0x%x\n", occupr); printf("occupancy offset: 0x%x\n", occupr);
print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,std::cout); print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,std::cout);
std::cout << endl; std::cout << endl;
@ -103,8 +116,8 @@ int main (int numargs, const char ** args)
std::cout << std::endl; std::cout << std::endl;
std::cout <<"temperature1: " << tmpb1[tileX][tileY] << " U" << std::endl; std::cout <<"temperature1: " << mc.temperature1At(cursor) << " U" << std::endl;
std::cout <<"temperature2: " << tmpb2[tileX][tileY] << " U" << std::endl; std::cout <<"temperature2: " << mc.temperature2At(cursor) << " U" << std::endl;
// biome, geolayer // biome, geolayer
std::cout << "biome: " << des.biome << std::endl; std::cout << "biome: " << des.biome << std::endl;
@ -148,7 +161,6 @@ int main (int numargs, const char ** args)
); );
} }
PRINT_FLAG( feature_global ); PRINT_FLAG( feature_global );
if( des.feature_global && have_global ) if( des.feature_global && have_global )
@ -166,6 +178,7 @@ int main (int numargs, const char ** args)
std::cout << std::endl; std::cout << std::endl;
} }
} }
}
DF->Detach(); DF->Detach();
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
std::cout << "Press any key to refresh..." << std::endl; std::cout << "Press any key to refresh..." << std::endl;

8
tools/supported/vdig.cpp
Unescape Escape View File

@ -93,7 +93,7 @@ int main (int argc, char* argv[])
DFHack::t_designation des = MCache->designationAt(xy); DFHack::t_designation des = MCache->designationAt(xy);
int16_t tt = MCache->tiletypeAt(xy); int16_t tt = MCache->tiletypeAt(xy);
int16_t veinmat = MCache->materialAt(xy); int16_t veinmat = MCache->veinMaterialAt(xy);
if( veinmat == -1 ) if( veinmat == -1 )
{ {
@ -114,7 +114,7 @@ int main (int argc, char* argv[])
{ {
DFHack::DFCoord current = flood.top(); DFHack::DFCoord current = flood.top();
flood.pop(); flood.pop();
int16_t vmat2 = MCache->materialAt(current); int16_t vmat2 = MCache->veinMaterialAt(current);
tt = MCache->tiletypeAt(current); tt = MCache->tiletypeAt(current);
if(!DFHack::isWallTerrain(tt)) if(!DFHack::isWallTerrain(tt))
continue; continue;
@ -136,14 +136,14 @@ int main (int argc, char* argv[])
{ {
below = 1; below = 1;
des_minus = MCache->designationAt(current-1); des_minus = MCache->designationAt(current-1);
vmat_minus = MCache->materialAt(current-1); vmat_minus = MCache->veinMaterialAt(current-1);
} }
if(MCache->testCoord(current+1)) if(MCache->testCoord(current+1))
{ {
above = 1; above = 1;
des_plus = MCache->designationAt(current+1); des_plus = MCache->designationAt(current+1);
vmat_plus = MCache->materialAt(current+1); vmat_plus = MCache->veinMaterialAt(current+1);
} }
} }
if(MCache->testCoord(current)) if(MCache->testCoord(current))