Mercurial > mm7
changeset 1142:1b570a110e6c
Слияние
| author | Ritor1 |
|---|---|
| date | Sat, 01 Jun 2013 20:09:26 +0600 |
| parents | 9604cb70c67b (current diff) e7871ca07661 (diff) |
| children | ed6a9efc6c90 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Indoor.cpp Sat Jun 01 20:09:18 2013 +0600 +++ b/Indoor.cpp Sat Jun 01 20:09:26 2013 +0600 @@ -299,10 +299,10 @@ for (uint i = 0; i < pBspRenderer->num_faces; ++i) { v2 = pBspRenderer->faces[i].uNodeID; - if (pBspRenderer->nodes[v2].viewing_portal_id == -1) + //if (pBspRenderer->nodes[v2].viewing_portal_id == -1) IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, nullptr, 4, nullptr); - else - IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, pBspRenderer->nodes[v2].std__vector_0007AC, 4, pBspRenderer->nodes[v2].pPortalBounding); + //else + //IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, pBspRenderer->nodes[v2].std__vector_0007AC, 4, pBspRenderer->nodes[v2].pPortalBounding); } } else for (uint j = 0; j < pBspRenderer->num_faces; ++j ) @@ -1373,9 +1373,11 @@ if (face_max_screenspace_y < stru_50B700._screen_space_y[i]) face_max_screenspace_y = stru_50B700._screen_space_y[i]; } - + //_screen_space_x = 719, 568, 493 + //savegame: qw , 0Bh and 0x1D4h + //problem here when standing near/on portal, condition is false because of face_min_screenspace_x > p->uViewportZ if (face_max_screenspace_x >= p->uViewportX && - face_min_screenspace_x <= p->uViewportZ && +// face_min_screenspace_x <= p->uViewportZ && face_max_screenspace_y >= p->uViewportY && face_min_screenspace_y <= p->uViewportW && sub_424829(num_vertices, &nodes[num_nodes].field_C, &p->field_C, uFaceID)) @@ -1420,7 +1422,7 @@ nodes[num_nodes].std__vector_0007AC, nodes[num_nodes].pPortalBounding); } - if ( v29 ) + if ( 1 ) { assert(num_nodes < 150);