Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw periapsis/apoapsis as icons on system view orbits

master
Denis Volk 2014-08-18 14:53:10 +02:00
parent 81e8659001
commit a6fef88652
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/icons/apoapsis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 B

BIN
data/icons/periapsis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 328 B

28
src/SystemView.cpp
View File

@ -15,6 +15,7 @@
#include "AnimationCurves.h"
#include "graphics/Material.h"
#include "graphics/Renderer.h"
#include "graphics/TextureBuilder.h"
using namespace Graphics;
@ -251,6 +252,11 @@ SystemView::SystemView() : UIView()
m_onMouseWheelCon =
Pi::onMouseWheel.connect(sigc::mem_fun(this, &SystemView::MouseWheel));
Graphics::TextureBuilder b1 = Graphics::TextureBuilder::UI("icons/periapsis.png");
m_periapsisIcon.reset(new Gui::TexturedQuad(b1.GetOrCreateTexture(Gui::Screen::GetRenderer(), "ui")));
Graphics::TextureBuilder b2 = Graphics::TextureBuilder::UI("icons/apoapsis.png");
m_apoapsisIcon.reset(new Gui::TexturedQuad(b2.GetOrCreateTexture(Gui::Screen::GetRenderer(), "ui")));
ResetViewpoint();
RefreshShips();
@ -318,6 +324,14 @@ void SystemView::PutOrbit(const Orbit *orbit, const vector3d &offset, const Colo
else
m_renderer->DrawLines(num_vertices, vts, color, m_lineState, LINE_LOOP);
}
Gui::Screen::EnterOrtho();
vector3d pos;
if(Gui::Screen::Project(offset + orbit->Perigeum() * double(m_zoom), pos))
m_periapsisIcon->Draw(Pi::renderer, vector2f(pos.x-3, pos.y-5), vector2f(6,10), color);
if(Gui::Screen::Project(offset + orbit->Apogeum() * double(m_zoom), pos))
m_apoapsisIcon->Draw(Pi::renderer, vector2f(pos.x-3, pos.y-5), vector2f(6,10), color);
Gui::Screen::LeaveOrtho();
}
void SystemView::OnClickObject(const SystemBody *b)
@ -469,13 +483,15 @@ void SystemView::PutBody(const SystemBody *b, const vector3d &offset, const matr
const double t0 = Pi::game->GetTime();
Orbit playerOrbit = Pi::player->ComputeOrbit();
Orbit plannedOrbit = Orbit::FromBodyState(Pi::player->GetPosition(),
//Orbit plannedOrbit = Orbit::FromBodyState(playerOrbit.OrbitalPosAtTime(m_time - t0),
m_planner->GetVel(),
frame->GetSystemBody()->GetMass());
PutOrbit(&playerOrbit, offset, Color::RED, b->GetRadius());
PutOrbit(&plannedOrbit, offset, Color::STEELBLUE, b->GetRadius());
if(!m_planner->GetOffsetVel().ExactlyEqual(vector3d(0,0,0))) {
Orbit plannedOrbit = Orbit::FromBodyState(Pi::player->GetPosition(),
m_planner->GetVel(),
frame->GetSystemBody()->GetMass());
PutOrbit(&plannedOrbit, offset, Color::STEELBLUE, b->GetRadius());
}
PutSelectionBox(offset + playerOrbit.OrbitalPosAtTime(m_time - t0)* double(m_zoom), Color::RED);
}

2
src/SystemView.h
View File

@ -100,6 +100,8 @@ private:
sigc::connection m_onMouseWheelCon;
std::unique_ptr<Graphics::Drawables::Disk> m_bodyIcon;
std::unique_ptr<Gui::TexturedQuad> m_periapsisIcon;
std::unique_ptr<Gui::TexturedQuad> m_apoapsisIcon;
Graphics::RenderState *m_lineState;
};