rwengine: iwyu: fix warnings in data subdirectory

openrw_iwyu.imp

@@ -9,6 +9,7 @@
     { "include": [ "@<glm/gtc/quaternion.\\inl>", "private", "<glm/gtc/quaternion.hpp>", "public"] },
     { "include": [ "@<glm/gtc/matrix_transform.\\inl>", "private", "<glm/gtc/matrix_transform.hpp>", "public"] },
     { "include": [ "@<glm/gtx/norm\\.inl>", "private", "<glm/gtx/norm.hpp>", "public"] },
+    { "include": [ "@<glm/gtx/\\.\\./gtc/quaternion\\.hpp>", "public", "<glm/gtc/quaternion.hpp>", "public"] },
 # Boost filesystem:
     { "include": [ "@<boost/filesystem/.*>", "private", "<boost/filesystem.hpp>", "public"] },
 # Boost iterator:

rwengine/src/data/AnimGroup.cpp

@@ -1,7 +1,11 @@
-#include "AnimGroup.hpp"
+#include "data/AnimGroup.hpp"
+
 #include <algorithm>
 #include <vector>
 
+#include <rw/defines.hpp>
+#include <rw/forward.hpp>
+
 // The default animations for every cycle
 const std::vector<AnimGroup> kBuiltInAnimGroups{
     {"man",

rwengine/src/data/AnimGroup.hpp

@@ -1,12 +1,15 @@
-#ifndef RWENGINE_DATA_ANIMGROUP_HPP
-#define RWENGINE_DATA_ANIMGROUP_HPP
+#ifndef _RWENGINE_DATA_ANIMGROUP_HPP_
+#define _RWENGINE_DATA_ANIMGROUP_HPP_
+
+#include <algorithm>
+#include <cstdint>
+#include <initializer_list>
+#include <iterator>
 #include <memory>
+#include <string>
 #include <unordered_map>
 
 #include <rw/forward.hpp>
-#include <rw/types.hpp>
-
-struct Animation;
 
 /**
  * The logical animations

rwengine/src/data/Chase.cpp

@@ -1,10 +1,14 @@
 #include "data/Chase.hpp"
+
 #include <cstdint>
-#include <engine/GameWorld.hpp>
+#include <cstddef>
 #include <fstream>
-#include <objects/GameObject.hpp>
+
 #include <rw/defines.hpp>
 
+#include "engine/GameWorld.hpp"
+#include "objects/GameObject.hpp"
+
 #define KEYFRAMES_PER_SECOND 30
 
 bool ChaseKeyframe::load(const std::string &filePath,

rwengine/src/data/Chase.hpp

@@ -1,5 +1,5 @@
-#ifndef _CHASE_HPP_
-#define _CHASE_HPP_
+#ifndef _RWENGINE_CHASE_HPP_
+#define _RWENGINE_CHASE_HPP_
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>

rwengine/src/data/CollisionModel.hpp

@@ -1,5 +1,5 @@
-#ifndef RWENGINE_COLLISIONMODEL_HPP
-#define RWENGINE_COLLISIONMODEL_HPP
+#ifndef _RWENGINE_COLLISIONMODEL_HPP_
+#define _RWENGINE_COLLISIONMODEL_HPP_
 #include <cstdint>
 #include <glm/glm.hpp>
 #include <string>

rwengine/src/data/CutsceneData.hpp

@@ -1,6 +1,5 @@
-#pragma once
-#ifndef _CUTSCENEDATA_HPP_
-#define _CUTSCENEDATA_HPP_
+#ifndef _RWENGINE_CUTSCENEDATA_HPP_
+#define _RWENGINE_CUTSCENEDATA_HPP_
 #include <glm/glm.hpp>
 #include <map>
 #include <string>

rwengine/src/data/GameTexts.hpp

@@ -1,5 +1,6 @@
-#ifndef RWENGINE_GAMETEXTS_HPP
-#define RWENGINE_GAMETEXTS_HPP
+#ifndef _RWENGINE_GAMETEXTS_HPP_
+#define _RWENGINE_GAMETEXTS_HPP_
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 

rwengine/src/data/InstanceData.hpp

@@ -1,6 +1,5 @@
-#pragma once
-#ifndef __INSTANCEDATA_HPP__
-#define __INSTANCEDATA_HPP__
+#ifndef _RWENGINE_INSTANCEDATA_HPP_
+#define _RWENGINE_INSTANCEDATA_HPP_
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <string>

rwengine/src/data/ModelData.hpp

@@ -1,17 +1,20 @@
-#ifndef RWENGINE_MODELDATA_HPP
-#define RWENGINE_MODELDATA_HPP
-#include <stdint.h>
+#ifndef _RWENGINE_MODELDATA_HPP_
+#define _RWENGINE_MODELDATA_HPP_
+#include <cstdint>
 #include <array>
 #include <glm/glm.hpp>
 #include <memory>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
-#include <data/CollisionModel.hpp>
-#include <data/Clump.hpp>
-#include <data/PathData.hpp>
 #include <rw/defines.hpp>
+#include <rw/forward.hpp>
+
+#include "data/CollisionModel.hpp"
+#include "data/Clump.hpp"
+#include "data/PathData.hpp"
 #ifdef RW_WINDOWS
 #include <rw_mingw.hpp>
 #endif

rwengine/src/data/PathData.hpp

@@ -1,6 +1,5 @@
-#pragma once
-#ifndef __GLT_PATHDATA_HPP__
-#define __GLT_PATHDATA_HPP__
+#ifndef _RWENGINE_PATHDATA_HPP_
+#define _RWENGINE_PATHDATA_HPP_
 #include <stdint.h>
 #include <glm/glm.hpp>
 #include <string>
@@ -30,4 +29,4 @@ struct PathData {
     std::vector<PathNode> nodes;
 };
 
-#endif
+#endif

rwengine/src/data/PedData.hpp

@@ -1,5 +1,5 @@
-#ifndef RWENGINE_DATA_PEDDATA_HPP
-#define RWENGINE_DATA_PEDDATA_HPP
+#ifndef _RWENGINE_PEDDATA_HPP_
+#define _RWENGINE_PEDDATA_HPP_
 #include <cstdint>
 #include <string>
 #include <vector>

rwengine/src/data/WeaponData.hpp

@@ -1,6 +1,5 @@
-#pragma once
-#ifndef _WEAPONDATA_HPP_
-#define _WEAPONDATA_HPP_
+#ifndef _RWENGINE_WEAPONDATA_HPP_
+#define _RWENGINE_WEAPONDATA_HPP_
 #include <cinttypes>
 #include <glm/glm.hpp>
 #include <string>

rwengine/src/data/ZoneData.hpp

@@ -1,5 +1,5 @@
-#ifndef RWENGINE_DATA_ZONEDATA_HPP
-#define RWENGINE_DATA_ZONEDATA_HPP
+#ifndef _RWENGINE_ZONEDATA_HPP_
+#define _RWENGINE_ZONEDATA_HPP_
 
 #include <algorithm>
 #include <glm/glm.hpp>

rwengine/src/data/forward.hpp

@@ -1,5 +1,5 @@
-#ifndef _RWENGINE_FORWARD_HPP_
-#define _RWENGINE_FORWARD_HPP_
+#ifndef _RWENGINE_DATA_FORWARD_HPP_
+#define _RWENGINE_DATA_FORWARD_HPP_
 
 struct CutsceneTracks;
 class GameTexts;