Loading src/GlApplication.cpp +15 −4 Changes for src/GlApplication.cpp: 15 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -58,18 +58,29 @@ void GlApplication::loadModels() { } void GlApplication::createEntities() { const float pi = glm::pi<float>(); m_spaceshipPlayer1->setScale(0.2f); m_spaceshipPlayer2->setScale(0.2f); m_spaceshipPlayer2->move({0, 0, 3}); m_spaceshipPlayer1->move({0, 0, -5}); m_spaceshipPlayer2->move({0, 0, 5}); glm::vec3 yAxis = (float)sin(pi/2) * this->m_spaceshipPlayer2->get_y_axis(); this->m_spaceshipPlayer2->rotate(glm::quat(cos(pi/2), yAxis)); m_entities[ModelKeys::SPACESHIP_1].push_back(m_spaceshipPlayer1); m_entities[ModelKeys::SPACESHIP_2].push_back(m_spaceshipPlayer2); const float pi = glm::pi<float>(); for(int i = 0 ; i < 150 ; i++) { glm::vec3 position = {rand() % 80 - 45, rand() % 80 - 45, rand() % 80 - 45}; if(position.x >= -10 && position.x <= 10 && position.y >= -10 && position.y <= 10 && position.z >= -10 && position.z <= 10) { i--; continue; } std::shared_ptr<Entity> asteroidEntity(new Asteroid()); asteroidEntity->setScale(0.25); asteroidEntity->move({rand() % 80 - 45, rand() % 80 - 45, rand() % 80 - 45}); asteroidEntity->move(position); m_entities[ModelKeys::ASTEROID].push_back(asteroidEntity); } Loading Loading
src/GlApplication.cpp +15 −4 Changes for src/GlApplication.cpp: 15 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -58,18 +58,29 @@ void GlApplication::loadModels() { } void GlApplication::createEntities() { const float pi = glm::pi<float>(); m_spaceshipPlayer1->setScale(0.2f); m_spaceshipPlayer2->setScale(0.2f); m_spaceshipPlayer2->move({0, 0, 3}); m_spaceshipPlayer1->move({0, 0, -5}); m_spaceshipPlayer2->move({0, 0, 5}); glm::vec3 yAxis = (float)sin(pi/2) * this->m_spaceshipPlayer2->get_y_axis(); this->m_spaceshipPlayer2->rotate(glm::quat(cos(pi/2), yAxis)); m_entities[ModelKeys::SPACESHIP_1].push_back(m_spaceshipPlayer1); m_entities[ModelKeys::SPACESHIP_2].push_back(m_spaceshipPlayer2); const float pi = glm::pi<float>(); for(int i = 0 ; i < 150 ; i++) { glm::vec3 position = {rand() % 80 - 45, rand() % 80 - 45, rand() % 80 - 45}; if(position.x >= -10 && position.x <= 10 && position.y >= -10 && position.y <= 10 && position.z >= -10 && position.z <= 10) { i--; continue; } std::shared_ptr<Entity> asteroidEntity(new Asteroid()); asteroidEntity->setScale(0.25); asteroidEntity->move({rand() % 80 - 45, rand() % 80 - 45, rand() % 80 - 45}); asteroidEntity->move(position); m_entities[ModelKeys::ASTEROID].push_back(asteroidEntity); } Loading