Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ortho unproject bug683 #692

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Ortho unproject bug683 #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a493d43
Fix typo in unproject Bug683
JohnBrookes Apr 8, 2014
3340264
Drag3D to work with ortho lens Bug691
JohnBrookes Apr 8, 2014
531f3be
replace const in Perspective Lens
JohnBrookes Apr 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/away3d/cameras/lenses/OrthographicLens.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ package away3d.cameras.lenses
var translation:Vector3D = Matrix3DUtils.CALCULATION_VECTOR3D;
matrix.copyColumnTo(3, translation);
v.x = nX + translation.x;
v.y = nX + translation.y;
v.y = -nY + translation.y;
v.z = sZ;
v.w = 1;

Expand Down
2 changes: 1 addition & 1 deletion src/away3d/cameras/lenses/PerspectiveLens.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package away3d.cameras.lenses
*
* @param fieldOfView The vertical field of view of the projection.
*/
public function PerspectiveLens(fieldOfView:Number = 60, coordinateSystem = CoordinateSystem.LEFT_HANDED)
public function PerspectiveLens(fieldOfView:Number = 60, coordinateSystem:uint = 0)
{
super();

Expand Down
20 changes: 12 additions & 8 deletions src/away3d/tools/utils/Drag3D.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,16 +380,20 @@ package away3d.tools.utils

private function intersect(x:Number = NaN, y:Number = NaN):void
{
var pMouse:Vector3D = (isNaN(x) && isNaN(y))? _view.unproject(_view.mouseX, _view.mouseY, 1, Matrix3DUtils.CALCULATION_VECTOR3D) : _view.unproject(x, y, 1, Matrix3DUtils.CALCULATION_VECTOR3D);
var rayPosition:Vector3D = (isNaN(x) && isNaN(y))? _view.unproject(_view.mouseX, _view.mouseY, 0) : _view.unproject(x, y, 0);
var rayDirection:Vector3D = (isNaN(x) && isNaN(y))? _view.unproject(_view.mouseX, _view.mouseY, 1) : _view.unproject(x, y, 1);

var cam:Vector3D = _view.camera.position;
var d0:Number = _np.x*cam.x + _np.y*cam.y + _np.z*cam.z - _d;
var d1:Number = _np.x*pMouse.x + _np.y*pMouse.y + _np.z*pMouse.z - _d;
var m:Number = d1/( d1 - d0 );
rayDirection.x = rayDirection.x - rayPosition.x;
rayDirection.y = rayDirection.y - rayPosition.y;
rayDirection.z = rayDirection.z - rayPosition.z;

_intersect.x = pMouse.x + ( cam.x - pMouse.x )*m;
_intersect.y = pMouse.y + ( cam.y - pMouse.y )*m;
_intersect.z = pMouse.z + ( cam.z - pMouse.z )*m;
var nDotV:Number = _np.x * rayDirection.x + _np.y * +rayDirection.y + _np.z * rayDirection.z;
var disToPlane:Number = -( _np.x * rayPosition.x + _np.y * rayPosition.y + _np.z * rayPosition.z + _d );
var t:Number = disToPlane / nDotV;

_intersect.x = rayPosition.x + t * rayDirection.x;
_intersect.y = rayPosition.y + t * rayDirection.y;
_intersect.z = rayPosition.z + t * rayDirection.z;

if (_bSetOffset) {
_bSetOffset = false;
Expand Down