Mercurial > mm7
comparison Indoor.cpp @ 1206:ab6560001f5b
arrays to std::arrays phase 2 - some more arrays converted
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 01:10:49 +0200 |
parents | 8c02e6f74b29 |
children | 96a81634669e |
comparison
equal
deleted
inserted
replaced
1205:8c02e6f74b29 | 1206:ab6560001f5b |
---|---|
530 v17 = (248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) | (((248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) | 530 v17 = (248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) | (((248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) |
531 | ((248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) << 8)) << 8); | 531 | ((248 - 8 * SHIWORD(stru_F8AD28.uCurrentAmbientLightLevel)) << 8)) << 8); |
532 sub_4B0E07(uFaceID); | 532 sub_4B0E07(uFaceID); |
533 pGame->pLightmapBuilder->ApplyLights_IndoorFace(uFaceID); | 533 pGame->pLightmapBuilder->ApplyLights_IndoorFace(uFaceID); |
534 pDecalBuilder->ApplyBloodsplatDecals_IndoorFace(uFaceID); | 534 pDecalBuilder->ApplyBloodsplatDecals_IndoorFace(uFaceID); |
535 pGame->pIndoorCameraD3D->ViewTransfrom_OffsetUV(static_vertices_F7B628, uNumVerticesa, array_507D30, &stru_F8AD28); | 535 pGame->pIndoorCameraD3D->ViewTransfrom_OffsetUV(static_vertices_F7B628, uNumVerticesa, array_507D30.data(), &stru_F8AD28); |
536 pGame->pIndoorCameraD3D->Project(array_507D30, uNumVerticesa, 0); | 536 pGame->pIndoorCameraD3D->Project(array_507D30.data(), uNumVerticesa, 0); |
537 pGame->pLightmapBuilder->std__vector_000004_size = 0; | 537 pGame->pLightmapBuilder->std__vector_000004_size = 0; |
538 if (stru_F8AD28.uNumLightsApplied > 0 || | 538 if (stru_F8AD28.uNumLightsApplied > 0 || |
539 pDecalBuilder->uNumDecals > 0) | 539 pDecalBuilder->uNumDecals > 0) |
540 { | 540 { |
541 stru_F7B60C.face_plane.vNormal.x = pFace->pFacePlane.vNormal.x; | 541 stru_F7B60C.face_plane.vNormal.x = pFace->pFacePlane.vNormal.x; |
544 stru_F7B60C.face_plane.vNormal.z = pFace->pFacePlane.vNormal.z; | 544 stru_F7B60C.face_plane.vNormal.z = pFace->pFacePlane.vNormal.z; |
545 stru_F7B60C.face_plane.dist = pFace->pFacePlane.dist; | 545 stru_F7B60C.face_plane.dist = pFace->pFacePlane.dist; |
546 } | 546 } |
547 | 547 |
548 if (stru_F8AD28.uNumLightsApplied > 0 && !(pFace->uAttributes & FACE_DO_NOT_LIGHT)) | 548 if (stru_F8AD28.uNumLightsApplied > 0 && !(pFace->uAttributes & FACE_DO_NOT_LIGHT)) |
549 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0); | 549 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &stru_F7B60C, uNumVerticesa, array_507D30.data(), pVertices, 0); |
550 | 550 |
551 if (pDecalBuilder->uNumDecals > 0) | 551 if (pDecalBuilder->uNumDecals > 0) |
552 pDecalBuilder->ApplyDecals(a4a, 1, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0, pFace->uSectorID); | 552 pDecalBuilder->ApplyDecals(a4a, 1, &stru_F7B60C, uNumVerticesa, array_507D30.data(), pVertices, 0, pFace->uSectorID); |
553 | 553 |
554 if (pFace->Fluid()) | 554 if (pFace->Fluid()) |
555 { | 555 { |
556 if (pFace->uBitmapID == pRenderer->hd_water_tile_id) | 556 if (pFace->uBitmapID == pRenderer->hd_water_tile_id) |
557 { | 557 { |