Some strange shit happens

This commit is contained in:
Vladislav Khorev committed 2026-04-22 22:38:20 +03:00
1 parent 4d9a5b0a6e
commit c655678486
10 files changed
+148 -36

No files matched your search

+12 -7
View File
@@ -3,15 +3,18 @@
#include <vector>
#include <memory>
#include <unordered_map>
#include <map>
#include "external/nlohmann/json.hpp"
#include "TextModel.h"
#include "InteractiveObject.h"
#include "Character.h"
namespace ZL {
//#include "Character.h"
//#include "render/TextureManager.h"
struct Texture;
struct VertexRenderStruct;
class Renderer;
namespace ZL {
//struct Texture;
//struct VertexRenderStruct;
//class Renderer;
class Character;
struct GameObjectData {
@@ -45,6 +48,7 @@ namespace ZL {
std::string id;
std::string name;
std::string texturePath;
std::map<std::string, std::string> meshTextures;
std::string animationIdlePath;
std::string animationWalkPath;
float positionX = 0.0f;
@@ -82,7 +86,7 @@ namespace ZL {
const std::string& zipPath = ""
);
static std::vector<std::unique_ptr<Character>> loadAndCreateNpcs(
static std::vector<std::unique_ptr<ZL::Character>> loadAndCreate_Npcs(
const std::string& jsonPath,
const std::string& zipPath = ""
);
@@ -90,4 +94,5 @@ namespace ZL {
static std::vector<NpcData> loadNpcsFromJson(const std::string& jsonPath, const std::string& zipPath = "");
};
} // namespace ZL
} // namespace ZL