Skip to content
This repository has been archived by the owner. It is now read-only.

/ re3 Archived

Permalink
Browse files
Merge branch 'master' into master
  • Loading branch information
@Fire-Head
Fire-Head committed Jul 11, 2019
2 parents d8dd649 + f35b053 commit aa449b6fe162d8960351c5fe164a9120b8572652
Unified Split
Showing with 6,878 additions and 917 deletions.
  1. +2 −2 src/animation/AnimBlendNode.cpp
  2. +1 −1 src/animation/AnimBlendNode.h
  3. +3 −3 src/animation/FrameUpdate.cpp
  4. +262 −15 src/audio/AudioManager.cpp
  5. +18 −6 src/audio/AudioManager.h
  6. +1 −1 src/audio/DMAudio.cpp
  7. +1 −1 src/audio/DMAudio.h
  8. +14 −0 src/audio/MusicManager.cpp
  9. +3 −0 src/audio/MusicManager.h
  10. +28 −0 src/audio/SampleManager.cpp
  11. +7 −0 src/audio/SampleManager.h
  12. +35 −4 src/control/AutoPilot.h
  13. +329 −3 src/control/Darkel.cpp
  14. +41 −1 src/control/Darkel.h
  15. +7 −7 src/control/PathFind.cpp
  16. +124 −0 src/control/Phones.cpp
  17. +49 −0 src/control/Phones.h
  18. +38 −38 src/control/Replay.cpp
  19. +1,138 −12 src/control/Script.cpp
  20. +209 −25 src/control/Script.h
  21. +1,158 −0 src/control/ScriptCommands.h
  22. +53 −38 src/core/Camera.cpp
  23. +4 −0 src/core/Camera.h
  24. +12 −12 src/core/Collision.cpp
  25. +1 −1 src/core/Collision.h
  26. +1 −0 src/core/ControllerConfig.cpp
  27. +2 −1 src/core/ControllerConfig.h
  28. +5 −0 src/core/Explosion.cpp
  29. +15 −0 src/core/Explosion.h
  30. +4 −3 src/core/FileLoader.cpp
  31. +5 −1 src/core/Fire.cpp
  32. +14 −7 src/core/Fire.h
  33. +354 −111 src/core/Frontend.cpp
  34. +30 −8 src/core/Frontend.h
  35. +14 −14 src/core/General.h
  36. +13 −0 src/core/Instance.cpp
  37. +10 −0 src/core/Instance.h
  38. +2 −2 src/core/MenuScreens.h
  39. +11 −11 src/core/Pad.cpp
  40. +10 −2 src/core/Placeable.cpp
  41. +9 −7 src/core/Placeable.h
  42. +10 −1 src/core/PlayerInfo.cpp
  43. +4 −1 src/core/PlayerInfo.h
  44. +12 −12 src/core/Radar.cpp
  45. +10 −3 src/core/Stats.cpp
  46. +7 −2 src/core/Stats.h
  47. +5 −5 src/core/Streaming.cpp
  48. +44 −0 src/core/Text.cpp
  49. +4 −0 src/core/Text.h
  50. +100 −1 src/core/Wanted.cpp
  51. +9 −4 src/core/Wanted.h
  52. +78 −0 src/core/World.cpp
  53. +3 −1 src/core/World.h
  54. +1 −0 src/core/common.h
  55. +3 −0 src/core/config.h
  56. +8 −2 src/core/main.cpp
  57. +7 −1 src/core/main.h
  58. +15 −22 src/core/re3.cpp
  59. +9 −2 src/entities/Building.cpp
  60. +0 −3 src/entities/Building.h
  61. +11 −3 src/entities/Dummy.cpp
  62. +0 −5 src/entities/Dummy.h
  63. +38 −22 src/entities/Entity.cpp
  64. +5 −17 src/entities/Entity.h
  65. +46 −33 src/entities/Physical.cpp
  66. +29 −19 src/entities/Physical.h
  67. +8 −2 src/entities/Treadable.cpp
  68. +1 −2 src/entities/Treadable.h
  69. +71 −35 src/math/Matrix.h
  70. +1 −1 src/math/Quaternion.h
  71. +4 −4 src/math/Vector.h
  72. +2 −2 src/math/Vector2D.h
  73. +4 −4 src/math/math.cpp
  74. +16 −0 src/math/maths.h
  75. +7 −1 src/modelinfo/BaseModelInfo.cpp
  76. +0 −2 src/modelinfo/BaseModelInfo.h
  77. +15 −5 src/modelinfo/ClumpModelInfo.cpp
  78. +0 −7 src/modelinfo/ClumpModelInfo.h
  79. +0 −7 src/modelinfo/MloInstance.cpp
  80. +0 −9 src/modelinfo/MloInstance.h
  81. +2 −1 src/modelinfo/ModelIndices.h
  82. +10 −2 src/modelinfo/PedModelInfo.cpp
  83. +0 −4 src/modelinfo/PedModelInfo.h
  84. +12 −4 src/modelinfo/SimpleModelInfo.cpp
  85. +0 −5 src/modelinfo/SimpleModelInfo.h
  86. +16 −6 src/modelinfo/VehicleModelInfo.cpp
  87. +2 −5 src/modelinfo/VehicleModelInfo.h
  88. +13 −4 src/objects/CutsceneHead.cpp
  89. +0 −5 src/objects/CutsceneHead.h
  90. +19 −7 src/objects/CutsceneObject.cpp
  91. +6 −14 src/objects/CutsceneObject.h
  92. +8 −2 src/objects/DummyObject.cpp
  93. +0 −1 src/objects/DummyObject.h
  94. +18 −3 src/objects/Object.cpp
  95. +2 −3 src/objects/Object.h
  96. +8 −2 src/objects/ParticleObject.cpp
  97. +0 −2 src/objects/ParticleObject.h
  98. +8 −2 src/objects/Projectile.cpp
  99. +0 −1 src/objects/Projectile.h
  100. +10 −3 src/peds/CivilianPed.cpp
  101. +2 −5 src/peds/CivilianPed.h
  102. +8 −2 src/peds/CopPed.cpp
  103. +0 −1 src/peds/CopPed.h
  104. +8 −2 src/peds/EmergencyPed.cpp
  105. +0 −2 src/peds/EmergencyPed.h
  106. +101 −48 src/peds/Ped.cpp
  107. +23 −49 src/peds/Ped.h
  108. +3 −3 src/peds/PedIK.cpp
  109. +37 −2 src/peds/PlayerPed.cpp
  110. +7 −1 src/peds/PlayerPed.h
  111. +8 −8 src/render/Clouds.cpp
  112. +2 −2 src/render/Coronas.cpp
  113. +3 −2 src/render/Draw.cpp
  114. +7 −7 src/render/Hud.cpp
  115. +4 −4 src/render/Particle.cpp
  116. +8 −8 src/render/PointLights.cpp
  117. +1 −1 src/render/Renderer.cpp
  118. +10 −10 src/render/Sprite.cpp
  119. +2 −2 src/render/Timecycle.cpp
  120. +7 −0 src/render/WeaponEffects.cpp
  121. +14 −0 src/render/WeaponEffects.h
  122. +6 −6 src/skel/win/win.cpp
  123. +1,142 −8 src/vehicles/Automobile.cpp
  124. +73 −21 src/vehicles/Automobile.h
  125. +7 −3 src/vehicles/Boat.cpp
  126. +1 −0 src/vehicles/Boat.h
  127. +1 −0 src/vehicles/DamageManager.cpp
  128. +23 −17 src/vehicles/DamageManager.h
  129. +126 −0 src/vehicles/Door.cpp
  130. +36 −0 src/vehicles/Door.h
  131. +2 −0 src/vehicles/HandlingMgr.h
  132. +7 −1 src/vehicles/Heli.cpp
  133. +0 −1 src/vehicles/Heli.h
  134. +8 −2 src/vehicles/Plane.cpp
  135. +0 −1 src/vehicles/Plane.h
  136. +8 −2 src/vehicles/Train.cpp
  137. +0 −1 src/vehicles/Train.h
  138. +323 −13 src/vehicles/Vehicle.cpp
  139. +87 −20 src/vehicles/Vehicle.h
  140. +12 −6 src/weapons/Weapon.h
  141. +3 −3 src/weapons/WeaponInfo.cpp
4 src/animation/AnimBlendNode.cpp
View file
@@ -125,8 +125,8 @@ CAnimBlendNode::CalcDeltas(void)
float cos = DotProduct(kfA->rotation, kfB->rotation);
if(cos > 1.0f)
cos = 1.0f;
theta = acos(cos);
invSin = theta == 0.0f ? 0.0f : 1.0f/sin(theta);
theta = Acos(cos);
invSin = theta == 0.0f ? 0.0f : 1.0f/Sin(theta);
}

void
2 src/animation/AnimBlendNode.h
View file
@@ -10,7 +10,7 @@ class CAnimBlendNode
public:
// for slerp
float theta; // angle between quaternions
float invSin; // 1/sin(theta)
float invSin; // 1/Sin(theta)
// indices into array in sequence
int32 frameA; // next key frame
int32 frameB; // previous key frame
6 src/animation/FrameUpdate.cpp
View file
@@ -53,7 +53,7 @@ FrameUpdateCallBack(AnimBlendFrameData *frame, void *arg)
if(norm == 0.0f)
rot.w = 1.0f;
else
rot *= 1.0f/sqrt(norm);
rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}

@@ -127,7 +127,7 @@ FrameUpdateCallBackWithVelocityExtraction(AnimBlendFrameData *frame, void *arg)
if(norm == 0.0f)
rot.w = 1.0f;
else
rot *= 1.0f/sqrt(norm);
rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}

@@ -206,7 +206,7 @@ FrameUpdateCallBackWith3dVelocityExtraction(AnimBlendFrameData *frame, void *arg
if(norm == 0.0f)
rot.w = 1.0f;
else
rot *= 1.0f/sqrt(norm);
rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}

0 comments on commit aa449b6

Please sign in to comment.