Mercurial > mm7
comparison Outdoor.cpp @ 1441:b67a3e0d6fc3
Слияние
author | Ritor1 |
---|---|
date | Sat, 27 Jul 2013 09:36:55 +0600 |
parents | 38df78aba732 |
children | 182d58b2a34c |
comparison
equal
deleted
inserted
replaced
1440:a72236d60edc | 1441:b67a3e0d6fc3 |
---|---|
26 #include "Chest.h" | 26 #include "Chest.h" |
27 #include "stru123.h" | 27 #include "stru123.h" |
28 #include "Time.h" | 28 #include "Time.h" |
29 #include "Viewport.h" | 29 #include "Viewport.h" |
30 #include "Events.h" | 30 #include "Events.h" |
31 #include "ParticleEngine.h" | |
31 | 32 |
32 #include "mm7_data.h" | 33 #include "mm7_data.h" |
33 #include "MM7.h" | 34 #include "MM7.h" |
34 #include "Lights.h" | 35 #include "Lights.h" |
35 | 36 |
193 redrawWorld = false; | 194 redrawWorld = false; |
194 pOutdoor->ExecDraw(redrawWorld); | 195 pOutdoor->ExecDraw(redrawWorld); |
195 | 196 |
196 pGame->DrawParticles(); | 197 pGame->DrawParticles(); |
197 pWeather->Draw(); | 198 pWeather->Draw(); |
198 array_5118E8._440F07(); | 199 trail_particle_generator.UpdateParticles(); |
199 } | 200 } |
200 | 201 |
201 //----- (00488E23) -------------------------------------------------------- | 202 //----- (00488E23) -------------------------------------------------------- |
202 double OutdoorLocation::GetFogDensityByTime() | 203 double OutdoorLocation::GetFogDensityByTime() |
203 { | 204 { |
780 v15 = a3c + 6.7553994e15; | 781 v15 = a3c + 6.7553994e15; |
781 v3->v_18.y = LODWORD(v15); | 782 v3->v_18.y = LODWORD(v15); |
782 a3d = v22 * v19 - v21 * v18; | 783 a3d = v22 * v19 - v21 * v18; |
783 v16 = a3d + 6.7553994e15; | 784 v16 = a3d + 6.7553994e15; |
784 v3->v_18.z = LODWORD(v16); | 785 v3->v_18.z = LODWORD(v16); |
785 v3->_486089_normalize_v_18(); | 786 v3->_normalize_v_18(); |
786 a3e = -((double)v3->v_18.x * v4->vWorldViewPosition.x) | 787 a3e = -((double)v3->v_18.x * v4->vWorldViewPosition.x) |
787 - (double)v3->v_18.y * v4->vWorldViewPosition.y | 788 - (double)v3->v_18.y * v4->vWorldViewPosition.y |
788 - (double)v3->v_18.z * v4->vWorldViewPosition.z; | 789 - (double)v3->v_18.z * v4->vWorldViewPosition.z; |
789 v17 = a3e + 6.7553994e15; | 790 v17 = a3e + 6.7553994e15; |
790 v3->field_24 = LODWORD(v17); | 791 v3->field_24 = LODWORD(v17); |