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

changed DigTarget to struct 

removed valid flag in DigTarget
removed assignment operator, relies on compiler to generate one (todo, write a real one)
added isequal operator test for DigTarget (todo, implement operator)
it seems to mark trees correct now! :D
develop
mizipzor 2010-02-18 04:54:01 +08:00 committed by belal
parent ce70eb0573
commit adb1b9e881
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
examples/digger.cpp
Unescape Escape View File

@ -58,15 +58,14 @@ int manhattan_distance(int x, int y, int z, int xx, int yy, int zz)
return abs(x-xx)+abs(y-yy)+abs(z-zz); return abs(x-xx)+abs(y-yy)+abs(z-zz);
} }
class DigTarget struct DigTarget
{ {
public: //public:
DigTarget() : DigTarget() :
source_distance(0), source_distance(0),
grid_x(0), grid_y(0), grid_x(0), grid_y(0),
local_x(0), local_y(0), local_x(0), local_y(0),
real_x(0), real_y(0), z(0), real_x(0), real_y(0), z(0)
valid(false)
{ {
} }
@ -75,8 +74,7 @@ public:
int sourcex, int sourcey, int sourcez) : int sourcex, int sourcey, int sourcez) :
//grid_x(realx/16), grid_y(realy/16), //grid_x(realx/16), grid_y(realy/16),
//local_x(realx%16), local_y(realy%16), //local_x(realx%16), local_y(realy%16),
real_x(realx), real_y(realy), z(_z), real_x(realx), real_y(realy), z(_z)
valid(true)
{ {
grid_x = realx/16; grid_x = realx/16;
grid_y = realy/16; grid_y = realy/16;
@ -98,9 +96,8 @@ public:
// sourcex, sourcey, sourcez)), // sourcex, sourcey, sourcez)),
grid_x(gridx), grid_y(gridy), grid_x(gridx), grid_y(gridy),
local_x(localx), local_y(localy), local_x(localx), local_y(localy),
z(_z), z(_z)
//real_x(realx), real_y(realy), real_z(realz), //real_x(realx), real_y(realy), real_z(realz)
valid(true)
{ {
real_x = (grid_x*16)+local_x; real_x = (grid_x*16)+local_x;
real_y = (grid_y*16)+local_y; real_y = (grid_y*16)+local_y;
@ -119,10 +116,9 @@ public:
int z; int z;
//int index; //int index;
const bool valid; //const bool valid;
bool operator<(const DigTarget& o) const { return source_distance < o.source_distance; } bool operator<(const DigTarget& o) const { return source_distance < o.source_distance; }
void operator=(const DigTarget& o) const { assert(false); } // dont use
//private: //private:
// int source_x, source_y, source_z; // int source_x, source_y, source_z;
@ -252,7 +248,7 @@ void test()
{ {
{ {
DigTarget dt; DigTarget dt;
assert(!dt.valid); //assert(!dt.valid);
} }
{ {
@ -271,7 +267,7 @@ void test()
assert(dt.z == 16); assert(dt.z == 16);
assert(dt.source_distance == 35); assert(dt.source_distance == 35);
assert(dt.valid); //assert(dt.valid);
} }
{ {
@ -291,8 +287,25 @@ void test()
assert(dt.z == 16); assert(dt.z == 16);
assert(dt.source_distance == 91); assert(dt.source_distance == 91);
assert(dt.valid); //assert(dt.valid);
} }
//{ // sorting
// DigTarget a(
// 20, 35, 16,
// 10, 12, 14);
// DigTarget b(
// 2, 4, 16,
// 5, 10,
// 10, 12, 14);
// vector<DigTarget> v;
// v.push_back(b);
// v.push_back(a);
// sort(v.begin(), v.end());
// assert(*(v.begin()) == a);
//}
} }
int main (int argc, const char* argv[]) int main (int argc, const char* argv[])