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

Fixed includes, unified formatting.

develop
Petr Mrázek 2010-10-25 04:39:14 +02:00
parent 36fb3a2c6a
commit 70cb93d9f4
5 changed files with 1722 additions and 1537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

607
library/include/dfhack/DFTileTypes.h
View File

File diff suppressed because it is too large Load Diff

133
tools/playground/deramp.cpp
Unescape Escape View File

@ -5,6 +5,7 @@
#include <map> #include <map>
#include <stddef.h> #include <stddef.h>
#include <assert.h> #include <assert.h>
#include <string.h>
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
@ -20,20 +21,20 @@ int main (void)
DFHack::tiletypes40d tiles; DFHack::tiletypes40d tiles;
DFHack::tiletypes40d tilesAbove; DFHack::tiletypes40d tilesAbove;
//DFHack::TileRow *ptile; //DFHack::TileRow *ptile;
int32_t oldT, newT; int32_t oldT, newT;
int16_t t; int16_t t;
int dirty=0, count=0;
int dirty=0, count=0;
DFHack::ContextManager DFMgr("Memory.xml"); DFHack::ContextManager DFMgr("Memory.xml");
DFHack::Context *DF = DFMgr.getSingleContext(); DFHack::Context *DF = DFMgr.getSingleContext();
//sanity check //sanity check
assert( sizeof(designations) == (16*16*sizeof(DFHack::t_designation)) ); assert( sizeof(designations) == (16*16*sizeof(DFHack::t_designation)) );
//Init //Init
try try
{ {
DF->Attach(); DF->Attach();
} }
@ -46,9 +47,9 @@ int main (void)
return 1; return 1;
} }
DFHack::Maps *Mapz = DF->getMaps(); DFHack::Maps *Mapz = DF->getMaps();
// init the map // init the map
if(!Mapz->Start()) if (!Mapz->Start())
{ {
cerr << "Can't init map." << endl; cerr << "Can't init map." << endl;
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
@ -56,73 +57,81 @@ int main (void)
#endif #endif
return 1; return 1;
} }
Mapz->getSize(x_max,y_max,z_max); Mapz->getSize(x_max,y_max,z_max);
uint8_t zeroes [16][16] = {0}; uint8_t zeroes [16][16] = {0};
// walk the map // walk the map
for(uint32_t x = 0; x< x_max;x++) for (uint32_t x = 0; x< x_max;x++)
{ {
for(uint32_t y = 0; y< y_max;y++) for (uint32_t y = 0; y< y_max;y++)
{ {
for(uint32_t z = 0; z< z_max;z++) for (uint32_t z = 0; z< z_max;z++)
{ {
if(Mapz->isValidBlock(x,y,z)) if (Mapz->isValidBlock(x,y,z))
{ {
dirty=0; dirty=0;
Mapz->ReadDesignations(x,y,z, &designations); Mapz->ReadDesignations(x,y,z, &designations);
Mapz->ReadTileTypes(x,y,z, &tiles); Mapz->ReadTileTypes(x,y,z, &tiles);
if(Mapz->isValidBlock(x,y,z+1)){ if (Mapz->isValidBlock(x,y,z+1))
Mapz->ReadTileTypes(x,y,z+1, &tilesAbove); {
}else{ Mapz->ReadTileTypes(x,y,z+1, &tilesAbove);
memset(&tilesAbove,0,sizeof(tilesAbove)); }
} else
{
for(uint32_t ty=0;ty<16;++ty){ memset(&tilesAbove,0,sizeof(tilesAbove));
for(uint32_t tx=0;tx<16;++tx){ }
//Only the remove ramp designation (ignore channel designation, etc)
oldT = tiles[tx][ty]; for (uint32_t ty=0;ty<16;++ty)
if( DFHack::designation_default == designations[tx][ty].bits.dig {
&& DFHack::RAMP==DFHack::tileTypeTable[oldT].c for (uint32_t tx=0;tx<16;++tx)
){ {
//Current tile is a ramp. //Only the remove ramp designation (ignore channel designation, etc)
//Set current tile, as accurately as can be expected oldT = tiles[tx][ty];
newT = DFHack::findSimilarTileType(oldT,DFHack::FLOOR); if ( DFHack::designation_default == designations[tx][ty].bits.dig
&& DFHack::RAMP==DFHack::tileTypeTable[oldT].c)
//If no change, skip it (couldn't find a good tile type) {
if( oldT == newT) continue; //Current tile is a ramp.
//Set new tile type, clear designation //Set current tile, as accurately as can be expected
tiles[tx][ty] = newT; newT = DFHack::findSimilarTileType(oldT,DFHack::FLOOR);
designations[tx][ty].bits.dig = DFHack::designation_no;
//If no change, skip it (couldn't find a good tile type)
//Check the tile above this one, in case a downward slope needs to be removed. if ( oldT == newT) continue;
if( DFHack::RAMP_TOP == DFHack::tileTypeTable[tilesAbove[tx][ty]].c ){ //Set new tile type, clear designation
tilesAbove[tx][ty] = 32; tiles[tx][ty] = newT;
} designations[tx][ty].bits.dig = DFHack::designation_no;
dirty=-1; //Check the tile above this one, in case a downward slope needs to be removed.
++count; if ( DFHack::RAMP_TOP == DFHack::tileTypeTable[tilesAbove[tx][ty]].c )
} {
} tilesAbove[tx][ty] = 32;
} }
//If anything was changed, write it all.
if(dirty){ dirty=-1;
Mapz->WriteDesignations(x,y,z, &designations); ++count;
Mapz->WriteTileTypes(x,y,z, &tiles); }
if(Mapz->isValidBlock(x,y,z+1)){ }
Mapz->WriteTileTypes(x,y,z+1, &tilesAbove); }
} //If anything was changed, write it all.
} if (dirty)
{
Mapz->WriteDesignations(x,y,z, &designations);
Mapz->WriteTileTypes(x,y,z, &tiles);
if (Mapz->isValidBlock(x,y,z+1))
{
Mapz->WriteTileTypes(x,y,z+1, &tilesAbove);
}
}
} }
} }
} }
} }
DF->Detach(); DF->Detach();
cout << "Found and changed " << count << " tiles." << endl; cout << "Found and changed " << count << " tiles." << endl;
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
cout << "Done. Press any key to continue" << endl; cout << "Done. Press any key to continue" << endl;
cin.ignore(); cin.ignore();
#endif #endif
return 0; return 0;
} }

2058
tools/playground/hellhole.cpp
View File

File diff suppressed because it is too large Load Diff

127
tools/playground/printtiletypes.cpp
Unescape Escape View File

@ -17,77 +17,84 @@ using namespace DFHack;
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
FILE *f=stdout; FILE *f=stdout;
const int Columns = 7; const int Columns = 7;
const char * Headings[Columns] = {"TileTypeID","Class","Material","V","Special","Direction","Description"}; const char * Headings[Columns] = {"TileTypeID","Class","Material","V","Special","Direction","Description"};
size_t Size[ Columns ] = {}; size_t Size[ Columns ] = {};
int i; int i;
//First, figure out column widths. //First, figure out column widths.
for(i=0;i<Columns;++i){ for(i=0;i<Columns;++i)
Size[i]=strlen(Headings[i])+1; {
} Size[i]=strlen(Headings[i])+1;
}
//Classes //Classes
fprintf(f,"\nTile Type Classes:\n"); fprintf(f,"\nTile Type Classes:\n");
for(i=0;i<tileclass_count;++i){ for(i=0;i<tileclass_count;++i)
Size[1]=max<size_t>(Size[1],strlen(TileClassString[i])); {
fprintf(f,"%4i ; %s\n", i, TileClassString[i] ,0 ); Size[1]=max<size_t>(Size[1],strlen(TileClassString[i]));
} fprintf(f,"%4i ; %s\n", i, TileClassString[i] ,0 );
}
//Materials //Materials
fprintf(f,"\nTile Type Materials:\n"); fprintf(f,"\nTile Type Materials:\n");
for(i=0;i<tilematerial_count;++i){ for(i=0;i<tilematerial_count;++i)
Size[2]=max<size_t>(Size[2],strlen(TileMaterialString[i])); {
fprintf(f,"%4i ; %s\n", i, TileMaterialString[i] ,0 ); Size[2]=max<size_t>(Size[2],strlen(TileMaterialString[i]));
} fprintf(f,"%4i ; %s\n", i, TileMaterialString[i] ,0 );
}
//Specials //Specials
fprintf(f,"\nTile Type Specials:\n"); fprintf(f,"\nTile Type Specials:\n");
for(i=0;i<tilespecial_count;++i){ for(i=0;i<tilespecial_count;++i)
Size[4]=max<size_t>(Size[4],strlen(TileSpecialString[i])); {
fprintf(f,"%4i ; %s\n", i, TileSpecialString[i] ,0 ); Size[4]=max<size_t>(Size[4],strlen(TileSpecialString[i]));
} fprintf(f,"%4i ; %s\n", i, TileSpecialString[i] ,0 );
}
/* - Not needed for now - /* - Not needed for now -
//Direction is tricky //Direction is tricky
for(i=0;i<TILE_TYPE_ARRAY_LENGTH;++i) for(i=0;i<TILE_TYPE_ARRAY_LENGTH;++i)
Size[5]=max(Size[5], tileTypeTable[i].d.sum()+1 ); Size[5]=max(Size[5], tileTypeTable[i].d.sum()+1 );
*/ */
//Print the headings first. //Print the headings first.
fprintf(f,"\nTile Types:\n"); fprintf(f,"\nTile Types:\n");
for(i=0;i<Columns;++i){ for(i=0;i<Columns;++i)
if(i) putc(';',f); {
fprintf(f," %-*s ",Size[i],Headings[i],0); if(i) putc(';',f);
} fprintf(f," %-*s ",Size[i],Headings[i],0);
fprintf(f,"\n"); }
fprintf(f,"\n");
//Process the whole array. //Process the whole array.
//A macro should be used for making the strings safe, but they are left in naked ? blocks //A macro should be used for making the strings safe, but they are left in naked ? blocks
//to illustrate the array references more clearly. //to illustrate the array references more clearly.
for(i=0;i<TILE_TYPE_ARRAY_LENGTH;++i){ for(i=0;i<TILE_TYPE_ARRAY_LENGTH;++i)
fprintf(f," %*i ; %-*s ; %-*s ; %*c ; %-*s ; %-*s ; %s\n", {
Size[0], i, fprintf(f," %*i ; %-*s ; %-*s ; %*c ; %-*s ; %-*s ; %s\n",
Size[1], ( tileTypeTable[i].name ? TileClassString[ tileTypeTable[i].c ] : "" ), Size[0], i,
Size[2], ( tileTypeTable[i].name ? TileMaterialString[ tileTypeTable[i].m ] : "" ), Size[1], ( tileTypeTable[i].name ? TileClassString[ tileTypeTable[i].c ] : "" ),
Size[3], ( tileTypeTable[i].v ? '0'+tileTypeTable[i].v : ' ' ), Size[2], ( tileTypeTable[i].name ? TileMaterialString[ tileTypeTable[i].m ] : "" ),
Size[4], ( tileTypeTable[i].s ? TileSpecialString[ tileTypeTable[i].s ] : "" ), Size[3], ( tileTypeTable[i].v ? '0'+tileTypeTable[i].v : ' ' ),
Size[5], ( tileTypeTable[i].d.whole ? tileTypeTable[i].d.getStr() : "" ), Size[4], ( tileTypeTable[i].s ? TileSpecialString[ tileTypeTable[i].s ] : "" ),
( tileTypeTable[i].name ? tileTypeTable[i].name : "" ), Size[5], ( tileTypeTable[i].d.whole ? tileTypeTable[i].d.getStr() : "" ),
0 ( tileTypeTable[i].name ? tileTypeTable[i].name : "" ),
); 0
} );
fprintf(f,"\n"); }
fprintf(f,"\n");
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
if( 1== argc){ if( 1== argc)
cout << "Done. Press any key to continue" << endl; {
cin.ignore(); cout << "Done. Press any key to continue" << endl;
} cin.ignore();
}
#endif #endif
return 0; return 0;
} }

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

@ -1,170 +1,168 @@
// Just show some position data // Just show some position data
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <climits> #include <climits>
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include <ctime> #include <ctime>
#include <cstdio> #include <cstdio>
#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>
using namespace DFHack; using namespace DFHack;
int main (int numargs, const char ** args) int main (int numargs, const char ** args)
{ {
DFHack::ContextManager DFMgr("Memory.xml"); DFHack::ContextManager DFMgr("Memory.xml");
DFHack::Context *DF = DFMgr.getSingleContext(); DFHack::Context *DF = DFMgr.getSingleContext();
BEGIN_PROBE: BEGIN_PROBE:
try try
{ {
DF->Attach(); DF->Attach();
} }
catch (std::exception& e) catch (std::exception& e)
{ {
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
cin.ignore(); cin.ignore();
#endif #endif
return 1; return 1;
} }
DFHack::Position *Pos = DF->getPosition(); DFHack::Position *Pos = DF->getPosition();
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();
OffsetGroup *mapsg = mem->getGroup("Maps"); OffsetGroup *mapsg = mem->getGroup("Maps");
OffsetGroup *mapblockg = mapsg->getGroup("block"); OffsetGroup *mapblockg = mapsg->getGroup("block");
OffsetGroup *localfeatg = mapsg->getGroup("features")->getGroup("local"); OffsetGroup *localfeatg = mapsg->getGroup("features")->getGroup("local");
uint32_t region_x_offset = mapsg->getAddress("region_x"); uint32_t region_x_offset = mapsg->getAddress("region_x");
uint32_t region_y_offset = mapsg->getAddress("region_y"); uint32_t region_y_offset = mapsg->getAddress("region_y");
uint32_t region_z_offset = mapsg->getAddress("region_z"); uint32_t region_z_offset = mapsg->getAddress("region_z");
uint32_t designatus = mapblockg->getOffset("designation"); uint32_t designatus = mapblockg->getOffset("designation");
uint32_t block_feature1 = mapblockg->getOffset("feature_local"); uint32_t block_feature1 = mapblockg->getOffset("feature_local");
uint32_t block_feature2 = mapblockg->getOffset("feature_global"); uint32_t block_feature2 = mapblockg->getOffset("feature_global");
uint32_t feature1_start_ptr = localfeatg->getAddress("start_ptr"); uint32_t feature1_start_ptr = localfeatg->getAddress("start_ptr");
int32_t regionX, regionY, regionZ; int32_t regionX, regionY, regionZ;
// read position of the region inside DF world // read position of the region inside DF world
p->readDWord (region_x_offset, (uint32_t &)regionX); p->readDWord (region_x_offset, (uint32_t &)regionX);
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(); Maps->Start();
vector<DFHack::t_feature> global_features; vector<DFHack::t_feature> global_features;
std::map <DFHack::planecoord, std::vector<DFHack::t_feature *> > local_features; std::map <DFHack::planecoord, std::vector<DFHack::t_feature *> > local_features;
Maps->ReadLocalFeatures(local_features); Maps->ReadLocalFeatures(local_features);
Maps->ReadGlobalFeatures(global_features); Maps->ReadGlobalFeatures(global_features);
int32_t cursorX, cursorY, cursorZ; int32_t cursorX, cursorY, cursorZ;
Pos->getCursorCoords(cursorX,cursorY,cursorZ); Pos->getCursorCoords(cursorX,cursorY,cursorZ);
if(cursorX != -30000) if(cursorX != -30000)
{ {
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; t_temperatures tmpb1, tmpb2;
mapblock40d block; mapblock40d block;
if(Maps->ReadBlock40d(blockX,blockY,cursorZ,&block)) if(Maps->ReadBlock40d(blockX,blockY,cursorZ,&block))
{ {
Maps->ReadTemperatures(blockX,blockY,cursorZ,&tmpb1, &tmpb2); 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 = block.tiletypes[tileX][tileY];
naked_designation &des = block.designation[tileX][tileY].bits; naked_designation &des = block.designation[tileX][tileY].bits;
uint32_t &desw = block.designation[tileX][tileY].whole; uint32_t &desw = block.designation[tileX][tileY].whole;
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;
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;
// tiletype // tiletype
std::cout <<"tiletype: " << tiletype; std::cout <<"tiletype: " << tiletype;
if(tileTypeTable[tiletype].name) if(tileTypeTable[tiletype].name)
std::cout << " = " << tileTypeTable[tiletype].name << std::endl; std::cout << " = " << tileTypeTable[tiletype].name << std::endl;
printf("%-10s: %4d %s\n","Class",tileTypeTable[tiletype].c,TileClassString[ tileTypeTable[tiletype].c ] , 0); printf("%-10s: %4d %s\n","Class",tileTypeTable[tiletype].c,TileClassString[ tileTypeTable[tiletype].c ] , 0);
printf("%-10s: %4d %s\n","Material",tileTypeTable[tiletype].c,TileMaterialString[ tileTypeTable[tiletype].m ] , 0); printf("%-10s: %4d %s\n","Material",tileTypeTable[tiletype].c,TileMaterialString[ tileTypeTable[tiletype].m ] , 0);
printf("%-10s: %4d %s\n","Special",tileTypeTable[tiletype].c,TileSpecialString[ tileTypeTable[tiletype].s ] , 0); printf("%-10s: %4d %s\n","Special",tileTypeTable[tiletype].c,TileSpecialString[ tileTypeTable[tiletype].s ] , 0);
printf("%-10s: %4d\n","Variant",tileTypeTable[tiletype].v , 0); printf("%-10s: %4d\n","Variant",tileTypeTable[tiletype].v , 0);
printf("%-10s: %s\n","Direction",tileTypeTable[tiletype].d.getStr() , 0); printf("%-10s: %s\n","Direction",tileTypeTable[tiletype].d.getStr() , 0);
std::cout << std::endl; std::cout << std::endl;
std::cout <<"temperature1: " << tmpb1[tileX][tileY] << " U" << std::endl; std::cout <<"temperature1: " << tmpb1[tileX][tileY] << " U" << std::endl;
std::cout <<"temperature2: " << tmpb2[tileX][tileY] << " U" << std::endl; std::cout <<"temperature2: " << tmpb2[tileX][tileY] << " U" << std::endl;
// biome, geolayer // biome, geolayer
std::cout << "biome: " << des.biome << std::endl; std::cout << "biome: " << des.biome << std::endl;
std::cout << "geolayer: " << des.geolayer_index << std::endl; std::cout << "geolayer: " << des.geolayer_index << std::endl;
// liquids // liquids
if(des.flow_size) if(des.flow_size)
{ {
if(des.liquid_type == DFHack::liquid_magma) if(des.liquid_type == DFHack::liquid_magma)
std::cout <<"magma: "; std::cout <<"magma: ";
else std::cout <<"water: "; else std::cout <<"water: ";
std::cout << des.flow_size << std::endl; std::cout << des.flow_size << std::endl;
} }
if(des.flow_forbid) if(des.flow_forbid)
std::cout << "flow forbid" << std::endl; std::cout << "flow forbid" << std::endl;
if(des.pile) if(des.pile)
std::cout << "stockpile?" << std::endl; std::cout << "stockpile?" << std::endl;
if(des.rained) if(des.rained)
std::cout << "rained?" << std::endl; std::cout << "rained?" << std::endl;
if(des.smooth) if(des.smooth)
std::cout << "smooth?" << std::endl; std::cout << "smooth?" << std::endl;
uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation); uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation);
printf("designation offset: 0x%x\n", designato); printf("designation offset: 0x%x\n", designato);
#define PRINT_FLAG( X ) printf("%-16s= %c\n", #X , ( des.X ? 'Y' : ' ' ) ) #define PRINT_FLAG( X ) printf("%-16s= %c\n", #X , ( des.X ? 'Y' : ' ' ) )
PRINT_FLAG( hidden ); PRINT_FLAG( hidden );
PRINT_FLAG( light ); PRINT_FLAG( light );
PRINT_FLAG( skyview ); PRINT_FLAG( skyview );
PRINT_FLAG( subterranean ); PRINT_FLAG( subterranean );
PRINT_FLAG( water_table ); PRINT_FLAG( water_table );
//PRINT_FLAG( rained ); //PRINT_FLAG( rained );
planecoord pc; planecoord pc;
pc.dim.x=blockX; pc.dim.y=blockY; pc.dim.x=blockX; pc.dim.y=blockY;
PRINT_FLAG( feature_local ); PRINT_FLAG( feature_local );
if( des.feature_local ){ if( des.feature_local )
printf("%-16s %4d (%2d) %s\n", "", {
block.local_feature, printf("%-16s %4d (%2d) %s\n", "",
local_features[pc][block.local_feature]->type, block.local_feature,
sa_feature[local_features[pc][block.local_feature]->type] local_features[pc][block.local_feature]->type,
); sa_feature[local_features[pc][block.local_feature]->type]
} );
}
PRINT_FLAG( feature_global );
if( des.feature_global ){ PRINT_FLAG( feature_global );
printf("%-16s %4d (%2d) %s\n", "", if( des.feature_global ){
block.global_feature, printf("%-16s %4d (%2d) %s\n", "",
global_features[block.global_feature].type, block.global_feature,
sa_feature[global_features[block.global_feature].type] global_features[block.global_feature].type,
); sa_feature[global_features[block.global_feature].type]
} );
}
#undef PRINT_FLAG #undef PRINT_FLAG
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 << "Done. Press any key to continue" << std::endl; cin.ignore();
std::cout << "Press any key to refresh..." << std::endl; goto BEGIN_PROBE;
cin.ignore(); #endif
goto BEGIN_PROBE; return 0;
#endif }
return 0;
}