Mercurial > mm7

comparison Indoor.cpp @ 1227:312e895a6439

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 07 Jun 2013 22:27:51 +0600
parents 33b30398e286 02e2a5c1ebc0
children ac1b79c498a8
comparison
equal deleted inserted replaced
1226:33b30398e286 1227:312e895a6439
300 if (bD3D) 300 if (bD3D)
301 { 301 {
302 pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z); 302 pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
303 for (uint i = 0; i < pBspRenderer->num_faces; ++i) 303 for (uint i = 0; i < pBspRenderer->num_faces; ++i)
304 { 304 {
305 v2 = pBspRenderer->faces[i].uNodeID; 305 //v2 = pBspRenderer->faces[i].uNodeID;
306 //if (pBspRenderer->nodes[v2].viewing_portal_id == -1) 306 if (pBspRenderer->nodes[pBspRenderer->faces[i].uNodeID].viewing_portal_id == -1)
307 IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, nullptr, 4, nullptr); 307 IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, nullptr, 4, nullptr);
308 //else 308 else
309 //IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, pBspRenderer->nodes[v2].std__vector_0007AC, 4, pBspRenderer->nodes[v2].pPortalBounding); 309 IndoorLocation::ExecDraw_d3d(pBspRenderer->faces[i].uFaceID, pBspRenderer->nodes[pBspRenderer->faces[i].uNodeID].std__vector_0007AC, 4, pBspRenderer->nodes[pBspRenderer->faces[i].uNodeID].pPortalBounding);
310 } 310 }
311 } 311 }
312 else for (uint j = 0; j < pBspRenderer->num_faces; ++j ) 312 else for (uint j = 0; j < pBspRenderer->num_faces; ++j )
313 { 313 {
314 pBLVRenderParams->field_7C = &pBspRenderer->nodes[pBspRenderer->faces[j].uNodeID].field_C; 314 pBLVRenderParams->field_7C = &pBspRenderer->nodes[pBspRenderer->faces[j].uNodeID].field_C;
519 static_vertices_F7C228[i].u = (signed short)pFace->pVertexUIDs[i]; 519 static_vertices_F7C228[i].u = (signed short)pFace->pVertexUIDs[i];
520 static_vertices_F7C228[i].v = (signed short)pFace->pVertexVIDs[i]; 520 static_vertices_F7C228[i].v = (signed short)pFace->pVertexVIDs[i];
521 } 521 }
522 522
523 if (!pVertices || 523 if (!pVertices ||
524 (pGame->pStru9Instance->_498377(pPortalBounding, 4u, pVertices, static_vertices_F7C228, &uNumVerticesa), uNumVerticesa) ) 524 (pGame->pStru9Instance->_498377(pPortalBounding, 4, pVertices, static_vertices_F7C228, &uNumVerticesa), uNumVerticesa) )
525 { 525 {
526 if (pGame->pIndoorCameraD3D->CalcPortalShape(static_vertices_F7C228, &uNumVerticesa, 526 if (pGame->pIndoorCameraD3D->CalcPortalShape(static_vertices_F7C228, &uNumVerticesa,
527 static_vertices_F7B628, pGame->pIndoorCameraD3D->std__vector_000034_prolly_frustrum, 4, false, 0) != 1 || uNumVerticesa ) 527 static_vertices_F7B628, pGame->pIndoorCameraD3D->std__vector_000034_prolly_frustrum, 4, false, 0) != 1 || uNumVerticesa )
528 { 528 {
529 a4a = SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel); 529 a4a = SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel);