AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 02:39:17 +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

4
src/Core/Resource/CGameArea.cpp → src/Core/Resource/Area/CGameArea.cpp
View File

@@ -2,8 +2,8 @@
#include "Core/Resource/Script/CScriptLayer.h"
#include "Core/Render/CRenderer.h"
CGameArea::CGameArea()
: CResource()
CGameArea::CGameArea(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mWorldIndex(-1)
, mVertexCount(0)
, mTriangleCount(0)

12
src/Core/Resource/CGameArea.h → src/Core/Resource/Area/CGameArea.h
View File

@@ -1,11 +1,11 @@
#ifndef CGAMEAREA_H
#define CGAMEAREA_H
#include "CResource.h"
#include "CCollisionMeshGroup.h"
#include "CLight.h"
#include "CMaterialSet.h"
#include "CPoiToWorld.h"
#include "Core/Resource/CResource.h"
#include "Core/Resource/CCollisionMeshGroup.h"
#include "Core/Resource/CLight.h"
#include "Core/Resource/CMaterialSet.h"
#include "Core/Resource/CPoiToWorld.h"
#include "Core/Resource/Model/CModel.h"
#include "Core/Resource/Model/CStaticModel.h"
#include <Common/types.h>
@@ -60,7 +60,7 @@ class CGameArea : public CResource
TResPtr<CPoiToWorld> mpPoiToWorldMap;
public:
CGameArea();
CGameArea(CResourceEntry *pEntry = 0);
~CGameArea();
void AddWorldModel(CModel *pModel);

2
src/Core/Resource/CAnimSet.h
View File

@@ -36,7 +36,7 @@ class CAnimSet : public CResource
std::vector<SAnimation> mAnims;
public:
CAnimSet() : CResource() {}
CAnimSet(CResourceEntry *pEntry = 0) : CResource(pEntry) {}
u32 NumNodes() const { return mNodes.size(); }
TString NodeName(u32 Index) { if (Index >= mNodes.size()) Index = 0; return mNodes[Index].Name; }

5
src/Core/Resource/CAnimation.cpp
View File

@@ -2,8 +2,9 @@
#include <Math/CTransform4f.h>
#include <Math/MathUtil.h>
CAnimation::CAnimation()
: mDuration(0.f)
CAnimation::CAnimation(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mDuration(0.f)
, mTickInterval(0.0333333f)
, mNumKeys(0)
{

2
src/Core/Resource/CAnimation.h
View File

@@ -32,7 +32,7 @@ class CAnimation : public CResource
SBoneChannelInfo mBoneInfo[100];
public:
CAnimation();
CAnimation(CResourceEntry *pEntry = 0);
void EvaluateTransform(float Time, u32 BoneID, CVector3f *pOutTranslation, CQuaternion *pOutRotation, CVector3f *pOutScale) const;
bool HasTranslation(u32 BoneID) const;

2
src/Core/Resource/CAnimationParameters.cpp
View File

@@ -1,7 +1,7 @@
#include "CAnimationParameters.h"
#include "CAnimSet.h"
#include "CResCache.h"
#include "CResourceInfo.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/Log.h>
#include <iostream>

2
src/Core/Resource/CCollisionMeshGroup.h
View File

@@ -12,7 +12,7 @@ class CCollisionMeshGroup : public CResource
std::vector<CCollisionMesh*> mMeshes;
public:
CCollisionMeshGroup() {}
CCollisionMeshGroup(CResourceEntry *pEntry = 0) : CResource(pEntry) {}
~CCollisionMeshGroup()
{

4
src/Core/Resource/CFont.cpp
View File

@@ -1,5 +1,5 @@
#include "CFont.h"
#include "CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Render/CDrawUtil.h"
#include "Core/Render/CRenderer.h"
@@ -7,7 +7,7 @@ CDynamicVertexBuffer CFont::smGlyphVertices;
CIndexBuffer CFont::smGlyphIndices;
bool CFont::smBuffersInitialized = false;
CFont::CFont() : CResource()
CFont::CFont(CResourceEntry *pEntry /*= 0*/) : CResource(pEntry)
{
}

2
src/Core/Resource/CFont.h
View File

@@ -58,7 +58,7 @@ class CFont : public CResource
public:
CFont();
CFont(CResourceEntry *pEntry = 0);
~CFont();
CResource* MakeCopy(CResCache *pCopyCache);
CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio,

2
src/Core/Resource/CMaterial.cpp
View File

@@ -1,5 +1,5 @@
#include "CMaterial.h"
#include "CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Render/CDrawUtil.h"
#include "Core/Render/CRenderer.h"
#include "Core/OpenGL/GLCommon.h"

3
src/Core/Resource/CPoiToWorld.cpp
View File

@@ -1,6 +1,7 @@
#include "CPoiToWorld.h"
CPoiToWorld::CPoiToWorld()
CPoiToWorld::CPoiToWorld(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
{
}

2
src/Core/Resource/CPoiToWorld.h
View File

@@ -22,7 +22,7 @@ private:
std::map<u32,SPoiMap*> mPoiLookupMap;
public:
CPoiToWorld();
CPoiToWorld(CResourceEntry *pEntry = 0);
~CPoiToWorld();
void AddPoi(u32 PoiID);

209
src/Core/Resource/CResCache.cpp
View File

@@ -1,209 +0,0 @@
#include "CResCache.h"
#include "Core/Resource/Factory/CAreaLoader.h"
#include "Core/Resource/Factory/CAnimationLoader.h"
#include "Core/Resource/Factory/CAnimSetLoader.h"
#include "Core/Resource/Factory/CCollisionLoader.h"
#include "Core/Resource/Factory/CFontLoader.h"
#include "Core/Resource/Factory/CModelLoader.h"
#include "Core/Resource/Factory/CPoiToWorldLoader.h"
#include "Core/Resource/Factory/CScanLoader.h"
#include "Core/Resource/Factory/CSkeletonLoader.h"
#include "Core/Resource/Factory/CSkinLoader.h"
#include "Core/Resource/Factory/CStringLoader.h"
#include "Core/Resource/Factory/CTextureDecoder.h"
#include "Core/Resource/Factory/CWorldLoader.h"
#include <FileIO/FileIO.h>
#include <Common/AssertMacro.h>
#include <Common/FileUtil.h>
#include <Common/Log.h>
#include <Common/TString.h>
#include <iostream>
CResCache::CResCache()
: mpGameExporter(nullptr)
{
}
CResCache::~CResCache()
{
Clean();
}
void CResCache::Clean()
{
if (mResourceCache.empty()) return;
Log::Write("Cleaning unused resources");
// I couldn't get this to work properly using reverse iterators, lol.
// Resources get cached after their dependencies, which is why I go backwards
// while loop is to ensure -all- unused resources are cleaned. Not sure of a better way to do it.
int NumResourcesCleaned = 1;
while (NumResourcesCleaned)
{
NumResourcesCleaned = 0;
for (auto it = mResourceCache.end(); it != mResourceCache.begin();)
{
it--;
if (it->second->mRefCount <= 0)
{
delete it->second;
it = mResourceCache.erase(it);
NumResourcesCleaned++;
}
}
}
Log::Write(std::to_string(mResourceCache.size()) + " resources loaded");
}
void CResCache::SetFolder(TString Path)
{
Path.EnsureEndsWith("/");
mResDir = Path;
Log::Write("Set resource folder: " + Path);
}
TString CResCache::GetSourcePath()
{
return mResDir;
}
CResource* CResCache::GetResource(CUniqueID ResID, CFourCC Type)
{
if (!ResID.IsValid()) return nullptr;
TString StringName = ResID.ToString() + "." + Type.ToString();
// With Game Exporter - get data buffer from exporter
if (mpGameExporter)
{
// Check if we already have resource loaded
auto Got = mResourceCache.find(ResID.ToLongLong());
if (Got != mResourceCache.end())
return Got->second;
// Otherwise load resource
std::vector<u8> DataBuffer;
mpGameExporter->LoadResource(ResID, DataBuffer);
if (DataBuffer.empty()) return nullptr;
CMemoryInStream MemStream(DataBuffer.data(), DataBuffer.size(), IOUtil::eBigEndian);
CResource *pRes = InternalLoadResource(MemStream, ResID, Type);
pRes->mResSource = StringName;
return pRes;
}
// Without Game Exporter - load from file
else
{
TString Source = mResDir + StringName;
return GetResource(Source);
}
}
CResource* CResCache::GetResource(const TString& rkResPath)
{
CUniqueID ResID = rkResPath.Hash64();
// Check if resource already exists
auto Got = mResourceCache.find(ResID.ToLongLong());
if (Got != mResourceCache.end())
return Got->second;
// Open file
CFileInStream File(rkResPath.ToStdString(), IOUtil::eBigEndian);
if (!File.IsValid())
{
Log::Error("Couldn't open resource: " + rkResPath);
return nullptr;
}
// Save old ResDir to restore later
TString OldResDir = mResDir;
mResDir = rkResPath.GetFileDirectory();
// Load resource
CFourCC Type = rkResPath.GetFileExtension().ToUpper();
CResource *pRes = InternalLoadResource(File, ResID, Type);
pRes->mResSource = rkResPath;
// Add to cache and cleanup
mResDir = OldResDir;
return pRes;
}
CFourCC CResCache::FindResourceType(CUniqueID ResID, const TStringList& rkPossibleTypes)
{
// If we only have one type then there's only one possibility.
if (rkPossibleTypes.size() == 1)
return CFourCC(rkPossibleTypes.front());
// Determine extension from filesystem - try every extension until we find one that works
TString PathBase = mResDir + ResID.ToString() + ".";
for (auto it = rkPossibleTypes.begin(); it != rkPossibleTypes.end(); it++)
{
TString NewPath = PathBase + *it;
if (FileUtil::Exists(NewPath))
return CFourCC(*it);
}
return "UNKN";
}
void CResCache::CacheResource(CResource *pRes)
{
u64 ID = pRes->ResID().ToLongLong();
auto Got = mResourceCache.find(ID);
if (Got != mResourceCache.end())
mResourceCache[ID] = pRes;
}
void CResCache::DeleteResource(CUniqueID ResID)
{
auto Got = mResourceCache.find(ResID.ToLongLong());
if (Got != mResourceCache.end())
{
delete Got->second;
mResourceCache.erase(Got, Got);
}
}
// ************ PROTECTED ************
CResource* CResCache::InternalLoadResource(IInputStream& rInput, const CUniqueID& rkID, CFourCC Type)
{
// todo - need some sort of auto-registration of loaders to avoid this if-else mess
ASSERT(mResourceCache.find(rkID.ToLongLong()) == mResourceCache.end()); // this test should be done before calling this func!
CResource *pRes = nullptr;
// Load resource
if (Type == "CMDL") pRes = CModelLoader::LoadCMDL(rInput);
else if (Type == "TXTR") pRes = CTextureDecoder::LoadTXTR(rInput);
else if (Type == "ANCS") pRes = CAnimSetLoader::LoadANCS(rInput);
else if (Type == "CHAR") pRes = CAnimSetLoader::LoadCHAR(rInput);
else if (Type == "MREA") pRes = CAreaLoader::LoadMREA(rInput);
else if (Type == "MLVL") pRes = CWorldLoader::LoadMLVL(rInput);
else if (Type == "STRG") pRes = CStringLoader::LoadSTRG(rInput);
else if (Type == "FONT") pRes = CFontLoader::LoadFONT(rInput);
else if (Type == "SCAN") pRes = CScanLoader::LoadSCAN(rInput);
else if (Type == "DCLN") pRes = CCollisionLoader::LoadDCLN(rInput);
else if (Type == "EGMC") pRes = CPoiToWorldLoader::LoadEGMC(rInput);
else if (Type == "CINF") pRes = CSkeletonLoader::LoadCINF(rInput);
else if (Type == "ANIM") pRes = CAnimationLoader::LoadANIM(rInput);
else if (Type == "CSKR") pRes = CSkinLoader::LoadCSKR(rInput);
if (!pRes) pRes = new CResource(); // Default for unsupported formats
ASSERT(pRes->mRefCount == 0);
// Cache and return
pRes->mID = rkID;
mResourceCache[rkID.ToLongLong()] = pRes;
return pRes;
}
CResCache gResCache;

36
src/Core/Resource/CResCache.h
View File

@@ -1,36 +0,0 @@
#ifndef CRESCACHE_H
#define CRESCACHE_H
#include "CResource.h"
#include "Core/GameProject/CGameExporter.h"
#include <Common/types.h>
#include <Common/TString.h>
#include <unordered_map>
class CResCache
{
std::unordered_map<u64, CResource*> mResourceCache;
TString mResDir;
CGameExporter *mpGameExporter;
public:
CResCache();
~CResCache();
void Clean();
void SetFolder(TString Path);
TString GetSourcePath();
CResource* GetResource(CUniqueID ResID, CFourCC Type);
CResource* GetResource(const TString& rkResPath);
CFourCC FindResourceType(CUniqueID ResID, const TStringList& rkPossibleTypes);
void CacheResource(CResource *pRes);
void DeleteResource(CUniqueID ResID);
inline void SetGameExporter(CGameExporter *pExporter) { mpGameExporter = pExporter; }
protected:
CResource* InternalLoadResource(IInputStream& rInput, const CUniqueID& rkID, CFourCC Type);
};
extern CResCache gResCache;
#endif // CRESCACHE_H

90
src/Core/Resource/CResource.cpp
View File

@@ -1,4 +1,5 @@
#include "CResource.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/AssertMacro.h>
#include <map>
@@ -24,14 +25,89 @@ EResType CResource::ResTypeForExtension(CFourCC Extension)
return Find->second;
}
// Implementation of functions declared in EResType.h
TString GetRawExtension(EResType /*Type*/, EGame /*Game*/)
// ************ GLOBAL ************
TString GetResourceTypeName(EResType Type)
{
switch (Type)
{
case eAnimation: return "Animation";
case eAnimCollisionPrimData: return "Animation Collision Primitive Data";
case eAnimEventData: return "Animation Event Data";
case eAnimSet: return "Animation Character Set";
case eArea: return "Area";
case eAreaCollision: return "Area Collision";
case eAreaGeometry: return "Area Geometry";
case eAreaLights: return "Area Lights";
case eAreaMaterials: return "Area Materials";
case eAreaSurfaceBounds: return "Area Surface Bounds";
case eAreaOctree: return "Area Octree";
case eAreaVisibilityTree: return "Area Visibility Tree";
case eAudioGroupSet: return "Audio Group Set";
case eAudioMacro: return "Audio Macro";
case eAudioSample: return "Audio Sample";
case eAudioLookupTable: return "Audio Lookup Table";
case eBinaryData: return "Binary Data";
case eBurstFireData: return "Burst Fire Data";
case eCharacter: return "Character";
case eDependencyGroup: return "Dependency Group";
case eDynamicCollision: return "Dynamic Collision";
case eFont: return "Font";
case eGuiFrame: return "GUI Frame";
case eGuiKeyFrame: return "GUI Keyframe";
case eHintSystem: return "Hint System";
case eMapArea: return "Area Map";
case eMapWorld: return "World Map";
case eMapUniverse: return "Universe Map";
case eMidi: return "MIDI";
case eModel: return "Model";
case eMusicTrack: return "Music";
case ePackage: return "Package";
case eParticle: return "Particle System";
case eParticleCollisionResponse: return "Collision Response Particle System";
case eParticleDecal: return "Decal Particle System";
case eParticleElectric: return "Electric Particle System";
case eParticleSorted: return "Sorted Particle System";
case eParticleSpawn: return "Spawn Particle System";
case eParticleSwoosh: return "Swoosh Particle System";
case eParticleTransform: return "Transform Particle System";
case eParticleWeapon: return "Weapon Particle System";
case ePathfinding: return "Pathfinding Mesh";
case ePortalArea: return "Portal Area";
case eResource: return "Resource";
case eRuleSet: return "Rule Set";
case eSaveArea: return "Area Save Info";
case eSaveWorld: return "World Save Info";
case eScan: return "Scan";
case eSkeleton: return "Skeleton";
case eSkin: return "Skin";
case eSourceAnimData: return "Source Animation Data";
case eSpatialPrimitive: return "Spatial Primitive";
case eStateMachine: return "State Machine";
case eStateMachine2: return "State Machine";
case eStaticGeometryMap: return "Static Geometry Map";
case eStreamedAudio: return "Streamed Audio";
case eStringList: return "String List";
case eStringTable: return "String Table";
case eTexture: return "Texture";
case eTweak: return "Tweak Data";
case eUnknown_CAAD: return "Unknown (CAAD)";
case eUserEvaluatorData: return "User Evaluator Data";
case eVideo: return "Video";
case eWorld: return "World";
default: return "INVALID";
}
}
TString GetResourceRawExtension(EResType /*Type*/, EGame /*Game*/)
{
return "";
}
TString GetCookedExtension(EResType Type, EGame Game)
TString GetResourceCookedExtension(EResType Type, EGame Game)
{
if (Game == eUnknownVersion)
Game = ePrime;
u32 GameTypeID = GetGameTypeID(Game, Type);
auto Find = gTypeExtensionMap.find(GameTypeID);
if (Find != gTypeExtensionMap.end()) return Find->second;
@@ -138,3 +214,11 @@ REGISTER_RESOURCE_TYPE(TXTR, eTexture, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(USRC, eUserEvaluatorData, eCorruptionProto, eCorruption)
REGISTER_RESOURCE_TYPE(XFSC, eParticleTransform, eReturns, eReturns)
REGISTER_RESOURCE_TYPE(WPSC, eParticleWeapon, ePrimeDemo, eCorruption)
// Split Area Data
REGISTER_RESOURCE_TYPE(AMAT, eAreaMaterials, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(AGEO, eAreaGeometry, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(AOCT, eAreaOctree, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(ABOX, eAreaSurfaceBounds, eEchoesDemo, eReturns)
REGISTER_RESOURCE_TYPE(ACLN, eAreaCollision, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(ALIT, eAreaLights, ePrimeDemo, eReturns)
REGISTER_RESOURCE_TYPE(AVIS, eAreaVisibilityTree, ePrimeDemo, eReturns)

33
src/Core/Resource/CResource.h
View File

@@ -2,6 +2,8 @@
#define CRESOURCE_H
#include "EResType.h"
#include "Core/GameProject/CResourceEntry.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/CFourCC.h>
#include <Common/CUniqueID.h>
#include <Common/types.h>
@@ -28,24 +30,35 @@ private: \
class CResource
{
DECLARE_RESOURCE_TYPE(eResource)
friend class CResCache;
TString mResSource;
CUniqueID mID;
CResourceEntry *mpEntry;
int mRefCount;
public:
CResource() : mRefCount(0) {}
CResource(CResourceEntry *pEntry = 0)
: mpEntry(pEntry), mRefCount(0)
{
if (!mpEntry) mpEntry = gResourceStore.CreateTransientEntry(Type());
}
virtual ~CResource() {}
inline TString Source() const { return mResSource.GetFileName(); }
inline TString FullSource() const { return mResSource; }
inline CUniqueID ResID() const { return mID; }
inline void Lock() { mRefCount++; }
inline void Release() { mRefCount--; }
inline bool IsValidResource() { return (Type() != eResource); }
inline CResourceEntry* Entry() const { return mpEntry; }
inline TString Source() const { return mpEntry->CookedAssetPath(true).GetFileName(); }
inline TString FullSource() const { return mpEntry->CookedAssetPath(true); }
inline CUniqueID ResID() const { return mpEntry->ID(); }
inline EGame Game() const { return mpEntry->Game(); }
inline bool IsReferenced() const { return mRefCount > 0; }
inline void SetGame(EGame Game) { mpEntry->SetGame(Game); }
inline void Lock() { mRefCount++; }
inline void Release() { mRefCount--; }
static EResType ResTypeForExtension(CFourCC Extension);
};
// Global Functions
TString GetResourceTypeName(EResType Type);
TString GetResourceRawExtension(EResType Type, EGame Game);
TString GetResourceCookedExtension(EResType Type, EGame Game);
#endif // CRESOURCE_H

6
src/Core/Resource/CResourceInfo.h
View File

@@ -2,7 +2,7 @@
#define CRESOURCEINFO
#include "CResource.h"
#include "CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/CUniqueID.h>
#include <Common/CFourCC.h>
#include <Common/FileUtil.h>
@@ -60,9 +60,9 @@ public:
if (!IsValid())
return nullptr;
if (mIsPath)
return gResCache.GetResource(mPath);
return gResourceStore.LoadResource(mPath);
else
return gResCache.GetResource(ID(), Type());
return gResourceStore.LoadResource(ID(), Type());
}
inline bool IsValid() const

4
src/Core/Resource/CScan.h
View File

@@ -31,8 +31,8 @@ private:
ELogbookCategory mCategory;
public:
CScan()
: CResource()
CScan(CResourceEntry *pEntry = 0)
: CResource(pEntry)
, mpFrame(nullptr)
, mpStringTable(nullptr)
, mIsSlow(false)

5
src/Core/Resource/CSkeleton.cpp
View File

@@ -62,8 +62,9 @@ bool CBone::IsRoot() const
// ************ CSkeleton ************
const float CSkeleton::skSphereRadius = 0.025f;
CSkeleton::CSkeleton()
: mpRootBone(nullptr)
CSkeleton::CSkeleton(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mpRootBone(nullptr)
{
}

2
src/Core/Resource/CSkeleton.h
View File

@@ -33,7 +33,7 @@ class CSkeleton : public CResource
static const float skSphereRadius;
public:
CSkeleton();
CSkeleton(CResourceEntry *pEntry = 0);
~CSkeleton();
void UpdateTransform(CBoneTransformData& rData, CAnimation *pAnim, float Time, bool AnchorRoot);
CBone* BoneByID(u32 BoneID) const;

2
src/Core/Resource/CSkin.h
View File

@@ -23,7 +23,7 @@ class CSkin : public CResource
std::vector<SVertGroup> mVertGroups;
public:
CSkin() {}
CSkin(CResourceEntry *pEntry = 0) : CResource(pEntry) {}
const SVertexWeights& WeightsForVertex(u32 VertIdx)
{

2
src/Core/Resource/CStringTable.h
View File

@@ -23,7 +23,7 @@ class CStringTable : public CResource
std::vector<SLangTable> mLangTables;
public:
CStringTable() {}
CStringTable(CResourceEntry *pEntry = 0) : CResource(pEntry) {}
inline u32 NumStrings() const { return mNumStrings; }
inline u32 NumLanguages() const { return mLangTables.size(); }

5
src/Core/Resource/CTexture.cpp
View File

@@ -1,7 +1,7 @@
#include "CTexture.h"
CTexture::CTexture()
: CResource()
CTexture::CTexture(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mTexelFormat(eRGBA8)
, mSourceTexelFormat(eRGBA8)
, mWidth(0)
@@ -125,6 +125,7 @@ void CTexture::Resize(u32 Width, u32 Height)
mWidth = (u16) Width;
mHeight = (u16) Height;
mNumMipMaps = 1;
CalcLinearSize();
}
}

2
src/Core/Resource/CTexture.h
View File

@@ -29,7 +29,7 @@ class CTexture : public CResource
GLuint mTextureID; // ID for texture GL buffer
public:
CTexture();
CTexture(CResourceEntry *pEntry = 0);
CTexture(u32 Width, u32 Height);
~CTexture();

6
src/Core/Resource/CWorld.cpp
View File

@@ -1,9 +1,9 @@
#include "CWorld.h"
#include "CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Script/CScriptLayer.h"
CWorld::CWorld()
: CResource()
CWorld::CWorld(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mWorldVersion(eUnknownVersion)
, mpWorldName(nullptr)
, mpDarkWorldName(nullptr)

4
src/Core/Resource/CWorld.h
View File

@@ -2,9 +2,9 @@
#define CWORLD_H
#include "CResource.h"
#include "CGameArea.h"
#include "CStringTable.h"
#include "SDependency.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/Resource/Model/CModel.h"
#include <Math/CTransform4f.h>
@@ -81,7 +81,7 @@ class CWorld : public CResource
public:
CWorld();
CWorld(CResourceEntry *pEntry = 0);
~CWorld();
void SetAreaLayerInfo(CGameArea *pArea);

2
src/Core/Resource/Cooker/CAreaCooker.h
View File

@@ -2,7 +2,7 @@
#define CAREACOOKER_H
#include "CSectionMgrOut.h"
#include "Core/Resource/CGameArea.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/Resource/EGame.h"
#include <FileIO/FileIO.h>

14
src/Core/Resource/EResType.h
View File

@@ -11,8 +11,15 @@ enum EResType
eAnimEventData,
eAnimSet,
eArea,
eAudioMacro,
eAreaCollision,
eAreaGeometry,
eAreaLights,
eAreaMaterials,
eAreaSurfaceBounds,
eAreaOctree,
eAreaVisibilityTree,
eAudioGroupSet,
eAudioMacro,
eAudioSample,
eAudioLookupTable,
eBinaryData,
@@ -67,10 +74,5 @@ enum EResType
eInvalidResType = -1
};
// defined in CResource.cpp
TString GetTypeName(EResType Type);
TString GetRawExtension(EResType Type, EGame Game);
TString GetCookedExtension(EResType Type, EGame Game);
#endif // ERESTYPE

33
src/Core/Resource/Factory/CAnimSetLoader.cpp
View File

@@ -1,5 +1,5 @@
#include "CAnimSetLoader.h"
#include "Core/Resource/CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/Log.h>
CAnimSetLoader::CAnimSetLoader()
@@ -14,7 +14,7 @@ CAnimSet* CAnimSetLoader::LoadCorruptionCHAR(IInputStream& rCHAR)
CAnimSet::SNode& node = pSet->mNodes[0];
node.Name = rCHAR.ReadString();
node.pModel = gResCache.GetResource(rCHAR.ReadLongLong(), "CMDL");
node.pModel = gResourceStore.LoadResource(rCHAR.ReadLongLong(), "CMDL");
return pSet;
}
@@ -28,7 +28,7 @@ CAnimSet* CAnimSetLoader::LoadReturnsCHAR(IInputStream& rCHAR)
rNode.Name = rCHAR.ReadString();
rCHAR.Seek(0x14, SEEK_CUR);
rCHAR.ReadString();
rNode.pModel = gResCache.GetResource(rCHAR.ReadLongLong(), "CMDL");
rNode.pModel = gResourceStore.LoadResource(rCHAR.ReadLongLong(), "CMDL");
return pSet;
}
@@ -194,7 +194,7 @@ void CAnimSetLoader::LoadHalfTransition(IInputStream& rANCS)
}
// ************ STATIC ************
CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS, CResourceEntry *pEntry)
{
if (!rANCS.IsValid()) return nullptr;
@@ -206,7 +206,8 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
}
CAnimSetLoader Loader;
Loader.pSet = new CAnimSet;
Loader.pSet = new CAnimSet(pEntry);
Loader.mVersion = pEntry->Game();
u32 NodeCount = rANCS.ReadLong();
Loader.pSet->mNodes.resize(NodeCount);
@@ -217,11 +218,15 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
rANCS.Seek(0x4, SEEK_CUR); // Skipping node self-index
u16 Unknown1 = rANCS.ReadShort();
if (iNode == 0) Loader.mVersion = (Unknown1 == 0xA) ? eEchoes : ePrime; // Best version indicator we know of unfortunately
if (iNode == 0 && Loader.mVersion == eUnknownVersion)
{
Loader.mVersion = (Unknown1 == 0xA) ? eEchoes : ePrime; // Best version indicator we know of unfortunately
Loader.pSet->SetGame(Loader.mVersion);
}
pNode->Name = rANCS.ReadString();
pNode->pModel = gResCache.GetResource(rANCS.ReadLong(), "CMDL");
pNode->pSkin = gResCache.GetResource(rANCS.ReadLong(), "CSKR");
pNode->pSkeleton = gResCache.GetResource(rANCS.ReadLong(), "CINF");
pNode->pModel = gResourceStore.LoadResource(rANCS.ReadLong(), "CMDL");
pNode->pSkin = gResourceStore.LoadResource(rANCS.ReadLong(), "CSKR");
pNode->pSkeleton = gResourceStore.LoadResource(rANCS.ReadLong(), "CINF");
if (pNode->pModel) pNode->pModel->SetSkin(pNode->pSkin);
// Unfortunately that's all that's actually supported at the moment. Hope to expand later.
@@ -330,7 +335,7 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
{
CAnimSet::SAnimation Anim;
Anim.Name = rPrim.Name;
Anim.pAnim = gResCache.GetResource(rPrim.AnimID, "ANIM");
Anim.pAnim = gResourceStore.LoadResource(rPrim.AnimID, "ANIM");
Loader.pSet->mAnims.push_back(Anim);
}
}
@@ -338,7 +343,7 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
return Loader.pSet;
}
CAnimSet* CAnimSetLoader::LoadCHAR(IInputStream& rCHAR)
CAnimSet* CAnimSetLoader::LoadCHAR(IInputStream& rCHAR, CResourceEntry *pEntry)
{
if (!rCHAR.IsValid()) return nullptr;
@@ -348,14 +353,16 @@ CAnimSet* CAnimSetLoader::LoadCHAR(IInputStream& rCHAR)
if (Check == 0x5 || Check == 0x3)
{
Loader.mVersion = eCorruption;
Loader.pSet = new CAnimSet();
Loader.pSet = new CAnimSet(pEntry);
Loader.pSet->SetGame(eCorruption);
return Loader.LoadCorruptionCHAR(rCHAR);
}
if (Check == 0x59)
{
Loader.mVersion = eReturns;
Loader.pSet = new CAnimSet();
Loader.pSet = new CAnimSet(pEntry);
Loader.pSet->SetGame(eReturns);
return Loader.LoadReturnsCHAR(rCHAR);
}

4
src/Core/Resource/Factory/CAnimSetLoader.h
View File

@@ -42,8 +42,8 @@ class CAnimSetLoader
void LoadHalfTransition(IInputStream& rANCS);
public:
static CAnimSet* LoadANCS(IInputStream& rANCS);
static CAnimSet* LoadCHAR(IInputStream& rCHAR);
static CAnimSet* LoadANCS(IInputStream& rANCS, CResourceEntry *pEntry);
static CAnimSet* LoadCHAR(IInputStream& rCHAR, CResourceEntry *pEntry);
};
#endif // CCHARACTERLOADER_H

19
src/Core/Resource/Factory/CAnimationLoader.cpp
View File

@@ -75,7 +75,11 @@ void CAnimationLoader::ReadUncompressedANIM()
NumBoneChannels++;
}
mGame = UncompressedCheckVersion();
if (mGame == eUnknownVersion)
{
mGame = UncompressedCheckVersion();
mpAnim->SetGame(mGame);
}
// Echoes only - rotation channel indices
std::vector<u8> RotationIndices;
@@ -206,7 +210,13 @@ void CAnimationLoader::ReadCompressedANIM()
{
// Header
mpInput->Seek(0x4, SEEK_CUR); // Skip alloc size
mGame = (mpInput->PeekShort() == 0x0101 ? eEchoes : ePrime); // Version check
if (mGame == eUnknownVersion)
{
mGame = (mpInput->PeekShort() == 0x0101 ? eEchoes : ePrime);
mpAnim->SetGame(mGame);
}
mpInput->Seek(mGame == ePrime ? 0x8 : 0x2, SEEK_CUR); // Skip EVNT (MP1) and unknowns
mpAnim->mDuration = mpInput->ReadFloat();
mpAnim->mTickInterval = mpInput->ReadFloat();
@@ -452,7 +462,7 @@ CQuaternion CAnimationLoader::DequantizeRotation(bool Sign, s16 X, s16 Y, s16 Z)
}
// ************ STATIC ************
CAnimation* CAnimationLoader::LoadANIM(IInputStream& rANIM)
CAnimation* CAnimationLoader::LoadANIM(IInputStream& rANIM, CResourceEntry *pEntry)
{
u32 CompressionType = rANIM.ReadLong();
@@ -463,7 +473,8 @@ CAnimation* CAnimationLoader::LoadANIM(IInputStream& rANIM)
}
CAnimationLoader Loader;
Loader.mpAnim = new CAnimation();
Loader.mpAnim = new CAnimation(pEntry);
Loader.mGame = pEntry->Game();
Loader.mpInput = &rANIM;
if (CompressionType == 0)

2
src/Core/Resource/Factory/CAnimationLoader.h
View File

@@ -41,7 +41,7 @@ class CAnimationLoader
CQuaternion DequantizeRotation(bool Sign, s16 X, s16 Y, s16 Z);
public:
static CAnimation* LoadANIM(IInputStream& rANIM);
static CAnimation* LoadANIM(IInputStream& rANIM, CResourceEntry *pEntry);
};
#endif // CANIMATIONLOADER_H

7
src/Core/Resource/Factory/CAreaLoader.cpp
View File

@@ -603,7 +603,7 @@ void CAreaLoader::ReadEGMC()
Log::FileWrite(mpMREA->GetSourceString(), "Reading EGMC");
mpSectionMgr->ToSection(mEGMCBlockNum);
CUniqueID EGMC(*mpMREA, (mVersion <= eEchoes ? e32Bit : e64Bit));
mpArea->mpPoiToWorldMap = gResCache.GetResource(EGMC, "EGMC");
mpArea->mpPoiToWorldMap = gResourceStore.LoadResource(EGMC, "EGMC");
}
void CAreaLoader::SetUpObjects()
@@ -650,7 +650,7 @@ void CAreaLoader::SetUpObjects()
}
// ************ STATIC ************
CGameArea* CAreaLoader::LoadMREA(IInputStream& MREA)
CGameArea* CAreaLoader::LoadMREA(IInputStream& MREA, CResourceEntry *pEntry)
{
CAreaLoader Loader;
@@ -665,9 +665,10 @@ CGameArea* CAreaLoader::LoadMREA(IInputStream& MREA)
}
// Header
Loader.mpArea = new CGameArea;
Loader.mpArea = new CGameArea(pEntry);
u32 Version = MREA.ReadLong();
Loader.mVersion = GetFormatVersion(Version);
Loader.mpArea->SetGame(Loader.mVersion);
Loader.mpArea->mVersion = Loader.mVersion;
Loader.mpMREA = &MREA;

6
src/Core/Resource/Factory/CAreaLoader.h
View File

@@ -2,10 +2,10 @@
#define CAREALOADER_H
#include "CSectionMgrIn.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/Resource/Script/CLink.h"
#include "Core/Resource/CGameArea.h"
#include "Core/Resource/EGame.h"
#include "Core/Resource/CResCache.h"
#include <FileIO/FileIO.h>
@@ -80,7 +80,7 @@ class CAreaLoader
void SetUpObjects();
public:
static CGameArea* LoadMREA(IInputStream& rMREA);
static CGameArea* LoadMREA(IInputStream& rMREA, CResourceEntry *pEntry);
static EGame GetFormatVersion(u32 Version);
};

5
src/Core/Resource/Factory/CCollisionLoader.cpp
View File

@@ -159,12 +159,12 @@ CCollisionMeshGroup* CCollisionLoader::LoadAreaCollision(IInputStream& rMREA)
return loader.mpGroup;
}
CCollisionMeshGroup* CCollisionLoader::LoadDCLN(IInputStream& rDCLN)
CCollisionMeshGroup* CCollisionLoader::LoadDCLN(IInputStream& rDCLN, CResourceEntry *pEntry)
{
if (!rDCLN.IsValid()) return nullptr;
CCollisionLoader Loader;
Loader.mpGroup = new CCollisionMeshGroup;
Loader.mpGroup = new CCollisionMeshGroup(pEntry);
u32 NumMeshes = rDCLN.ReadLong();
@@ -183,6 +183,7 @@ CCollisionMeshGroup* CCollisionLoader::LoadDCLN(IInputStream& rDCLN)
Loader.mpMesh = new CCollisionMesh;
Loader.mpMesh->mOctreeLoaded = false;
Loader.mpGroup->SetGame(Loader.mVersion);
if (Loader.mVersion == eReturns)
Loader.mpMesh->mAABox = CAABox(rDCLN);

2
src/Core/Resource/Factory/CCollisionLoader.h
View File

@@ -22,7 +22,7 @@ class CCollisionLoader
public:
static CCollisionMeshGroup* LoadAreaCollision(IInputStream& rMREA);
static CCollisionMeshGroup* LoadDCLN(IInputStream& rDCLN);
static CCollisionMeshGroup* LoadDCLN(IInputStream& rDCLN, CResourceEntry *pEntry);
static EGame GetFormatVersion(u32 Version);
};

9
src/Core/Resource/Factory/CFontLoader.cpp
View File

@@ -18,8 +18,8 @@ CFont* CFontLoader::LoadFont(IInputStream& rFONT)
mpFont->mDefaultSize = rFONT.ReadLong();
mpFont->mFontName = rFONT.ReadString();
if (mVersion <= eEchoes) mpFont->mpFontTexture = gResCache.GetResource(rFONT.ReadLong(), "TXTR");
else mpFont->mpFontTexture = gResCache.GetResource(rFONT.ReadLongLong(), "TXTR");
if (mVersion <= eEchoes) mpFont->mpFontTexture = gResourceStore.LoadResource(rFONT.ReadLong(), "TXTR");
else mpFont->mpFontTexture = gResourceStore.LoadResource(rFONT.ReadLongLong(), "TXTR");
mpFont->mTextureFormat = rFONT.ReadLong();
u32 NumGlyphs = rFONT.ReadLong();
@@ -79,7 +79,7 @@ CFont* CFontLoader::LoadFont(IInputStream& rFONT)
return mpFont;
}
CFont* CFontLoader::LoadFONT(IInputStream& rFONT)
CFont* CFontLoader::LoadFONT(IInputStream& rFONT, CResourceEntry *pEntry)
{
if (!rFONT.IsValid()) return nullptr;
@@ -99,7 +99,8 @@ CFont* CFontLoader::LoadFONT(IInputStream& rFONT)
}
CFontLoader Loader;
Loader.mpFont = new CFont();
Loader.mpFont = new CFont(pEntry);
Loader.mpFont->SetGame(Version);
Loader.mVersion = Version;
return Loader.LoadFont(rFONT);
}

4
src/Core/Resource/Factory/CFontLoader.h
View File

@@ -1,9 +1,9 @@
#ifndef CFONTLOADER_H
#define CFONTLOADER_H
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/CFont.h"
#include "Core/Resource/EGame.h"
#include "Core/Resource/CResCache.h"
class CFontLoader
{
@@ -14,7 +14,7 @@ class CFontLoader
CFont* LoadFont(IInputStream& rFONT);
public:
static CFont* LoadFONT(IInputStream& rFONT);
static CFont* LoadFONT(IInputStream& rFONT, CResourceEntry *pEntry);
static EGame GetFormatVersion(u32 Version);
};

6
src/Core/Resource/Factory/CMaterialLoader.cpp
View File

@@ -1,5 +1,5 @@
#include "CMaterialLoader.h"
#include "Core/Resource/CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/OpenGL/GLCommon.h"
#include <Common/Log.h>
#include <iostream>
@@ -50,7 +50,7 @@ void CMaterialLoader::ReadPrimeMatSet()
for (u32 iTex = 0; iTex < NumTextures; iTex++)
{
u32 TextureID = mpFile->ReadLong();
mTextures[iTex] = gResCache.GetResource(TextureID, "TXTR");
mTextures[iTex] = gResourceStore.LoadResource(TextureID, "TXTR");
}
// Materials
@@ -366,7 +366,7 @@ CMaterial* CMaterialLoader::ReadCorruptionMaterial()
continue;
}
pPass->mpTexture = gResCache.GetResource(TextureID, "TXTR");
pPass->mpTexture = gResourceStore.LoadResource(TextureID, "TXTR");
pPass->mTexCoordSource = 4 + (u8) mpFile->ReadLong();
u32 AnimSize = mpFile->ReadLong();

2
src/Core/Resource/Factory/CMaterialLoader.h
View File

@@ -1,9 +1,9 @@
#ifndef CMATERIALLOADER_H
#define CMATERIALLOADER_H
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/CMaterialSet.h"
#include "Core/Resource/EGame.h"
#include "Core/Resource/CResCache.h"
#include <FileIO/FileIO.h>
#include <assimp/scene.h>

5
src/Core/Resource/Factory/CModelLoader.cpp
View File

@@ -382,7 +382,7 @@ SSurface* CModelLoader::LoadAssimpMesh(const aiMesh *pkMesh, CMaterialSet *pSet)
}
// ************ STATIC ************
CModel* CModelLoader::LoadCMDL(IInputStream& rCMDL)
CModel* CModelLoader::LoadCMDL(IInputStream& rCMDL, CResourceEntry *pEntry)
{
CModelLoader Loader;
@@ -452,7 +452,8 @@ CModel* CModelLoader::LoadCMDL(IInputStream& rCMDL)
return nullptr;
}
CModel *pModel = new CModel();
CModel *pModel = new CModel(pEntry);
pModel->SetGame(Loader.mVersion);
Loader.mpModel = pModel;
Loader.mpSectionMgr = new CSectionMgrIn(BlockCount, &rCMDL);
rCMDL.SeekToBoundary(32);

4
src/Core/Resource/Factory/CModelLoader.h
View File

@@ -2,9 +2,9 @@
#define CMODELLOADER_H
#include "CSectionMgrIn.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Model/CBasicModel.h"
#include "Core/Resource/Model/CModel.h"
#include "Core/Resource/CResCache.h"
#include "Core/Resource/EGame.h"
#include <Common/Flags.h>
@@ -57,7 +57,7 @@ private:
SSurface* LoadAssimpMesh(const aiMesh *pkMesh, CMaterialSet *pSet);
public:
static CModel* LoadCMDL(IInputStream& rCMDL);
static CModel* LoadCMDL(IInputStream& rCMDL, CResourceEntry *pEntry);
static CModel* LoadWorldModel(IInputStream& rMREA, CSectionMgrIn& rBlockMgr, CMaterialSet& rMatSet, EGame Version);
static CModel* LoadCorruptionWorldModel(IInputStream& rMREA, CSectionMgrIn& rBlockMgr, CMaterialSet& rMatSet, u32 HeaderSecNum, u32 GPUSecNum, EGame Version);
static void BuildWorldMeshes(const std::vector<CModel*>& rkIn, std::vector<CModel*>& rOut, bool DeleteInputModels);

4
src/Core/Resource/Factory/CPoiToWorldLoader.cpp
View File

@@ -1,8 +1,8 @@
#include "CPoiToWorldLoader.h"
CPoiToWorld* CPoiToWorldLoader::LoadEGMC(IInputStream& rEGMC)
CPoiToWorld* CPoiToWorldLoader::LoadEGMC(IInputStream& rEGMC, CResourceEntry *pEntry)
{
CPoiToWorld *pOut = new CPoiToWorld();
CPoiToWorld *pOut = new CPoiToWorld(pEntry);
u32 NumMappings = rEGMC.ReadLong();
for (u32 iMap = 0; iMap < NumMappings; iMap++)

2
src/Core/Resource/Factory/CPoiToWorldLoader.h
View File

@@ -11,7 +11,7 @@ class CPoiToWorldLoader
CPoiToWorldLoader() {}
public:
static CPoiToWorld* LoadEGMC(IInputStream& rEGMC);
static CPoiToWorld* LoadEGMC(IInputStream& rEGMC, CResourceEntry *pEntry);
};
#endif // CPOITOWORLDLOADER_H

21
src/Core/Resource/Factory/CScanLoader.cpp
View File

@@ -1,5 +1,5 @@
#include "CScanLoader.h"
#include "Core/Resource/CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/Log.h>
CScanLoader::CScanLoader()
@@ -10,7 +10,7 @@ CScan* CScanLoader::LoadScanMP1(IInputStream& rSCAN)
{
// Basic support at the moment - don't read animation/scan image data
rSCAN.Seek(0x4, SEEK_CUR); // Skip FRME ID
mpScan->mpStringTable = gResCache.GetResource(rSCAN.ReadLong(), "STRG");
mpScan->mpStringTable = gResourceStore.LoadResource(rSCAN.ReadLong(), "STRG");
mpScan->mIsSlow = (rSCAN.ReadLong() != 0);
mpScan->mCategory = (CScan::ELogbookCategory) rSCAN.ReadLong();
mpScan->mIsImportant = (rSCAN.ReadByte() == 1);
@@ -58,12 +58,14 @@ CScan* CScanLoader::LoadScanMP2(IInputStream& rSCAN)
{
case 0x14:
case 0xB:
mpScan = new CScan();
mpScan = new CScan(mpEntry);
mpScan->SetGame(eEchoes);
LoadParamsMP2(rSCAN);
break;
case 0x12:
case 0x16:
mpScan = new CScan();
mpScan = new CScan(mpEntry);
mpScan->SetGame(eCorruption);
LoadParamsMP3(rSCAN);
break;
default:
@@ -86,7 +88,7 @@ void CScanLoader::LoadParamsMP2(IInputStream& rSCAN)
switch (PropertyID)
{
case 0x2F5B6423:
mpScan->mpStringTable = gResCache.GetResource(rSCAN.ReadLong(), "STRG");
mpScan->mpStringTable = gResourceStore.LoadResource(rSCAN.ReadLong(), "STRG");
break;
case 0xC308A322:
@@ -119,7 +121,7 @@ void CScanLoader::LoadParamsMP3(IInputStream& rSCAN)
switch (PropertyID)
{
case 0x2F5B6423:
mpScan->mpStringTable = gResCache.GetResource(rSCAN.ReadLongLong(), "STRG");
mpScan->mpStringTable = gResourceStore.LoadResource(rSCAN.ReadLongLong(), "STRG");
break;
case 0xC308A322:
@@ -139,7 +141,7 @@ void CScanLoader::LoadParamsMP3(IInputStream& rSCAN)
}
// ************ STATIC/PUBLIC ************
CScan* CScanLoader::LoadSCAN(IInputStream& rSCAN)
CScan* CScanLoader::LoadSCAN(IInputStream& rSCAN, CResourceEntry *pEntry)
{
if (!rSCAN.IsValid()) return nullptr;
@@ -157,6 +159,7 @@ CScan* CScanLoader::LoadSCAN(IInputStream& rSCAN)
// The MP2 load function will check for MP3
CScanLoader Loader;
Loader.mVersion = eEchoes;
Loader.mpEntry = pEntry;
if (Magic == 0x01000000) rSCAN.Seek(-4, SEEK_CUR); // The version number isn't present in the Echoes demo
return Loader.LoadScanMP2(rSCAN);
}
@@ -176,6 +179,8 @@ CScan* CScanLoader::LoadSCAN(IInputStream& rSCAN)
// MP1 SCAN - read the file!
CScanLoader Loader;
Loader.mVersion = ePrime;
Loader.mpScan = new CScan();
Loader.mpScan = new CScan(pEntry);
Loader.mpScan->SetGame(ePrime);
Loader.mpEntry = pEntry;
return Loader.LoadScanMP1(rSCAN);
}

3
src/Core/Resource/Factory/CScanLoader.h
View File

@@ -7,6 +7,7 @@
class CScanLoader
{
TResPtr<CScan> mpScan;
CResourceEntry *mpEntry;
EGame mVersion;
CScanLoader();
@@ -16,7 +17,7 @@ class CScanLoader
void LoadParamsMP3(IInputStream& rSCAN);
public:
static CScan* LoadSCAN(IInputStream& rSCAN);
static CScan* LoadSCAN(IInputStream& rSCAN, CResourceEntry *pEntry);
};
#endif // CSCANLOADER_H

4
src/Core/Resource/Factory/CScriptLoader.cpp
View File

@@ -1,7 +1,7 @@
#include "CScriptLoader.h"
#include "CTemplateLoader.h"
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Script/CMasterTemplate.h"
#include "Core/Resource/CResCache.h"
#include <Common/Log.h>
#include <iostream>
#include <sstream>
@@ -117,7 +117,7 @@ void CScriptLoader::ReadProperty(IProperty *pProp, u32 Size, IInputStream& rSCLY
if (ResID.IsValid())
{
CFourCC Type = gResCache.FindResourceType(ResID, rkExtensions);
CFourCC Type = gResourceStore.ResourceTypeByID(ResID, rkExtensions);
Info = CResourceInfo(ResID, Type);
}

4
src/Core/Resource/Factory/CScriptLoader.h
View File

@@ -1,11 +1,11 @@
#ifndef CSCRIPTLOADER_H
#define CSCRIPTLOADER_H
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/Resource/Script/CScriptObject.h"
#include "Core/Resource/Script/CScriptLayer.h"
#include "Core/Resource/Script/CMasterTemplate.h"
#include "Core/Resource/CGameArea.h"
#include "Core/Resource/CResCache.h"
class CScriptLoader
{

7
src/Core/Resource/Factory/CSkeletonLoader.cpp
View File

@@ -25,12 +25,12 @@ void CSkeletonLoader::CalculateBoneInverseBindMatrices()
}
// ************ STATIC ************
CSkeleton* CSkeletonLoader::LoadCINF(IInputStream& rCINF)
CSkeleton* CSkeletonLoader::LoadCINF(IInputStream& rCINF, CResourceEntry *pEntry)
{
CSkeletonLoader Loader;
CSkeleton *pSkel = new CSkeleton();
CSkeleton *pSkel = new CSkeleton(pEntry);
Loader.mpSkeleton = pSkel;
EGame Game = eUnknownVersion;
EGame Game = pEntry->Game();
u32 NumBones = rCINF.ReadLong();
pSkel->mBones.reserve(NumBones);
@@ -60,6 +60,7 @@ CSkeleton* CSkeletonLoader::LoadCINF(IInputStream& rCINF)
{
u32 Check = rCINF.PeekLong();
Game = ((Check > 100 || Check == 0) ? eEchoes : ePrime);
Loader.mpSkeleton->SetGame(Game);
}
if (Game == eEchoes)
{

2
src/Core/Resource/Factory/CSkeletonLoader.h
View File

@@ -15,7 +15,7 @@ class CSkeletonLoader
void CalculateBoneInverseBindMatrices();
public:
static CSkeleton* LoadCINF(IInputStream& rCINF);
static CSkeleton* LoadCINF(IInputStream& rCINF, CResourceEntry *pEntry);
};
#endif // CSKELETONLOADER_H

4
src/Core/Resource/Factory/CSkinLoader.cpp
View File

@@ -2,12 +2,12 @@
#include <Common/AssertMacro.h>
// ************ STATIC ************
CSkin* CSkinLoader::LoadCSKR(IInputStream& rCSKR)
CSkin* CSkinLoader::LoadCSKR(IInputStream& rCSKR, CResourceEntry *pEntry)
{
if (!rCSKR.IsValid()) return nullptr;
u32 NumVertexGroups = rCSKR.ReadLong();
CSkin *pSkin = new CSkin();
CSkin *pSkin = new CSkin(pEntry);
pSkin->mVertGroups.resize(NumVertexGroups);
for (u32 iGrp = 0; iGrp < NumVertexGroups; iGrp++)

2
src/Core/Resource/Factory/CSkinLoader.h
View File

@@ -8,7 +8,7 @@ class CSkinLoader
{
CSkinLoader() {}
public:
static CSkin* LoadCSKR(IInputStream& rCSKR);
static CSkin* LoadCSKR(IInputStream& rCSKR, CResourceEntry *pEntry);
};
#endif // CSKINLOADER_H

9
src/Core/Resource/Factory/CStringLoader.cpp
View File

@@ -1,10 +1,6 @@
#include "CStringLoader.h"
#include <Common/Log.h>
CStringLoader::CStringLoader()
{
}
void CStringLoader::LoadPrimeDemoSTRG(IInputStream& rSTRG)
{
// This function starts at 0x4 in the file - right after the size
@@ -158,7 +154,7 @@ void CStringLoader::LoadNameTable(IInputStream& rSTRG)
}
// ************ STATIC ************
CStringTable* CStringLoader::LoadSTRG(IInputStream& rSTRG)
CStringTable* CStringLoader::LoadSTRG(IInputStream& rSTRG, CResourceEntry *pEntry)
{
// Verify that this is a valid STRG
if (!rSTRG.IsValid()) return nullptr;
@@ -198,7 +194,8 @@ CStringTable* CStringLoader::LoadSTRG(IInputStream& rSTRG)
// Valid; now we create the loader and call the function that reads the rest of the file
CStringLoader Loader;
Loader.mpStringTable = new CStringTable();
Loader.mpStringTable = new CStringTable(pEntry);
Loader.mpStringTable->SetGame(Version);
Loader.mVersion = Version;
if (Version == ePrimeDemo) Loader.LoadPrimeDemoSTRG(rSTRG);

8
src/Core/Resource/Factory/CStringLoader.h
View File

@@ -1,24 +1,24 @@
#ifndef CSTRINGLOADER_H
#define CSTRINGLOADER_H
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/CStringTable.h"
#include "Core/Resource/CResCache.h"
#include "Core/Resource/EGame.h"
#include "Core/Resource/TResPtr.h"
class CStringLoader
{
TResPtr<CStringTable> mpStringTable;
CStringTable *mpStringTable;
EGame mVersion;
CStringLoader();
CStringLoader() {}
void LoadPrimeDemoSTRG(IInputStream& rSTRG);
void LoadPrimeSTRG(IInputStream& rSTRG);
void LoadCorruptionSTRG(IInputStream& rSTRG);
void LoadNameTable(IInputStream& rSTRG);
public:
static CStringTable* LoadSTRG(IInputStream& rSTRG);
static CStringTable* LoadSTRG(IInputStream &rSTRG, CResourceEntry *pEntry);
static EGame GetFormatVersion(u32 Version);
};

11
src/Core/Resource/Factory/CTextureDecoder.cpp
View File

@@ -44,7 +44,7 @@ CTextureDecoder::~CTextureDecoder()
CTexture* CTextureDecoder::CreateTexture()
{
CTexture *pTex = new CTexture;
CTexture *pTex = new CTexture(mpEntry);
pTex->mSourceTexelFormat = mTexelFormat;
pTex->mWidth = mWidth;
pTex->mHeight = mHeight;
@@ -91,17 +91,19 @@ CTexture* CTextureDecoder::CreateTexture()
}
// ************ STATIC ************
CTexture* CTextureDecoder::LoadTXTR(IInputStream& rTXTR)
CTexture* CTextureDecoder::LoadTXTR(IInputStream& rTXTR, CResourceEntry *pEntry)
{
CTextureDecoder Decoder;
Decoder.mpEntry = pEntry;
Decoder.ReadTXTR(rTXTR);
Decoder.PartialDecodeGXTexture(rTXTR);
return Decoder.CreateTexture();
}
CTexture* CTextureDecoder::DoFullDecode(IInputStream& rTXTR)
CTexture* CTextureDecoder::DoFullDecode(IInputStream& rTXTR, CResourceEntry *pEntry)
{
CTextureDecoder Decoder;
Decoder.mpEntry = pEntry;
Decoder.ReadTXTR(rTXTR);
Decoder.FullDecodeGXTexture(rTXTR);
@@ -110,9 +112,10 @@ CTexture* CTextureDecoder::DoFullDecode(IInputStream& rTXTR)
return pTexture;
}
CTexture* CTextureDecoder::LoadDDS(IInputStream& rDDS)
CTexture* CTextureDecoder::LoadDDS(IInputStream& rDDS, CResourceEntry *pEntry)
{
CTextureDecoder Decoder;
Decoder.mpEntry = pEntry;
Decoder.ReadDDS(rDDS);
Decoder.DecodeDDS(rDDS);
return Decoder.CreateTexture();

7
src/Core/Resource/Factory/CTextureDecoder.h
View File

@@ -10,6 +10,7 @@
class CTextureDecoder
{
CResourceEntry *mpEntry;
ETexelFormat mTexelFormat;
u16 mWidth, mHeight;
u32 mNumMipMaps;
@@ -77,9 +78,9 @@ class CTextureDecoder
// Static
public:
static CTexture* LoadTXTR(IInputStream& rTXTR);
static CTexture* LoadDDS(IInputStream& rDDS);
static CTexture* DoFullDecode(IInputStream& rTXTR);
static CTexture* LoadTXTR(IInputStream& rTXTR, CResourceEntry *pEntry);
static CTexture* LoadDDS(IInputStream& rDDS, CResourceEntry *pEntry);
static CTexture* DoFullDecode(IInputStream& rTXTR, CResourceEntry *pEntry);
static CTexture* DoFullDecode(CTexture *pTexture);
// Utility

37
src/Core/Resource/Factory/CWorldLoader.cpp
View File

@@ -1,5 +1,5 @@
#include "CWorldLoader.h"
#include "Core/Resource/CResCache.h"
#include "Core/GameProject/CResourceStore.h"
#include <Common/Log.h>
CWorldLoader::CWorldLoader()
@@ -15,19 +15,19 @@ void CWorldLoader::LoadPrimeMLVL(IInputStream& rMLVL)
// Header
if (mVersion < eCorruptionProto)
{
mpWorld->mpWorldName = gResCache.GetResource(rMLVL.ReadLong(), "STRG");
if (mVersion == eEchoes) mpWorld->mpDarkWorldName = gResCache.GetResource(rMLVL.ReadLong(), "STRG");
mpWorld->mpWorldName = gResourceStore.LoadResource(rMLVL.ReadLong(), "STRG");
if (mVersion == eEchoes) mpWorld->mpDarkWorldName = gResourceStore.LoadResource(rMLVL.ReadLong(), "STRG");
if (mVersion >= eEchoes) mpWorld->mUnknown1 = rMLVL.ReadLong();
if (mVersion >= ePrime) mpWorld->mpSaveWorld = gResCache.GetResource(rMLVL.ReadLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResCache.GetResource(rMLVL.ReadLong(), "CMDL");
if (mVersion >= ePrime) mpWorld->mpSaveWorld = gResourceStore.LoadResource(rMLVL.ReadLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResourceStore.LoadResource(rMLVL.ReadLong(), "CMDL");
}
else
{
mpWorld->mpWorldName = gResCache.GetResource(rMLVL.ReadLongLong(), "STRG");
mpWorld->mpWorldName = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "STRG");
rMLVL.Seek(0x4, SEEK_CUR); // Skipping unknown value
mpWorld->mpSaveWorld = gResCache.GetResource(rMLVL.ReadLongLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResCache.GetResource(rMLVL.ReadLongLong(), "CMDL");
mpWorld->mpSaveWorld = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "CMDL");
}
// Memory relays - only in MP1
@@ -58,9 +58,9 @@ void CWorldLoader::LoadPrimeMLVL(IInputStream& rMLVL)
CWorld::SArea *pArea = &mpWorld->mAreas[iArea];
if (mVersion < eCorruptionProto)
pArea->pAreaName = gResCache.GetResource(rMLVL.ReadLong(), "STRG");
pArea->pAreaName = gResourceStore.LoadResource(rMLVL.ReadLong(), "STRG");
else
pArea->pAreaName = gResCache.GetResource(rMLVL.ReadLongLong(), "STRG");
pArea->pAreaName = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "STRG");
pArea->Transform = CTransform4f(rMLVL);
pArea->AetherBox = CAABox(rMLVL);
@@ -169,9 +169,9 @@ void CWorldLoader::LoadPrimeMLVL(IInputStream& rMLVL)
// MapWorld
if (mVersion < eCorruptionProto)
mpWorld->mpMapWorld = gResCache.GetResource(rMLVL.ReadLong(), "MAPW");
mpWorld->mpMapWorld = gResourceStore.LoadResource(rMLVL.ReadLong(), "MAPW");
else
mpWorld->mpMapWorld = gResCache.GetResource(rMLVL.ReadLongLong(), "MAPW");
mpWorld->mpMapWorld = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "MAPW");
rMLVL.Seek(0x5, SEEK_CUR); // Unknown values which are always 0
// AudioGrps
@@ -221,7 +221,7 @@ void CWorldLoader::LoadPrimeMLVL(IInputStream& rMLVL)
void CWorldLoader::LoadReturnsMLVL(IInputStream& rMLVL)
{
mpWorld->mpWorldName = gResCache.GetResource(rMLVL.ReadLongLong(), "STRG");
mpWorld->mpWorldName = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "STRG");
bool Check = (rMLVL.ReadByte() != 0);
if (Check)
@@ -230,8 +230,8 @@ void CWorldLoader::LoadReturnsMLVL(IInputStream& rMLVL)
rMLVL.Seek(0x10, SEEK_CUR);
}
mpWorld->mpSaveWorld = gResCache.GetResource(rMLVL.ReadLongLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResCache.GetResource(rMLVL.ReadLongLong(), "CMDL");
mpWorld->mpSaveWorld = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "SAVW");
mpWorld->mpDefaultSkybox = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "CMDL");
// Areas
u32 NumAreas = rMLVL.ReadLong();
@@ -242,7 +242,7 @@ void CWorldLoader::LoadReturnsMLVL(IInputStream& rMLVL)
// Area header
CWorld::SArea *pArea = &mpWorld->mAreas[iArea];
pArea->pAreaName = gResCache.GetResource(rMLVL.ReadLongLong(), "STRG");
pArea->pAreaName = gResourceStore.LoadResource(rMLVL.ReadLongLong(), "STRG");
pArea->Transform = CTransform4f(rMLVL);
pArea->AetherBox = CAABox(rMLVL);
pArea->FileID = rMLVL.ReadLongLong();
@@ -281,7 +281,7 @@ void CWorldLoader::LoadReturnsMLVL(IInputStream& rMLVL)
// todo: Layer ID support
}
CWorld* CWorldLoader::LoadMLVL(IInputStream& rMLVL)
CWorld* CWorldLoader::LoadMLVL(IInputStream& rMLVL, CResourceEntry *pEntry)
{
if (!rMLVL.IsValid()) return nullptr;
@@ -302,7 +302,8 @@ CWorld* CWorldLoader::LoadMLVL(IInputStream& rMLVL)
// Filestream is valid, magic+version are valid; everything seems good!
CWorldLoader Loader;
Loader.mpWorld = new CWorld();
Loader.mpWorld = new CWorld(pEntry);
Loader.mpWorld->SetGame(Version);
Loader.mpWorld->mWorldVersion = Version;
Loader.mVersion = Version;

4
src/Core/Resource/Factory/CWorldLoader.h
View File

@@ -1,8 +1,8 @@
#ifndef CWORLDLOADER_H
#define CWORLDLOADER_H
#include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/CWorld.h"
#include "Core/Resource/CResCache.h"
#include "Core/Resource/EGame.h"
#include <FileIO/FileIO.h>
@@ -17,7 +17,7 @@ class CWorldLoader
void LoadReturnsMLVL(IInputStream& rMLVL);
public:
static CWorld* LoadMLVL(IInputStream& rMLVL);
static CWorld* LoadMLVL(IInputStream& rMLVL, CResourceEntry *pEntry);
static EGame GetFormatVersion(u32 Version);
};

4
src/Core/Resource/Model/CBasicModel.cpp
View File

@@ -2,8 +2,8 @@
#include <iostream>
#include <list>
CBasicModel::CBasicModel()
: CResource()
CBasicModel::CBasicModel(CResourceEntry *pEntry /*= 0*/)
: CResource(pEntry)
, mVertexCount(0)
, mTriangleCount(0)
, mBuffered(false)

2
src/Core/Resource/Model/CBasicModel.h
View File

@@ -21,7 +21,7 @@ protected:
std::vector<SSurface*> mSurfaces;
public:
CBasicModel();
CBasicModel(CResourceEntry *pEntry = 0);
~CBasicModel();
u32 GetVertexCount();

5
src/Core/Resource/Model/CModel.cpp
View File

@@ -1,11 +1,12 @@
#include "CModel.h"
#include "Core/Render/CDrawUtil.h"
#include "Core/Render/CRenderer.h"
#include "Core/Resource/Area/CGameArea.h"
#include "Core/OpenGL/GLCommon.h"
#include <Common/AssertMacro.h>
CModel::CModel()
: CBasicModel()
CModel::CModel(CResourceEntry *pEntry /*= 0*/)
: CBasicModel(pEntry)
{
mHasOwnMaterials = true;
mHasOwnSurfaces = true;

2
src/Core/Resource/Model/CModel.h
View File

@@ -21,7 +21,7 @@ class CModel : public CBasicModel
bool mHasOwnMaterials;
public:
CModel();
CModel(CResourceEntry *pEntry = 0);
CModel(CMaterialSet *pSet, bool OwnsMatSet);
~CModel();

18
src/Core/Resource/Model/CStaticModel.cpp
View File

@@ -4,7 +4,7 @@
#include "Core/OpenGL/GLCommon.h"
CStaticModel::CStaticModel()
: CBasicModel()
: CBasicModel(nullptr)
, mpMaterial(nullptr)
, mTransparent(false)
{
@@ -75,11 +75,11 @@ void CStaticModel::BufferGL()
}
// Make sure the number of submesh offset vectors matches the number of IBOs, then add the offsets
while (mIBOs.size() > mSubmeshEndOffsets.size())
mSubmeshEndOffsets.emplace_back(std::vector<u32>(mSurfaces.size()));
while (mIBOs.size() > mSurfaceEndOffsets.size())
mSurfaceEndOffsets.emplace_back(std::vector<u32>(mSurfaces.size()));
for (u32 iIBO = 0; iIBO < mIBOs.size(); iIBO++)
mSubmeshEndOffsets[iIBO][iSurf] = mIBOs[iIBO].GetSize();
mSurfaceEndOffsets[iIBO][iSurf] = mIBOs[iIBO].GetSize();
}
mVBO.Buffer();
@@ -101,7 +101,7 @@ void CStaticModel::ClearGLBuffer()
{
mVBO.Clear();
mIBOs.clear();
mSubmeshEndOffsets.clear();
mSurfaceEndOffsets.clear();
mBuffered = false;
}
@@ -139,8 +139,8 @@ void CStaticModel::DrawSurface(FRenderOptions Options, u32 Surface)
{
// Since there is a shared IBO for every mesh, we need two things to draw a single one: an offset and a size
u32 Offset = 0;
if (Surface > 0) Offset = mSubmeshEndOffsets[iIBO][Surface - 1];
u32 Size = mSubmeshEndOffsets[iIBO][Surface] - Offset;
if (Surface > 0) Offset = mSurfaceEndOffsets[iIBO][Surface - 1];
u32 Size = mSurfaceEndOffsets[iIBO][Surface] - Offset;
if (!Size) continue; // The chosen submesh doesn't use this IBO
@@ -179,7 +179,7 @@ CMaterial* CStaticModel::GetMaterial()
void CStaticModel::SetMaterial(CMaterial *pMat)
{
mpMaterial = pMat;
mTransparent = ((pMat->Options() & CMaterial::eTransparent) != 0);
mTransparent = pMat->Options().HasFlag(CMaterial::eTransparent);
}
bool CStaticModel::IsTransparent()
@@ -189,7 +189,7 @@ bool CStaticModel::IsTransparent()
bool CStaticModel::IsOccluder()
{
return ((mpMaterial->Options() & CMaterial::eOccluder) != 0);
return mpMaterial->Options().HasFlag(CMaterial::eOccluder);
}
CIndexBuffer* CStaticModel::InternalGetIBO(EGXPrimitiveType Primitive)

8
src/Core/Resource/Model/CStaticModel.h
View File

@@ -5,14 +5,14 @@
#include "Core/Render/FRenderOptions.h"
#include "Core/OpenGL/CIndexBuffer.h"
/* A CStaticModel is meant for meshes that don't move. It's built specifically with terrain in mind.
* It only links to one material, and what it does best is combining submeshes from different models
* into shared VBOs and IBOs. This allows for a significantly reduced number of draw calls. */
/* A CStaticModel is meant for meshes that don't move. It only links to one material,
* and is used to combine surfaces from different world models into shared VBOs and
* IBOs. This allows for a significantly reduced number of draw calls. */
class CStaticModel : public CBasicModel
{
CMaterial *mpMaterial;
std::vector<CIndexBuffer> mIBOs;
std::vector<std::vector<u32>> mSubmeshEndOffsets;
std::vector<std::vector<u32>> mSurfaceEndOffsets;
bool mTransparent;
public:

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