Mercurial > mm7
changeset 36:415e1f2d5936
Слияние
author | Ritor1 |
---|---|
date | Sun, 20 Jan 2013 20:04:18 +0600 |
parents | aac67e0d2c10 (current diff) 8aa7e4a303c9 (diff) |
children | 979f13f456dc |
files | Vis.cpp |
diffstat | 1 files changed, 26 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/Vis.cpp Sun Jan 20 20:03:36 2013 +0600 +++ b/Vis.cpp Sun Jan 20 20:04:18 2013 +0600 @@ -1345,17 +1345,16 @@ bool result; // eax@1 RenderVertexD3D3 *v5; // edx@2 RenderVertexD3D3 *v6; // esi@2 - RenderVertexD3D3 v7; // qdi@2 + void *v7; // edi@2 unsigned int v8; // ebx@2 - int v9; // ecx@3 - int v10; // ecx@5 - float v11; // eax@8 + float *v9; // ecx@3 + float *v10; // ecx@5 + RenderVertexD3D3 *v11; // eax@8 RenderVertexD3D3 v12; // [sp+4h] [bp-4Ch]@8 - char v13; // [sp+24h] [bp-2Ch]@2 - float v14; // [sp+28h] [bp-28h]@4 + RenderVertexD3D3 v13; // [sp+24h] [bp-2Ch]@2 Vis *thisa; // [sp+44h] [bp-Ch]@1 - RenderVertexD3D3 *v16; // [sp+48h] [bp-8h]@2 - unsigned int v17; // [sp+4Ch] [bp-4h]@2 + RenderVertexD3D3 *v15; // [sp+48h] [bp-8h]@2 + unsigned int v16; // [sp+4Ch] [bp-4h]@2 result = uEnd; thisa = this; @@ -1363,41 +1362,41 @@ { v5 = a2; v6 = &a2[uEnd]; - LODWORD(v7.pos.x) = (int)&v13; - v16 = &a2[uEnd]; + v7 = &v13; + v15 = &a2[uEnd]; v8 = uStart - 1; - v17 = uEnd; + v16 = uEnd; while ( 1 ) { - memcpy(*(void **)&v7.pos.x, v6, 0x20u); - v9 = (int)&v5[v8].pos.y; + memcpy(v7, v6, 0x20u); + v9 = &v5[v8].pos.y; do { - v9 += 32; + v9+=8; ++v8; } - while ( *(float *)v9 < (double)v14 ); - v10 = (int)&v5[v17].pos.y; + while ( *v9 < (double)v13.pos.y ); + v10 = &v5[v16].pos.y; do { - v10 -= 32; - --v17; + v10-=8; + --v16; } - while ( *(float *)v10 > (double)v14 ); - if ( (signed int)v8 >= (signed int)v17 ) + while ( *v10 > (double)v13.pos.y ); + if ( (signed int)v8 >= (signed int)v16 ) break; - LODWORD(v11) = (int)&v5[v17]; + v11 = &v5[v16]; memcpy(&v12, &a2[v8], sizeof(v12)); v5 = a2; - memcpy(&a2[v8], *(void **)&v11, sizeof(a2[v8])); + memcpy(&a2[v8], v11, sizeof(a2[v8])); v6 = &v12; - v7.pos.x = v11; + v7 = v11; } memcpy(&v12, &v5[v8], sizeof(v12)); - memcpy(&v5[v8], v16, sizeof(v5[v8])); - memcpy(v16, &v12, 0x20u); - SortVerticesByY(v5, uStart, v8 - 1); - SortVerticesByY(a2, v8 + 1, uEnd); + memcpy(&v5[v8], v15, sizeof(v5[v8])); + memcpy(v15, &v12, 0x20u); + SortVerticesByX(v5, uStart, v8 - 1); + SortVerticesByX(a2, v8 + 1, uEnd); } return true; }