Mercurial > mm7

comparison mm7_5.cpp @ 1643:7182930263b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixpoint functions renaming
author zipi
date Tue, 17 Sep 2013 19:24:23 +0100
parents 2c71fa8913d2
children 483cc7f0d86c 3c451fd02fcf
comparison
equal deleted inserted replaced
1642:8971dc85b8fb 1643:7182930263b3
4474 || higher_z < v29->pBounding.z1 ) 4474 || higher_z < v29->pBounding.z1 )
4475 { 4475 {
4476 continue; 4476 continue;
4477 } 4477 }
4478 4478
4479 v32 = fixpoint_sub0(v29->pFacePlane_old.vNormal.x,v49); 4479 v32 = fixpoint_mul(v29->pFacePlane_old.vNormal.x,v49);
4480 v33 = fixpoint_sub0(v29->pFacePlane_old.vNormal.z,v47); 4480 v33 = fixpoint_mul(v29->pFacePlane_old.vNormal.z,v47);
4481 v34 = fixpoint_sub0(v29->pFacePlane_old.vNormal.y,v48); 4481 v34 = fixpoint_mul(v29->pFacePlane_old.vNormal.y,v48);
4482 v59 = v32 + v33 + v34; 4482 v59 = v32 + v33 + v34;
4483 if ( v59 ) 4483 if ( v59 )
4484 { 4484 {
4485 v70 = v29->pFacePlane_old.dist 4485 v70 = v29->pFacePlane_old.dist
4486 + obj1_z * v29->pFacePlane_old.vNormal.z 4486 + obj1_z * v29->pFacePlane_old.vNormal.z
4502 */ 4502 */
4503 4503
4504 if( abs(v38) >> 14 > abs(v59) ) 4504 if( abs(v38) >> 14 > abs(v59) )
4505 continue; 4505 continue;
4506 4506
4507 v58 = fixpoint_sub2(v38,v59); 4507 v58 = fixpoint_div(v38,v59);
4508 4508
4509 if( v58 < 0 ) 4509 if( v58 < 0 )
4510 { 4510 {
4511 continue; 4511 continue;
4512 } 4512 }
4513 4513
4514 if(!sub_4075DB( 4514 if(!sub_4075DB(
4515 obj1_x + ((fixpoint_sub0(v49,v58) + 32768) >> 16), 4515 obj1_x + ((fixpoint_mul(v49,v58) + 32768) >> 16),
4516 obj1_y + ((fixpoint_sub0(v48,v58) + 32768) >> 16), 4516 obj1_y + ((fixpoint_mul(v48,v58) + 32768) >> 16),
4517 obj1_z + ((fixpoint_sub0(v47,v58) + 32768) >> 16), 4517 obj1_z + ((fixpoint_mul(v47,v58) + 32768) >> 16),
4518 v29) ) 4518 v29) )
4519 { 4519 {
4520 continue; 4520 continue;
4521 } 4521 }
4522 4522
4635 //|| (v25 = dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i],LODWORD(v26) = v25 << 16, HIDWORD(v26) = v25 >> 16, 4635 //|| (v25 = dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i],LODWORD(v26) = v25 << 16, HIDWORD(v26) = v25 >> 16,
4636 //dword_4F5D98_xs[i] + ((signed int)(((unsigned __int64)(v26 / (dword_4F5CC4_ys[i + 2] - dword_4F5CC4_ys[i + 1])* ((v8 - dword_4F5CC4_ys[i + 1]) << 16)) >> 16) 4636 //dword_4F5D98_xs[i] + ((signed int)(((unsigned __int64)(v26 / (dword_4F5CC4_ys[i + 2] - dword_4F5CC4_ys[i + 1])* ((v8 - dword_4F5CC4_ys[i + 1]) << 16)) >> 16)
4637 // + 32768) >> 16) >= a4a) ) 4637 // + 32768) >> 16) >= a4a) )
4638 else 4638 else
4639 { 4639 {
4640 v25 = fixpoint_sub2(dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i], dword_4F5CC8_ys[i + 1] - dword_4F5CC8_ys[i]); 4640 v25 = fixpoint_div(dword_4F5D98_xs[i + 1] - dword_4F5D98_xs[i], dword_4F5CC8_ys[i + 1] - dword_4F5CC8_ys[i]);
4641 if( dword_4F5D98_xs[i] + (fixpoint_sub0(v25, (v8 - dword_4F5CC8_ys[i]) << 16) + 32768 >> 16) >= a4a) 4641 if( dword_4F5D98_xs[i] + (fixpoint_mul(v25, (v8 - dword_4F5CC8_ys[i]) << 16) + 32768 >> 16) >= a4a)
4642 ++a3a; 4642 ++a3a;
4643 } 4643 }
4644 } 4644 }
4645 } 4645 }
4646 } 4646 }