Merge branch 'pr-124'

Editor/ProjectResourceFactoryBase.cpp

@@ -1,6 +1,9 @@
-#include "ProjectResourceFactoryBase.hpp"
+#include "Editor/ProjectResourceFactoryBase.hpp"
+
 #include "Runtime/IObj.hpp"
 
+#include <logvisor/logvisor.hpp>
+
 #undef min
 #undef max
 

Editor/ProjectResourceFactoryMP1.cpp

@@ -1,41 +1,42 @@
-#include "ProjectResourceFactoryMP1.hpp"
-#include "Runtime/IOStreams.hpp"
+#include "Editor/ProjectResourceFactoryMP1.hpp"
 
+#include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CGameHintInfo.hpp"
-#include "Runtime/Particle/CParticleDataFactory.hpp"
-#include "Runtime/Particle/CGenDescription.hpp"
-#include "Runtime/Particle/CElectricDescription.hpp"
-#include "Runtime/Particle/CSwooshDescription.hpp"
-#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
-#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
-#include "Runtime/Particle/CWeaponDescription.hpp"
-#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
-#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CRasterFont.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
-#include "Runtime/Graphics/CModel.hpp"
-#include "Runtime/Graphics/CTexture.hpp"
-#include "Runtime/Character/CCharLayoutInfo.hpp"
-#include "Runtime/Character/CSkinRules.hpp"
-#include "Runtime/Character/CAnimCharacterSet.hpp"
-#include "Runtime/Character/CAllFormatsAnimSource.hpp"
-#include "Runtime/Character/CAnimPOIData.hpp"
-#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
-#include "Runtime/Collision/CCollisionResponseData.hpp"
-#include "Runtime/CSaveWorld.hpp"
-#include "Runtime/AutoMapper/CMapWorld.hpp"
-#include "Runtime/AutoMapper/CMapArea.hpp"
-#include "Runtime/AutoMapper/CMapUniverse.hpp"
-#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
+#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
+#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
 #include "Runtime/World/CPathFindArea.hpp"
-#include "Audio/CAudioGroupSet.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "Audio/CMidiManager.hpp"
-#include "Runtime/CDependencyGroup.hpp"
+
 #include "DataSpec/DNACommon/TXTR.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
 
 namespace DataSpec {
 extern hecl::Database::DataSpecEntry SpecEntMP1;

Runtime/Audio/CAudioGroupSet.cpp

@@ -1,4 +1,4 @@
-#include "CAudioGroupSet.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace urde {
 

Runtime/Audio/CAudioSys.cpp

@@ -1,6 +1,10 @@
-#include "CAudioSys.hpp"
-#include "CSimplePool.hpp"
-#include "CAudioGroupSet.hpp"
+#include "Runtime/Audio/CAudioSys.hpp"
+
+#include <string>
+#include <unordered_map>
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace urde {
 namespace {

Runtime/Audio/CMidiManager.cpp

@@ -1,4 +1,4 @@
-#include "CMidiManager.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
 
 namespace urde {
 

Runtime/Audio/CStaticAudioPlayer.cpp

@@ -1,6 +1,7 @@
-#include "CStaticAudioPlayer.hpp"
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
+#include "Runtime/Audio/CStaticAudioPlayer.hpp"
+
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/CDvdRequest.hpp"
 
 namespace urde {
 

Runtime/Audio/CStreamAudioManager.cpp

@@ -1,11 +1,17 @@
-#include "CStreamAudioManager.hpp"
-#include "CStringExtras.hpp"
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
-#include "Audio/CAudioSys.hpp"
-#include "amuse/DSPCodec.hpp"
+#include "Runtime/Audio/CStreamAudioManager.hpp"
+
+#include "Runtime/Audio/CAudioSys.hpp"
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/CDvdRequest.hpp"
+#include "Runtime/CStringExtras.hpp"
+
+#include <algorithm>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 
+#include <amuse/DSPCodec.hpp>
+
 namespace urde {
 class CDSPStreamManager;
 

Runtime/AutoMapper/CMapArea.cpp

@@ -1,10 +1,11 @@
-#include "CMapArea.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMappableObject.hpp"
-#include "CToken.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "CResFactory.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+
+#include "Runtime/CResFactory.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/AutoMapper/CMappableObject.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 CMapArea::CMapArea(CInputStream& in, u32 size)

Runtime/AutoMapper/CMapUniverse.cpp

@@ -1,7 +1,8 @@
-#include "CMapUniverse.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CGameState.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 

Runtime/AutoMapper/CMapWorld.cpp

@@ -1,9 +1,10 @@
-#include "CMapWorld.hpp"
-#include "CMapWorldInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CWorld.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 

Runtime/AutoMapper/CMapWorldInfo.cpp

@@ -1,6 +1,7 @@
-#include "CMapWorldInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMemoryCardSys.hpp"
+#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
+
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 

Runtime/Camera/CBallCamera.cpp

@@ -1,18 +1,24 @@
-#include "GameGlobalObjects.hpp"
-#include "CBallCamera.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+
+#include <algorithm>
+#include <cmath>
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptDock.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CStateManager.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "World/CPlayer.hpp"
-#include "Input/ControlMapper.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "Camera/CPathCamera.hpp"
-#include "World/CScriptSpindleCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "World/CScriptDoor.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CScriptDock.hpp"
-#include "Collision/CGameCollision.hpp"
 
 namespace urde {
 

Runtime/Camera/CCameraFilter.cpp

@@ -1,12 +1,16 @@
-#include "Graphics/CGraphics.hpp"
-#include "CCameraFilter.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "CSimplePool.hpp"
-#include "Graphics/Shaders/CColoredQuadFilter.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
-#include "Graphics/Shaders/CScanLinesFilter.hpp"
-#include "Graphics/Shaders/CRandomStaticFilter.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp"
+#include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <algorithm>
+#include <zeus/CColor.hpp>
 
 namespace urde {
 

Runtime/Camera/CCameraManager.cpp

@@ -1,18 +1,20 @@
-#include "CCameraManager.hpp"
-#include "CCameraShakeData.hpp"
-#include "CFirstPersonCamera.hpp"
-#include "CStateManager.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CPlayer.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraShakeData.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Camera/CInterpolationCamera.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CCinematicCamera.hpp"
-#include "CBallCamera.hpp"
-#include "CInterpolationCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "CPathCamera.hpp"
-#include "World/CScriptSpindleCamera.hpp"
-#include "World/CExplosion.hpp"
 
 namespace urde {
 float CCameraManager::sFirstPersonFOV = 55.f;

Runtime/Camera/CCameraShakeData.cpp

@@ -1,7 +1,13 @@
-#include "CCameraShakeData.hpp"
-#include "World/ScriptLoader.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/Camera/CCameraShakeData.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
+
+#include <algorithm>
+#include <cmath>
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/Camera/CCameraSpline.cpp

@@ -1,6 +1,8 @@
-#include "Camera/CCameraSpline.hpp"
-#include "CStateManager.hpp"
-#include "World/CScriptCameraWaypoint.hpp"
+#include "Runtime/Camera/CCameraSpline.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CScriptCameraWaypoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Camera/CCinematicCamera.cpp

@@ -1,11 +1,13 @@
-#include "CCinematicCamera.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptActor.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptActor.hpp"
+#include "Runtime/World/CScriptCameraWaypoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CScriptCameraWaypoint.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Character/CAnimTreeNode.hpp"
 
 namespace urde {
 

Runtime/Camera/CFirstPersonCamera.cpp

@@ -1,9 +1,11 @@
-#include "CFirstPersonCamera.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptGrapplePoint.hpp"
-#include "World/CScriptCameraPitchVolume.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraPitchVolume.hpp"
+#include "Runtime/World/CScriptGrapplePoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace DataSpec::DNAMP1 {

Runtime/Camera/CGameCamera.cpp

@@ -1,7 +1,8 @@
-#include "CGameCamera.hpp"
-#include "CStateManager.hpp"
-#include "Camera/CCameraManager.hpp"
-#include "World/CActorParameters.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CActorParameters.hpp"
 
 namespace urde {
 

Runtime/Camera/CInterpolationCamera.cpp

@@ -1,9 +1,11 @@
-#include "CInterpolationCamera.hpp"
-#include "CCameraManager.hpp"
-#include "CStateManager.hpp"
-#include "Camera/CBallCamera.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptSpindleCamera.hpp"
+#include "Runtime/Camera/CInterpolationCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Camera/CPathCamera.cpp

@@ -1,11 +1,13 @@
-#include "CPathCamera.hpp"
-#include "CCameraManager.hpp"
-#include "CStateManager.hpp"
-#include "CBallCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptDoor.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Character/CActorLights.cpp

@@ -1,14 +1,16 @@
-#include "CActorLights.hpp"
-#include "Graphics/CModel.hpp"
-#include "World/CGameArea.hpp"
-#include "CStateManager.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "World/CGameLight.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CGameLight.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "GameGlobalObjects.hpp"
-#include "World/CExplosion.hpp"
-#include "Graphics/CBooRenderer.hpp"
 
 namespace urde {
 

Runtime/Character/CAdditiveAnimPlayback.cpp

@@ -1,7 +1,8 @@
-#include "CAdditiveAnimPlayback.hpp"
-#include "CSegStatementSet.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "CAnimTreeNode.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 

Runtime/Character/CAdditiveBodyState.cpp

@@ -1,9 +1,10 @@
-#include "CAdditiveBodyState.hpp"
-#include "CBodyController.hpp"
-#include "Character/CPASDatabase.hpp"
-#include "CStateManager.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CPASAnimParmData.hpp"
+#include "Runtime/Character/CAdditiveBodyState.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CPASDatabase.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 

Runtime/Character/CAllFormatsAnimSource.cpp

@@ -1,8 +1,10 @@
-#include "CAllFormatsAnimSource.hpp"
-#include "logvisor/logvisor.hpp"
-#include "CSimplePool.hpp"
-#include "CAnimSourceReader.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Character/CAnimSourceReader.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CAllFormatsAnimSource");

Runtime/Character/CAnimCharacterSet.cpp

@@ -1,5 +1,6 @@
-#include "CAnimCharacterSet.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimData.cpp

@@ -1,26 +1,30 @@
-#include "CAnimData.hpp"
-#include "CCharacterInfo.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "CCharacterFactory.hpp"
-#include "CAnimationManager.hpp"
-#include "CTransitionManager.hpp"
-#include "CAdditiveAnimPlayback.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CParticleGenInfo.hpp"
-#include "IAnimReader.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CAnimPerSegmentData.hpp"
-#include "CSegStatementSet.hpp"
-#include "CStateManager.hpp"
-#include "CAnimPlaybackParms.hpp"
-#include "CAnimTreeBlend.hpp"
-#include "CPrimitive.hpp"
-#include "CAllFormatsAnimSource.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimPerSegmentData.hpp"
+#include "Runtime/Character/CAnimPlaybackParms.hpp"
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("CAnimData");

Runtime/Character/CAnimPOIData.cpp

@@ -1,5 +1,6 @@
-#include "CAnimPOIData.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimSource.cpp

@@ -1,8 +1,11 @@
-#include "CAnimSource.hpp"
-#include "CAnimPOIData.hpp"
-#include "CSegId.hpp"
-#include "CSegIdList.hpp"
-#include "CSegStatementSet.hpp"
+#include "Runtime/Character/CAnimSource.hpp"
+
+#include <algorithm>
+
+#include "Runtime/Character/CAnimPOIData.hpp"
+#include "Runtime/Character/CSegId.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimSourceReader.cpp

@@ -1,9 +1,10 @@
-#include "CAnimSourceReader.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAnimSourceReader.hpp"
+
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeAnimReaderContainer.cpp

@@ -1,5 +1,6 @@
-#include "CAnimTreeAnimReaderContainer.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"
+
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeBlend.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeBlend.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeDoubleChild.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeDoubleChild.hpp"
+#include "Runtime/Character/CAnimTreeDoubleChild.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeLoopIn.cpp

@@ -1,5 +1,6 @@
-#include "CAnimTreeLoopIn.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CAnimTreeLoopIn.hpp"
+
+#include "Runtime/Character/CTreeUtils.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeNode.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeSequence.cpp

@@ -1,7 +1,8 @@
-#include "CAnimTreeSequence.hpp"
-#include "IMetaAnim.hpp"
-#include "CAnimSysContext.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CAnimTreeSequence.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CTreeUtils.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeSingleChild.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeSingleChild.hpp"
+#include "Runtime/Character/CAnimTreeSingleChild.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTimeScale.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTransition.cpp

@@ -1,4 +1,4 @@
-#include "CAnimTreeTransition.hpp"
+#include "Runtime/Character/CAnimTreeTransition.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTweenBase.cpp

@@ -1,6 +1,7 @@
-#include "CAnimTreeTweenBase.hpp"
-#include "CSegStatementSet.hpp"
-#include "CSegIdList.hpp"
+#include "Runtime/Character/CAnimTreeTweenBase.hpp"
+
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimation.cpp

@@ -1,5 +1,6 @@
-#include "CAnimation.hpp"
-#include "CMetaAnimFactory.hpp"
+#include "Runtime/Character/CAnimation.hpp"
+
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimationDatabaseGame.cpp

@@ -1,7 +1,8 @@
-#include "CAnimationDatabaseGame.hpp"
-#include "IMetaAnim.hpp"
-#include "CPrimitive.hpp"
-#include "CAnimation.hpp"
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+
+#include "Runtime/Character/CAnimation.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimationManager.cpp

@@ -1,7 +1,7 @@
-#include "CAnimationManager.hpp"
-#include "CAnimationDatabaseGame.hpp"
-#include "CTransitionDatabaseGame.hpp"
-#include "IMetaAnim.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimationSet.cpp

@@ -1,5 +1,6 @@
-#include "CAnimationSet.hpp"
-#include "CMetaTransFactory.hpp"
+#include "Runtime/Character/CAnimationSet.hpp"
+
+#include "Runtime/Character/CMetaTransFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CAssetFactory.cpp

@@ -1,9 +1,10 @@
-#include "CAssetFactory.hpp"
-#include "CAnimCharacterSet.hpp"
-#include "CCharacterFactory.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CModelData.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CAssetFactory.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CModelData.hpp"
 
 namespace urde {
 

Runtime/Character/CBodyController.cpp

@@ -1,11 +1,13 @@
-#include "CBodyController.hpp"
-#include "World/CActor.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CPASAnimParm.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CActorModelParticles.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CPhysicsActor.hpp"
-#include "World/CActorModelParticles.hpp"
-#include "Character/CPASAnimParm.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "CStateManager.hpp"
 
 namespace urde {
 

Runtime/Character/CBodyState.cpp

@@ -1,10 +1,12 @@
-#include "CBodyState.hpp"
-#include "CBodyController.hpp"
-#include "World/CActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CBodyState.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CPatterned.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CPASAnimParmData.hpp"
-#include "World/CPatterned.hpp"
 
 namespace urde {
 

Runtime/Character/CBodyStateCmdMgr.cpp

@@ -1,4 +1,5 @@
-#include "CBodyStateCmdMgr.hpp"
+#include "Runtime/Character/CBodyStateCmdMgr.hpp"
+
 #include <cfloat>
 
 namespace urde {

Runtime/Character/CBodyStateInfo.cpp

@@ -1,6 +1,7 @@
-#include "CBodyStateInfo.hpp"
-#include "World/CActor.hpp"
-#include "CBodyController.hpp"
+#include "Runtime/Character/CBodyStateInfo.hpp"
+
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 

Runtime/Character/CBoneTracking.cpp

@@ -1,9 +1,10 @@
-#include "Character/CBoneTracking.hpp"
-#include "Character/CBodyController.hpp"
-#include "Character/CAnimData.hpp"
-#include "Character/CHierarchyPoseBuilder.hpp"
-#include "World/CPatterned.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CBoneTracking.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CHierarchyPoseBuilder.hpp"
+#include "Runtime/World/CPatterned.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/Character/CBoolPOINode.cpp

@@ -1,5 +1,6 @@
-#include "CBoolPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 

Runtime/Character/CCharAnimTime.cpp

@@ -1,4 +1,5 @@
-#include "CCharAnimTime.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
+
 #include <algorithm>
 #include <cmath>
 #include <cfloat>

Runtime/Character/CCharLayoutInfo.cpp

@@ -1,5 +1,6 @@
-#include "CCharLayoutInfo.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 

Runtime/Character/CCharacterFactory.cpp

@@ -1,18 +1,19 @@
-#include "CCharacterFactory.hpp"
-#include "CAnimCharacterSet.hpp"
-#include "CSimplePool.hpp"
-#include "CTransitionDatabaseGame.hpp"
-#include "CAnimationDatabaseGame.hpp"
-#include "CAnimationManager.hpp"
-#include "CTransitionManager.hpp"
-#include "CRandom16.hpp"
-#include "CPrimitive.hpp"
-#include "CAnimData.hpp"
-#include "CAdditiveAnimPlayback.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CParticleGenInfo.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
 
 namespace urde {
 

Runtime/Character/CCharacterInfo.cpp

@@ -1,4 +1,4 @@
-#include "CCharacterInfo.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
 
 namespace urde {
 

Runtime/Character/CCharacterSet.cpp

@@ -1,4 +1,4 @@
-#include "CCharacterSet.hpp"
+#include "Runtime/Character/CCharacterSet.hpp"
 
 namespace urde {
 

Runtime/Character/CEffectComponent.cpp

@@ -1,4 +1,4 @@
-#include "CEffectComponent.hpp"
+#include "Runtime/Character/CEffectComponent.hpp"
 
 namespace urde {
 

Runtime/Character/CFBStreamedAnimReader.cpp

@@ -1,6 +1,12 @@
-#include "CFBStreamedAnimReader.hpp"
-#include "CSegIdList.hpp"
-#include "CSegStatementSet.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <memory>
+
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 

Runtime/Character/CFBStreamedCompression.cpp

@@ -1,5 +1,6 @@
-#include "CFBStreamedCompression.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CFBStreamedCompression.hpp"
+
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
 
 namespace urde {
 

Runtime/Character/CGroundMovement.cpp

@@ -1,14 +1,16 @@
-#include "CGroundMovement.hpp"
-#include "World/CPhysicsActor.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CCollisionInfoList.hpp"
-#include "Collision/CollisionUtil.hpp"
-#include "Collision/CAABoxFilter.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CGroundMovement.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CAABoxFilter.hpp"
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CScriptPlatform.hpp"
-#include "World/CWorld.hpp"
-#include "World/CPlayer.hpp"
 
 namespace urde {
 

Runtime/Character/CHalfTransition.cpp

@@ -1,5 +1,6 @@
-#include "CHalfTransition.hpp"
-#include "CMetaTransFactory.hpp"
+#include "Runtime/Character/CHalfTransition.hpp"
+
+#include "Runtime/Character/CMetaTransFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CHierarchyPoseBuilder.cpp

@@ -1,7 +1,9 @@
-#include "CHierarchyPoseBuilder.hpp"
-#include "CAnimData.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "zeus/CEulerAngles.hpp"
+#include "Runtime/Character/CHierarchyPoseBuilder.hpp"
+
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+
+#include <zeus/CEulerAngles.hpp>
 
 namespace urde {
 

Runtime/Character/CIkChain.cpp

@@ -1,5 +1,6 @@
-#include "Character/CIkChain.hpp"
-#include "Character/CAnimData.hpp"
+#include "Runtime/Character/CIkChain.hpp"
+
+#include "Runtime/Character/CAnimData.hpp"
 
 namespace urde {
 

Runtime/Character/CInt32POINode.cpp

@@ -1,5 +1,6 @@
-#include "CInt32POINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 CInt32POINode::CInt32POINode()

Runtime/Character/CMetaAnimBlend.cpp

@@ -1,6 +1,7 @@
-#include "CMetaAnimBlend.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimBlend.hpp"
+
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimFactory.cpp

@@ -1,9 +1,10 @@
-#include "CMetaAnimFactory.hpp"
-#include "CMetaAnimPlay.hpp"
-#include "CMetaAnimBlend.hpp"
-#include "CMetaAnimPhaseBlend.hpp"
-#include "CMetaAnimRandom.hpp"
-#include "CMetaAnimSequence.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
+
+#include "Runtime/Character/CMetaAnimBlend.hpp"
+#include "Runtime/Character/CMetaAnimPhaseBlend.hpp"
+#include "Runtime/Character/CMetaAnimPlay.hpp"
+#include "Runtime/Character/CMetaAnimRandom.hpp"
+#include "Runtime/Character/CMetaAnimSequence.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimPhaseBlend.cpp

@@ -1,7 +1,8 @@
-#include "CMetaAnimPhaseBlend.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeTimeScale.hpp"
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimPhaseBlend.hpp"
+
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimPlay.cpp

@@ -1,8 +1,9 @@
-#include "CMetaAnimPlay.hpp"
-#include "CAnimSysContext.hpp"
-#include "CSimplePool.hpp"
-#include "CAllFormatsAnimSource.hpp"
-#include "CAnimTreeAnimReaderContainer.hpp"
+#include "Runtime/Character/CMetaAnimPlay.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimRandom.cpp

@@ -1,6 +1,7 @@
-#include "CMetaAnimRandom.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimSysContext.hpp"
+#include "Runtime/Character/CMetaAnimRandom.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimSequence.cpp

@@ -1,6 +1,7 @@
-#include "CMetaAnimSequence.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeSequence.hpp"
+#include "Runtime/Character/CMetaAnimSequence.hpp"
+
+#include "Runtime/Character/CAnimTreeSequence.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransFactory.cpp

@@ -1,8 +1,9 @@
-#include "CMetaTransFactory.hpp"
-#include "CMetaTransMetaAnim.hpp"
-#include "CMetaTransTrans.hpp"
-#include "CMetaTransPhaseTrans.hpp"
-#include "CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransFactory.hpp"
+
+#include "Runtime/Character/CMetaTransMetaAnim.hpp"
+#include "Runtime/Character/CMetaTransPhaseTrans.hpp"
+#include "Runtime/Character/CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransMetaAnim.cpp

@@ -1,6 +1,7 @@
-#include "CMetaTransMetaAnim.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeLoopIn.hpp"
+#include "Runtime/Character/CMetaTransMetaAnim.hpp"
+
+#include "Runtime/Character/CAnimTreeLoopIn.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransPhaseTrans.cpp

@@ -1,8 +1,9 @@
-#include "CMetaTransPhaseTrans.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CTimeScaleFunctions.hpp"
-#include "CAnimTreeTransition.hpp"
-#include "CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CMetaTransPhaseTrans.hpp"
+
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CAnimTreeTransition.hpp"
+#include "Runtime/Character/CTimeScaleFunctions.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransSnap.cpp

@@ -1,4 +1,4 @@
-#include "CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransSnap.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransTrans.cpp

@@ -1,5 +1,6 @@
-#include "CMetaTransTrans.hpp"
-#include "CAnimTreeTransition.hpp"
+#include "Runtime/Character/CMetaTransTrans.hpp"
+
+#include "Runtime/Character/CAnimTreeTransition.hpp"
 
 namespace urde {
 

Runtime/Character/CModelData.cpp

@@ -1,17 +1,21 @@
-#include "CModelData.hpp"
-#include "CAnimData.hpp"
-#include "IAnimReader.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Graphics/CVertexMorphEffect.hpp"
+#include "Runtime/Character/CModelData.hpp"
+
 #include "Editor/ProjectManager.hpp"
-#include "CActorLights.hpp"
-#include "CStateManager.hpp"
-#include "CPlayerState.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CAssetFactory.hpp"
-#include "CCharacterFactory.hpp"
-#include "CAdditiveAnimPlayback.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CAssetFactory.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CModelData");

Runtime/Character/CPASAnimInfo.cpp

@@ -1,4 +1,4 @@
-#include "CPASAnimInfo.hpp"
+#include "Runtime/Character/CPASAnimInfo.hpp"
 
 namespace urde {
 

Runtime/Character/CPASAnimParmData.cpp

@@ -1,4 +1,4 @@
-#include "CPASAnimParmData.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 

Runtime/Character/CPASAnimState.cpp

@@ -1,9 +1,14 @@
-#include "CPASAnimState.hpp"
-#include "CPASAnimParmData.hpp"
-#include "CRandom16.hpp"
-#include "zeus/Math.hpp"
-#include <cmath>
+#include "Runtime/Character/CPASAnimState.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+
+#include <algorithm>
 #include <cfloat>
+#include <cmath>
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/Character/CPASDatabase.cpp

@@ -1,6 +1,10 @@
-#include "CPASDatabase.hpp"
-#include "CPASAnimParmData.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/Character/CPASDatabase.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+
+#include <algorithm>
 
 namespace urde {
 

Runtime/Character/CPASParmInfo.cpp

@@ -1,4 +1,4 @@
-#include "CPASParmInfo.hpp"
+#include "Runtime/Character/CPASParmInfo.hpp"
 
 namespace urde {
 

Runtime/Character/CPOINode.cpp

@@ -1,9 +1,10 @@
-#include "CPOINode.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
 

Runtime/Character/CParticleData.cpp

@@ -1,4 +1,4 @@
-#include "CParticleData.hpp"
+#include "Runtime/Character/CParticleData.hpp"
 
 namespace urde {
 

Runtime/Character/CParticleDatabase.cpp

@@ -1,11 +1,12 @@
-#include "CParticleDatabase.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "Character/CPoseAsTransforms.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Particle/CParticleElectric.hpp"
+#include "Runtime/Character/CParticleDatabase.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
 
 namespace urde {
 

Runtime/Character/CParticleGenInfo.cpp

@@ -1,10 +1,12 @@
-#include "CParticleGenInfo.hpp"
-#include "Graphics/IRenderer.hpp"
-#include "Particle/CParticleGen.hpp"
-#include "GameGlobalObjects.hpp"
-#include "World/CGameLight.hpp"
-#include "CStateManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/IRenderer.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+#include "Runtime/World/CGameLight.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {

Runtime/Character/CParticlePOINode.cpp

@@ -1,5 +1,6 @@
-#include "CParticlePOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 

Runtime/Character/CPoseAsTransforms.cpp

@@ -1,5 +1,6 @@
-#include "CPoseAsTransforms.hpp"
-#include "CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+
+#include "Runtime/Character/CCharLayoutInfo.hpp"
 
 namespace urde {
 

Runtime/Character/CPrimitive.cpp

@@ -1,4 +1,4 @@
-#include "CPrimitive.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
 
 namespace urde {
 

Runtime/Character/CRagDoll.cpp

@@ -1,10 +1,11 @@
-#include "CRagDoll.hpp"
-#include "Collision/CMetroidAreaCollider.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CMaterialFilter.hpp"
-#include "Collision/CCollidableSphere.hpp"
-#include "Collision/CCollisionInfo.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CRagDoll.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionInfo.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Collision/CMetroidAreaCollider.hpp"
 
 namespace urde {
 

Runtime/Character/CSegIdList.cpp

@@ -1,4 +1,4 @@
-#include "CSegIdList.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
 
 namespace urde {
 

Runtime/Character/CSegStatementSet.cpp

@@ -1,6 +1,7 @@
-#include "CSegStatementSet.hpp"
-#include "CSegIdList.hpp"
-#include "CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
+
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
 
 namespace urde {
 

Runtime/Character/CSequenceHelper.cpp

@@ -1,11 +1,12 @@
-#include "CSequenceHelper.hpp"
-#include "CAnimSysContext.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "IMetaAnim.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CSequenceHelper.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+#include "Runtime/Character/CTreeUtils.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CSkinBank.cpp

@@ -1,5 +1,6 @@
-#include "CSkinBank.hpp"
-#include "CPoseAsTransforms.hpp"
+#include "Runtime/Character/CSkinBank.hpp"
+
+#include "Runtime/Character/CPoseAsTransforms.hpp"
 
 namespace urde {
 

Runtime/Character/CSkinRules.cpp

@@ -1,7 +1,8 @@
-#include "CSkinRules.hpp"
-#include "CToken.hpp"
-#include "Graphics/CModel.hpp"
-#include "CPoseAsTransforms.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+#include "Runtime/Graphics/CModel.hpp"
 
 namespace urde {
 

Runtime/Character/CSoundPOINode.cpp

@@ -1,5 +1,6 @@
-#include "CSoundPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 

Runtime/Character/CSteeringBehaviors.cpp

@@ -1,6 +1,7 @@
-#include "CSteeringBehaviors.hpp"
-#include "World/CPhysicsActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CSteeringBehaviors.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
 
 namespace urde {
 

Runtime/Character/CTimeScaleFunctions.cpp

@@ -1,5 +1,6 @@
-#include "CTimeScaleFunctions.hpp"
-#include "zeus/Math.hpp"
+#include "Runtime/Character/CTimeScaleFunctions.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 

Runtime/Character/CTransition.cpp

@@ -1,4 +1,4 @@
-#include "CTransition.hpp"
+#include "Runtime/Character/CTransition.hpp"
 
 namespace urde {
 

Runtime/Character/CTransitionDatabaseGame.cpp

@@ -1,6 +1,11 @@
-#include "CTransitionDatabaseGame.hpp"
-#include "CTransition.hpp"
-#include "CHalfTransition.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CHalfTransition.hpp"
+#include "Runtime/Character/CTransition.hpp"
+
+#include <algorithm>
+#include <utility>
 
 namespace urde {
 

Runtime/Character/CTransitionManager.cpp

@@ -1,5 +1,6 @@
-#include "CTransitionManager.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+
+#include "Runtime/Character/CTreeUtils.hpp"
 
 namespace urde {