Mercurial > mm7
comparison Render.cpp @ 1205:8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 00:30:48 +0200 |
parents | 0dbf6c4dd029 |
children | ab6560001f5b |
comparison
equal
deleted
inserted
replaced
1204:832f09144726 | 1205:8c02e6f74b29 |
---|---|
1132 { | 1132 { |
1133 //v116 = terrain_76DFC8[v17]; | 1133 //v116 = terrain_76DFC8[v17]; |
1134 if ( v120 > terrain_76DFC8[v17] ) | 1134 if ( v120 > terrain_76DFC8[v17] ) |
1135 { | 1135 { |
1136 v125 = v120; | 1136 v125 = v120; |
1137 memset32(terrain_76D9C8, v119 + 1, 4 * (v120 - terrain_76DFC8[v17] + 1)); | 1137 memset32(terrain_76D9C8.data(), v119 + 1, 4 * (v120 - terrain_76DFC8[v17] + 1)); |
1138 v19 = v120; | 1138 v19 = v120; |
1139 do | 1139 do |
1140 terrain_76DBC8[v126++] = v19--; | 1140 terrain_76DBC8[v126++] = v19--; |
1141 while ( v19 >= terrain_76DFC8[v17] ); | 1141 while ( v19 >= terrain_76DFC8[v17] ); |
1142 if ( terrain_76DFC8[v17] == terrain_76DDC8[v17 + 127] ) | 1142 if ( terrain_76DFC8[v17] == terrain_76DDC8[v17 + 127] ) |
1180 //v24 = terrain_76E3C8[v18]; | 1180 //v24 = terrain_76E3C8[v18]; |
1181 v126 = 0; | 1181 v126 = 0; |
1182 if ( v120 > terrain_76E3C8[v18] ) | 1182 if ( v120 > terrain_76E3C8[v18] ) |
1183 { | 1183 { |
1184 v125 = v120; | 1184 v125 = v120; |
1185 memset32(terrain_76D5C8, v122, 4 * (v120 - terrain_76E3C8[v18] + 1)); | 1185 memset32(terrain_76D5C8.data(), v122, 4 * (v120 - terrain_76E3C8[v18] + 1)); |
1186 do | 1186 do |
1187 { | 1187 { |
1188 v25 = v126; | 1188 v25 = v126; |
1189 v26 = v125--; | 1189 v26 = v125--; |
1190 ++v126; | 1190 ++v126; |
1233 { | 1233 { |
1234 //v116 = terrain_76DDC8[v17]; | 1234 //v116 = terrain_76DDC8[v17]; |
1235 if ( v122 < terrain_76DDC8[v17] ) | 1235 if ( v122 < terrain_76DDC8[v17] ) |
1236 { | 1236 { |
1237 v106 = v122; | 1237 v106 = v122; |
1238 memset32(terrain_76DBC8, v120 + 1, 4 * (terrain_76DDC8[v17] - v122 + 1)); | 1238 memset32(terrain_76DBC8.data(), v120 + 1, 4 * (terrain_76DDC8[v17] - v122 + 1)); |
1239 for ( v32 = v122; v32 <= terrain_76DDC8[v17]; v32++) | 1239 for ( v32 = v122; v32 <= terrain_76DDC8[v17]; v32++) |
1240 terrain_76D9C8[v126++] = v32; | 1240 terrain_76D9C8[v126++] = v32; |
1241 if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] ) | 1241 if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] ) |
1242 { | 1242 { |
1243 do | 1243 do |
1278 v126 = 0; | 1278 v126 = 0; |
1279 v37 = terrain_76E1C8[v18]; | 1279 v37 = terrain_76E1C8[v18]; |
1280 if ( v122 < v37 ) | 1280 if ( v122 < v37 ) |
1281 { | 1281 { |
1282 v114 = v122; | 1282 v114 = v122; |
1283 memset32(terrain_76D7C8, i, 4 * (v37 - v122 + 1)); | 1283 memset32(terrain_76D7C8.data(), i, 4 * (v37 - v122 + 1)); |
1284 do | 1284 do |
1285 { | 1285 { |
1286 v38 = v126; | 1286 v38 = v126; |
1287 v39 = v114; | 1287 v39 = v114; |
1288 ++v126; | 1288 ++v126; |
1330 { | 1330 { |
1331 //v116 = terrain_76DDC8[v17]; | 1331 //v116 = terrain_76DDC8[v17]; |
1332 if ( v119 > terrain_76DDC8[v17] ) | 1332 if ( v119 > terrain_76DDC8[v17] ) |
1333 { | 1333 { |
1334 v106 = v119; | 1334 v106 = v119; |
1335 memset32(terrain_76DBC8, i, 4 * (v119 - terrain_76DDC8[v17] + 1)); | 1335 memset32(terrain_76DBC8.data(), i, 4 * (v119 - terrain_76DDC8[v17] + 1)); |
1336 for ( v45 = v119; v45 >= terrain_76DDC8[v17]; v45--) | 1336 for ( v45 = v119; v45 >= terrain_76DDC8[v17]; v45--) |
1337 terrain_76D9C8[v126++] = v45; | 1337 terrain_76D9C8[v126++] = v45; |
1338 if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] ) | 1338 if ( terrain_76DDC8[v17] == terrain_76DBC8[v17 -1] ) |
1339 { | 1339 { |
1340 do | 1340 do |
1375 v49 = terrain_76E1C8[v18]; | 1375 v49 = terrain_76E1C8[v18]; |
1376 v126 = 0; | 1376 v126 = 0; |
1377 if ( v119 > v49 ) | 1377 if ( v119 > v49 ) |
1378 { | 1378 { |
1379 v125 = v119; | 1379 v125 = v119; |
1380 memset32(terrain_76D7C8, v120 + 1, 4 * (v119 - v49 + 1)); | 1380 memset32(terrain_76D7C8.data(), v120 + 1, 4 * (v119 - v49 + 1)); |
1381 do | 1381 do |
1382 { | 1382 { |
1383 v50 = v126; | 1383 v50 = v126; |
1384 v51 = v125--; | 1384 v51 = v125--; |
1385 ++v126; | 1385 ++v126; |
1427 { | 1427 { |
1428 //v116 = terrain_76DFC8[v17]; | 1428 //v116 = terrain_76DFC8[v17]; |
1429 if ( i < terrain_76DFC8[v17] ) | 1429 if ( i < terrain_76DFC8[v17] ) |
1430 { | 1430 { |
1431 v106 = i; | 1431 v106 = i; |
1432 memset32(terrain_76D9C8, v122, 4 * (terrain_76DFC8[v17] - i + 1)); | 1432 memset32(terrain_76D9C8.data(), v122, 4 * (terrain_76DFC8[v17] - i + 1)); |
1433 v56 = i; | 1433 v56 = i; |
1434 do | 1434 do |
1435 { | 1435 { |
1436 v57 = v126++; | 1436 v57 = v126++; |
1437 terrain_76DBC8[v57] = v56++; | 1437 terrain_76DBC8[v57] = v56++; |
1478 v126 = 0; | 1478 v126 = 0; |
1479 v62 = terrain_76E3C8[v18]; | 1479 v62 = terrain_76E3C8[v18]; |
1480 if ( i < v62 ) | 1480 if ( i < v62 ) |
1481 { | 1481 { |
1482 v114 = i; | 1482 v114 = i; |
1483 memset32(terrain_76D5C8, v119 + 1, 4 * (v62 - i + 1)); | 1483 memset32(terrain_76D5C8.data(), v119 + 1, 4 * (v62 - i + 1)); |
1484 do | 1484 do |
1485 { | 1485 { |
1486 v63 = v126; | 1486 v63 = v126; |
1487 v64 = v114; | 1487 v64 = v114; |
1488 ++v126; | 1488 ++v126; |
2829 v58 = v92; | 2829 v58 = v92; |
2830 v17->field_59 = 1; | 2830 v17->field_59 = 1; |
2831 v17->field_34 = v58->distance; | 2831 v17->field_34 = v58->distance; |
2832 v17->terrain_grid_z = v94; | 2832 v17->terrain_grid_z = v94; |
2833 v17->terrain_grid_x = LOBYTE(v99); | 2833 v17->terrain_grid_x = LOBYTE(v99); |
2834 v59 = *(unsigned __int16 *)((char *)pTerrainNormalIndices + LODWORD(v93)); | 2834 v59 = *(unsigned __int16 *)((char *)pTerrainNormalIndices.data() + LODWORD(v93)); |
2835 if ( v59 > (signed int)(uNumTerrainNormals - 1) ) | 2835 if ( v59 > (signed int)(uNumTerrainNormals - 1) ) |
2836 { | 2836 { |
2837 pNormalb = 0; | 2837 pNormalb = 0; |
2838 v60 = 0; | 2838 v60 = 0; |
2839 } | 2839 } |
8973 v14 = &ecx0->pTargetSurface[pViewport->uViewportTL_X + pViewport->uViewportTL_Y * ecx0->uTargetSurfacePitch]; | 8973 v14 = &ecx0->pTargetSurface[pViewport->uViewportTL_X + pViewport->uViewportTL_Y * ecx0->uTargetSurfacePitch]; |
8974 v37 = 2 * v13; | 8974 v37 = 2 * v13; |
8975 LODWORD(v40) = (int)v14; | 8975 LODWORD(v40) = (int)v14; |
8976 | 8976 |
8977 int __i = 0; | 8977 int __i = 0; |
8978 v15 = dword_F1B430; | 8978 v15 = dword_F1B430.data(); |
8979 do | 8979 do |
8980 { | 8980 { |
8981 v16 = v3; | 8981 v16 = v3; |
8982 v3 += LODWORD(a3); | 8982 v3 += LODWORD(a3); |
8983 dword_F1B430[__i++] = v16 >> 16; | 8983 dword_F1B430[__i++] = v16 >> 16; |