SQC-15_online #1

Merged
memartel_loc merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Showing only changes of commit e8d456cc09 - Show all commits

View File

@ -1241,12 +1241,6 @@ void Engine::Render(float elapsedTime) {
gameTime += elapsedTime * 10;
for (auto& [key, player] : m_players) {
RemotePlayer* rt = (RemotePlayer*)player;
rt->Render(m_animeAtlas, m_shader01, all, elapsedTime);
m_otherplayerpos = rt->GetPosition();
}
//Vector3f dance = Vector3f(sin(gameTime), 0, cos(-gameTime));
//dance.Normalize();
//m_remotePlayer.ApplyPhysics(dance, &m_world, elapsedTime);
@ -1347,7 +1341,14 @@ void Engine::Render(float elapsedTime) {
}
}
lsPck.clear();
for (auto& [key, player] : m_players) {
RemotePlayer* rt = (RemotePlayer*)player;
rt->Render(m_animeAtlas, m_shader01, all, elapsedTime);
m_otherplayerpos = rt->GetPosition();
}
}
}
else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS)
{