j3d1/KlassischeKeplerKriege
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge

Browse source
This commit is contained in:
j3d1 2016-10-06 03:52:36 +02:00
parent 6e6a28c9ff
commit 34d2c82fd9
2 changed files with 48 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
game/renderer_polygon_3d/renderer_polygon_3d.cpp
View file

@ -38,7 +38,7 @@ void RendererPolygon3d::setup() {
addModel("../data/mesh/ship_ufo.stl", &m_shipModel); addModel("../data/mesh/ship_ufo.stl", &m_shipModel);
m_texture = nullptr; m_texture = nullptr;
m_backgroundTexturePath = "../data/img/stars_nebular.png"; m_backgroundTexturePath = "../data/img/background_3.png";
loadBackgroundTexture(); loadBackgroundTexture();
m_postprocess_shader.init(); m_postprocess_shader.init();
@ -520,7 +520,7 @@ void RendererPolygon3d::renderPlanets() {
m_planetModel->render(); m_planetModel->render();
} }
} }
/*
void RendererPolygon3d::renderSun() { void RendererPolygon3d::renderSun() {
m_planetModel->bind(); m_planetModel->bind();
@ -546,7 +546,7 @@ void RendererPolygon3d::renderSun() {
m_planetModel->render(); m_planetModel->render();
} }
} }
*/
void RendererPolygon3d::renderMissiles() { void RendererPolygon3d::renderMissiles() {
// TODO: add fire trail for missiles near the sun // TODO: add fire trail for missiles near the sun
@ -573,7 +573,7 @@ void RendererPolygon3d::renderMissiles() {
glm::mat4 model = computeModelMatrix(ship); glm::mat4 model = computeModelMatrix(ship);
glUniformMatrix4fv(m_shader_game_objects.location("model"), 1, GL_FALSE, glm::value_ptr(model)); glUniformMatrix4fv(m_shader_game_objects.location("model"), 1, GL_FALSE, glm::value_ptr(model));
glm::vec3 c = glm::vec3(0.1, 1.0, 0.2); glm::vec3 c = ship->color;
glUniform3f(m_shader_game_objects.location("materialColor"), c.x, c.y, c.z); glUniform3f(m_shader_game_objects.location("materialColor"), c.x, c.y, c.z);
m_shipModel->render(); m_shipModel->render();

89
game/state/state.cpp
View file

@ -139,7 +139,7 @@ namespace game {
return false; return false;
} }
Ship *ship = new Ship(generateId(), spawnPos, m_shipRadius); Ship *ship = new Ship(generateId(), spawnPos, player->color, m_shipRadius);
player->ship = ship; player->ship = ship;
ships.push_back(ship); ships.push_back(ship);
@ -159,29 +159,29 @@ namespace game {
void State::quitPlayer(size_t playerId) void State::quitPlayer(size_t playerId)
{ {
std::cout << playerId << " quit" << std::endl; std::cout << playerId << " quit" << std::endl;
Player *player = playerForId(playerId); Player *player = playerForId(playerId);
if (player != nullptr) { if (player != nullptr) {
for (Missile *missile : player->missiles) { for (Missile *missile : player->missiles) {
player->missiles.remove(missile); player->missiles.remove(missile);
missile->player = nullptr; missile->player = nullptr;
m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile)); m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile));
} }
if (player->ship != nullptr) { if (player->ship != nullptr) {
ships.remove(player->ship); ships.remove(player->ship);
m_nextEvents.push_back(new ShipEvent(LifeCycle::Destroy, player->ship)); m_nextEvents.push_back(new ShipEvent(LifeCycle::Destroy, player->ship));
} }
players.remove(player); players.remove(player);
delete(player); delete(player);
} }
} }
void State::clear(size_t playerId) void State::clear(size_t playerId)
{ {
std::cout << playerId << " clear" << std::endl; std::cout << playerId << " clear" << std::endl;
} }
void State::setName(size_t playerId, std::string name) void State::setName(size_t playerId, std::string name)
@ -234,9 +234,8 @@ namespace game {
(void) dt; (void) dt;
for (Player *player : players) { for (Player *player : players) {
if (player->alive) { if (player->alive) {
player->energy += dt; player->energy += dt * ENERGY_PER_DT;
} }
// try to execute as much queued commands as possible. // try to execute as much queued commands as possible.
while (player->hasCommandInQueue()) { while (player->hasCommandInQueue()) {
Command *command = player->peekCommand(); Command *command = player->peekCommand();
@ -261,7 +260,7 @@ namespace game {
std::cout<<"player " << killer->id << " killed " << victim->id << std::endl; std::cout<<"player " << killer->id << " killed " << victim->id << std::endl;
// destroy ship // destroy ship
ships.remove(victim->ship); ships.remove(victim->ship);
delete(victim->ship); delete(victim->ship);
victim->ship = nullptr; victim->ship = nullptr;
@ -282,7 +281,7 @@ namespace game {
for (Player *player : players) { for (Player *player : players) {
std::vector<Missile*> rm; std::vector<Missile*> rm;
for (Missile *missile : player->missiles) { for (Missile *missile : player->missiles) {
const Missile::Event evt = missile->advance(this, dt); const Missile::Event evt = missile->advance(this, dt);
const bool isHit = (evt.hit != Hit::Nothing); const bool isHit = (evt.hit != Hit::Nothing);
@ -290,73 +289,73 @@ namespace game {
missile->trace->addPointFromMissile(isHit); // force point if missile gets destroyed a missile->trace->addPointFromMissile(isHit); // force point if missile gets destroyed a
} }
if (!isHit) { if (!isHit) {
continue; continue;
} }
bool spawnExplosion = true; bool spawnExplosion = true;
switch(evt.hit) { switch(evt.hit) {
case Hit::Planet: case Hit::Planet:
// TODO: add black spot on the planet. // TODO: add black spot on the planet.
// TODO: if water planet, add waves // TODO: if water planet, add waves
// TODO: if gas planet, add nice gas explosion effect // TODO: if gas planet, add nice gas explosion effect
// and start burning on this spot for some time. // and start burning on this spot for some time.
//std::cout<<"hit Planet" << std::endl; //std::cout<<"hit Planet" << std::endl;
break; break;
case Hit::Ship: case Hit::Ship:
//std::cout<<"hit Player" << std::endl; //std::cout<<"hit Player" << std::endl;
playerKillsPlayer(playerForId(evt.playerIdKiller), playerForId(evt.playerIdVictim)); playerKillsPlayer(playerForId(evt.playerIdKiller), playerForId(evt.playerIdVictim));
break; break;
case Hit::BorderOfUniverse: case Hit::BorderOfUniverse:
//std::cout<<"missile left the universe." << std::endl; //std::cout<<"missile left the universe." << std::endl;
spawnExplosion = false; spawnExplosion = false;
break; break;
default: default:
break; break;
} }
if (spawnExplosion) { if (spawnExplosion) {
addExplosionFromHit(&evt); addExplosionFromHit(&evt);
} }
if (missile->trace != nullptr) { if (missile->trace != nullptr) {
missile->trace->finish(); missile->trace->finish();
} }
rm.push_back(missile); rm.push_back(missile);
} }
for (Missile *missile : rm) { for (Missile *missile : rm) {
player->missiles.remove(missile); player->missiles.remove(missile);
m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile)); m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile));
} }
} }
} }
void State::advanceExplosions(float dt) void State::advanceExplosions(float dt)
{ {
std::vector<Explosion*> rm; std::vector<Explosion*> rm;
for (Explosion *explosion : explosions) { for (Explosion *explosion : explosions) {
explosion->age += dt; explosion->age += dt;
if (explosion->age >= explosion->maxAge) { if (explosion->age >= explosion->maxAge) {
rm.push_back(explosion); rm.push_back(explosion);
} }
} }
for (Explosion *explosion : rm) { for (Explosion *explosion : rm) {
explosions.remove(explosion); explosions.remove(explosion);
m_nextEvents.push_back(new ExplosionEvent(LifeCycle::Destroy, explosion)); m_nextEvents.push_back(new ExplosionEvent(LifeCycle::Destroy, explosion));
//delete(explosion); //delete(explosion);
} }
} }
void State::advance(float dt) void State::advance(float dt)