Mercurial > mm7
diff Vis.cpp @ 692:066e2b29b30f
viewport.cpp added
author | Gloval |
---|---|
date | Sat, 16 Mar 2013 21:57:32 +0400 |
parents | ecfb1b3c9a39 |
children | bd611ae85d27 |
line wrap: on
line diff
--- a/Vis.cpp Sat Mar 16 14:33:23 2013 +0200 +++ b/Vis.cpp Sat Mar 16 21:57:32 2013 +0400 @@ -1743,10 +1743,10 @@ if (Vis_static_stru_F91E10.object_pointers[0]->actual_z > pBillboardRenderList[v3].actual_z) return 1; } - else if ((double)(pViewport->uScreenX) <= *(float *)&v35 && - (double)pViewport->uScreenZ >= *(float *)&v35 && - (double)pViewport->uScreenY <= *(float *)&v36 && - (double)pViewport->uScreenW >= *(float *)&v36) + else if ((double)(pViewport->uScreen_TL_X) <= *(float *)&v35 && + (double)pViewport->uScreen_BR_X >= *(float *)&v35 && + (double)pViewport->uScreen_TL_Y <= *(float *)&v36 && + (double)pViewport->uScreen_BR_Y >= *(float *)&v36) return 1; v40 = 0; v10 = (int)&pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[0].pos.y; @@ -1757,13 +1757,13 @@ v11 = *(float *)v10; v13 = *(float *)(v10 - 4); Vis_static_stru_F91E10.uNumPointers = 0; - if ( v13 >= (double)(pViewport->uScreenX)) + if ( v13 >= (double)(pViewport->uScreen_TL_X)) { - if ( v12 <= (double)pViewport->uScreenZ ) + if ( v12 <= (double)pViewport->uScreen_BR_X ) { - if ( v11 >= (double)pViewport->uScreenY ) + if ( v11 >= (double)pViewport->uScreen_TL_Y ) { - if ( v11 <= (double)pViewport->uScreenW ) + if ( v11 <= (double)pViewport->uScreen_BR_Y ) { v14 = v11; v15 = v12; @@ -1811,10 +1811,10 @@ v41 = v38; Vis_static_stru_F91E10.uNumPointers = 0; v23 = (v20 - v21) * 0.5; - if ( v23 < (double)(pViewport->uScreenX) - || v23 > (double)pViewport->uScreenZ - || (double)pViewport->uScreenY > v41 - || (double)pViewport->uScreenW < v41 + if ( v23 < (double)(pViewport->uScreen_TL_X) + || v23 > (double)pViewport->uScreen_BR_X + || (double)pViewport->uScreen_TL_Y > v41 + || (double)pViewport->uScreen_BR_Y < v41 || ((v25 = v23, CastPickRay(local_80, SLODWORD(v25), v41, fDepth), uCurrentlyLoadedLevelType != 1) ? (PickOutdoorFaces_Mouse(fDepth, local_80, &Vis_static_stru_F91E10, &vis_face_filter, false)) : (PickIndoorFaces_Mouse(fDepth, local_80, &Vis_static_stru_F91E10, &vis_face_filter)),