Mercurial > mm7
diff mm7_5.cpp @ 1643:7182930263b3
fixpoint functions renaming
| author | zipi |
|---|---|
| date | Tue, 17 Sep 2013 19:24:23 +0100 |
| parents | 2c71fa8913d2 |
| children | 483cc7f0d86c 3c451fd02fcf |
line wrap: on
line diff
--- a/mm7_5.cpp Tue Sep 17 20:15:56 2013 +0200 +++ b/mm7_5.cpp Tue Sep 17 19:24:23 2013 +0100 @@ -4476,9 +4476,9 @@ continue; } - v32 = fixpoint_sub0(v29->pFacePlane_old.vNormal.x,v49); - v33 = fixpoint_sub0(v29->pFacePlane_old.vNormal.z,v47); - v34 = fixpoint_sub0(v29->pFacePlane_old.vNormal.y,v48); + v32 = fixpoint_mul(v29->pFacePlane_old.vNormal.x,v49); + v33 = fixpoint_mul(v29->pFacePlane_old.vNormal.z,v47); + v34 = fixpoint_mul(v29->pFacePlane_old.vNormal.y,v48); v59 = v32 + v33 + v34; if ( v59 ) { @@ -4504,7 +4504,7 @@ if( abs(v38) >> 14 > abs(v59) ) continue; - v58 = fixpoint_sub2(v38,v59); + v58 = fixpoint_div(v38,v59); if( v58 < 0 ) { @@ -4512,9 +4512,9 @@ } if(!sub_4075DB( - obj1_x + ((fixpoint_sub0(v49,v58) + 32768) >> 16), - obj1_y + ((fixpoint_sub0(v48,v58) + 32768) >> 16), - obj1_z + ((fixpoint_sub0(v47,v58) + 32768) >> 16), + obj1_x + ((fixpoint_mul(v49,v58) + 32768) >> 16), + obj1_y + ((fixpoint_mul(v48,v58) + 32768) >> 16), + obj1_z + ((fixpoint_mul(v47,v58) + 32768) >> 16), v29) ) { continue; @@ -4637,8 +4637,8 @@ // + 32768) >> 16) >= a4a) ) else { - v25 = fixpoint_sub2(dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i], dword_4F5CC8_ys[i + 1] - dword_4F5CC8_ys[i]); - if( dword_4F5D98_xs[i] + (fixpoint_sub0(v25, (v8 - dword_4F5CC8_ys[i]) << 16) + 32768 >> 16) >= a4a) + v25 = fixpoint_div(dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i], dword_4F5CC8_ys[i + 1] - dword_4F5CC8_ys[i]); + if( dword_4F5D98_xs[i] + (fixpoint_mul(v25, (v8 - dword_4F5CC8_ys[i]) << 16) + 32768 >> 16) >= a4a) ++a3a; } }