luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6364 through r6379 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-05-04 21:38:12 +00:00
parent 993f990036
commit 67a488fc5c
227 changed files with 19006 additions and 5574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp
View File

@@ -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
@@ -164,18 +166,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)
{