mirror of
https://github.com/rwengine/openrw.git
synced 2024-09-18 16:32:32 +02:00
rwengine: iwyu: reduce warnings in loaders subdirectory
This commit is contained in:
parent
e381a6c700
commit
0fc83a97e4
@ -31,7 +31,6 @@ set(RWENGINE_SOURCES
|
|||||||
src/core/Profiler.cpp
|
src/core/Profiler.cpp
|
||||||
src/core/Profiler.hpp
|
src/core/Profiler.hpp
|
||||||
|
|
||||||
src/data/forward.hpp
|
|
||||||
src/data/AnimGroup.cpp
|
src/data/AnimGroup.cpp
|
||||||
src/data/AnimGroup.hpp
|
src/data/AnimGroup.hpp
|
||||||
src/data/Chase.cpp
|
src/data/Chase.cpp
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
#ifndef _RWENGINE_DATA_FORWARD_HPP_
|
|
||||||
#define _RWENGINE_DATA_FORWARD_HPP_
|
|
||||||
|
|
||||||
struct CutsceneTracks;
|
|
||||||
class GameTexts;
|
|
||||||
|
|
||||||
#endif
|
|
@ -18,6 +18,7 @@
|
|||||||
#include "ai/TrafficDirector.hpp"
|
#include "ai/TrafficDirector.hpp"
|
||||||
|
|
||||||
#include "data/CutsceneData.hpp"
|
#include "data/CutsceneData.hpp"
|
||||||
|
#include "data/InstanceData.hpp"
|
||||||
#include "data/WeaponData.hpp"
|
#include "data/WeaponData.hpp"
|
||||||
|
|
||||||
#include "loaders/LoaderCutsceneDAT.hpp"
|
#include "loaders/LoaderCutsceneDAT.hpp"
|
||||||
|
@ -1 +0,0 @@
|
|||||||
#include <loaders/DataLoader.hpp>
|
|
@ -1,9 +1,13 @@
|
|||||||
#include <loaders/GenericDATLoader.hpp>
|
#include <loaders/GenericDATLoader.hpp>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cctype>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <iterator>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
#include <rw/defines.hpp>
|
||||||
|
|
||||||
#include <data/ModelData.hpp>
|
#include <data/ModelData.hpp>
|
||||||
#include <data/WeaponData.hpp>
|
#include <data/WeaponData.hpp>
|
||||||
#include <objects/VehicleInfo.hpp>
|
#include <objects/VehicleInfo.hpp>
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
#ifndef _GENERICDATLOADER_HPP_
|
#ifndef _RWENGINE_GENERICDATLOADER_HPP_
|
||||||
#define _GENERICDATLOADER_HPP_
|
#define _RWENGINE_GENERICDATLOADER_HPP_
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
struct DynamicObjectData;
|
struct DynamicObjectData;
|
||||||
|
@ -1,9 +1,15 @@
|
|||||||
#include "loaders/LoaderCOL.hpp"
|
#include "loaders/LoaderCOL.hpp"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
|
#include "data/CollisionModel.hpp"
|
||||||
|
|
||||||
constexpr uint32_t kCollMagic = 0x4C4C4F43;
|
constexpr uint32_t kCollMagic = 0x4C4C4F43;
|
||||||
|
|
||||||
struct ColHeader {
|
struct ColHeader {
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#ifndef RWENGINE_LOADERCOL_HPP
|
#ifndef _RWENGINE_LOADERCOL_HPP_
|
||||||
#define RWENGINE_LOADERCOL_HPP
|
#define _RWENGINE_LOADERCOL_HPP_
|
||||||
#include <data/CollisionModel.hpp>
|
#include <data/CollisionModel.hpp>
|
||||||
#include <glm/glm.hpp>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -1,14 +1,17 @@
|
|||||||
#include "loaders/LoaderCutsceneDAT.hpp"
|
#include "loaders/LoaderCutsceneDAT.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <limits>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
#include <data/CutsceneData.hpp>
|
|
||||||
#include <platform/FileHandle.hpp>
|
|
||||||
#include <rw/defines.hpp>
|
#include <rw/defines.hpp>
|
||||||
|
|
||||||
|
#include "data/CutsceneData.hpp"
|
||||||
|
#include "platform/FileHandle.hpp"
|
||||||
|
|
||||||
void LoaderCutsceneDAT::load(CutsceneTracks &tracks, FileHandle file) {
|
void LoaderCutsceneDAT::load(CutsceneTracks &tracks, FileHandle file) {
|
||||||
std::string dataStr(file->data, file->length);
|
std::string dataStr(file->data, file->length);
|
||||||
std::stringstream ss(dataStr);
|
std::stringstream ss(dataStr);
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#ifndef _RWENGINE_LOADERCUTSCENEDAT_HPP_
|
||||||
#ifndef _LOADERCUTSCENEDAT_HPP_
|
#define _RWENGINE_LOADERCUTSCENEDAT_HPP_
|
||||||
#define _LOADERCUTSCENEDAT_HPP_
|
|
||||||
|
|
||||||
#include <data/forward.hpp>
|
|
||||||
#include <rw/forward.hpp>
|
#include <rw/forward.hpp>
|
||||||
|
|
||||||
|
struct CutsceneTracks;
|
||||||
|
|
||||||
class LoaderCutsceneDAT {
|
class LoaderCutsceneDAT {
|
||||||
public:
|
public:
|
||||||
void load(CutsceneTracks& tracks, FileHandle file);
|
void load(CutsceneTracks& tracks, FileHandle file);
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
#include "loaders/LoaderGXT.hpp"
|
#include "loaders/LoaderGXT.hpp"
|
||||||
|
|
||||||
#include <data/GameTexts.hpp>
|
#include <cstddef>
|
||||||
#include "platform/FileHandle.hpp"
|
#include <cstdint>
|
||||||
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
#include <platform/FileHandle.hpp>
|
||||||
|
|
||||||
|
#include "data/GameTexts.hpp"
|
||||||
|
|
||||||
void LoaderGXT::load(GameTexts &texts, FileHandle &file) {
|
void LoaderGXT::load(GameTexts &texts, FileHandle &file) {
|
||||||
auto data = file->data;
|
auto data = file->data;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#ifndef _RWENGINE_LOADERGXT_HPP_
|
||||||
#ifndef _LOADERGXT_HPP_
|
#define _RWENGINE_LOADERGXT_HPP_
|
||||||
#define _LOADERGXT_HPP_
|
|
||||||
#include <data/forward.hpp>
|
|
||||||
#include <rw/forward.hpp>
|
#include <rw/forward.hpp>
|
||||||
|
|
||||||
|
class GameTexts;
|
||||||
|
|
||||||
class LoaderGXT {
|
class LoaderGXT {
|
||||||
public:
|
public:
|
||||||
void load(GameTexts& texts, FileHandle& file);
|
void load(GameTexts& texts, FileHandle& file);
|
||||||
|
@ -1,13 +1,16 @@
|
|||||||
#include <loaders/LoaderIDE.hpp>
|
#include "loaders/LoaderIDE.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
#include <cstdlib>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include "data/PathData.hpp"
|
||||||
|
|
||||||
bool LoaderIDE::load(const std::string &filename, const PedStatsList &stats) {
|
bool LoaderIDE::load(const std::string &filename, const PedStatsList &stats) {
|
||||||
std::ifstream str(filename);
|
std::ifstream str(filename);
|
||||||
|
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
#ifndef RWENGINE_LOADERIDE_HPP
|
#ifndef _RWENGINE_LOADERIDE_HPP_
|
||||||
#define RWENGINE_LOADERIDE_HPP
|
#define _RWENGINE_LOADERIDE_HPP_
|
||||||
|
|
||||||
#include <data/ModelData.hpp>
|
|
||||||
#include <data/PathData.hpp>
|
|
||||||
#include <data/PedData.hpp>
|
|
||||||
#include <glm/glm.hpp>
|
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <objects/VehicleInfo.hpp>
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include <data/PedData.hpp>
|
||||||
|
#include <data/ModelData.hpp>
|
||||||
|
|
||||||
class LoaderIDE {
|
class LoaderIDE {
|
||||||
public:
|
public:
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
#include "loaders/LoaderIFP.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <cctype>
|
||||||
#include <loaders/LoaderIFP.hpp>
|
#include <memory>
|
||||||
|
|
||||||
bool findKeyframes(float t, AnimationBone* bone, AnimationKeyframe& f1,
|
bool findKeyframes(float t, AnimationBone* bone, AnimationKeyframe& f1,
|
||||||
AnimationKeyframe& f2, float& alpha) {
|
AnimationKeyframe& f2, float& alpha) {
|
||||||
|
@ -1,14 +1,16 @@
|
|||||||
#pragma once
|
#ifndef _RWENGINE_LOADERIFP_HPP_
|
||||||
#ifndef _LOADERDFF_IFP_
|
#define _RWENGINE_LOADERIFP_HPP_
|
||||||
#define _LOADERDFF_IFP_
|
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <cstddef>
|
||||||
#include <glm/gtx/quaternion.hpp>
|
#include <cstdint>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "rw/forward.hpp"
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/quaternion.hpp>
|
||||||
|
|
||||||
|
#include <rw/forward.hpp>
|
||||||
|
|
||||||
struct AnimationKeyframe {
|
struct AnimationKeyframe {
|
||||||
glm::quat rotation;
|
glm::quat rotation;
|
||||||
|
@ -2,11 +2,18 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
#include <cstdlib>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/quaternion.hpp>
|
||||||
|
|
||||||
|
#include "data/InstanceData.hpp"
|
||||||
|
#include "data/ZoneData.hpp"
|
||||||
|
|
||||||
enum SectionTypes { INST, PICK, CULL, ZONE, NONE };
|
enum SectionTypes { INST, PICK, CULL, ZONE, NONE };
|
||||||
|
|
||||||
/// Load the IPL data into memory
|
/// Load the IPL data into memory
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
#ifndef _LOADERIPL_HPP_
|
#ifndef _RWENGINE_LOADERIPL_HPP_
|
||||||
#define _LOADERIPL_HPP_
|
#define _RWENGINE_LOADERIPL_HPP_
|
||||||
#include <data/InstanceData.hpp>
|
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#include <data/ZoneData.hpp>
|
#include <data/ZoneData.hpp>
|
||||||
|
|
||||||
#include <iostream>
|
struct InstanceData;
|
||||||
#include <memory>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\class LoaderIPL
|
\class LoaderIPL
|
||||||
|
@ -2,10 +2,13 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
#include <cmath>
|
||||||
|
#include <cstdlib>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
bool WeatherLoader::load(const std::string& filename) {
|
bool WeatherLoader::load(const std::string& filename) {
|
||||||
std::ifstream fstream(filename.c_str());
|
std::ifstream fstream(filename.c_str());
|
||||||
|
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#pragma once
|
#ifndef _RWENGINE_WEATHERLOADER_HPP_
|
||||||
#ifndef _WEATHERLOADER_HPP_
|
#define _RWENGINE_WEATHERLOADER_HPP_
|
||||||
#define _WEATHERLOADER_HPP_
|
|
||||||
|
|
||||||
#include <rw/types.hpp>
|
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include <rw/types.hpp>
|
||||||
|
|
||||||
class WeatherLoader {
|
class WeatherLoader {
|
||||||
public:
|
public:
|
||||||
struct WeatherData {
|
struct WeatherData {
|
||||||
|
Loading…
Reference in New Issue
Block a user