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

Removal of dead function declarations, const and pass by reference changes

master
Andrew Copland 2019-03-02 20:31:00 +00:00
parent b6099b80a2
commit d8c6e73513
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Pi.cpp
View File

@ -1619,15 +1619,9 @@ void Pi::SetMouseGrab(bool on)
void Pi::DrawPiGui(double delta, std::string handler)
{
PROFILE_SCOPED()
// #define PROFILE_LUA_TIME 1
#ifdef PROFILE_LUA_TIME
auto before = clock();
#endif
if (!IsConsoleActive())
Pi::pigui->Render(delta, handler);
#ifdef PROFILE_LUA_TIME
auto after = clock();
Output("Lua PiGUI took %f\n", double(after - before) / CLOCKS_PER_SEC);
#endif
PiGui::RenderImGui();
}

14
src/WorldView.cpp
View File

@ -1071,9 +1071,9 @@ std::tuple<double, double, double> WorldView::CalculateHeadingPitchRoll(PlaneTyp
std::isnan(roll) ? 0.0 : roll);
}
static vector3d projectToScreenSpace(vector3d pos, RefCountedPtr<CameraContext> cameraContext, bool adjustZ = true)
static vector3d projectToScreenSpace(const vector3d &pos, RefCountedPtr<CameraContext> cameraContext, const bool adjustZ = true)
{
const Graphics::Frustum frustum = cameraContext->GetFrustum();
const Graphics::Frustum &frustum = cameraContext->GetFrustum();
const float h = Graphics::GetScreenHeight();
const float w = Graphics::GetScreenWidth();
vector3d proj;
@ -1089,7 +1089,7 @@ static vector3d projectToScreenSpace(vector3d pos, RefCountedPtr<CameraContext>
}
// needs to run inside m_cameraContext->Begin/EndFrame();
vector3d WorldView::WorldSpaceToScreenSpace(Body *body) const
vector3d WorldView::WorldSpaceToScreenSpace(const Body *body) const
{
if (body->IsType(Object::PLAYER) && GetCamType() == CAM_INTERNAL)
return vector3d(0, 0, 0);
@ -1099,7 +1099,7 @@ vector3d WorldView::WorldSpaceToScreenSpace(Body *body) const
}
// needs to run inside m_cameraContext->Begin/EndFrame();
vector3d WorldView::WorldSpaceToScreenSpace(vector3d position) const
vector3d WorldView::WorldSpaceToScreenSpace(const vector3d &position) const
{
const Frame *cam_frame = m_cameraContext->GetCamFrame();
matrix3x3d cam_rot = cam_frame->GetInterpOrient();
@ -1108,7 +1108,7 @@ vector3d WorldView::WorldSpaceToScreenSpace(vector3d position) const
}
// needs to run inside m_cameraContext->Begin/EndFrame();
vector3d WorldView::ShipSpaceToScreenSpace(vector3d pos) const
vector3d WorldView::ShipSpaceToScreenSpace(const vector3d &pos) const
{
matrix3x3d orient = Pi::player->GetInterpOrient();
const Frame *cam_frame = m_cameraContext->GetCamFrame();
@ -1118,13 +1118,13 @@ vector3d WorldView::ShipSpaceToScreenSpace(vector3d pos) const
}
// needs to run inside m_cameraContext->Begin/EndFrame();
vector3d WorldView::CameraSpaceToScreenSpace(vector3d pos) const
vector3d WorldView::CameraSpaceToScreenSpace(const vector3d &pos) const
{
return projectToScreenSpace(pos, m_cameraContext);
}
// needs to run inside m_cameraContext->Begin/EndFrame();
vector3d WorldView::GetTargetIndicatorScreenPosition(Body *body) const
vector3d WorldView::GetTargetIndicatorScreenPosition(const Body *body) const
{
if (body->IsType(Object::PLAYER) && GetCamType() == CAM_INTERNAL)
return vector3d(0, 0, 0);

15
src/WorldView.h
View File

@ -75,12 +75,12 @@ public:
std::tuple<double, double, double> CalculateHeadingPitchRoll(enum PlaneType);
vector3d WorldSpaceToScreenSpace(Body *body) const;
vector3d WorldSpaceToScreenSpace(vector3d position) const;
vector3d ShipSpaceToScreenSpace(vector3d position) const;
vector3d GetTargetIndicatorScreenPosition(Body *body) const;
vector3d WorldSpaceToScreenSpace(const Body *body) const;
vector3d WorldSpaceToScreenSpace(const vector3d &position) const;
vector3d ShipSpaceToScreenSpace(const vector3d &position) const;
vector3d GetTargetIndicatorScreenPosition(const Body *body) const;
vector3d GetMouseDirection() const;
vector3d CameraSpaceToScreenSpace(vector3d pos) const;
vector3d CameraSpaceToScreenSpace(const vector3d &pos) const;
void BeginCameraFrame() { m_cameraContext->BeginFrame(); };
void EndCameraFrame() { m_cameraContext->EndFrame(); };
@ -98,7 +98,6 @@ private:
void RefreshButtonStateAndVisibility();
void ChangeInternalCameraMode(InternalCameraController::Mode m);
void UpdateCameraName();
enum IndicatorSide {
INDICATOR_HIDDEN,
@ -129,17 +128,13 @@ private:
void OnToggleLabels();
void DrawCombatTargetIndicator(const Indicator &target, const Indicator &lead, const Color &c);
void DrawImageIndicator(const Indicator &marker, Gui::TexturedQuad *quad, const Color &c);
void DrawEdgeMarker(const Indicator &marker, const Color &c);
void OnPlayerDockOrUndock();
void OnPlayerChangeTarget();
void OnPlayerChangeFlightControlState();
/// Handler for "requestTimeAccelerationInc" event
void OnRequestTimeAccelInc();
/// Handler for "requestTimeAccelerationDec" event
void OnRequestTimeAccelDec();
void SelectBody(Body *, bool reselectIsDeselect);
void MouseWheel(bool up);
Game *m_game;