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

Quick ugly fix for #255

master
Taiki Kim 2012-01-19 18:43:29 -08:00
parent 9f2fe4578e
commit cd8ccff2c9
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GalacticView.cpp
View File

@ -166,10 +166,12 @@ void GalacticView::Update()
void GalacticView::MouseButtonDown(int button, int x, int y)
{
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoom *= pow(0.25f, ft);
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoom *= pow(4.0f, ft);
if (this == Pi::GetView()) {
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoom *= pow(0.25f, ft);
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoom *= pow(4.0f, ft);
}
}

12
src/SectorView.cpp
View File

@ -870,11 +870,13 @@ void SectorView::ShowAll()
void SectorView::MouseButtonDown(int button, int x, int y)
{
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoomMovingTo += 10.0*ft;
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoomMovingTo -= 10.0*ft;
if (this == Pi::GetView()) {
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoomMovingTo += 10.0*ft;
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoomMovingTo -= 10.0*ft;
}
}
Sector* SectorView::GetCached(int sectorX, int sectorY, int sectorZ)

12
src/SystemView.cpp
View File

@ -335,9 +335,11 @@ void SystemView::Update()
void SystemView::MouseButtonDown(int button, int x, int y)
{
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoom *= pow(0.25f, ft);
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoom *= pow(4.0f, ft);
if (this == Pi::GetView()) {
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
m_zoom *= pow(0.25f, ft);
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_zoom *= pow(4.0f, ft);
}
}

2
src/WorldView.cpp
View File

@ -1602,7 +1602,7 @@ void WorldView::DrawEdgeMarker(const Indicator &marker)
void WorldView::MouseButtonDown(int button, int x, int y)
{
if (GetCamType() == CAM_EXTERNAL)
if (this == Pi::GetView() && GetCamType() == CAM_EXTERNAL)
{
const float ft = Pi::GetFrameTime();
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))