Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online
This commit is contained in:
commit
4d44d57a5a
@ -153,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.running || current.states.still)
|
||||
index = 0;
|
||||
|
||||
}
|
||||
@ -173,7 +173,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.running || current.states.still)
|
||||
index = 1;
|
||||
|
||||
}
|
||||
@ -193,7 +193,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.running || current.states.still)
|
||||
index = 3;
|
||||
|
||||
}
|
||||
@ -213,7 +213,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.running || current.states.still)
|
||||
index = 5;
|
||||
}
|
||||
else if (angle < -0.75) //Dos - side négatif
|
||||
@ -232,7 +232,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.running || current.states.still)
|
||||
index = 7;
|
||||
|
||||
}
|
||||
@ -252,7 +252,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.running || current.states.still)
|
||||
index = 2;
|
||||
|
||||
}
|
||||
@ -272,7 +272,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.running || current.states.still)
|
||||
index = 4;
|
||||
|
||||
}
|
||||
@ -292,7 +292,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.running || current.states.still)
|
||||
index = 6;
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user