CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

File importer now supports shapes, camera pan is now locked to 45 degree increments

Browse Source 
this was a massive pain in the ass :)
This commit is contained in:
DirtPiper
2019-11-10 22:59:08 -05:00
parent 1f4147fd90
commit 98f4246f17
4 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
CameraController.cpp
View File

@@ -57,6 +57,35 @@ void CameraController::refreshZoom(const CoordinateFrame& frame)
void CameraController::pan(CoordinateFrame* frame,float spdX, float spdY)
{
yaw+=spdX;
pitch+=spdY;
if (pitch>1.4f) pitch=1.4f;
if (pitch<-1.4f) pitch=-1.4f;
frame->translation = Vector3(sin(-yaw)*zoom*cos(pitch),sin(pitch)*zoom,cos(-yaw)*zoom*cos(pitch))+focusPosition;
frame->lookAt(focusPosition);
}
void CameraController::panLock(CoordinateFrame* frame,float spdX, float spdY)
{
int sign = 0;
yaw = toDegrees(yaw);
if((((yaw - fmod(yaw, 45)) / 45) * 45) < 0)
{
sign = 1;
}
yaw = fabs(yaw);
yaw = ((yaw - fmod(yaw, 45)) / 45) * 45;
yaw = toRadians(yaw);
if(sign==1)
{
yaw = yaw * -1;
}
yaw+=spdX;
pitch+=spdY;
@@ -105,14 +134,14 @@ void CameraController::Zoom(short delta)
void CameraController::panLeft()
{
CoordinateFrame frame = g3dCamera.getCoordinateFrame();
pan(&frame,toRadians(-45),0);
panLock(&frame,toRadians(-45),0);
setFrame(frame);
}
void CameraController::panRight()
{
CoordinateFrame frame = g3dCamera.getCoordinateFrame();
pan(&frame,toRadians(45),0);
panLock(&frame,toRadians(45),0);
setFrame(frame);
}