Skip to content

Y
ygopro
Commit b71023f2 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

add ClientField::ResetSequence (#2678) 

* add ClientField::ResetSequence

* update ClientField::AddCard

* fix ClientField::RemoveCard

* fix remove xyz material animation
parent 4aee608d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 58 deletions
gframe/client_field.cpp
View file @ b71023f2
...@@ -143,6 +143,16 @@ void ClientField::Initial(int player, int deckc, int extrac) { ...@@ -143,6 +143,16 @@ void ClientField::Initial(int player, int deckc, int extrac) {
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true); GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
} }
} }
void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) {
unsigned char seq = 0;
for (auto& pcard : list) {
pcard->sequence = seq++;
if (reset_height) {
pcard->curPos.Z = 0.01f + 0.01f * pcard->sequence;
pcard->mTransform.setTranslation(pcard->curPos);
}
}
}
ClientCard* ClientField::GetCard(int controler, int location, int sequence, int sub_seq) { ClientCard* ClientField::GetCard(int controler, int location, int sequence, int sub_seq) {
std::vector<ClientCard*>* lst = 0; std::vector<ClientCard*>* lst = 0;
bool is_xyz = (location & LOCATION_OVERLAY) != 0; bool is_xyz = (location & LOCATION_OVERLAY) != 0;
...@@ -194,16 +204,10 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -194,16 +204,10 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
case LOCATION_DECK: { case LOCATION_DECK: {
if (sequence != 0 || deck[controler].size() == 0) { if (sequence != 0 || deck[controler].size() == 0) {
deck[controler].push_back(pcard); deck[controler].push_back(pcard);
pcard->sequence = (unsigned char)(deck[controler].size() - 1);
} else { } else {
deck[controler].push_back(0); deck[controler].insert(deck[controler].begin(), pcard);
for(int i = deck[controler].size() - 1; i > 0; --i) {
deck[controler][i] = deck[controler][i - 1];
deck[controler][i]->sequence++;
}
deck[controler][0] = pcard;
pcard->sequence = 0;
} }
ResetSequence(deck[controler], true);
pcard->is_reversed = false; pcard->is_reversed = false;
pcard->ClearData(); pcard->ClearData();
pcard->ClearTarget(); pcard->ClearTarget();
...@@ -212,7 +216,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -212,7 +216,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
} }
case LOCATION_HAND: { case LOCATION_HAND: {
hand[controler].push_back(pcard); hand[controler].push_back(pcard);
pcard->sequence = (unsigned char)(hand[controler].size() - 1); ResetSequence(hand[controler], false);
break; break;
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
...@@ -225,30 +229,22 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -225,30 +229,22 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
grave[controler].push_back(pcard); grave[controler].push_back(pcard);
pcard->sequence = (unsigned char)(grave[controler].size() - 1); ResetSequence(grave[controler], false);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
remove[controler].push_back(pcard); remove[controler].push_back(pcard);
pcard->sequence = (unsigned char)(remove[controler].size() - 1); ResetSequence(remove[controler], false);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
if(extra_p_count[controler] == 0 || (pcard->position & POS_FACEUP)) { if(extra_p_count[controler] == 0 || (pcard->position & POS_FACEUP)) {
extra[controler].push_back(pcard); extra[controler].push_back(pcard);
pcard->sequence = (unsigned char)(extra[controler].size() - 1);
} else { } else {
extra[controler].push_back(0); size_t faceup_begin = extra[controler].size() - extra_p_count[controler];
int p = extra[controler].size() - extra_p_count[controler] - 1; extra[controler].insert(extra[controler].begin() + faceup_begin, pcard);
for(int i = extra[controler].size() - 1; i > p; --i) {
extra[controler][i] = extra[controler][i - 1];
extra[controler][i]->sequence++;
extra[controler][i]->curPos += irr::core::vector3df(0, 0, 0.01f);
extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
}
extra[controler][p] = pcard;
pcard->sequence = p;
} }
ResetSequence(extra[controler], true);
if (pcard->position & POS_FACEUP) if (pcard->position & POS_FACEUP)
extra_p_count[controler]++; extra_p_count[controler]++;
break; break;
...@@ -256,73 +252,52 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -256,73 +252,52 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
} }
} }
ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) { ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) {
ClientCard* pcard = 0; ClientCard* pcard = nullptr;
switch (location) { switch (location) {
case LOCATION_DECK: { case LOCATION_DECK: {
pcard = deck[controler][sequence]; pcard = deck[controler][sequence];
for (size_t i = sequence; i < deck[controler].size() - 1; ++i) { deck[controler].erase(deck[controler].begin() + sequence);
deck[controler][i] = deck[controler][i + 1]; ResetSequence(deck[controler], true);
deck[controler][i]->sequence--;
deck[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
deck[controler][i]->mTransform.setTranslation(deck[controler][i]->curPos);
}
deck[controler].erase(deck[controler].end() - 1);
break; break;
} }
case LOCATION_HAND: { case LOCATION_HAND: {
pcard = hand[controler][sequence]; pcard = hand[controler][sequence];
for (size_t i = sequence; i < hand[controler].size() - 1; ++i) { hand[controler].erase(hand[controler].begin() + sequence);
hand[controler][i] = hand[controler][i + 1]; ResetSequence(hand[controler], false);
hand[controler][i]->sequence--;
}
hand[controler].erase(hand[controler].end() - 1);
break; break;
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
pcard = mzone[controler][sequence]; pcard = mzone[controler][sequence];
mzone[controler][sequence] = 0; mzone[controler][sequence] = nullptr;
break; break;
} }
case LOCATION_SZONE: { case LOCATION_SZONE: {
pcard = szone[controler][sequence]; pcard = szone[controler][sequence];
szone[controler][sequence] = 0; szone[controler][sequence] = nullptr;
break; break;
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
pcard = grave[controler][sequence]; pcard = grave[controler][sequence];
for (size_t i = sequence; i < grave[controler].size() - 1; ++i) { grave[controler].erase(grave[controler].begin() + sequence);
grave[controler][i] = grave[controler][i + 1]; ResetSequence(grave[controler], true);
grave[controler][i]->sequence--;
grave[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
grave[controler][i]->mTransform.setTranslation(grave[controler][i]->curPos);
}
grave[controler].erase(grave[controler].end() - 1);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
pcard = remove[controler][sequence]; pcard = remove[controler][sequence];
for (size_t i = sequence; i < remove[controler].size() - 1; ++i) { remove[controler].erase(remove[controler].begin() + sequence);
remove[controler][i] = remove[controler][i + 1]; ResetSequence(remove[controler], true);
remove[controler][i]->sequence--;
remove[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
remove[controler][i]->mTransform.setTranslation(remove[controler][i]->curPos);
}
remove[controler].erase(remove[controler].end() - 1);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
pcard = extra[controler][sequence]; pcard = extra[controler][sequence];
for (size_t i = sequence; i < extra[controler].size() - 1; ++i) { extra[controler].erase(extra[controler].begin() + sequence);
extra[controler][i] = extra[controler][i + 1]; ResetSequence(extra[controler], true);
extra[controler][i]->sequence--;
extra[controler][i]->curPos -= irr::core::vector3df(0, 0, 0.01f);
extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
}
extra[controler].erase(extra[controler].end() - 1);
if (pcard->position & POS_FACEUP) if (pcard->position & POS_FACEUP)
extra_p_count[controler]--; extra_p_count[controler]--;
break; break;
} }
default:
return nullptr;
} }
pcard->location = 0; pcard->location = 0;
return pcard; return pcard;
......
gframe/client_field.h
View file @ b71023f2
...@@ -96,6 +96,7 @@ public: ...@@ -96,6 +96,7 @@ public:
~ClientField(); ~ClientField();
void Clear(); void Clear();
void Initial(int player, int deckc, int extrac); void Initial(int player, int deckc, int extrac);
void ResetSequence(std::vector<ClientCard*>& list, bool reset_height);
ClientCard* GetCard(int controler, int location, int sequence, int sub_seq = 0); ClientCard* GetCard(int controler, int location, int sequence, int sub_seq = 0);
void AddCard(ClientCard* pcard, int controler, int location, int sequence); void AddCard(ClientCard* pcard, int controler, int location, int sequence);
ClientCard* RemoveCard(int controler, int location, int sequence); ClientCard* RemoveCard(int controler, int location, int sequence);
......
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