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

Pan left added. Whoops

Browse Source
This commit is contained in:
MusicalProgrammer
2018-04-30 11:22:25 -04:00
parent 78ece8c2a2
commit df5076e90f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main.cpp
View File

@@ -64,6 +64,7 @@ static bool left = false;
static bool right = false; static bool right = false;
static bool centerCam = false; static bool centerCam = false;
static bool panRight = false; static bool panRight = false;
static bool panLeft = false;
static bool tiltUp = false; static bool tiltUp = false;
static const int CURSOR = 0; static const int CURSOR = 0;
static const int ARROWS = 1; static const int ARROWS = 1;
@@ -275,6 +276,8 @@ void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
cameraPos = Vector3(cameraPos.x, cameraPos.y, cameraPos.z) - frame.lookVector()*2; cameraPos = Vector3(cameraPos.x, cameraPos.y, cameraPos.z) - frame.lookVector()*2;
else if(button->name == "PanRight") else if(button->name == "PanRight")
panRight = true; panRight = true;
else if(button->name == "PanLeft")
panLeft = true;
else if(button->name == "TiltUp") else if(button->name == "TiltUp")
tiltUp = true; tiltUp = true;
} }
@@ -937,25 +940,34 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
//app->setFocalPoint(Vector3(0,0,0)); //app->setFocalPoint(Vector3(0,0,0));
if(panRight) float panDirection=0;
{
float addOrSubtractThis=toRadians(45); if (panLeft)
{
panDirection=toRadians(-45);
panLeft = false;
}
if (panRight)
{
panDirection=toRadians(45);
panRight = false;
}
if(panDirection!=0)
{
Vector3 camPos = frame.translation; Vector3 camPos = frame.translation;
Vector3 focalPoint = app->getFocalPoint(); Vector3 focalPoint = app->getFocalPoint();
CoordinateFrame localFrame = CoordinateFrame(); CoordinateFrame localFrame = CoordinateFrame();
CoordinateFrame cf = CoordinateFrame(Vector3(focalPoint.x,0,focalPoint.z)); CoordinateFrame cf = CoordinateFrame(Vector3(focalPoint.x,0,focalPoint.z));
cf.lookAt(Vector3(camPos.x,0,camPos.z)); cf.lookAt(Vector3(camPos.x,0,camPos.z));
cf=cf*Matrix3::fromEulerAnglesXYZ(0,addOrSubtractThis,0); cf=cf*Matrix3::fromEulerAnglesXYZ(0,panDirection,0);
float distd = (Vector3(camPos.x,0,camPos.z)-Vector3(focalPoint.x,0,focalPoint.z)).magnitude(); float distd = (Vector3(camPos.x,0,camPos.z)-Vector3(focalPoint.x,0,focalPoint.z)).magnitude();
cf=cf+cf.lookVector()*distd; // Distance cf=cf+cf.lookVector()*distd; // Distance
cf=cf+Vector3(0,camPos.y,0); cf=cf+Vector3(0,camPos.y,0);
cf.lookAt(focalPoint); cf.lookAt(focalPoint);
panRight = false;
//Vector3 camerapoint = frame.translation; //Vector3 camerapoint = frame.translation;
messageTime = System::time(); messageTime = System::time();
cameraPos=camPos; cameraPos=camPos;
app->debugController.setCoordinateFrame(cf); app->debugController.setCoordinateFrame(cf);
} }