Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics
This commit is contained in:
commit
f3be9f03a3
|
@ -146,14 +146,15 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="Resource\Loaders\Textloader.cpp" />
|
<ClCompile Include="Resource\Loaders\ByteLoader.cpp" />
|
||||||
|
<ClCompile Include="Resource\Loaders\CustomLoader.cpp" />
|
||||||
|
<ClCompile Include="MainTest.cpp" />
|
||||||
<ClCompile Include="Resource\OResourceHandler.cpp" />
|
<ClCompile Include="Resource\OResourceHandler.cpp" />
|
||||||
<ClCompile Include="Resource\OResource.cpp" />
|
<ClCompile Include="Resource\OResource.cpp" />
|
||||||
<ClCompile Include="Utilities.cpp" />
|
<ClCompile Include="Utilities.cpp" />
|
||||||
<ClCompile Include="WinTimer.cpp" />
|
<ClCompile Include="WinTimer.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Resource\OResourceHandler.h" />
|
|
||||||
<ClInclude Include="Resource\OysterResource.h" />
|
<ClInclude Include="Resource\OysterResource.h" />
|
||||||
<ClInclude Include="Resource\OResource.h" />
|
<ClInclude Include="Resource\OResource.h" />
|
||||||
<ClInclude Include="Utilities-InlineImpl.h" />
|
<ClInclude Include="Utilities-InlineImpl.h" />
|
||||||
|
|
|
@ -21,15 +21,21 @@
|
||||||
<ClCompile Include="WinTimer.cpp">
|
<ClCompile Include="WinTimer.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="Resource\Loaders\Textloader.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Resource\OResource.cpp">
|
<ClCompile Include="Resource\OResource.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="Resource\OResourceHandler.cpp">
|
<ClCompile Include="Resource\OResourceHandler.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="Resource\Loaders\ByteLoader.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="Resource\Loaders\CustomLoader.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="MainTest.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Utilities.h">
|
<ClInclude Include="Utilities.h">
|
||||||
|
@ -47,8 +53,5 @@
|
||||||
<ClInclude Include="Resource\OResource.h">
|
<ClInclude Include="Resource\OResource.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="Resource\OResourceHandler.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
|
@ -103,16 +103,15 @@ bool ReadFromFile(const wchar_t fileName[], const char openFlag[], std::string&
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OResource* OResource::ByteLoader(const wchar_t filename[], ResourceType type)
|
OResource* OResource::ByteLoader(const wchar_t filename[], ResourceType type, OResource* old)
|
||||||
{
|
{
|
||||||
OResource *resource = 0;
|
OResource *resource = old;
|
||||||
std::wstring wOut;
|
std::wstring wOut;
|
||||||
std::string sOut;
|
std::string sOut;
|
||||||
bool success = false;
|
bool success = false;
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case Oyster::Resource::ResourceType_UNKNOWN:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_Raw:
|
case Oyster::Resource::ResourceType_Byte_Raw:
|
||||||
success = ReadFromFile(filename, "rb", sOut, sizeof(char));
|
success = ReadFromFile(filename, "rb", sOut, sizeof(char));
|
||||||
break;
|
break;
|
||||||
|
@ -147,10 +146,28 @@ OResource* OResource::ByteLoader(const wchar_t filename[], ResourceType type)
|
||||||
char *data = new char[sOut.size()+1];
|
char *data = new char[sOut.size()+1];
|
||||||
data[sOut.size()] = '\0';
|
data[sOut.size()] = '\0';
|
||||||
memcpy(&data[0], &sOut[0], sOut.size());
|
memcpy(&data[0], &sOut[0], sOut.size());
|
||||||
resource = new OResource((OHRESOURCE)data, type, (sizeof(char) * sOut.size()), sizeof(char), filename);
|
|
||||||
|
if(!old)
|
||||||
|
{
|
||||||
|
resource = new OResource((OHRESOURCE)data, type, (sizeof(char) * sOut.size()), sizeof(char), filename);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
old->resourceData = (OHRESOURCE)data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return resource;
|
return resource;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OResource::ByteUnloader()
|
||||||
|
{
|
||||||
|
delete [] ((char*)this->resourceData);
|
||||||
|
this->resourceData = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
OResource* OResource::ByteReloader()
|
||||||
|
{
|
||||||
|
ByteUnloader();
|
||||||
|
return ByteLoader(this->resourceFilename.c_str(), this->resourceType, this);
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
|
||||||
|
#include "..\OResource.h"
|
||||||
|
#include "..\..\Utilities.h"
|
||||||
|
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
using namespace Oyster::Resource;
|
||||||
|
|
||||||
|
|
||||||
|
OResource* OResource::CustomLoader(const wchar_t filename[], CustomLoadFunction fnc)
|
||||||
|
{
|
||||||
|
const CustomData &data = fnc();
|
||||||
|
|
||||||
|
if(!data.loadedData) return 0;
|
||||||
|
if(!data.resourceUnloadFnc) return 0;
|
||||||
|
|
||||||
|
OResource *resource = new OResource((OHRESOURCE)data.loadedData, ResourceType_UNKNOWN, 0, 0, filename);
|
||||||
|
|
||||||
|
resource->customData = new CustomResourceData();
|
||||||
|
resource->customData->unloadingFunction = data.resourceUnloadFnc;
|
||||||
|
resource->resourceData = (OHRESOURCE)data.loadedData;
|
||||||
|
resource->customData->loadingFunction = fnc;
|
||||||
|
|
||||||
|
return resource;
|
||||||
|
}
|
||||||
|
void OResource::CustomUnloader()
|
||||||
|
{
|
||||||
|
this->customData->unloadingFunction((void*)this->resourceData);
|
||||||
|
}
|
||||||
|
OResource* OResource::CustomReloader()
|
||||||
|
{
|
||||||
|
CustomUnloader();
|
||||||
|
|
||||||
|
const CustomData &data = this->customData->loadingFunction();
|
||||||
|
this->resourceData = (OHRESOURCE)data.loadedData;
|
||||||
|
|
||||||
|
if(data.resourceUnloadFnc)
|
||||||
|
this->customData->unloadingFunction = data.resourceUnloadFnc;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
|
@ -8,57 +8,75 @@ OResource::OResource(OHRESOURCE handle, ResourceType type, size_t resourceSize,
|
||||||
, resourceSize (resourceSize)
|
, resourceSize (resourceSize)
|
||||||
, resourceElementSize (elementSize)
|
, resourceElementSize (elementSize)
|
||||||
, resourceType (type)
|
, resourceType (type)
|
||||||
|
, customData (0)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
OResource::~OResource()
|
OResource::~OResource()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
bool OResource::Release()
|
|
||||||
|
OResource* OResource::Load (const wchar_t filename[], ResourceType type)
|
||||||
{
|
{
|
||||||
if(this->resourceRef.Decref() == 0)
|
switch (type)
|
||||||
{
|
{
|
||||||
Remove(this->resourceType, this->resourceData);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OResource::Remove(ResourceType t, OHRESOURCE& r)
|
|
||||||
{
|
|
||||||
switch (t)
|
|
||||||
{
|
|
||||||
case Oyster::Resource::ResourceType_Texture_PNG:
|
|
||||||
case Oyster::Resource::ResourceType_Texture_DDS:
|
|
||||||
case Oyster::Resource::ResourceType_Texture_JPG:
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Mesh_VertexData:
|
|
||||||
case Oyster::Resource::ResourceType_Mesh_AnimationData:
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Audio_mp3:
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Vertex:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Hull:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Domain:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Geometry:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Pixel:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Compute:
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_UNKNOWN:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_Raw:
|
case Oyster::Resource::ResourceType_Byte_Raw:
|
||||||
case Oyster::Resource::ResourceType_Byte_ANSI:
|
case Oyster::Resource::ResourceType_Byte_ANSI:
|
||||||
case Oyster::Resource::ResourceType_Byte_UTF8:
|
case Oyster::Resource::ResourceType_Byte_UTF8:
|
||||||
case Oyster::Resource::ResourceType_Byte_UNICODE:
|
case Oyster::Resource::ResourceType_Byte_UNICODE:
|
||||||
case Oyster::Resource::ResourceType_Byte_UTF16LE:
|
case Oyster::Resource::ResourceType_Byte_UTF16LE:
|
||||||
delete ((char*)r);
|
return OResource::ByteLoader(filename, type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
OResource* OResource::Load (const wchar_t filename[], CustomLoadFunction loadFnc)
|
||||||
|
{
|
||||||
|
return OResource::CustomLoader(filename, loadFnc);
|
||||||
|
}
|
||||||
|
OResource* OResource::Reload (OResource* resource)
|
||||||
|
{
|
||||||
|
if(!resource) return 0;
|
||||||
|
|
||||||
|
switch (resource->resourceType)
|
||||||
|
{
|
||||||
|
case Oyster::Resource::ResourceType_Byte_Raw:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_ANSI:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UTF8:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UNICODE:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UTF16LE:
|
||||||
|
resource->ByteReloader();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Oyster::Resource::ResourceType_UNKNOWN:
|
||||||
|
resource->CustomReloader();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return resource;
|
||||||
|
}
|
||||||
|
bool OResource::Release (OResource* resource)
|
||||||
|
{
|
||||||
|
if(resource->resourceRef.Decref() == 0)
|
||||||
|
{
|
||||||
|
switch (resource->resourceType)
|
||||||
|
{
|
||||||
|
case Oyster::Resource::ResourceType_Byte_Raw:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_ANSI:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UTF8:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UNICODE:
|
||||||
|
case Oyster::Resource::ResourceType_Byte_UTF16LE:
|
||||||
|
resource->ByteUnloader();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Oyster::Resource::ResourceType_UNKNOWN:
|
||||||
|
resource->CustomUnloader();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,10 +15,16 @@ namespace Oyster
|
||||||
{
|
{
|
||||||
class OResource
|
class OResource
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
|
struct CustomResourceData
|
||||||
|
{
|
||||||
|
CustomLoadFunction loadingFunction;
|
||||||
|
CustomUnloadFunction unloadingFunction;
|
||||||
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
OResource(OHRESOURCE handle, ResourceType type, size_t size, size_t elementSize, ::std::wstring resourceFilename);
|
OResource(OHRESOURCE handle, ResourceType type, size_t size, size_t elementSize, ::std::wstring resourceFilename);
|
||||||
virtual~ OResource();
|
virtual~ OResource();
|
||||||
bool Release();
|
|
||||||
|
|
||||||
inline ResourceType GetResourceType() const
|
inline ResourceType GetResourceType() const
|
||||||
{ return this->resourceType; }
|
{ return this->resourceType; }
|
||||||
|
@ -36,23 +42,30 @@ namespace Oyster
|
||||||
{ this->resourceID = id; }
|
{ this->resourceID = id; }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static OResource* TextureLoader (const wchar_t filename[], ResourceType type) {return 0;}
|
static OResource* Load (const wchar_t filename[], ResourceType type);
|
||||||
static OResource* MeshLoader (const wchar_t filename[], ResourceType type) {return 0;};
|
static OResource* Load (const wchar_t filename[], CustomLoadFunction loadFnc);
|
||||||
static OResource* AudioLoader (const wchar_t filename[], ResourceType type) {return 0;};
|
static OResource* Reload (OResource* resource);
|
||||||
static OResource* ShaderLoader (const wchar_t filename[], ResourceType type) {return 0;};
|
static bool Release (OResource* resource);
|
||||||
static OResource* ByteLoader (const wchar_t filename[], ResourceType type);
|
|
||||||
|
|
||||||
Utility::DynamicMemory::RefCount resourceRef;
|
Utility::DynamicMemory::RefCount resourceRef;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static void Remove (ResourceType t, OHRESOURCE& r);
|
static OResource* ByteLoader (const wchar_t filename[], ResourceType type, OResource* old = 0);
|
||||||
|
void ByteUnloader ();
|
||||||
|
OResource* ByteReloader ();
|
||||||
|
|
||||||
OHRESOURCE resourceData;
|
static OResource* CustomLoader (const wchar_t filename[], CustomLoadFunction loadFnc);
|
||||||
ResourceType resourceType;
|
void CustomUnloader ();
|
||||||
size_t resourceSize;
|
OResource* CustomReloader ();
|
||||||
size_t resourceElementSize;
|
|
||||||
::std::wstring resourceFilename;
|
OHRESOURCE resourceData;
|
||||||
unsigned int resourceID;
|
ResourceType resourceType;
|
||||||
|
size_t resourceSize;
|
||||||
|
size_t resourceElementSize;
|
||||||
|
::std::wstring resourceFilename;
|
||||||
|
unsigned int resourceID;
|
||||||
|
|
||||||
|
CustomResourceData *customData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,18 +23,72 @@ public:
|
||||||
} resourcePrivate;
|
} resourcePrivate;
|
||||||
|
|
||||||
|
|
||||||
void IResourceHandler::Release()
|
OHRESOURCE OysterResource::LoadResource(const wchar_t* filename, ResourceType type)
|
||||||
{
|
{
|
||||||
IResourceHandler::Clean();
|
if(!filename) return 0;
|
||||||
|
|
||||||
|
OResource *resourceData = resourcePrivate.FindResource(filename);
|
||||||
|
if(resourceData)
|
||||||
|
{
|
||||||
|
//Add new reference
|
||||||
|
resourcePrivate.SaveResource(resourceData, false);
|
||||||
|
return resourceData->GetResourceHandle();
|
||||||
|
}
|
||||||
|
|
||||||
|
resourceData = OResource::Load(filename, type);
|
||||||
|
|
||||||
|
if(!resourceData) return 0;
|
||||||
|
|
||||||
|
resourcePrivate.SaveResource(resourceData);
|
||||||
|
|
||||||
|
return resourceData->GetResourceHandle();
|
||||||
}
|
}
|
||||||
void IResourceHandler::Clean()
|
OHRESOURCE OysterResource::LoadResource(const wchar_t filename[], CustomLoadFunction loadFnc, unsigned int CustomId)
|
||||||
|
{
|
||||||
|
if(!filename) return 0;
|
||||||
|
if(!loadFnc) return 0;
|
||||||
|
|
||||||
|
OResource *resourceData = resourcePrivate.FindResource(filename);
|
||||||
|
if(resourceData)
|
||||||
|
{
|
||||||
|
//Add new reference
|
||||||
|
resourcePrivate.SaveResource(resourceData, false);
|
||||||
|
return resourceData->GetResourceHandle();
|
||||||
|
}
|
||||||
|
|
||||||
|
resourceData = OResource::Load(filename, loadFnc);
|
||||||
|
|
||||||
|
if(!resourceData) return 0;
|
||||||
|
|
||||||
|
if(resourceData) resourceData->SetResourceID(CustomId);
|
||||||
|
resourcePrivate.SaveResource(resourceData);
|
||||||
|
|
||||||
|
return (OHRESOURCE)resourceData->GetResourceHandle();
|
||||||
|
}
|
||||||
|
|
||||||
|
OHRESOURCE ReloadResource(const wchar_t filename[])
|
||||||
|
{
|
||||||
|
OResource *resourceData = resourcePrivate.FindResource(filename);
|
||||||
|
if(!resourceData) return 0; //The resource has not been loaded
|
||||||
|
|
||||||
|
return OResource::Reload(resourceData)->GetResourceHandle();
|
||||||
|
}
|
||||||
|
OHRESOURCE ReloadResource(OHRESOURCE resource)
|
||||||
|
{
|
||||||
|
OResource *resourceData = resourcePrivate.FindResource(resource);
|
||||||
|
if(!resourceData) return 0; //The resource has not been loaded
|
||||||
|
|
||||||
|
return OResource::Reload(resourceData)->GetResourceHandle();
|
||||||
|
}
|
||||||
|
|
||||||
|
void OysterResource::Clean()
|
||||||
{
|
{
|
||||||
auto i = resourcePrivate.resources.begin();
|
auto i = resourcePrivate.resources.begin();
|
||||||
auto last = resourcePrivate.resources.end();
|
auto last = resourcePrivate.resources.end();
|
||||||
|
|
||||||
for (i; i != last; i++)
|
for (i; i != last; i++)
|
||||||
{
|
{
|
||||||
if(i->second->Release())
|
if(OResource::Release(i->second))
|
||||||
{
|
{
|
||||||
const wchar_t* temp = i->second->GetResourceFilename();
|
const wchar_t* temp = i->second->GetResourceFilename();
|
||||||
delete resourcePrivate.resources[temp];
|
delete resourcePrivate.resources[temp];
|
||||||
|
@ -42,67 +96,12 @@ void IResourceHandler::Clean()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OHRESOURCE IResourceHandler::LoadResource(const wchar_t* filename, ResourceType type, bool force)
|
void OysterResource::ReleaseResource(const OHRESOURCE& resourceData)
|
||||||
{
|
|
||||||
OResource *resourceData = resourcePrivate.FindResource(filename);
|
|
||||||
if(resourceData)
|
|
||||||
{
|
|
||||||
resourcePrivate.SaveResource(resourceData, false);
|
|
||||||
return resourceData->GetResourceHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (type)
|
|
||||||
{
|
|
||||||
case Oyster::Resource::ResourceType_Texture_PNG:
|
|
||||||
case Oyster::Resource::ResourceType_Texture_DDS:
|
|
||||||
case Oyster::Resource::ResourceType_Texture_JPG:
|
|
||||||
resourceData = OResource::TextureLoader(filename, type);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Mesh_VertexData:
|
|
||||||
case Oyster::Resource::ResourceType_Mesh_AnimationData:
|
|
||||||
resourceData = OResource::MeshLoader(filename, type);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Audio_mp3:
|
|
||||||
resourceData = OResource::AudioLoader(filename, type);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Vertex:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Hull:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Domain:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Geometry:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Pixel:
|
|
||||||
case Oyster::Resource::ResourceType_Shader_Compute:
|
|
||||||
resourceData = OResource::ShaderLoader(filename, type);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Oyster::Resource::ResourceType_UNKNOWN:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_Raw:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_ANSI:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_UTF8:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_UNICODE:
|
|
||||||
case Oyster::Resource::ResourceType_Byte_UTF16LE:
|
|
||||||
resourceData = OResource::ByteLoader(filename, type);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
//The format is not supported.
|
|
||||||
printf("(%i) is not a resourceData type or it is currently not supported!", type);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Resource exists! It's a miracle =D.
|
|
||||||
resourcePrivate.SaveResource(resourceData);
|
|
||||||
|
|
||||||
return resourceData->GetResourceHandle();
|
|
||||||
}
|
|
||||||
void IResourceHandler::ReleaseResource(const OHRESOURCE& resourceData)
|
|
||||||
{
|
{
|
||||||
OResource* t = resourcePrivate.FindResource(resourceData);
|
OResource* t = resourcePrivate.FindResource(resourceData);
|
||||||
if(t)
|
if(t)
|
||||||
{
|
{
|
||||||
if(t->Release())
|
if(OResource::Release(t))
|
||||||
{
|
{
|
||||||
const wchar_t* temp = t->GetResourceFilename();
|
const wchar_t* temp = t->GetResourceFilename();
|
||||||
delete resourcePrivate.resources[temp];
|
delete resourcePrivate.resources[temp];
|
||||||
|
@ -110,13 +109,14 @@ void IResourceHandler::ReleaseResource(const OHRESOURCE& resourceData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void IResourceHandler::SetResourceId (const OHRESOURCE& resourceData, unsigned int id)
|
|
||||||
|
void OysterResource::SetResourceId (const OHRESOURCE& resourceData, unsigned int id)
|
||||||
{
|
{
|
||||||
OResource* t = resourcePrivate.FindResource(resourceData);
|
OResource* t = resourcePrivate.FindResource(resourceData);
|
||||||
|
|
||||||
if(t) t->SetResourceID(id);
|
if(t) t->SetResourceID(id);
|
||||||
}
|
}
|
||||||
ResourceType IResourceHandler::GetResourceType (const OHRESOURCE& resourceData)
|
ResourceType OysterResource::GetResourceType (const OHRESOURCE& resourceData)
|
||||||
{
|
{
|
||||||
OResource* t = resourcePrivate.FindResource(resourceData);
|
OResource* t = resourcePrivate.FindResource(resourceData);
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ ResourceType IResourceHandler::GetResourceType (const OHRESOURCE& resourceData)
|
||||||
|
|
||||||
return ResourceType_UNKNOWN;
|
return ResourceType_UNKNOWN;
|
||||||
}
|
}
|
||||||
const wchar_t* IResourceHandler::GetResourceFilename (const OHRESOURCE& resourceData)
|
const wchar_t* OysterResource::GetResourceFilename (const OHRESOURCE& resourceData)
|
||||||
{
|
{
|
||||||
OResource* t = resourcePrivate.FindResource(resourceData);
|
OResource* t = resourcePrivate.FindResource(resourceData);
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ const wchar_t* IResourceHandler::GetResourceFilename (const OHRESOURCE& resource
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
unsigned int IResourceHandler::GetResourceId (const OHRESOURCE& resourceData)
|
unsigned int OysterResource::GetResourceId (const OHRESOURCE& resourceData)
|
||||||
{
|
{
|
||||||
OResource* t = resourcePrivate.FindResource(resourceData);
|
OResource* t = resourcePrivate.FindResource(resourceData);
|
||||||
|
|
||||||
|
@ -166,15 +166,12 @@ void ResourcePrivate::SaveResource( OResource* r, bool addNew )
|
||||||
{
|
{
|
||||||
if(!r) return;
|
if(!r) return;
|
||||||
|
|
||||||
if(!addNew)
|
if(addNew)
|
||||||
{
|
|
||||||
r->resourceRef.Incref();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
this->resources[r->GetResourceFilename()] = r;
|
this->resources[r->GetResourceFilename()] = r;
|
||||||
r->resourceRef.Incref();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r->resourceRef.Incref();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
#ifndef MISC_O_RESOURCE_HANLDER_H
|
|
||||||
#define MISC_O_RESOURCE_HANLDER_H
|
|
||||||
|
|
||||||
|
|
||||||
#include "OysterResource.h"
|
|
||||||
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
|
||||||
// Created by [Dennis Andersen] [2013]
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace Oyster
|
|
||||||
{
|
|
||||||
namespace Resource
|
|
||||||
{
|
|
||||||
class OResourceHandler :public IResourceHandler
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
OResourceHandler ();
|
|
||||||
virtual~ OResourceHandler ();
|
|
||||||
void Release () override;
|
|
||||||
void Clean () override;
|
|
||||||
OHRESOURCE LoadResource (const wchar_t filename[], ResourceType type, bool force) override;
|
|
||||||
void ReleaseResource (const OHRESOURCE& resource) override;
|
|
||||||
void SetResourceId (const OHRESOURCE& resource, unsigned int id) override;
|
|
||||||
ResourceType GetResourceType (const OHRESOURCE& resource) const override;
|
|
||||||
const wchar_t* GetResourceFilename (const OHRESOURCE& resource) const override;
|
|
||||||
unsigned int GetResourceId (const OHRESOURCE& resource) const override;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -10,34 +10,15 @@ namespace Oyster
|
||||||
{
|
{
|
||||||
namespace Resource
|
namespace Resource
|
||||||
{
|
{
|
||||||
|
struct CustomData;
|
||||||
/** A Resource handle representing various resources */
|
/** A Resource handle representing various resources */
|
||||||
typedef unsigned long OHRESOURCE;
|
typedef unsigned long OHRESOURCE;
|
||||||
|
typedef void(*CustomUnloadFunction)(void*);
|
||||||
|
typedef const CustomData&(*CustomLoadFunction)();
|
||||||
|
|
||||||
/** An enum class representing all avalible resources that is supported. */
|
/** An enum class representing all avalible resources that is supported. */
|
||||||
enum ResourceType
|
enum ResourceType
|
||||||
{
|
{
|
||||||
//Texture
|
|
||||||
ResourceType_Texture_PNG, /**< Handle can be interpeted as ID3D11ShaderResourceView */
|
|
||||||
ResourceType_Texture_DDS, /**< Handle can be interpeted as ID3D11ShaderResourceView */
|
|
||||||
ResourceType_Texture_JPG, /**< Handle can be interpeted as ID3D11ShaderResourceView */
|
|
||||||
|
|
||||||
//Mesh
|
|
||||||
ResourceType_Mesh_AllInOne, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Mesh_VertexData, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Mesh_AnimationData, /**< Handle can be interpeted as ? */
|
|
||||||
|
|
||||||
//Audio
|
|
||||||
ResourceType_Audio_mp3, /**< Handle can be interpeted as ? */
|
|
||||||
|
|
||||||
//Shaders
|
|
||||||
ResourceType_Shader_Vertex, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Shader_VertexBLOB, /**< Handle can be interpeted as ID3Blob */
|
|
||||||
ResourceType_Shader_Hull, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Shader_Domain, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Shader_Geometry, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Shader_Pixel, /**< Handle can be interpeted as ? */
|
|
||||||
ResourceType_Shader_Compute, /**< Handle can be interpeted as ? */
|
|
||||||
|
|
||||||
//Byte
|
//Byte
|
||||||
ResourceType_Byte_Raw, /**< Handle can be interpeted as char[] or char* */
|
ResourceType_Byte_Raw, /**< Handle can be interpeted as char[] or char* */
|
||||||
ResourceType_Byte_ANSI, /**< Handle can be interpeted as char[] or char* */
|
ResourceType_Byte_ANSI, /**< Handle can be interpeted as char[] or char* */
|
||||||
|
@ -46,22 +27,25 @@ namespace Oyster
|
||||||
ResourceType_Byte_UTF16LE, /**< Handle can be interpeted as char[] or char* */
|
ResourceType_Byte_UTF16LE, /**< Handle can be interpeted as char[] or char* */
|
||||||
|
|
||||||
ResourceType_COUNT, /**< Handle can be interpeted as ? */
|
ResourceType_COUNT, /**< Handle can be interpeted as ? */
|
||||||
ResourceType_UNKNOWN = -1 /**< Handle can be interpeted as char[] or char* */
|
|
||||||
|
ResourceType_UNKNOWN = -1, /**< Handle can be interpeted as void* */
|
||||||
|
};
|
||||||
|
|
||||||
|
/** A struct to return when doing a custom resource Load
|
||||||
|
* By loading this way you are handing over the ownership to the resource loaded.
|
||||||
|
*/
|
||||||
|
struct CustomData
|
||||||
|
{
|
||||||
|
void* loadedData; ///<! The loaded resource interpeted as a void*.
|
||||||
|
CustomUnloadFunction resourceUnloadFnc; ///<! The function that will be used to free the resource when needed.
|
||||||
};
|
};
|
||||||
|
|
||||||
/** A resource handler interface to interact with when loading resources.
|
/** A resource handler interface to interact with when loading resources.
|
||||||
* The resource handler uses the filename to make resources unuiqe.
|
* The resource handler uses the filename to make resources unuiqe.
|
||||||
*/
|
*/
|
||||||
class IResourceHandler
|
class OysterResource
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/**
|
|
||||||
* Release the resource handle, wich in turn releases every resource loaded with this instance.
|
|
||||||
* @return Nothing.
|
|
||||||
*/
|
|
||||||
static void Release();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load a resource given a type.
|
* Load a resource given a type.
|
||||||
* @param filename The path to the resource.
|
* @param filename The path to the resource.
|
||||||
|
@ -69,7 +53,30 @@ namespace Oyster
|
||||||
* @param force If set to true, the resource will be reloaded if it already exists. If it does not, nothing happens.
|
* @param force If set to true, the resource will be reloaded if it already exists. If it does not, nothing happens.
|
||||||
* @return If function suceeds, a handle to the resource will be returned. If failed 0 is returned.
|
* @return If function suceeds, a handle to the resource will be returned. If failed 0 is returned.
|
||||||
*/
|
*/
|
||||||
static OHRESOURCE LoadResource(const wchar_t filename[], ResourceType type, bool force = false);
|
static OHRESOURCE LoadResource(const wchar_t filename[], ResourceType type);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load a resource with a custom loading function
|
||||||
|
* @param filename The path to the resource.
|
||||||
|
* @param force If set to true, the resource will be reloaded even if exists.
|
||||||
|
* @param loadFnc If set, this gives you the right to do custom resource loading if your recource type is not supported.
|
||||||
|
* @return If function suceeds, a handle to the resource will be returned. If failed 0 is returned.
|
||||||
|
*/
|
||||||
|
static OHRESOURCE LoadResource(const wchar_t filename[], CustomLoadFunction loadFnc = 0, unsigned int CustomId = 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reload a resource
|
||||||
|
* @param filename The path to the resource.
|
||||||
|
* @return If function suceeds, a handle to the resource will be returned. If failed 0 is returned.
|
||||||
|
*/
|
||||||
|
static OHRESOURCE ReloadResource(const wchar_t filename[]);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reload a resource
|
||||||
|
* @param filename The path to the resource.
|
||||||
|
* @return If function suceeds, a handle to the resource will be returned. If failed 0 is returned.
|
||||||
|
*/
|
||||||
|
static OHRESOURCE ReloadResource(OHRESOURCE resource);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Releases all resources loaded by the resource handler.
|
* Releases all resources loaded by the resource handler.
|
||||||
|
|
|
@ -112,11 +112,13 @@ namespace Utility
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
RefCount() :count(0) { }
|
RefCount() :count(0) { }
|
||||||
void Incref() { this->count++; }
|
RefCount(const RefCount& o) { count = o.count; }
|
||||||
void Incref(int c) { this->count += c; }
|
const RefCount& operator=(const RefCount& o) { count = o.count; return *this;}
|
||||||
int Decref() { return --this->count;}
|
void Incref() { this->count++; }
|
||||||
void Reset() { this->count = 0; }
|
void Incref(int c) { this->count += c; }
|
||||||
|
int Decref() { return --this->count;}
|
||||||
|
void Reset() { this->count = 0; }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue