however
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
#include "ContentLUT.h"
|
||||
|
||||
#include <memory>
|
||||
#include "ContentLUT.hpp"
|
||||
|
||||
#include "Content.h"
|
||||
#include "../constants.h"
|
||||
@@ -8,9 +6,10 @@
|
||||
#include "../coders/json.h"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../items/ItemDef.h"
|
||||
|
||||
#include "../data/dynamic.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
ContentLUT::ContentLUT(const Content* content, size_t blocksCount, size_t itemsCount) {
|
||||
auto* indices = content->getIndices();
|
||||
for (size_t i = 0; i < blocksCount; i++) {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#ifndef CONTENT_CONTENT_LUT_H_
|
||||
#define CONTENT_CONTENT_LUT_H_
|
||||
#ifndef CONTENT_CONTENT_LUT_HPP_
|
||||
#define CONTENT_CONTENT_LUT_HPP_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <filesystem>
|
||||
#include "Content.h"
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../constants.h"
|
||||
|
||||
#include "Content.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <filesystem>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
@@ -93,4 +93,4 @@ public:
|
||||
std::vector<contententry> getMissingContent() const;
|
||||
};
|
||||
|
||||
#endif // CONTENT_CONTENT_LUT_H_
|
||||
#endif // CONTENT_CONTENT_LUT_HPP_
|
||||
@@ -1,25 +1,24 @@
|
||||
#include "ContentLoader.h"
|
||||
|
||||
#include "Content.h"
|
||||
#include "ContentPack.h"
|
||||
#include "../coders/json.h"
|
||||
#include "../core_defs.hpp"
|
||||
#include "../data/dynamic.h"
|
||||
#include "../debug/Logger.hpp"
|
||||
#include "../files/files.h"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../logic/scripting/scripting.h"
|
||||
#include "../typedefs.h"
|
||||
#include "../util/listutil.hpp"
|
||||
#include "../voxels/Block.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <algorithm>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "Content.h"
|
||||
#include "../debug/Logger.hpp"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../util/listutil.h"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../files/files.h"
|
||||
#include "../coders/json.h"
|
||||
#include "../typedefs.h"
|
||||
#include "../core_defs.h"
|
||||
#include "../data/dynamic.h"
|
||||
|
||||
#include "ContentPack.h"
|
||||
#include "../logic/scripting/scripting.h"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
static debug::Logger logger("content-loader");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "PacksManager.hpp"
|
||||
|
||||
#include "../util/listutil.h"
|
||||
#include "../util/listutil.hpp"
|
||||
|
||||
#include <queue>
|
||||
#include <sstream>
|
||||
|
||||
Reference in New Issue
Block a user