Added darklands
This commit is contained in:
1 parent
4e9eef1863
commit
c086fe1ef0
16 files changed
+351
-4
No files matched your search
@@ -45,9 +45,10 @@ namespace ZL {
|
||||
static GameObjectData parseGameObjectData(const json& item)
|
||||
{
|
||||
GameObjectData data;
|
||||
data.name = item.value("name", "Unknown");
|
||||
data.texturePath = item.value("texturePath", "");
|
||||
data.meshPath = item.value("meshPath", "");
|
||||
data.name = item.value("name", "Unknown");
|
||||
data.texturePath = item.value("texturePath", "");
|
||||
data.textureDarkandsPath = item.value("textureDarkandsPath", "");
|
||||
data.meshPath = item.value("meshPath", "");
|
||||
data.rotationX = item.value("rotationX", 0.0f);
|
||||
data.rotationY = item.value("rotationY", 0.0f);
|
||||
data.rotationZ = item.value("rotationZ", 0.0f);
|
||||
@@ -110,6 +111,8 @@ namespace ZL {
|
||||
obj.name = data.name;
|
||||
|
||||
obj.texture = renderer.textureManager.LoadFromPng(data.texturePath, zipPath);
|
||||
if (!data.textureDarkandsPath.empty())
|
||||
obj.textureDarklands = renderer.textureManager.LoadFromPng(data.textureDarkandsPath, zipPath);
|
||||
|
||||
if (data.meshPath.size() > 4 && data.meshPath.compare(data.meshPath.size() - 4, 4, ".bin") == 0)
|
||||
obj.mesh.data = LoadModelFromBinFile(data.meshPath, zipPath);
|
||||
|
||||
Reference in new issue
Block a user