Skip to content

Y
ygopro
Commit 5f4df1ee authored by Damien Lawford's avatar Damien Lawford
Browse files
Options

Hand Collision

parent e9a7686b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
gframe/event_handler.cpp
View file @ 5f4df1ee
...@@ -1502,21 +1502,23 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1502,21 +1502,23 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
return false; return false;
} }
void ClientField::GetHoverField(int x, int y) { void ClientField::GetHoverField(int x, int y) {
irr::core::recti sfRect(393, 504, 875, 600); irr::core::recti sfRect(430, 504, 875, 600);
irr::core::recti ofRect(501, 135, 790, 191); irr::core::recti ofRect(531, 135, 800, 191);
irr::core::position2di pos(x, y); irr::core::position2di pos(x, y);
if(sfRect.isPointInside(pos)) { if(sfRect.isPointInside(pos)) {
int hc = hand[0].size(); int hc = hand[0].size();
if(hc == 0) if(hc == 0)
hovered_location = 0; hovered_location = 0;
else if(hc < 7) { else if(hc < 7) {
int left = 393 + 82 * (6 - hc) / 2; int cardSize = 66;
int cardSpace = 10;
int left = sfRect.UpperLeftCorner.X + (cardSize + cardSpace) * (6 - hc) / 2;
if(x < left) if(x < left)
hovered_location = 0; hovered_location = 0;
else { else {
int seq = (x - left) / 82; int seq = (x - left) / (cardSize + cardSpace);
if(seq >= hc) seq = hc - 1; if(seq >= hc) seq = hc - 1;
if(x - left - 82 * seq < 71) { if(x - left - (cardSize + cardSpace) * seq < cardSize) {
hovered_controler = 0; hovered_controler = 0;
hovered_location = LOCATION_HAND; hovered_location = LOCATION_HAND;
hovered_sequence = seq; hovered_sequence = seq;
...@@ -1528,20 +1530,22 @@ void ClientField::GetHoverField(int x, int y) { ...@@ -1528,20 +1530,22 @@ void ClientField::GetHoverField(int x, int y) {
if(x >= 804) if(x >= 804)
hovered_sequence = hc - 1; hovered_sequence = hc - 1;
else else
hovered_sequence = (x - 393) * (hc - 1) / 411; hovered_sequence = (x - sfRect.UpperLeftCorner.X) * (hc - 1) / 393;
} }
} else if(ofRect.isPointInside(pos)) { } else if(ofRect.isPointInside(pos)) {
int hc = hand[1].size(); int hc = hand[1].size();
if(hc == 0) if(hc == 0)
hovered_location = 0; hovered_location = 0;
else if(hc < 7) { else if(hc < 7) {
int left = 501 + 49 * (6 - hc) / 2; int cardSize = 39;
int cardSpace = 7;
int left = ofRect.UpperLeftCorner.X + (cardSize + cardSpace) * (6 - hc) / 2;
if(x < left) if(x < left)
hovered_location = 0; hovered_location = 0;
else { else {
int seq = (x - left) / 49; int seq = (x - left) / (cardSize + cardSpace);
if(seq >= hc) seq = hc - 1; if(seq >= hc) seq = hc - 1;
if(x - left - 49 * seq < 42) { if(x - left - (cardSize + cardSpace) * seq < cardSize) {
hovered_controler = 1; hovered_controler = 1;
hovered_location = LOCATION_HAND; hovered_location = LOCATION_HAND;
hovered_sequence = hc - 1 - seq; hovered_sequence = hc - 1 - seq;
...@@ -1553,7 +1557,7 @@ void ClientField::GetHoverField(int x, int y) { ...@@ -1553,7 +1557,7 @@ void ClientField::GetHoverField(int x, int y) {
if(x >= 748) if(x >= 748)
hovered_sequence = 0; hovered_sequence = 0;
else else
hovered_sequence = hc - 1 - (x - 501) * (hc - 1) / 247; hovered_sequence = hc - 1 - (x - ofRect.UpperLeftCorner.X) * (hc - 1) / 247;
} }
} else { } else {
double screenx = x / 1024.0 * 1.35 - 0.90; double screenx = x / 1024.0 * 1.35 - 0.90;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment