a) debug Camera Matrices. enable with _IRR_COMPILE_WITH_90_DEGREE_CAMERA.

- allow ICameraSceneNode to accept any values and correct in buildCameraLookAtMatrixLH with normalize_camera_direction.
 if disabled defaults to the current v1.9 normalize
b) add initial Rotation to MayaCamera Constructor default 0,0
c) switchToMayaCamera in Examples. Clones FPSCamera default disabled


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6366 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CCameraSceneNode.cpp

@@ -265,6 +265,9 @@ void CCameraSceneNode::render()
 //! update
 void CCameraSceneNode::updateMatrices()
 {
+#if defined(_IRR_COMPILE_WITH_90_DEGREE_CAMERA)
+	ViewArea.getTransform(video::ETS_VIEW).buildCameraLookAtMatrixLH(getAbsolutePosition(), Target, UpVector);
+#else
 	core::vector3df pos = getAbsolutePosition();
 	core::vector3df tgtv = Target - pos;
 	tgtv.normalize();
@@ -282,6 +285,7 @@ void CCameraSceneNode::updateMatrices()
 	}
 
 	ViewArea.getTransform(video::ETS_VIEW).buildCameraLookAtMatrixLH(pos, Target, up);
+#endif
 	ViewArea.getTransform(video::ETS_VIEW) *= Affector;
 	recalculateViewArea();
 }

source/Irrlicht/CSceneManager.cpp

@@ -775,14 +775,16 @@ ICameraSceneNode* CSceneManager::addCameraSceneNode(ISceneNode* parent,
 //! The returned pointer must not be dropped.
 ICameraSceneNode* CSceneManager::addCameraSceneNodeMaya(ISceneNode* parent,
 	f32 rotateSpeed, f32 zoomSpeed, f32 translationSpeed, s32 id, f32 distance,
-	bool makeActive)
+	bool makeActive
+	, f32 rotX, f32 rotY)
 {
 	ICameraSceneNode* node = addCameraSceneNode(parent, core::vector3df(),
 			core::vector3df(0,0,100), id, makeActive);
 	if (node)
 	{
 		ISceneNodeAnimator* anm = new CSceneNodeAnimatorCameraMaya(CursorControl,
-			rotateSpeed, zoomSpeed, translationSpeed, distance);
+			rotateSpeed, zoomSpeed, translationSpeed, distance
+			,rotX,rotY);
 
 		node->addAnimator(anm);
 		anm->drop();

source/Irrlicht/CSceneManager.h

@@ -147,7 +147,9 @@ namespace scene
 		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent=0,
 			f32 rotateSpeed=-1500.f, f32 zoomSpeed=200.f,
 			f32 translationSpeed=1500.f, s32 id=-1, f32 distance=70.f,
-			bool makeActive=true) IRR_OVERRIDE;
+			bool makeActive=true
+			, f32 rotX = 0.f, f32 rotY = 0.f
+		) IRR_OVERRIDE;
 
 		//! Adds a camera scene node which is able to be controled with the mouse and keys
 		//! like in most first person shooters (FPS):
@@ -565,13 +567,36 @@ namespace scene
 			void* TextureValue;
 		};
 
+		/*
+			const core::aabbox3d<f32> box = Node->getTransformedBoundingBox();
+			Distance = core::min_(camera.getDistanceFromSQ(box.MinEdge), camera.getDistanceFromSQ(box.MaxEdge));
+		*/
+		static inline f32 estimatedSphereDistance(const ISceneNode* node, const core::vector3df& camera)
+		{
+			const core::aabbox3d<f32>& box = node->getBoundingBox();
+			const f32* m = node->getAbsoluteTransformation().pointer();
+
+			f32 p[4];
+			p[0] = camera.X - (box.MinEdge.X * m[0] + box.MinEdge.Y * m[4] + box.MinEdge.Z * m[8] + m[12]);
+			p[1] = camera.Y - (box.MinEdge.X * m[1] + box.MinEdge.Y * m[5] + box.MinEdge.Z * m[9] + m[13]);
+			p[2] = camera.Z - (box.MinEdge.X * m[2] + box.MinEdge.Y * m[6] + box.MinEdge.Z * m[10] + m[14]);
+			f32 l0 = (p[0] * p[0]) + (p[1] * p[1]) + (p[2] * p[2]);
+
+			p[0] = camera.X - (box.MaxEdge.X * m[0] + box.MaxEdge.Y * m[4] + box.MaxEdge.Z * m[8] + m[12]);
+			p[1] = camera.Y - (box.MaxEdge.X * m[1] + box.MaxEdge.Y * m[5] + box.MaxEdge.Z * m[9] + m[13]);
+			p[2] = camera.Z - (box.MaxEdge.X * m[2] + box.MaxEdge.Y * m[6] + box.MaxEdge.Z * m[10] + m[14]);
+			f32 l1 = (p[0] * p[0]) + (p[1] * p[1]) + (p[2] * p[2]);
+			return core::min_(l0, l1);
+		}
+
 		//! sort on distance (center) to camera
 		struct TransparentNodeEntry
 		{
 			TransparentNodeEntry(ISceneNode* n, const core::vector3df& camera)
 				: Node(n)
 			{
-				Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera);
+				//Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera);
+				Distance = estimatedSphereDistance(n, camera);
 			}
 
 			bool operator < (const TransparentNodeEntry& other) const

source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp

@@ -15,11 +15,13 @@ namespace scene
 
 //! constructor
 CSceneNodeAnimatorCameraMaya::CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor,
-	f32 rotateSpeed, f32 zoomSpeed, f32 translateSpeed, f32 distance)
+	f32 rotateSpeed, f32 zoomSpeed, f32 translateSpeed, f32 distance
+	, f32 rotX, f32 rotY
+)
 	: CursorControl(cursor), OldCamera(0), MousePos(0.5f, 0.5f),
 	TargetMinDistance(0.f),
 	ZoomSpeed(zoomSpeed), RotateSpeed(rotateSpeed), TranslateSpeed(translateSpeed),
-	CurrentZoom(distance), RotX(0.0f), RotY(0.0f),
+	CurrentZoom(distance), RotX(rotX), RotY(rotY),
 	Zooming(false), Rotating(false), Moving(false), Translating(false)
 {
 	#ifdef _DEBUG
@@ -171,18 +173,18 @@ void CSceneNodeAnimatorCameraMaya::animateNode(ISceneNode *node, u32 timeMs)
 	// Translation ---------------------------------
 
 	core::vector3df translate(OldTarget);
-	const core::vector3df upVector(camera->getUpVector());
+	const core::vector3df upVector(normalize_y(camera->getUpVector()));
 	const core::vector3df target = camera->getTarget();
 
 	core::vector3df pos = camera->getPosition();
 	core::vector3df tvectX = pos - target;
 	tvectX = tvectX.crossProduct(upVector);
-	tvectX.normalize();
+	tvectX.normalize_z();
 
 	const SViewFrustum* const va = camera->getViewFrustum();
 	core::vector3df tvectY = (va->getFarLeftDown() - va->getFarRightDown());
 	tvectY = tvectY.crossProduct(upVector.Y > 0 ? pos - target : target - pos);
-	tvectY.normalize();
+	tvectY.normalize_x();
 
 	if (isMouseKeyDown(2) && !Zooming)
 	{

source/Irrlicht/CSceneNodeAnimatorCameraMaya.h

@@ -29,7 +29,9 @@ namespace scene
 	public:
 		//! Constructor
 		CSceneNodeAnimatorCameraMaya(gui::ICursorControl* cursor, f32 rotateSpeed = -1500.f,
-			f32 zoomSpeed = 200.f, f32 translationSpeed = 1500.f, f32 distance=70.f);
+			f32 zoomSpeed = 200.f, f32 translationSpeed = 1500.f, f32 distance=70.f
+			, f32 rotX = 0.f, f32 rotY = 0.f
+		);
 
 		//! Destructor
 		virtual ~CSceneNodeAnimatorCameraMaya();