Mercurial > mm7
diff Vis.cpp @ 1554:e303d8a9bcdc
Merge
author | Grumpy7 |
---|---|
date | Sat, 07 Sep 2013 21:14:48 +0200 |
parents | c4ab816fcc5e |
children | 2c71fa8913d2 |
line wrap: on
line diff
--- a/Vis.cpp Sat Sep 07 21:00:02 2013 +0200 +++ b/Vis.cpp Sat Sep 07 21:14:48 2013 +0200 @@ -1,5 +1,3 @@ -#include <assert.h> - #include "Vis.h" #include "Outdoor.h" #include "BSPModel.h" @@ -592,9 +590,9 @@ Intersection->vWorldPosition.y = pRayStart->vWorldPosition.y + t * ray_dir_x; Intersection->vWorldPosition.z = pRayStart->vWorldPosition.z + t * ray_dir_z; - IntersectPoint.x = (signed __int64)Intersection->vWorldPosition.x; - IntersectPoint.y = (signed __int64)Intersection->vWorldPosition.y; - IntersectPoint.z = (signed __int64)Intersection->vWorldPosition.z; + IntersectPoint.x = Intersection->vWorldPosition.x; + IntersectPoint.y = Intersection->vWorldPosition.y; + IntersectPoint.z = Intersection->vWorldPosition.z; if ( !CheckIntersectBModel(pFace, IntersectPoint, pBModelID) ) return false; @@ -883,11 +881,11 @@ int outz; // [sp+94h] [bp-Ch]@1 int outy; // [sp+98h] [bp-8h]@1 - pRotY = pIndoorCamera->sRotationY + UnprojectX((signed __int64)fMouseX); + pRotY = pIndoorCamera->sRotationY + UnprojectX(fMouseX); pStartR.z = pIndoorCamera->pos.z; pStartR.x = pIndoorCamera->pos.x; pStartR.y = pIndoorCamera->pos.y; - pRotX = pIndoorCamera->sRotationX + UnprojectY((signed __int64)fMouseY); + pRotX = pIndoorCamera->sRotationX + UnprojectY(fMouseY); pDepth = fixpoint_from_float(fPickDepth); Vec3_int_::Rotate(pDepth, pRotY, pRotX, pStartR, &outx, &outy, &outz);