diff --git a/game/renderer_polygon_3d/renderer_polygon_3d.cpp b/game/renderer_polygon_3d/renderer_polygon_3d.cpp index 949d94d..0b3b2a5 100644 --- a/game/renderer_polygon_3d/renderer_polygon_3d.cpp +++ b/game/renderer_polygon_3d/renderer_polygon_3d.cpp @@ -75,7 +75,8 @@ namespace endofthejedi { glm::vec3 c = glm::vec3(1.0, 1.0, 0.5); glUniform3f(m_shader.location("lightColor"), c.x, c.y, c.z); - glm::vec3 p = glm::vec3(1.0, 0.0, 0.0); + //glm::vec3 p = glm::vec3(1.0, 0.0, 0.0); + glm::vec3 p = glm::vec3(0.5f, 0.5f, -4.0f); glUniform3f(m_shader.location("lightPosition"), p.x, p.y, p.z); renderPlanets(); @@ -161,6 +162,7 @@ namespace endofthejedi { glm::vec3 c = planet->getColor(); glUniform3f(m_shader.location("materialColor"), c.x, c.y, c.z); + glUniform3f(m_shader.location("color"), c.x, c.y, c.z); m_planetModel->render(m_shader); } @@ -268,7 +270,7 @@ namespace endofthejedi { fade_out = 1.0 - (trace->age / trace->maxAge); } - glColor3f(0.0, 0.0, 1.0/fade_out); + glColor3f(0.0, 0.0, 1.0*fade_out); glBegin(GL_LINE_STRIP); for (const game::Trace::TracePoint &tp : trace->points) { glVertex2f(tp.position.x, tp.position.y); diff --git a/game/state/state.cpp b/game/state/state.cpp index 12edaa6..42864ad 100644 --- a/game/state/state.cpp +++ b/game/state/state.cpp @@ -50,7 +50,6 @@ namespace game { planets.push_back(new Planet(pos, i, 0.03 + 0.07*util::randf_0_1())); } - planets.push_back(new Planet(glm::vec2(0.0f, 0.0f), 0, 0.1f)); } bool State::spawnShipForPlayer(Player *player) diff --git a/game/state/trace.cpp b/game/state/trace.cpp index 3739cdf..ef89fc5 100644 --- a/game/state/trace.cpp +++ b/game/state/trace.cpp @@ -31,7 +31,7 @@ namespace game { void Trace::addPointFromMissile(bool forceAdd) { fidelityCounter++; - if (forceAdd || fidelityCounter >= 20) { + if (forceAdd || fidelityCounter >= 10) { fidelityCounter = 0; points.push_back(TracePoint(missile)); } diff --git a/game/state/trace.hpp b/game/state/trace.hpp index 7edfbaf..57653a4 100644 --- a/game/state/trace.hpp +++ b/game/state/trace.hpp @@ -13,7 +13,7 @@ namespace game { */ class Trace { public: - Trace(Missile *missile, float maxAge=5.0); + Trace(Missile *missile, float maxAge=3.0); ~Trace(); // Add the current position of the missile as a new point on the