the final rename
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
#include "Content.h"
|
||||
#include "Content.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "../voxels/Block.h"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../voxels/Block.hpp"
|
||||
#include "../items/ItemDef.hpp"
|
||||
|
||||
#include "ContentPack.h"
|
||||
#include "../logic/scripting/scripting.h"
|
||||
#include "ContentPack.hpp"
|
||||
#include "../logic/scripting/scripting.hpp"
|
||||
|
||||
ContentBuilder::~ContentBuilder() {}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef CONTENT_CONTENT_H_
|
||||
#define CONTENT_CONTENT_H_
|
||||
#ifndef CONTENT_CONTENT_HPP_
|
||||
#define CONTENT_CONTENT_HPP_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -7,8 +7,8 @@
|
||||
#include <stdexcept>
|
||||
#include <unordered_map>
|
||||
#include <set>
|
||||
#include "../typedefs.h"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../voxels/Block.hpp"
|
||||
|
||||
using DrawGroups = std::set<ubyte>;
|
||||
|
||||
@@ -146,4 +146,4 @@ public:
|
||||
const std::unordered_map<std::string, std::unique_ptr<ContentPackRuntime>>& getPacks() const;
|
||||
};
|
||||
|
||||
#endif // CONTENT_CONTENT_H_
|
||||
#endif // CONTENT_CONTENT_HPP_
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "ContentLUT.hpp"
|
||||
|
||||
#include "Content.h"
|
||||
#include "../constants.h"
|
||||
#include "../files/files.h"
|
||||
#include "../coders/json.h"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../data/dynamic.h"
|
||||
#include "Content.hpp"
|
||||
#include "../constants.hpp"
|
||||
#include "../files/files.hpp"
|
||||
#include "../coders/json.hpp"
|
||||
#include "../voxels/Block.hpp"
|
||||
#include "../items/ItemDef.hpp"
|
||||
#include "../data/dynamic.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#ifndef CONTENT_CONTENT_LUT_HPP_
|
||||
#define CONTENT_CONTENT_LUT_HPP_
|
||||
|
||||
#include "Content.h"
|
||||
#include "Content.hpp"
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../constants.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../constants.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
#include "ContentLoader.h"
|
||||
#include "ContentLoader.hpp"
|
||||
|
||||
#include "Content.h"
|
||||
#include "ContentPack.h"
|
||||
#include "../coders/json.h"
|
||||
#include "Content.hpp"
|
||||
#include "ContentPack.hpp"
|
||||
#include "../coders/json.hpp"
|
||||
#include "../core_defs.hpp"
|
||||
#include "../data/dynamic.h"
|
||||
#include "../data/dynamic.hpp"
|
||||
#include "../debug/Logger.hpp"
|
||||
#include "../files/files.h"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../logic/scripting/scripting.h"
|
||||
#include "../typedefs.h"
|
||||
#include "../files/files.hpp"
|
||||
#include "../items/ItemDef.hpp"
|
||||
#include "../logic/scripting/scripting.hpp"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../util/listutil.hpp"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../voxels/Block.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef CONTENT_CONTENT_LOADER_H_
|
||||
#define CONTENT_CONTENT_LOADER_H_
|
||||
#ifndef CONTENT_CONTENT_LOADER_HPP_
|
||||
#define CONTENT_CONTENT_LOADER_HPP_
|
||||
|
||||
#include "../voxels/Block.h"
|
||||
#include "../voxels/Block.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
@@ -38,4 +38,4 @@ public:
|
||||
void load(ContentBuilder& builder);
|
||||
};
|
||||
|
||||
#endif // CONTENT_CONTENT_LOADER_H_
|
||||
#endif // CONTENT_CONTENT_LOADER_HPP_
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "ContentPack.h"
|
||||
#include "ContentPack.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <algorithm>
|
||||
|
||||
#include "../coders/json.h"
|
||||
#include "../files/files.h"
|
||||
#include "../files/engine_paths.h"
|
||||
#include "../data/dynamic.h"
|
||||
#include "../coders/json.hpp"
|
||||
#include "../files/files.hpp"
|
||||
#include "../files/engine_paths.hpp"
|
||||
#include "../data/dynamic.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef CONTENT_CONTENT_PACK_H_
|
||||
#define CONTENT_CONTENT_PACK_H_
|
||||
#ifndef CONTENT_CONTENT_PACK_HPP_
|
||||
#define CONTENT_CONTENT_PACK_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -116,4 +116,4 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif // CONTENT_CONTENT_PACK_H_
|
||||
#endif // CONTENT_CONTENT_PACK_HPP_
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef CONTENT_PACKS_MANAGER_HPP_
|
||||
#define CONTENT_PACKS_MANAGER_HPP_
|
||||
|
||||
#include "ContentPack.h"
|
||||
#include "ContentPack.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <filesystem>
|
||||
|
||||
Reference in New Issue
Block a user