Major refactoring for game objects
This commit is contained in:
1 parent
efb85f7328
commit
2cae9998a0
18 files changed
+547
-716
No files matched your search
@@ -1,6 +1,7 @@
|
||||
#include "Game.h"
|
||||
#include "AnimatedModel.h"
|
||||
#include "utils/Utils.h"
|
||||
#include "items/ItemRegistry.h"
|
||||
#include "render/OpenGlExtensions.h"
|
||||
#include <iostream>
|
||||
#include "render/TextureManager.h"
|
||||
@@ -158,6 +159,8 @@ namespace ZL
|
||||
|
||||
std::cout << "Load resurces step 4" << std::endl;
|
||||
|
||||
ItemRegistry::instance().loadFromJson("resources/config2/items.json", CONST_ZIP_FILE);
|
||||
|
||||
LocationSetup uniInteriorParams;
|
||||
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior.json";
|
||||
uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
|
||||
@@ -167,6 +170,7 @@ namespace ZL
|
||||
uniInteriorParams.teleportsJsonPath = "resources/config2/teleports.json";
|
||||
uniInteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_interior.json";
|
||||
uniInteriorParams.scriptPath = "resources/start_uni_interior.lua";
|
||||
uniInteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_interior.json";
|
||||
uniInteriorParams.playerPosition = Eigen::Vector3f(0.942694, 0, -9.63104);
|
||||
|
||||
locations["uni_interior"] = std::make_shared<Location>(renderer, inventory);
|
||||
@@ -174,6 +178,7 @@ namespace ZL
|
||||
|
||||
LocationSetup uniExteriorParams = uniInteriorParams;
|
||||
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects2.json";
|
||||
uniExteriorParams.interactiveObjectsJsonPath = "";
|
||||
//uniExteriorParams.navigationJsonPaths = {"resources/config2/navigation2.json"};
|
||||
uniExteriorParams.navigationJsonPaths = { "resources/w/nav_uni_exterior.txt" };
|
||||
uniExteriorParams.teleportsJsonPath = "resources/config2/teleports2.json";
|
||||
@@ -194,6 +199,7 @@ namespace ZL
|
||||
params_dorm.teleportsJsonPath = "resources/config2/teleports_dorm.json";
|
||||
params_dorm.triggerZonesJsonPath = "resources/config2/trigger_zones_dorm.json";
|
||||
params_dorm.scriptPath = "resources/start_dorm.lua";
|
||||
params_dorm.interactiveObjectsJsonPath = "resources/config2/interactive_objects_dorm.json";
|
||||
params_dorm.playerPosition = Eigen::Vector3f(6.76345, 0, -14.6022);
|
||||
|
||||
locations["location_dorm"] = std::make_shared<Location>(renderer, inventory);
|
||||
|
||||
Reference in new issue
Block a user