added load from json game objects

This commit is contained in:
Vlad committed 2026-04-07 20:17:04 +06:00
1 parent 178f69967b
commit e1b491be73
6 files changed
+242 -3

No files matched your search

+6 -1
View File
@@ -9,6 +9,7 @@
#include "UiManager.h"
#include "Projectile.h"
#include "utils/TaskManager.h"
#include "items/GameObjectLoader.h"
#include <queue>
#include <vector>
#include <string>
@@ -17,7 +18,7 @@
#include <render/TextRenderer.h>
#include "MenuManager.h"
#include "ScriptEngine.h"
#include <unordered_map>
#include <unordered_set>
namespace ZL {
@@ -48,6 +49,9 @@ namespace ZL {
std::shared_ptr<Texture> roomTexture;
VertexRenderStruct roomMesh;
std::unordered_map<std::string, LoadedGameObject> gameObjects;
/*
std::shared_ptr<Texture> fireboxTexture;
VertexRenderStruct fireboxMesh;
@@ -56,6 +60,7 @@ namespace ZL {
std::shared_ptr<Texture> benchTexture;
VertexRenderStruct benchMesh;
*/
std::unique_ptr<Character> player;
std::vector<std::unique_ptr<Character>> npcs;