comparison Indoor.h @ 1671:4bbb80c7dba7

Merge
author Ritor1
date Wed, 18 Sep 2013 20:04:49 +0600
parents 8971dc85b8fb
children 35c1e4ff6ba7
comparison
equal deleted inserted replaced
1670:014eb02bd0e6 1671:4bbb80c7dba7
467 467
468 468
469 469
470 470
471 471
472 #define BLV_RENDER_DRAW_SW_OUTLINES 1
473 #define BLV_RENDER_DRAW_D3D_OUTLINES 2
474 472
475 /* 162 */ 473 /* 162 */
476 #pragma pack(push, 1) 474 #pragma pack(push, 1)
477 struct BLVRenderParams 475 struct BLVRenderParams
478 { 476 {
479 inline BLVRenderParams(): 477 inline BLVRenderParams()
480 uFlags(0)
481 { 478 {
482 uViewportX = 0; 479 uViewportX = 0;
483 uViewportY = 0; 480 uViewportY = 0;
484 uViewportZ = 0; 481 uViewportZ = 0;
485 uViewportW = 0; 482 uViewportW = 0;
486 } 483 }
487 484
488 void Reset(); 485 void Reset();
489 486
490 int field_0_timer_; 487 int field_0_timer_;
491 int uFlags; // & INDOOR_CAMERA_DRAW_D3D_OUTLINES: render d3d outlines 488 int _unused_uFlags; // & INDOOR_CAMERA_DRAW_D3D_OUTLINES: render d3d outlines
492 Vec3_int_ _unused_vPartyPos; 489 Vec3_int_ _unused_vPartyPos;
493 int _unused_sPartyRotY; 490 int _unused_sPartyRotY;
494 int _unused_sPartyRotX; 491 int _unused_sPartyRotX;
495 int uPartySectorID; 492 int uPartySectorID;
496 int sCosineY; 493 int _unused_sCosineY; // matches ODMRenderParams::int sines and cosines
497 int sSineY; 494 int _unused_sSineY; // computed in 0048600E
498 int sCosineNegX; 495 int _unused_sCosineNegX; // merged into IndoorCameraD3D
499 int sSineNegX; 496 int _unused_sSineNegX; // --//--
500 float fCosineY; 497 float _unused_fCosineY; // matches old IndoorCamera::fRotationCosineY (new IndoorCameraD3D::fRotationCosineY)
501 float fSineY; 498 float _unused_fSineY; // matches old IndoorCamera::fRotationSineY (new IndoorCameraD3D::fRotationSineY)
502 float fCosineNegX; 499 float _unused_fCosineNegX; // the same
503 float fSineNegX; 500 float _unused_fSineNegX; // the same
504 int fov_rad_fixpoint; 501 int fov_rad_fixpoint;
505 int fov_rad_inv_fixpoint;//float 502 int fov_rad_inv_fixpoint;//float
506 unsigned __int16 *pRenderTarget; 503 unsigned __int16 *pRenderTarget;
507 unsigned int uTargetWidth; 504 unsigned int uTargetWidth;
508 unsigned int uTargetHeight; 505 unsigned int uTargetHeight;