Mercurial > mm7

comparison stru6.cpp @ 693:e0a1fccc89b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
map render fixes
author Gloval
date Sun, 17 Mar 2013 01:50:34 +0400
parents 574cc56e05e9
children d394cc892106
comparison
equal deleted inserted replaced
692:066e2b29b30f 693:e0a1fccc89b1
1454 v11 = v10->pHwSpriteIDs[0]; 1454 v11 = v10->pHwSpriteIDs[0];
1455 v70 = v10; 1455 v70 = v10;
1456 uAnimLength -= pEventTimer->uTimeElapsed; 1456 uAnimLength -= pEventTimer->uTimeElapsed;
1457 if ( pRenderer->pRenderD3D ) 1457 if ( pRenderer->pRenderD3D )
1458 { 1458 {
1459 v12 = (double)(signed int)pViewport->uViewportX; 1459 v12 = (double)(signed int)pViewport->uViewportTL_X;
1460 vd3d[0].pos.x = v12; 1460 vd3d[0].pos.x = v12;
1461 vd3d[1].pos.x = v12; 1461 vd3d[1].pos.x = v12;
1462 v13 = (double)(signed int)pViewport->uViewportZ; 1462 v13 = (double)(signed int)pViewport->uViewportBR_X;
1463 v26 = pViewport->uViewportW + 1; 1463 v26 = pViewport->uViewportBR_Y + 1;
1464 vd3d[0].diffuse = 0x7F7F7Fu; 1464 vd3d[0].diffuse = 0x7F7F7Fu;
1465 vd3d[1].diffuse = 0x7F7F7Fu; 1465 vd3d[1].diffuse = 0x7F7F7Fu;
1466 vd3d[2].pos.x = v13; 1466 vd3d[2].pos.x = v13;
1467 vd3d[3].pos.x = v13; 1467 vd3d[3].pos.x = v13;
1468 v14 = (double)(signed int)pViewport->uViewportY; 1468 v14 = (double)(signed int)pViewport->uViewportTL_Y;
1469 vd3d[2].diffuse = 0x7F7F7Fu; 1469 vd3d[2].diffuse = 0x7F7F7Fu;
1470 vd3d[3].diffuse = 0x7F7F7Fu; 1470 vd3d[3].diffuse = 0x7F7F7Fu;
1471 vd3d[0].specular = 0; 1471 vd3d[0].specular = 0;
1472 vd3d[1].specular = 0; 1472 vd3d[1].specular = 0;
1473 vd3d[0].pos.y = v14; 1473 vd3d[0].pos.y = v14;
1474 v15 = (double)(pViewport->uViewportW + 1); 1474 v15 = (double)(pViewport->uViewportBR_Y + 1);
1475 vd3d[2].specular = 0; 1475 vd3d[2].specular = 0;
1476 vd3d[3].specular = 0; 1476 vd3d[3].specular = 0;
1477 vd3d[1].pos.y = v15; 1477 vd3d[1].pos.y = v15;
1478 vd3d[2].pos.y = v15; 1478 vd3d[2].pos.y = v15;
1479 vd3d[3].pos.y = v14; 1479 vd3d[3].pos.y = v14;
1519 else 1519 else
1520 { 1520 {
1521 vsr.pTarget = pRenderer->pTargetSurface; 1521 vsr.pTarget = pRenderer->pTargetSurface;
1522 vsr.uParentBillboardID = -1; 1522 vsr.uParentBillboardID = -1;
1523 vsr.pTargetZ = pRenderer->pActiveZBuffer; 1523 vsr.pTargetZ = pRenderer->pActiveZBuffer;
1524 vsr.uScreenSpaceX = (signed int)(pViewport->uViewportZ - pViewport->uViewportX) / 2; 1524 vsr.uScreenSpaceX = (signed int)(pViewport->uViewportBR_X - pViewport->uViewportTL_X) / 2;
1525 vsr.uScreenSpaceY = pViewport->uViewportW; 1525 vsr.uScreenSpaceY = pViewport->uViewportBR_Y;
1526 v24 = 16777216; 1526 v24 = 16777216;
1527 LODWORD(v18) = 0; 1527 LODWORD(v18) = 0;
1528 HIDWORD(v18) = (signed __int16)(LOWORD(pViewport->uViewportZ) - LOWORD(pViewport->uViewportX)); 1528 HIDWORD(v18) = (signed __int16)(LOWORD(pViewport->uViewportBR_X) - LOWORD(pViewport->uViewportTL_X));
1529 vsr._screenspace_x_scaler_packedfloat = v18 / 0x1000000; 1529 vsr._screenspace_x_scaler_packedfloat = v18 / 0x1000000;
1530 LODWORD(v18) = 0; 1530 LODWORD(v18) = 0;
1531 HIDWORD(v18) = (signed __int16)(LOWORD(pViewport->uViewportW) - LOWORD(pViewport->uViewportY)); 1531 HIDWORD(v18) = (signed __int16)(LOWORD(pViewport->uViewportBR_Y) - LOWORD(pViewport->uViewportTL_Y));
1532 v26 = v18 / 16777216; 1532 v26 = v18 / 16777216;
1533 vsr._screenspace_y_scaler_packedfloat = v18 / 0x1000000; 1533 vsr._screenspace_y_scaler_packedfloat = v18 / 0x1000000;
1534 vsr.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v70->uPaletteIndex, 0, 1); 1534 vsr.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v70->uPaletteIndex, 0, 1);
1535 vsr.uTargetPitch = pRenderer->uTargetSurfacePitch; 1535 vsr.uTargetPitch = pRenderer->uTargetSurfacePitch;
1536 vsr.uParentBillboardID = -1; 1536 vsr.uParentBillboardID = -1;
1537 vsr.uViewportX = pViewport->uViewportX; 1537 vsr.uViewportX = pViewport->uViewportTL_X;
1538 vsr.uViewportZ = pViewport->uViewportZ; 1538 vsr.uViewportZ = pViewport->uViewportBR_X;
1539 vsr.uViewportY = pViewport->uViewportY; 1539 vsr.uViewportY = pViewport->uViewportTL_Y;
1540 vsr.sZValue = 0; 1540 vsr.sZValue = 0;
1541 vsr.uViewportW = pViewport->uViewportW; 1541 vsr.uViewportW = pViewport->uViewportBR_Y;
1542 vsr.uFlags = 0; 1542 vsr.uFlags = 0;
1543 if ( v11 >= 0 ) 1543 if ( v11 >= 0 )
1544 pSprites_LOD->pSpriteHeaders[v11]._4ACC38(&vsr, 1); 1544 pSprites_LOD->pSpriteHeaders[v11]._4ACC38(&vsr, 1);
1545 } 1545 }
1546 } 1546 }