Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert changes to CardSelector. This wasn't meant to be part of my previous check in, another case of AnkhSVN selecting a file automatically for submission when it was in a different changelist. Sorry!

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-12-18 03:47:52 +00:00
parent 64eefeb0f4
commit c7666a933a
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/CardSelector.cpp
+4 -9
View File
@@ -16,37 +16,32 @@ using std::cout;
#undef True #undef True
#endif #endif
// small sized cards are 40 * 28, use this as a compensation factor
const float kCardRatio = 28.0f / 40.0f;
// allow a slight fudge factor of 4 pixels when comparing distances (ie ~ 1/10th of a small card's diagonal length)
const float kSlopValue = 4.0f;
struct Left: public Exp struct Left: public Exp
{ {
static inline bool test(CardSelector::Target* ref, CardSelector::Target* test) static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
{ {
return (ref->x - test->x) * kCardRatio > fabs(ref->y - test->y) - kSlopValue; return ref->x - test->x > fabs(ref->y - test->y);
} }
}; };
struct Right: public Exp struct Right: public Exp
{ {
static inline bool test(CardSelector::Target* ref, CardSelector::Target* test) static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
{ {
return (test->x - ref->x) * kCardRatio > fabs(ref->y - test->y) - kSlopValue; return test->x - ref->x > fabs(ref->y - test->y);
} }
}; };
struct Up: public Exp struct Up: public Exp
{ {
static inline bool test(CardSelector::Target* ref, CardSelector::Target* test) static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
{ {
return ref->y - test->y > fabs(ref->x - test->x) * kCardRatio - kSlopValue; return ref->y - test->y > fabs(ref->x - test->x);
} }
}; };
struct Down: public Exp struct Down: public Exp
{ {
static inline bool test(CardSelector::Target* ref, CardSelector::Target* test) static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
{ {
return test->y - ref->y > fabs(ref->x - test->x) * kCardRatio - kSlopValue; return test->y - ref->y > fabs(ref->x - test->x);
} }
}; };
struct Diff: public Exp struct Diff: public Exp