minor fixing

This commit is contained in:
vladislav.khorev committed 2013-01-28 10:40:28 +00:00
1 parent 8ec1ba5e74
commit de3a23b98d
6 files changed
+42 -57

No files matched your search

+8 -8
View File
@@ -36,7 +36,7 @@ void TPanoramicCamera::MoveAlpha(float dAlpha)
}
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -59,7 +59,7 @@ void TPanoramicCamera::MovePhi(float dPhi)
}
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -74,7 +74,7 @@ void TPanoramicCamera::MoveDist(float dDist)
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -96,7 +96,7 @@ void TPanoramicCamera::SetAlpha(float alpha)
}
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
void TPanoramicCamera::MoveForward()
@@ -113,7 +113,7 @@ void TPanoramicCamera::MoveForward()
CamShift = CamShift + mov;
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
void TPanoramicCamera::MoveBackward()
@@ -129,7 +129,7 @@ void TPanoramicCamera::MoveBackward()
CamShift = CamShift + mov;
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -147,7 +147,7 @@ void TPanoramicCamera::MoveLeft()
CamShift = CamShift + mov;
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -165,7 +165,7 @@ void TPanoramicCamera::MoveRight()
CamShift = CamShift + mov;
//Possibly refactor???
Renderer->CalcCamPosVec();
Renderer->CalcCamPos();
}
@@ -97,13 +97,27 @@ void TSalmonRendererInterface::InitOpenGL(int screenWidth, int screenHeight, flo
}
vec3 TSalmonRendererInterface::GetCamShift()
{
return boost::apply_visitor(TGetCamShiftVisitor(), Camera);
}
void TSalmonRendererInterface::CalcCamPosVec()
vec3 TSalmonRendererInterface::GetCamVec()
{
return boost::apply_visitor(TGetCamVecVisitor(), Camera);
}
vec3 TSalmonRendererInterface::GetCamPos()
{
return CamPos;
}
void TSalmonRendererInterface::CalcCamPos()
{
TCalcCamVecVisitor v;
boost::apply_visitor(v, CameraMover);
boost::apply_visitor(v, Camera);
CamPos = GetCamShift() - GetCamVec();
@@ -181,7 +195,7 @@ void TSalmonRendererInterface::PushPerspectiveProjectionMatrix(float angle, floa
void TSalmonRendererInterface::SetGLCamView()
{
TSetCameraViewVisitor v;
boost::apply_visitor(v, CameraMover);
boost::apply_visitor(v, Camera);
CamModelViewMatrix = ModelviewMatrixStack.top();
CamInversedModelViewMatrix = InverseModelViewMatrix(CamModelViewMatrix);
@@ -294,12 +308,6 @@ void TSalmonRendererInterface::SetGlNegZView()
}
vec3 TSalmonRendererInterface::GetCamPos()
{
return CamPos;
}
void TSalmonRendererInterface::SwitchToScreen()
{