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

This commit is contained in:
MarcEricMartel 2023-12-06 16:36:29 -05:00
commit cb0dad3e31

View File

@ -120,13 +120,21 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
angle = -angle; angle = -angle;
Vector3f side = angleRemote.Cross(angleCam); Vector3f side = angleRemote.Cross(angleCam);
static float time = 0.f;
static bool Shooting = false; static bool Shooting = false;
time += elapsedTime;
if (time >= 200)
{
time -= 200;
Shooting = !Shooting;
}
bool isLeft = side.y > 0; bool isLeft = side.y > 0;
if (angle >= 0.75) //Face //side positif if (angle >= 0.75) //Face //side positif
{ {
if(current.states.shooting){ if(current.states.shooting){
if (Shooting) if (Shooting)
index = 17; index = 17;
@ -144,8 +152,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 0; index = 0;
Shooting = !Shooting;
} }
else if (angle >= 0.25 && isLeft) //Frontleft else if (angle >= 0.25 && isLeft) //Frontleft
{ {
@ -167,10 +173,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 1; index = 1;
Shooting = !Shooting;
} }
else if (angle >= -0.25 && isLeft) //ProfileLeft else if (angle >= -0.25 && isLeft) //ProfileLeft
{ {
@ -191,8 +193,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 3; index = 3;
Shooting = !Shooting;
} }
else if (angle >= -0.75 && isLeft) //BackLeft else if (angle >= -0.75 && isLeft) //BackLeft
{ {
@ -212,8 +212,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
index = 30; index = 30;
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 5; index = 5;
Shooting = !Shooting;
} }
else if (angle < -0.75) //Dos //side négatif else if (angle < -0.75) //Dos //side négatif
{ {
@ -234,8 +232,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 7; index = 7;
Shooting = !Shooting;
} }
else if (angle >= 0.25 && !isLeft) //FrontRight else if (angle >= 0.25 && !isLeft) //FrontRight
{ {
@ -257,7 +253,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 2; index = 2;
Shooting = !Shooting;
} }
else if (angle >= -0.25 && !isLeft) //ProfileRight else if (angle >= -0.25 && !isLeft) //ProfileRight
{ {
@ -278,7 +273,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 4; index = 4;
Shooting = !Shooting;
} }
else if (angle >= -0.75 && !isLeft) //BackRight else if (angle >= -0.75 && !isLeft) //BackRight
{ {
@ -299,7 +293,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 6; index = 6;
Shooting = !Shooting;
} }