memartel_loc/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online

Browse Source
This commit is contained in:
MarcEricMartel 2023-12-13 13:47:41 -05:00
commit f509b01827
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SQCSim2021/remoteplayer.cpp
View File

@ -130,9 +130,11 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
if (!current.states.shooting) if (!current.states.shooting)
Shooting = false; Shooting = false;
else else
Shooting = !Shooting; Shooting = true;
} }
std::cout << "shooting : " << current.states.shooting << " jumping : " << current.states.jumping << " jumpshot : " << current.states.jumpshot << " running : " << current.states.running << " still : " << current.states.still << " dead : " << current.states.dead << " hit : " << current.states.hit << std::endl;
if (angle >= 0.75) //Face - side positif if (angle >= 0.75) //Face - side positif
{ {
if(current.states.shooting){ if(current.states.shooting){
@ -151,7 +153,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 25; index = 25;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 0; index = 0;
} }
@ -173,7 +175,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 26; index = 26;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 1; index = 1;
} }
@ -196,7 +198,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 28; index = 28;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 3; index = 3;
} }
@ -218,7 +220,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 30; index = 30;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 5; index = 5;
} }
else if (angle < -0.75) //Dos - side négatif else if (angle < -0.75) //Dos - side négatif
@ -239,7 +241,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 32; index = 32;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 7; index = 7;
} }
@ -261,7 +263,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 27; index = 27;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 2; index = 2;
} }
@ -283,7 +285,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 29; index = 29;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 4; index = 4;
} }
@ -307,7 +309,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 31; index = 31;
else if (current.states.running && current.states.still) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 6; index = 6;
} }