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

Changed how panning works

Browse Source
This commit is contained in:
andreja6
2018-04-29 23:55:53 -07:00
parent f0f16a3a69
commit 4bdb1d6939
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
main.cpp
View File

@@ -63,6 +63,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;
@@ -264,6 +265,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;
} }
@@ -900,7 +903,17 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
{ {
panRight = false; panRight = false;
CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
Vector3 camerapoint = frame.translation; float y = frame.translation.y;
CoordinateFrame frame2 = CoordinateFrame(frame.rotation, frame.translation + frame.lookVector()*25);
Vector3 focus = frame.translation+frame.lookVector()*25;
frame2 = frame2 * Matrix3::fromEulerAnglesXYZ(0,toRadians(45),0);
frame2 = frame2 - frame2.lookVector()*25;
cameraPos = Vector3(frame2.translation.x, y, frame2.translation.z);
CoordinateFrame newFrame = CoordinateFrame(frame2.rotation, Vector3(frame2.translation.x, y, frame2.translation.z));
newFrame.lookAt(focus);
app->debugController.setCoordinateFrame(newFrame);
/*Vector3 camerapoint = frame.translation;
Vector3 focalPoint = camerapoint + frame.lookVector() * 25; Vector3 focalPoint = camerapoint + frame.lookVector() * 25;
@@ -909,7 +922,8 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
float angle = toRadians(90);
float angle = atan2(camerapoint.z - focalPoint.z, focalPoint.x - camerapoint.x);
//message = Convert(angle); //message = Convert(angle);
@@ -928,20 +942,35 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
// } // }
messageTime = System::time(); messageTime = System::time();
//abs(((float)(getVectorDistance(Vector3(focalPoint.x, camerapoint.y, focalPoint.z), camerapoint)))); //abs(((float)(getVectorDistance(Vector3(focalPoint.x, camerapoint.y, focalPoint.z), camerapoint))));
float x = distc * cos(angle-toRadians(2)) + focalPoint.x; float x = distc * cos(angle + toRadians(2)) + focalPoint.x;
float z = distc * sin(angle-toRadians(2)) + focalPoint.z; float z = distc * sin(angle + toRadians(2)) + focalPoint.z;
message = "NOT 0, " + Convert(x) + ", " + Convert(z); message = "NOT 0, " + Convert(toDegrees(angle)) + ", " + Convert(toDegrees(angle + toRadians(2)));
//camerapoint = Vector3(sin(angle)*distc,camerapoint.y,cos(angle)*distc); //camerapoint = Vector3(sin(angle)*distc,camerapoint.y,cos(angle)*distc);
camerapoint = Vector3(x,camerapoint.y,z); camerapoint = Vector3(x,camerapoint.y,z);
CoordinateFrame newFrame = CoordinateFrame(camerapoint); CoordinateFrame newFrame = CoordinateFrame(camerapoint);
newFrame.lookAt(focalPoint); newFrame.lookAt(focalPoint);
cameraPos = camerapoint; cameraPos = camerapoint;
app->debugController.setCoordinateFrame(newFrame); app->debugController.setCoordinateFrame(newFrame);*/
} }
if(panLeft)
{
panLeft = false;
CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
float y = frame.translation.y;
CoordinateFrame frame2 = CoordinateFrame(frame.rotation, frame.translation + frame.lookVector()*25);
Vector3 focus = frame.translation+frame.lookVector()*25;
frame2 = frame2 * Matrix3::fromEulerAnglesXYZ(0,toRadians(-45),0);
frame2 = frame2 - frame2.lookVector()*25;
cameraPos = Vector3(frame2.translation.x, y, frame2.translation.z);
CoordinateFrame newFrame = CoordinateFrame(frame2.rotation, Vector3(frame2.translation.x, y, frame2.translation.z));
newFrame.lookAt(focus);
app->debugController.setCoordinateFrame(newFrame);
}
if(tiltUp) if(tiltUp)
{ {
tiltUp = false; tiltUp = false;