Mercurial > mm7

comparison Indoor.cpp @ 1441:b67a3e0d6fc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 27 Jul 2013 09:36:55 +0600
parents 468f434a8d8a 38df78aba732
children 934074e7fcc1
comparison
equal deleted inserted replaced
1440:a72236d60edc 1441:b67a3e0d6fc3
60 60
61 LEVEL_TYPE uCurrentlyLoadedLevelType = LEVEL_null; 61 LEVEL_TYPE uCurrentlyLoadedLevelType = LEVEL_null;
62 62
63 stru320 stru_F8AD28; // idb 63 stru320 stru_F8AD28; // idb
64 stru337 stru_F81018; 64 stru337 stru_F81018;
65 stru167_wrap array_5118E8;
66 BspRenderer_PortalViewportData stru_F8A590; 65 BspRenderer_PortalViewportData stru_F8A590;
67 BspRenderer *pBspRenderer = new BspRenderer; // idb 66 BspRenderer *pBspRenderer = new BspRenderer; // idb
68 stru141 stru_721530; 67 stru141 stru_721530;
69 std::array<stru352, 480> stru_F83B80; 68 std::array<stru352, 480> stru_F83B80;
70 69
410 _this.uTargetHeight = 480; 409 _this.uTargetHeight = 480;
411 _this.pTargetZ = pRenderer->pActiveZBuffer; 410 _this.pTargetZ = pRenderer->pActiveZBuffer;
412 sub_440BED(&_this); 411 sub_440BED(&_this);
413 pParty->uFlags &= ~2; 412 pParty->uFlags &= ~2;
414 pGame->DrawParticles(); 413 pGame->DrawParticles();
415 array_5118E8._440F07(); 414 trail_particle_generator.UpdateParticles();
416 } 415 }
417 416
418 //----- (004C0EF2) -------------------------------------------------------- 417 //----- (004C0EF2) --------------------------------------------------------
419 void BLVFace::FromODM(ODMFace *face) 418 void BLVFace::FromODM(ODMFace *face)
420 { 419 {
4009 if ( v30 ) 4008 if ( v30 )
4010 { 4009 {
4011 if ( pDest ) 4010 if ( pDest )
4012 { 4011 {
4013 qword_A750D8 = 256i64; 4012 qword_A750D8 = 256i64;
4014 word_A750E0 = 46; 4013 PlayerSpeechID = SPEECH_46;
4015 word_A750E2 = LOWORD(v34[rand() % v30]); 4014 uSpeakingCharacter = LOWORD(v34[rand() % v30]);
4016 } 4015 }
4017 } 4016 }
4018 } 4017 }
4019 } 4018 }
4020 //----- (0046CEC3) -------------------------------------------------------- 4019 //----- (0046CEC3) --------------------------------------------------------
6907 PortalFace._screen_space_x[bottom_num_vertices] = PortalFace._screen_space_x[0]; 6906 PortalFace._screen_space_x[bottom_num_vertices] = PortalFace._screen_space_x[0];
6908 PortalFace._screen_space_y[bottom_num_vertices] = PortalFace._screen_space_y[0]; 6907 PortalFace._screen_space_y[bottom_num_vertices] = PortalFace._screen_space_y[0];
6909 } 6908 }
6910 return bottom_num_vertices; 6909 return bottom_num_vertices;
6911 } 6910 }
6911
6912 //----- (004AAEA6) --------------------------------------------------------
6913 int __fastcall sub_4AAEA6_transform(RenderVertexSoft *a1)
6914 {
6915 double v4; // st5@2
6916 double v5; // st4@3
6917 float v11; // [sp+8h] [bp-8h]@2
6918 float v12; // [sp+8h] [bp-8h]@6
6919 float v13; // [sp+Ch] [bp-4h]@2
6920 float v14; // [sp+Ch] [bp-4h]@6
6921
6922 if ( pBLVRenderParams->sPartyRotX )
6923 {
6924 v13 = a1->vWorldPosition.x - (double)pParty->vPosition.x;
6925 v11 = a1->vWorldPosition.y - (double)pParty->vPosition.y;
6926 v4 = a1->vWorldPosition.z - (double)pParty->vPosition.z;
6927 if ( pRenderer->pRenderD3D )
6928 {
6929 v5 = v11 * pBLVRenderParams->fSineY + v13 * pBLVRenderParams->fCosineY;
6930 a1->vWorldViewPosition.y = v13 * pBLVRenderParams->fSineY - v11 * pBLVRenderParams->fCosineY;
6931 }
6932 else
6933 {
6934 v5 = v13 * pBLVRenderParams->fCosineY - v11 * pBLVRenderParams->fSineY;
6935 a1->vWorldViewPosition.y = v13 * pBLVRenderParams->fSineY + v11 * pBLVRenderParams->fCosineY;
6936 }
6937 a1->vWorldViewPosition.x = v5 * pBLVRenderParams->fCosineNegX - v4 * pBLVRenderParams->fSineNegX;
6938 a1->vWorldViewPosition.z = v5 * pBLVRenderParams->fSineNegX + v4 * pBLVRenderParams->fCosineNegX;
6939 }
6940 else
6941 {
6942 v14 = a1->vWorldPosition.x - (double)pParty->vPosition.x;
6943 v12 = a1->vWorldPosition.y - (double)pParty->vPosition.y;
6944 a1->vWorldViewPosition.z = a1->vWorldPosition.z - (double)pParty->vPosition.z;
6945 if ( pRenderer->pRenderD3D )
6946 {
6947 a1->vWorldViewPosition.x = v12 * pBLVRenderParams->fSineY + v14 * pBLVRenderParams->fCosineY;
6948 a1->vWorldViewPosition.y = v14 * pBLVRenderParams->fSineY - v12 * pBLVRenderParams->fCosineY;
6949 }
6950 else
6951 {
6952 a1->vWorldViewPosition.x = v14 * pBLVRenderParams->fCosineY - v12 * pBLVRenderParams->fSineY;
6953 a1->vWorldViewPosition.y = v14 * pBLVRenderParams->fSineY + v12 * pBLVRenderParams->fCosineY;
6954 }
6955 }
6956 return 0;
6957 }