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

Material lookup by name + minor fixes

Browse Source
This commit is contained in:
parax0
2015-08-08 11:21:49 -04:00
parent 9157acd164
commit 8d90cd7e01
9 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Resource/factory/CMaterialLoader.cpp
View File

@@ -15,21 +15,6 @@ CMaterialLoader::~CMaterialLoader()
{
}
CMaterialSet* CMaterialLoader::LoadMaterialSet(CInputStream& Mat, EGame Version)
{
CMaterialLoader Loader;
Loader.mpSet = new CMaterialSet();
Loader.mpFile = &Mat;
Loader.mVersion = Version;
if ((Version >= ePrimeKioskDemo) && (Version <= eEchoes))
Loader.ReadPrimeMatSet();
else
Loader.ReadCorruptionMatSet();
return Loader.mpSet;
}
void CMaterialLoader::ReadPrimeMatSet()
{
// Textures
@@ -590,3 +575,19 @@ void CMaterialLoader::CreateCorruptionPasses(CMaterial *pMat)
}
}
}
// ************ STATIC ************
CMaterialSet* CMaterialLoader::LoadMaterialSet(CInputStream& Mat, EGame Version)
{
CMaterialLoader Loader;
Loader.mpSet = new CMaterialSet();
Loader.mpFile = &Mat;
Loader.mVersion = Version;
if ((Version >= ePrimeKioskDemo) && (Version <= eEchoes))
Loader.ReadPrimeMatSet();
else
Loader.ReadCorruptionMatSet();
return Loader.mpSet;
}

1
Resource/factory/CMaterialLoader.h
View File

@@ -32,6 +32,7 @@ class CMaterialLoader
CMaterial* ReadCorruptionMaterial();
void CreateCorruptionPasses(CMaterial *pMat);
// Static
public:
static CMaterialSet* LoadMaterialSet(CInputStream& Mat, EGame Version);
};

1
Resource/factory/CModelLoader.h
View File

@@ -1,7 +1,6 @@
#ifndef CMODELLOADER_H
#define CMODELLOADER_H
#include "../model/SModelData.h"
#include "../model/CBasicModel.h"
#include "../model/CModel.h"
#include "../EFormatVersion.h"