Mercurial > mm7
comparison Vis.cpp @ 1138:f947bedb2859
Слияние
author | Ritor1 |
---|---|
date | Sat, 01 Jun 2013 10:32:31 +0600 |
parents | 62c759bc49f7 39eaa6b00141 |
children | dac817fbf85a |
comparison
equal
deleted
inserted
replaced
1137:62c759bc49f7 | 1138:f947bedb2859 |
---|---|
484 RenderVertexSoft v12; // [sp+34h] [bp-3Ch]@2 | 484 RenderVertexSoft v12; // [sp+34h] [bp-3Ch]@2 |
485 int v13; // [sp+64h] [bp-Ch]@7 | 485 int v13; // [sp+64h] [bp-Ch]@7 |
486 Vis *thisa; // [sp+68h] [bp-8h]@1 | 486 Vis *thisa; // [sp+68h] [bp-8h]@1 |
487 RenderVertexSoft *v15; // [sp+6Ch] [bp-4h]@2 | 487 RenderVertexSoft *v15; // [sp+6Ch] [bp-4h]@2 |
488 | 488 |
489 result = a4; | 489 result = a4 != 0; |
490 thisa = this; | 490 thisa = this; |
491 if ( a4 > a3 ) | 491 if ( a4 > a3 ) |
492 { | 492 { |
493 v5 = a2; | 493 v5 = a2; |
494 v15 = &a2[a4]; | 494 v15 = &a2[a4]; |
634 return false; | 634 return false; |
635 for ( uint i = 0; i < v5; ++i ) | 635 for ( uint i = 0; i < v5; ++i ) |
636 { | 636 { |
637 if ( v16 >= 2 ) | 637 if ( v16 >= 2 ) |
638 break; | 638 break; |
639 if ( v6 ^ intersect_face_vertex_coords_list_b[i + 1] >= b ) | 639 if ( v6 ^ (intersect_face_vertex_coords_list_b[i + 1] >= b) ) |
640 { | 640 { |
641 if ( intersect_face_vertex_coords_list_a[i + 1] >= a ) | 641 if ( intersect_face_vertex_coords_list_a[i + 1] >= a ) |
642 v10 = 0; | 642 v10 = 0; |
643 else | 643 else |
644 v10 = 2; | 644 v10 = 2; |