diff --git a/SQCSim2021/remoteplayer.cpp b/SQCSim2021/remoteplayer.cpp index 321c64d..8dd4676 100644 --- a/SQCSim2021/remoteplayer.cpp +++ b/SQCSim2021/remoteplayer.cpp @@ -130,9 +130,11 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr if (!current.states.shooting) Shooting = false; 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(current.states.shooting){ @@ -151,7 +153,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping) index = 25; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 0; } @@ -173,7 +175,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping ) index = 26; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 1; } @@ -196,7 +198,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping ) index = 28; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 3; } @@ -218,7 +220,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping) index = 30; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 5; } 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 ) index = 32; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 7; } @@ -261,7 +263,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping) index = 27; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 2; } @@ -283,7 +285,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping) index = 29; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 4; } @@ -307,7 +309,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr } else if (current.states.jumping) index = 31; - else if (current.states.running && current.states.still) + else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) index = 6; }