Merge pull request #584 from randomteddybear/IDEImprovements

Gizmo and camera improvements.

Author: ivansafrin

Core/Contents/Include/PolyRay.h

@@ -38,7 +38,18 @@ namespace Polycode {
 			Number boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near = 0.0, float far = 9999.0) const;
 
 			Vector3 planeIntersectPoint(const Vector3 &planeNormal, Number planeDistance) const;
+			Vector3 planeIntersectPoint(const Vector3 &planeNormal, const Vector3 &planePosition) const;
 			Ray tranformByMatrix(const Matrix4& matrix) const;
+
+			/**
+			* finds the two closest point on the ray to an arbitrary point space.
+			*/
+			Vector3 closestPointOnRay(const Vector3 &point) const;
+
+			/**
+			* finds the two closest points between two rays, returns false if they're parallel.
+			*/
+			bool closestPointsBetween(const Ray &ray2, Vector3 *point1, Vector3 *point2);
 
 			bool polygonIntersect(const Vector3 &v1, const Vector3 &v2, const Vector3 &v3) const;
 

Core/Contents/Source/PolyRay.cpp

@@ -55,6 +55,11 @@ Vector3 Ray::planeIntersectPoint(const Vector3 &planeNormal, Number planeDistanc
 	 return origin + direction * (-distanceToOrigin / direction.dot(planeNormal));
 }
 
+Vector3 Ray::planeIntersectPoint(const Vector3 &planeNormal, const Vector3 &planePosition) const {
+	Number d = (planePosition - origin).dot(planeNormal) / direction.dot(planeNormal);
+	return origin + direction * d;
+}
+
 bool Ray::polygonIntersect(const Vector3 &v1, const Vector3 &v2, const Vector3 &v3) const {
 
     Number t,u,v;
@@ -94,6 +99,40 @@ bool Ray::polygonIntersect(const Vector3 &v1, const Vector3 &v2, const Vector3 &
 	return true;
 }
 
+Vector3 Ray::closestPointOnRay(const Vector3 &point) const {
+	Number b = (point - origin).dot(direction)/ direction.dot(direction);
+	return origin + direction*b;
+}
+
+bool Ray::closestPointsBetween(const Ray &ray2, Vector3 *point1, Vector3 *point2) {
+	Vector3 wOrigin = origin - ray2.origin;
+
+	Number a = direction.dot(direction);
+	Number b = direction.dot(ray2.direction);
+	Number c = ray2.direction.dot(ray2.direction);
+	Number d = direction.dot(wOrigin);
+	Number e = ray2.direction.dot(wOrigin);
+	Number denom = a*c - b*b;
+
+	if(denom < 0.00001) {
+		if(point1)
+			*point1 = Vector3(0); 
+		if(point2)
+			*point2 = Vector3(0); 
+		return false;
+	}
+
+	Number s = (b*e - c*d)/denom;
+	Number t = (a*e - b*d)/denom;
+
+	
+	if(point1)
+		*point1 = origin + direction*s; 
+	if(point2)
+		*point2 = ray2.origin + ray2.direction*t; 
+	return true;
+}
+
 Number Ray::boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near, float far) const {
 
 	if(box.x == 0 || box.y == 0 || box.z == 0)

IDE/Contents/Include/TrackballCamera.h

@@ -60,7 +60,6 @@ class TrackballCamera : public EventDispatcher {
 
 		int mouseMode;
 
-		Vector3 getMouseProjectionOnBall(const Vector2 &mousePosition);
 		void updateCamera();	
 		void processMouseMovement(const Vector2 &newPosition);
 
@@ -72,8 +71,6 @@ class TrackballCamera : public EventDispatcher {
 		Vector2 trackBallMouseStart;
 		Vector2 trackBallMouseEnd;			
 		Vector3 orbitingCenter;
-		Vector3 trackballRotateStart;
-		Vector3 trackballRotateEnd;	
 		Vector3 trackballEye;		
 		Number cameraDistance;
 		CoreInput *coreInput;		

IDE/Contents/Include/TransformGizmo.h

@@ -94,17 +94,26 @@ class TransformGizmo : public Entity {
 
 		void transformSelectedEntities(const Vector3 &move, const Vector3 &scale, Number rotate);
 		Vector3 getTransformPlanePosition();
-		
+		Vector3 getPositionAlongAxis();
+		bool isConstrainedToSingleAxis();
+
 		Number getTransformPlaneAngle();
+		Number get2dAngle();
+		Vector2 getCorrectedMousePosition();
+
+		void resetTransform();
 
         void setTransformOrientation(int orientation);
 
         void updateOrientationForEntity(Entity *entity);
 
         void setTransformPlane(Number x, Number y, Number z, bool forceGlobal = false);
+		void setTransformPlane(bool useX, bool useY, bool useZ);
         void setTransformPlaneFromView();
 
         void setCenterMode(int centerMode);
+
+		void toggleOrientation();
 
 		static const int TRANSFORM_MOVE = 0;
 		static const int TRANSFORM_SCALE = 1;
@@ -136,11 +145,16 @@ class TransformGizmo : public Entity {
         int transformMode;
         int gizmoMode;
         int orientation;
+		int startingOrientation;
 
         int centerMode;
 
 		std::vector<Entity*> selectedEntities;
 		std::vector<Vector3> entityPositions;
+
+		std::vector<Vector3> oldPosition;
+		std::vector<Vector3> oldScale;
+		std::vector<Quaternion> oldRotation;
 
 		Scene *targetScene;
 		Camera *targetCamera;
@@ -164,6 +178,8 @@ class TransformGizmo : public Entity {
         Vector3 gizmoPoint;
 		Vector3 startingPoint;
 		Number startingAngle;
+
+		Vector2 mouseStart2d;
 
         Number scaleAmount;
 

IDE/Contents/Source/TrackballCamera.cpp

@@ -46,11 +46,8 @@ TrackballCamera::TrackballCamera(Camera *targetCamera, Entity *trackballShape) :
 
 	coreInput = CoreServices::getInstance()->getCore()->getInput();
 
-	targetCamera->setPosition(cameraDistance, cameraDistance, cameraDistance);
-	trackballRotateEnd = getMouseProjectionOnBall(Vector2(trackballShape->getWidth()/2.0, trackballShape->getHeight()/2.0));
-	trackballRotateStart = trackballRotateEnd;
-	
-	updateCamera();	
+	targetCamera->lookAt(orbitingCenter);
+	updateCamera();
 }
 
 Number TrackballCamera::getCameraDistance() {
@@ -98,7 +95,10 @@ void TrackballCamera::handleEvent(Event *event) {
 					} else {
                         if(!rotationDisabled) {
                             mouseMode = MOUSE_MODE_ORBITING;
-                            trackballRotateStart = trackballRotateEnd = getMouseProjectionOnBall(inputEvent->getMousePosition());
+							trackBallMouseStart = trackBallMouseEnd = Vector2(
+								inputEvent->getMousePosition().x / trackballShape->getWidth(),
+								inputEvent->getMousePosition().y / trackballShape->getHeight()
+							);
                         }
 					}
 				}
@@ -125,15 +125,18 @@ void TrackballCamera::handleEvent(Event *event) {
 
 void TrackballCamera::setOrbitingCenter(const Vector3 &newCenter) {
 	orbitingCenter = newCenter;
-	updateCamera();	
 }
 
 void TrackballCamera::processMouseMovement(const Vector2 &newPosition) {
 	switch(mouseMode) {
 		case MOUSE_MODE_ORBITING:
 		{
-			trackballRotateEnd = getMouseProjectionOnBall(newPosition);
+			trackBallMouseEnd  = Vector2(
+							newPosition.x / trackballShape->getWidth(),
+							newPosition.y / trackballShape->getHeight()
+						);
 			updateCamera();
+			trackBallMouseStart = trackBallMouseEnd;
 		}	
 		break;
 		case MOUSE_MODE_PANNING:
@@ -183,6 +186,7 @@ void TrackballCamera::processMouseMovement(const Vector2 &newPosition) {
 
 void TrackballCamera::setCameraPosition(Vector3 cameraPosition) {
     targetCamera->setPosition(cameraPosition);
+	targetCamera->lookAt(orbitingCenter);
     updateCamera();
 }
 
@@ -192,60 +196,37 @@ Vector3 TrackballCamera::getOribitingCenter() {
 
 void TrackballCamera::updateCamera() {
 
+	Quaternion currentCamQuat = targetCamera->getRotationQuat();
 	trackballEye = targetCamera->getPosition() - orbitingCenter;
 	trackballEye.setLength(cameraDistance);
-	
-	
-	Number angle = acos(trackballRotateStart.dot(trackballRotateEnd) / trackballRotateStart.length() / trackballRotateEnd.length());
-	
-	if(angle == angle) {
-		Vector3 axis = trackballRotateStart.crossProduct(trackballRotateEnd);
-		axis.Normalize();
+
+	if(mouseMode == MOUSE_MODE_ORBITING) {
+		Vector2 localMouse =  trackBallMouseEnd - trackBallMouseStart;
+
 		Quaternion q;
-		
-		angle *= trackballRotateSpeed;	
-		q.fromAngleAxis(angle, axis);
-		
+		// yaw
+		if(Vector3(0.0, 1.0, 0.0).dot(currentCamQuat.applyTo(Vector3(0.0, 0.0, -1.0))) > 0.0)
+			q.fromAngleAxis(localMouse.x*2.0, Vector3(0.0, 1.0, 0.0));
+		else
+			q.fromAngleAxis(localMouse.x*-2.0, Vector3(0.0, 1.0, 0.0));
+		currentCamQuat = q * currentCamQuat;
+		trackballEye = q.applyTo(trackballEye);
+
+		// local pitch
+		q.fromAngleAxis(localMouse.y*-2.0, currentCamQuat.applyTo(Vector3(1.0, 0.0, 0.0)));
+		currentCamQuat = q * currentCamQuat;
 		trackballEye = q.applyTo(trackballEye);
-		trackballRotateEnd = q.applyTo(trackballRotateEnd);
-		
-		trackballRotateStart = trackballRotateEnd;
 	}
 
 	targetCamera->setPosition(orbitingCenter + trackballEye);	
-	targetCamera->lookAt(orbitingCenter);
+	targetCamera->setRotationByQuaternion(currentCamQuat);
     dispatchEvent(new Event(), Event::CHANGE_EVENT);
 }
 
 void TrackballCamera::disableRotation(bool val) {
     rotationDisabled = val;
 }
 
-Vector3 TrackballCamera::getMouseProjectionOnBall(const Vector2 &mousePosition) {
-
-	Vector3 mouseOnBall = Vector3((mousePosition.x - (trackballShape->getWidth() * 0.5)) / (trackballShape->getWidth() * 0.5),(mousePosition.y - (trackballShape->getHeight() * 0.5)) / (trackballShape->getHeight() * 0.5), 0.0);
-	mouseOnBall.x *= -1;	
-	
-	Number length = mouseOnBall.length();
-	
-
-	if (length < sqrt(0.5)) {
-		mouseOnBall.z = sqrt(1.0 - length*length);
-	} else {
-		mouseOnBall.z = 0.5 / length;
-	}
-
-	trackballEye = targetCamera->getPosition() - orbitingCenter;
-	
-	Vector3 projection = Vector3(0.0, 1.0, 0.0).setLength(mouseOnBall.y);		
-	
-	projection = projection + (Vector3(0.0, 1.0, 0.0).crossProduct(trackballEye).setLength(mouseOnBall.x));				
-	
-	trackballEye.setLength(mouseOnBall.z);
-	projection = projection + (trackballEye);
-	
-	return projection;	
-}
 /*
 void TrackballCamera::setCameraPosition(Vector3 cameraPosition) {