Mercurial > fife-parpg
comparison engine/core/view/camera.cpp @ 28:1e3b68c260a6
fix for instance facing location on actions + KDevelop project file upgrade
author | jasoka@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Fri, 11 Jul 2008 12:56:25 +0000 |
parents | 40a7c9618ade |
children | d66538926e78 |
comparison
equal
deleted
inserted
replaced
27:788cb9525b2f | 28:1e3b68c260a6 |
---|---|
506 InstanceVisualCacheItem& vc = visual->getCacheItem(this); | 506 InstanceVisualCacheItem& vc = visual->getCacheItem(this); |
507 | 507 |
508 // use cached values if there is no need to do full recalculation | 508 // use cached values if there is no need to do full recalculation |
509 ScreenPoint drawpt; | 509 ScreenPoint drawpt; |
510 int angle = 0; | 510 int angle = 0; |
511 if (m_updated && (!m_iswarped) && (!(instance->getChangeInfo() & (ICHANGE_LOC | ICHANGE_ROTATION))) && (vc.image)) { | 511 if (m_updated && (!m_iswarped) && (!(instance->getChangeInfo() & (ICHANGE_LOC | ICHANGE_ROTATION | ICHANGE_FACING_LOC))) && (vc.image)) { |
512 int pos_estimate_x = vc.screenpoint.x - cammove.x; | 512 int pos_estimate_x = vc.screenpoint.x - cammove.x; |
513 int pos_estimate_y = vc.screenpoint.y - cammove.y; | 513 int pos_estimate_y = vc.screenpoint.y - cammove.y; |
514 int pos_estimate_z = vc.screenpoint.z - cammove.z; | 514 int pos_estimate_z = vc.screenpoint.z - cammove.z; |
515 angle = vc.facing_angle; | 515 angle = vc.facing_angle; |
516 //std::cout << "orig x = " << drawpt.x << ", est x = " << pos_estimate_x << "\n"; | 516 //std::cout << "orig x = " << drawpt.x << ", est x = " << pos_estimate_x << "\n"; |