AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-16 00:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Completely overhauled resource loading in preparation for projects

Browse Source
This commit is contained in:
parax0
2016-06-29 17:18:31 -06:00
parent e53a895b29
commit 2d6dfad2d3
102 changed files with 1334 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Resource/Script/CLink.h
View File

@@ -2,7 +2,7 @@
#define CLINK_H
#include "CScriptObject.h"
#include "Core/Resource/CGameArea.h"
#include "Core/Resource/Area/CGameArea.h"
#include <Common/TString.h>
#include <Common/types.h>

2
src/Core/Resource/Script/CScriptObject.h
View File

@@ -4,9 +4,9 @@
#include "IProperty.h"
#include "IPropertyTemplate.h"
#include "CScriptTemplate.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/Resource/Model/CModel.h"
#include "Core/Resource/CCollisionMeshGroup.h"
#include "Core/Resource/CGameArea.h"
class CScriptLayer;
class CLink;

6
src/Core/Resource/Script/CScriptTemplate.cpp
View File

@@ -1,7 +1,7 @@
#include "CScriptTemplate.h"
#include "CScriptObject.h"
#include "CMasterTemplate.h"
#include "Core/Resource/CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/CAnimSet.h"
#include <Common/Log.h>
@@ -166,7 +166,7 @@ CResource* CScriptTemplate::FindDisplayAsset(CPropertyStruct *pProperties, u32&
if (it->AssetSource == SEditorAsset::eFile)
{
TString Path = "../resources/" + it->AssetLocation;
pRes = gResCache.GetResource(Path);
pRes = gResourceStore.LoadResource(Path);
}
// Property
@@ -216,7 +216,7 @@ CCollisionMeshGroup* CScriptTemplate::FindCollision(CPropertyStruct *pProperties
if (it->AssetSource == SEditorAsset::eFile)
{
TString path = "../resources/" + it->AssetLocation;
pRes = gResCache.GetResource(path);
pRes = gResourceStore.LoadResource(path);
}
// Property