Delete TextResource

engine/CMakeLists.txt

@@ -276,7 +276,6 @@ set (RESOURCE_SRC
 	resource/ResourceManager.cpp
 	resource/TextureResource.cpp
 	resource/MeshResource.cpp
-	resource/TextResource.cpp
 	resource/FontResource.cpp
 	resource/SoundResource.cpp
 	resource/ArchiveBundle.cpp
@@ -290,7 +289,6 @@ set (RESOURCE_HEADERS
 	resource/Bundle.h
 	resource/TextureResource.h
 	resource/MeshResource.h
-	resource/TextResource.h
 	resource/FontResource.h
 	resource/SoundResource.h
 	resource/ArchiveBundle.h

engine/Crown.h

@@ -105,8 +105,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "ArchiveBundle.h"
 #include "FileBundle.h"
 #include "ResourceManager.h"
-
-#include "TextResource.h"
 #include "TextureResource.h"
 #include "MaterialResource.h"
 #include "FontResource.h"

engine/resource/ResourceManager.cpp

@@ -37,7 +37,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Filesystem.h"
 #include "TextReader.h"
 #include "DiskFile.h"
-#include "TextResource.h"
 #include "TextureResource.h"
 #include "MeshResource.h"
 #include "SoundResource.h"
@@ -343,7 +342,6 @@ void* ResourceManager::load_by_type(ResourceId name)
 	switch (name.type)
 	{
 		case TEXTURE_TYPE: return TextureResource::load(m_resource_allocator, m_resource_bundle, name);
-		case TEXT_TYPE: return TextResource::load(m_resource_allocator, m_resource_bundle, name);
 		case MESH_TYPE: return MeshResource::load(m_resource_allocator, m_resource_bundle, name);
 		case SOUND_TYPE: return SoundResource::load(m_resource_allocator, m_resource_bundle, name);
 		default: return NULL;
@@ -356,7 +354,6 @@ void ResourceManager::unload_by_type(ResourceId name, void* resource)
 	switch (name.type)
 	{
 		case TEXTURE_TYPE: return TextureResource::unload(m_resource_allocator, resource);
-		case TEXT_TYPE: return TextResource::unload(m_resource_allocator, resource);
 		case MESH_TYPE: return MeshResource::unload(m_resource_allocator, resource);
 		case SOUND_TYPE: return SoundResource::unload(m_resource_allocator, resource);
 	}
@@ -370,7 +367,6 @@ void ResourceManager::online(ResourceId name, void* resource)
 	switch (name.type)
 	{
 		case TEXTURE_TYPE: return TextureResource::online(resource);
-		case TEXT_TYPE: return TextResource::online(resource);
 		case MESH_TYPE: return MeshResource::online(resource);
 		case SOUND_TYPE: return SoundResource::online(resource);
 	}

engine/resource/TextResource.cpp

@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2013 Daniele Bartolini, Michele Rossi
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "TextResource.h"
-#include "DiskFile.h"
-#include "Bundle.h"
-#include "Log.h"
-#include "Allocator.h"
-
-namespace crown
-{
-
-//-----------------------------------------------------------------------------
-void* TextResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
-{
-	DiskFile* stream = bundle.open(id);
-
-	CE_ASSERT(stream != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
-
-	TextResource* resource = (TextResource*)allocator.allocate(sizeof(TextResource));
-
-	stream->read(&resource->length, sizeof(uint32_t));
-	
-	resource->data = (char*)allocator.allocate(sizeof(char) * (resource->length + 1));
-
-	stream->read(resource->data, (size_t)resource->length);
-	
-	resource->data[resource->length] = '\0';
-
-	bundle.close(stream);
-
-	return resource;
-}
-
-//-----------------------------------------------------------------------------
-void TextResource::unload(Allocator& allocator, void* resource)
-{
-	CE_ASSERT(resource != NULL, "Resource not loaded");
-
-	((TextResource*)resource)->length = 0;
-
-	allocator.deallocate(((TextResource*)resource)->data);
-	allocator.deallocate(resource);
-}
-
-//-----------------------------------------------------------------------------
-void TextResource::online(void* resource)
-{
-	(void) resource;
-}
-
-//-----------------------------------------------------------------------------
-void TextResource::offline()
-{
-}
-
-} // namespace crown

engine/resource/TextResource.h

@@ -1,51 +0,0 @@
-/*
-Copyright (c) 2013 Daniele Bartolini, Michele Rossi
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#pragma once
-
-#include "Types.h"
-#include "Resource.h"
-
-namespace crown
-{
-
-class Bundle;
-class Allocator;
-
-class TextResource
-{
-public:
-
-	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void			unload(Allocator& allocator, void* resource);
-	static void			online(void* resource);
-	static void			offline();
-
-	uint32_t			length;
-	char*				data;
-};
-
-} // namespace crown