Master merged in rendering-2

COPYING.txt

@@ -1,3 +1,4 @@
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

game/Game.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -42,7 +43,7 @@ extern "C"
 	void shutdown();
 
 	/// Called once per frame, here is the place you tipically perform input checking,
-	/// updates, drawing and so on. The @dt parameter contains the last frame delta time
+	/// updates, drawing and so on. The @a dt parameter contains the last frame delta time
 	/// in seconds. 
 	void frame(float dt);
 }

samples/terrain/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(sample-terrain)
 
 set (SRC
-	terrain.cpp
+	terrain_main.cpp
 	Terrain.cpp
 )
 

samples/terrain/Terrain.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -50,13 +51,13 @@ Terrain::~Terrain()
 {
 	if (mHeights != NULL)
 	{
-		delete[] mHeights;
+		m_allocator.deallocate(mHeights);
 	}
 
-	delete[] mVertices;
-	delete[] mNormals;
-	delete[] mTexCoords;
-	delete[] mIndices;
+	m_allocator.deallocate(mVertices);
+	m_allocator.deallocate(mNormals);
+	m_allocator.deallocate(mTexCoords);
+	m_allocator.deallocate(mIndices);
 }
 
 void Terrain::CreateTerrain(uint32_t xSize, uint32_t zSize, uint32_t tilePerMeter, float initialHeight)
@@ -76,7 +77,7 @@ void Terrain::CreateTerrain(uint32_t xSize, uint32_t zSize, uint32_t tilePerMete
 
 	uint32_t heightsCount = mVerticesInSizeX * mVerticesInSizeZ;
 
-	mHeights = new float[heightsCount];
+	mHeights = (float*)m_allocator.allocate(heightsCount * sizeof(float));
 
 	// Init heights
 	for (uint32_t i = 0; i < heightsCount; i++)
@@ -85,13 +86,13 @@ void Terrain::CreateTerrain(uint32_t xSize, uint32_t zSize, uint32_t tilePerMete
 	}
 
 	// Construct drawing data
-	mVertices = new Vec3[heightsCount];			// There are as many vertices as heights
+	mVertices = (Vec3*)m_allocator.allocate(heightsCount * sizeof(Vec3));		// There are as many vertices as heights
 	mVertexCount = heightsCount;
-	mNormals = new Vec3[heightsCount];			// Same as vertices
+	mNormals = (Vec3*)m_allocator.allocate(heightsCount * sizeof(Vec3));		// Same as vertices
 	mNormalCount = heightsCount;
-	mTexCoords = new Vec2[heightsCount];		// Same as vertices
+	mTexCoords = (Vec2*)m_allocator.allocate(heightsCount * sizeof(Vec2));				// Same as vertices
 	mTexCoordCount = heightsCount;
-	mIndices = new uint16_t[mTilesInSizeX * mTilesInSizeZ * 6];	//
+	mIndices = (uint16_t*)m_allocator.allocate(mTilesInSizeX * mTilesInSizeZ * 6 * sizeof(uint16_t));	//
 	mIndexCount = mTilesInSizeX * mTilesInSizeZ * 6;
 
 	// Populate vertex list (generate a grid lying on the xz-plane and facing upwards)

samples/terrain/Terrain.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -30,6 +31,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Intersection.h"
 #include "Ray.h"
 #include "Renderer.h"
+#include "MallocAllocator.h"
 
 #define MAX_BRUSH_SIZE 256
 
@@ -72,6 +74,8 @@ public:
 
 private:
 
+	MallocAllocator	m_allocator;
+
 	uint32_t		mSizeX;				// X in meters
 	uint32_t		mSizeZ;				// Z in meters
 	float			mOffsetX;

samples/terrain/terrain.cpp → samples/terrain/terrain_main.cpp

@@ -83,10 +83,10 @@ public:
 		Vec3 start = Vec3(0.0f, 10.0f, 0.0f);
 
 		// Add a movable camera
-		cam = new Camera(start, 90.0f, 1.6f);
-		system = new FPSSystem(cam, 10.0f, 2.5f);
+		cam = CE_NEW(m_allocator, Camera)(start, 90.0f, 1.6f);
+		system = CE_NEW(m_allocator, FPSSystem)(cam, 10.0f, 2.5f);
 		// Add a skybox
-		skybox = new Skybox(Vec3::ZERO, true);
+		skybox = CE_NEW(m_allocator, Skybox)(Vec3::ZERO, true);
 
 		terrain.CreateTerrain(64, 64, 1, 0.0f);
 		terrain.PlotCircle(4, 4, 4, 2);
@@ -175,6 +175,7 @@ public:
 
 private:
 
+	MallocAllocator m_allocator;
 	FPSSystem* system;
 	Camera* cam;
 	Skybox* skybox;

src/ArchiveResourceArchive.cpp → src/ArchiveBundle.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -23,17 +24,18 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "ArchiveResourceArchive.h"
+#include "ArchiveBundle.h"
 #include "Filesystem.h"
 #include "Resource.h"
 #include "DiskFile.h"
 #include "Log.h"
+#include "Memory.h"
 
 namespace crown
 {
 
 //-----------------------------------------------------------------------------
-ArchiveResourceArchive::ArchiveResourceArchive(Filesystem& fs) :
+ArchiveBundle::ArchiveBundle(Filesystem& fs) :
 	m_filesystem(fs),
 	m_archive_file(NULL),
 	m_entries_count(0),
@@ -51,24 +53,26 @@ ArchiveResourceArchive::ArchiveResourceArchive(Filesystem& fs) :
 	Log::d("Entries: %d", header.entries_count);
 	Log::d("Checksum: %d", header.checksum);
 	
-	m_entries = new ArchiveEntry[header.entries_count];
+	// No need to initialize memory
+	m_entries = (ArchiveEntry*)m_allocator.allocate(header.entries_count * sizeof(ArchiveEntry));
+
 	m_entries_count = header.entries_count;
-	
+
 	// Read the entries
 	m_archive_file->read(m_entries, m_entries_count * sizeof(ArchiveEntry));
 }
 
 //-----------------------------------------------------------------------------
-ArchiveResourceArchive::~ArchiveResourceArchive()
+ArchiveBundle::~ArchiveBundle()
 {
 	if (m_archive_file != NULL)
 	{
-			m_filesystem.close(m_archive_file);
+		m_filesystem.close(m_archive_file);
 	}
 	
 	if (m_entries != NULL)
 	{
-		delete[] m_entries;
+		m_allocator.deallocate(m_entries);
 	}
 	
 	m_entries = NULL;
@@ -76,7 +80,7 @@ ArchiveResourceArchive::~ArchiveResourceArchive()
 }
 
 //-----------------------------------------------------------------------------
-DiskFile* ArchiveResourceArchive::open(ResourceId name)
+DiskFile* ArchiveBundle::open(ResourceId name)
 {
 	// Search the resource in the archive
 	for (uint32_t i = 0; i < m_entries_count; i++)
@@ -94,7 +98,7 @@ DiskFile* ArchiveResourceArchive::open(ResourceId name)
 }
 
 //-----------------------------------------------------------------------------
-void ArchiveResourceArchive::close(DiskFile* resource)
+void ArchiveBundle::close(DiskFile* resource)
 {
 	// Does nothing, the stream is automatically closed at exit.
 	(void)resource;

src/ArchiveResourceArchive.h → src/ArchiveBundle.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -26,7 +27,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include "Types.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
+#include "MallocAllocator.h"
 
 namespace crown
 {
@@ -54,21 +56,23 @@ class DiskFile;
 /// recent version of the engine with older game archives.
 
 /// Source of resources
-class ArchiveResourceArchive : public ResourceArchive
+class ArchiveBundle : public Bundle
 {
 public:
 
-					ArchiveResourceArchive(Filesystem& fs);
-					~ArchiveResourceArchive();
+					ArchiveBundle(Filesystem& fs);
+					~ArchiveBundle();
 
-	/// @copydoc ResourceArchive::open()
+	/// @a copydoc Bundle::open()
 	DiskFile*		open(ResourceId name);
 
-	/// @copydoc ResourceArchive::close()
+	/// @a copydoc Bundle::close()
 	void			close(DiskFile* resource);
 
 private:
 
+	MallocAllocator	m_allocator;
+
 	Filesystem&		m_filesystem;
 
 	DiskFile*		m_archive_file;

src/ResourceArchive.h → src/Bundle.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -51,13 +52,13 @@ struct ArchiveEntry
 class Filesystem;
 class DiskFile;
 
-class ResourceArchive
+class Bundle
 {
 public:
 
-	virtual					~ResourceArchive() {}
+	virtual					~Bundle() {}
 
-	/// Opens the resource file containing @name resource
+	/// Opens the resource file containing @a name resource
 	/// and returns a stream from which read the data from.
 	/// @note
 	/// The resource stream points exactly at the start

src/CMakeLists.txt

@@ -10,8 +10,8 @@ set (SRC
 	FontResource.cpp
 	VertexShaderResource.cpp
 	PixelShaderResource.cpp
-	ArchiveResourceArchive.cpp
-	FileResourceArchive.cpp
+	ArchiveBundle.cpp
+	FileBundle.cpp
 
 	FPSSystem.cpp
 	JSONParser.cpp
@@ -26,7 +26,7 @@ set (HEADERS
 	MaterialResource.h
 	Resource.h
 	ResourceManager.h
-	ResourceArchive.h
+	Bundle.h
 	Skybox.h
 
 	TextureResource.h
@@ -34,8 +34,8 @@ set (HEADERS
 	FontResource.h
 	VertexShaderResource.h
 	PixelShaderResource.h
-	ArchiveResourceArchive.h
-	FileResourceArchive.h
+	ArchiveBundle.h
+	FileBundle.h
 
 	FPSSystem.h
 	JSONParser.h
@@ -150,6 +150,8 @@ set (STRINGS_HEADERS
 )
 
 set (MEM_SRC
+	core/mem/Memory.cpp
+	core/mem/Allocator.cpp
 	core/mem/MallocAllocator.cpp
 	core/mem/ProxyAllocator.cpp
 )
@@ -173,11 +175,13 @@ set (COMPRESSORS_HEADERS
 set (SETTINGS_SRC
 	core/settings/IntSetting.cpp
 	core/settings/FloatSetting.cpp
+	core/settings/StringSetting.cpp
 )
 
 set (SETTINGS_HEADERS
 	core/settings/IntSetting.h
 	core/settings/FloatSetting.h
+	core/settings/StringSetting.h
 )
 
 set (INPUT_SRC

src/Camera.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/Camera.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -39,14 +40,14 @@ class Camera
 {
 public:
 
-	/// Construct the camera placed at the given world-space @position
-	/// with the given @fov field of view and @aspect ratio.
+	/// Construct the camera placed at the given world-space @a position
+	/// with the given @a fov field of view and @a aspect ratio.
 					Camera(const Vec3& position, float fov, float aspect);
 
 	/// Returns the world-space position of the camera 
 	const Vec3&		position() const;
 
-	/// Sets the world-space @position of the camera
+	/// Sets the world-space @a position of the camera
 	void			set_position(const Vec3& position);
 
 	/// Returns the lookat-point of the camera
@@ -55,7 +56,7 @@ public:
 	/// Sets the lookat-point of the camera
 	void			set_look_at(const Vec3& lookat);
 
-	/// Sets the rotation of the camera about the world's @x axis and @y axis
+	/// Sets the rotation of the camera about the world's @a x axis and @a y axis
 	void			set_rotation(const float x, const float y);
 
 	/// Returns the up-vector of the camera
@@ -94,16 +95,16 @@ public:
 	/// Returns the renderer-independent view matrix used by the camera
 	const Mat4&		view_matrix() const;
 
-	/// Moves the camera towards look direction by @meters meters
+	/// Moves the camera towards look direction by @a meters meters
 	void			move_forward(float meters);
 
-	/// Moves the camera towards the opposite look direction by @meters meters
+	/// Moves the camera towards the opposite look direction by @a meters meters
 	void			move_backward(float meters);
 
-	/// Moves the camera along the axis perpendicular to the look direction by @meters meters
+	/// Moves the camera along the axis perpendicular to the look direction by @a meters meters
 	void			strafe_left(float meters);
 
-	/// Moves the camera along the axis perpendicular to the look direction by @meters meters
+	/// Moves the camera along the axis perpendicular to the look direction by @a meters meters
 	void			strafe_right(float meters);
 
 protected:

src/Config.h.in

@@ -24,9 +24,9 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#define CROWN_VERSION_MAJOR @CROWN_VERSION_MAJOR@
-#define CROWN_VERSION_MINOR @CROWN_VERSION_MINOR@
-#define CROWN_VERSION_MICRO @CROWN_VERSION_MICRO@
+#define CROWN_VERSION_MAJOR @CROWN_VERSION_MAJOR@ 
+#define CROWN_VERSION_MINOR @CROWN_VERSION_MINOR@ 
+#define CROWN_VERSION_MICRO @CROWN_VERSION_MICRO@ 
 
 #cmakedefine LINUX
 #cmakedefine WINDOWS

src/Crown.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -99,9 +100,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Camera.h"
 #include "Device.h"
 #include "Glyph.h"
-#include "ResourceArchive.h"
-#include "ArchiveResourceArchive.h"
-#include "FileResourceArchive.h"
+#include "Bundle.h"
+#include "ArchiveBundle.h"
+#include "FileBundle.h"
 #include "ResourceManager.h"
 #include "Skybox.h"
 

src/Device.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -37,8 +38,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "String.h"
 #include "Args.h"
 #include "Game.h"
-#include "ArchiveResourceArchive.h"
-#include "FileResourceArchive.h"
+#include <cstdlib>
+#include "ArchiveBundle.h"
+#include "FileBundle.h"
 #include "ResourceManager.h"
 #include "TextureResource.h"
 #include "Keyboard.h"
@@ -46,6 +48,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Touch.h"
 #include "Accelerometer.h"
 #include "OsWindow.h"
+#include "Memory.h"
 
 namespace crown
 {
@@ -76,7 +79,7 @@ Device::Device() :
 	m_debug_renderer(NULL),
 
 	m_resource_manager(NULL),
-	m_resource_archive(NULL),
+	m_resource_bundle(NULL),
 
 	m_game_library(NULL)
 {
@@ -172,13 +175,13 @@ void Device::shutdown()
 
 	if (m_input_manager)
 	{
-		delete m_input_manager;
+		CE_DELETE(m_allocator, m_input_manager);
 	}
 
 	Log::i("Releasing DebugRenderer...");
 	if (m_debug_renderer)
 	{
-		delete m_debug_renderer;
+		CE_DELETE(m_allocator, m_debug_renderer);
 	}
 
 	Log::i("Releasing Renderer...");
@@ -192,24 +195,24 @@ void Device::shutdown()
 	Log::i("Releasing Window...");
 	if (m_window)
 	{
-		delete m_window;
+		CE_DELETE(m_allocator, m_window);
 	}
 
 	Log::i("Releasing ResourceManager...");
-	if (m_resource_archive)
+	if (m_resource_bundle)
 	{
-		delete m_resource_archive;
+		CE_DELETE(m_allocator, m_resource_bundle);
 	}
 
 	if (m_resource_manager)
 	{
-		delete m_resource_manager;
+		CE_DELETE(m_allocator, m_resource_manager);
 	}
 
 	Log::i("Releasing Filesystem...");
 	if (m_filesystem)
 	{
-		delete m_filesystem;
+		CE_DELETE(m_allocator, m_filesystem);
 	}
 
 	m_is_init = false;
@@ -379,7 +382,7 @@ const void* Device::data(ResourceId name)
 //-----------------------------------------------------------------------------
 void Device::create_filesystem()
 {
-	m_filesystem = new Filesystem(m_preferred_root_path);
+	m_filesystem = CE_NEW(m_allocator, Filesystem)(m_preferred_root_path);
 
 	Log::d("Filesystem created.");
 	Log::d("Filesystem root path: %s", m_filesystem->root_path());
@@ -391,15 +394,15 @@ void Device::create_resource_manager()
 	// Select appropriate resource archive
 	if (m_preferred_mode == MODE_DEVELOPMENT)
 	{
-		m_resource_archive = new FileResourceArchive(*m_filesystem);
+		m_resource_bundle = CE_NEW(m_allocator, FileBundle)(*m_filesystem);
 	}
 	else
 	{
-		m_resource_archive = new ArchiveResourceArchive(*m_filesystem);
+		m_resource_bundle = CE_NEW(m_allocator, ArchiveBundle)(*m_filesystem);
 	}
 
 	// Create resource manager
-	m_resource_manager = new ResourceManager(*m_resource_archive, m_resource_allocator);
+	m_resource_manager = CE_NEW(m_allocator, ResourceManager)(*m_resource_bundle);
 
 	Log::d("Resource manager created.");
 	Log::d("Resource seed: %d", m_resource_manager->seed());
@@ -409,7 +412,7 @@ void Device::create_resource_manager()
 void Device::create_input_manager()
 {
 	// Create input manager
-	m_input_manager = new InputManager();
+	m_input_manager = CE_NEW(m_allocator, InputManager)();
 
 	Log::d("Input manager created.");
 }
@@ -417,7 +420,7 @@ void Device::create_input_manager()
 //-----------------------------------------------------------------------------
 void Device::create_window()
 {
-	m_window = new OsWindow(m_preferred_window_width, m_preferred_window_height);
+	m_window = CE_NEW(m_allocator, OsWindow)(m_preferred_window_width, m_preferred_window_height);
 
 	CE_ASSERT(m_window != NULL, "Unable to create the window");
 
@@ -440,7 +443,7 @@ void Device::create_renderer()
 void Device::create_debug_renderer()
 {
 	// Create debug renderer
-	m_debug_renderer = new DebugRenderer(*m_renderer);
+	m_debug_renderer = CE_NEW(m_allocator, DebugRenderer)(*m_renderer);
 
 	Log::d("Debug renderer created.");
 }

src/Device.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -36,8 +37,8 @@ namespace crown
 
 class Filesystem;
 class ResourceManager;
-class ResourceArchive;
 class OsWindow;
+class Bundle;
 class Renderer;
 class DebugRenderer;
 class InputManager;
@@ -125,6 +126,9 @@ private:
 
 private:
 
+	// Used to allocate all subsystems
+	MallocAllocator			m_allocator;
+
 	// Preferred settings from command line
 	int32_t					m_preferred_window_width;
 	int32_t					m_preferred_window_height;
@@ -151,8 +155,7 @@ private:
 
 	// Private subsystems
 	ResourceManager*		m_resource_manager;
-	ResourceArchive*		m_resource_archive;
-	MallocAllocator			m_resource_allocator;
+	Bundle*					m_resource_bundle;
 
 	// The game currently running
 	void*					m_game_library;

src/FPSSystem.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/FPSSystem.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/FileResourceArchive.cpp → src/FileBundle.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -24,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <cstdio>
-#include "FileResourceArchive.h"
+#include "FileBundle.h"
 #include "Filesystem.h"
 #include "Resource.h"
 #include "DiskFile.h"
@@ -35,18 +36,18 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-FileResourceArchive::FileResourceArchive(Filesystem& fs) :
+FileBundle::FileBundle(Filesystem& fs) :
 	m_filesystem(fs)
 {
 }
 
 //-----------------------------------------------------------------------------
-FileResourceArchive::~FileResourceArchive()
+FileBundle::~FileBundle()
 {
 }
 
 //-----------------------------------------------------------------------------
-DiskFile* FileResourceArchive::open(ResourceId name)
+DiskFile* FileBundle::open(ResourceId name)
 {
 	// Convert name/type into strings
 	char resource_name[512];
@@ -68,7 +69,7 @@ DiskFile* FileResourceArchive::open(ResourceId name)
 }
 
 //-----------------------------------------------------------------------------
-void FileResourceArchive::close(DiskFile* resource)
+void FileBundle::close(DiskFile* resource)
 {
 	m_filesystem.close(resource);
 }

src/FileResourceArchive.h → src/FileBundle.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -26,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include "Types.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
 
 namespace crown
 {
@@ -46,17 +47,17 @@ struct ResourceHeader
 };
 
 /// Source of resources
-class FileResourceArchive : public ResourceArchive
+class FileBundle : public Bundle
 {
 public:
 
-					FileResourceArchive(Filesystem& fs);
-					~FileResourceArchive();
+					FileBundle(Filesystem& fs);
+					~FileBundle();
 
-	/// @copydoc ResourceArchive::open()
+	/// @a copydoc Bundle::open()
 	DiskFile*		open(ResourceId name);
 
-	/// @copydoc ResourceArchive::close()
+	/// @a copydoc Bundle::close()
 	void			close(DiskFile* resource);
 
 

src/FontResource.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -30,10 +31,10 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* FontResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* FontResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
 	(void)allocator;
-	(void)archive;
+	(void)bundle;
 	(void)id;
 
 	return NULL;

src/FontResource.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -33,13 +34,13 @@ namespace crown
 {
 
 class Allocator;
-class ResourceArchive;
+class Bundle;
 
 class FontResource
 {
 public:
 
-	static void*		load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
 	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
 	static void			offline();

src/Glyph.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/MaterialResource.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -30,10 +31,10 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* MaterialResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* MaterialResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
 	(void)allocator;
-	(void)archive;
+	(void)bundle;
 	(void)id;
 	// TODO
 

src/MaterialResource.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -40,7 +41,7 @@ namespace crown
 /// @note The maximum number of usable layers depends on the graphic card/Renderer config.
 const uint32_t MAX_TEXTURE_LAYERS = 8;
 
-class ResourceArchive;
+class Bundle;
 class Allocator;
 
 /// A material describes the visual properties of a surface.
@@ -50,7 +51,7 @@ class MaterialResource
 {
 public:
 
-	static void*	load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
+	static void*	load(Allocator& allocator, Bundle& bundle, ResourceId id);
 	static void		online(void* resource);
 	static void		unload(Allocator& allocator, void* texture);
 	static void		offline();

src/PixelShaderResource.cpp

@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "PixelShaderResource.h"
 #include "DiskFile.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
 #include "Allocator.h"
 #include "Device.h"
 #include "Log.h"
@@ -34,9 +34,9 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* PixelShaderResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* PixelShaderResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* stream = archive.open(id);
+	DiskFile* stream = bundle.open(id);
 
 	CE_ASSERT(stream != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 
@@ -50,7 +50,7 @@ void* PixelShaderResource::load(Allocator& allocator, ResourceArchive& archive,
 	
 	resource->m_program_text[resource->m_program_text_length] = '\0';
 
-	archive.close(stream);
+	bundle.close(stream);
 
 	return resource;
 }

src/PixelShaderResource.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -32,15 +33,15 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-class ResourceArchive;
+class Bundle;
 class Allocator;
 
 class PixelShaderResource
 {
 public:
 
-	static void*		load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
-	static void			online(void* resource);
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
+	static void			online(void* script);
 	static void			unload(Allocator& allocator, void* resource);
 	static void			offline();
 

src/Resource.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/ResourceManager.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -45,9 +46,8 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-ResourceManager::ResourceManager(ResourceArchive& archive, Allocator& allocator) :
-	m_resource_archive(archive),
-	m_resource_allocator(allocator),
+ResourceManager::ResourceManager(Bundle& bundle) :
+	m_resource_bundle(bundle),
 	m_resources(m_allocator),
 	m_loading_queue(m_allocator),
 	m_loaded_queue(m_allocator),
@@ -338,30 +338,30 @@ void ResourceManager::background_load()
 }
 
 //-----------------------------------------------------------------------------
-void* ResourceManager::load_by_type(ResourceId name) const
+void* ResourceManager::load_by_type(ResourceId name)
 {
 	if (name.type == TEXTURE_TYPE)
 	{
-		return TextureResource::load(m_resource_allocator, m_resource_archive, name);
+		return TextureResource::load(m_resource_allocator, m_resource_bundle, name);
 	}
 	else if (name.type == TEXT_TYPE)
 	{
-		return TextResource::load(m_resource_allocator, m_resource_archive, name);
+		return TextResource::load(m_resource_allocator, m_resource_bundle, name);
 	}
 	else if (name.type == VERTEX_SHADER_TYPE)
 	{
-		return VertexShaderResource::load(m_resource_allocator, m_resource_archive, name);
+		return VertexShaderResource::load(m_resource_allocator, m_resource_bundle, name);
 	}
 	else if (name.type == PIXEL_SHADER_TYPE)
 	{
-		return PixelShaderResource::load(m_resource_allocator, m_resource_archive, name);
+		return PixelShaderResource::load(m_resource_allocator, m_resource_bundle, name);
 	}
 
 	return NULL;
 }
 
 //-----------------------------------------------------------------------------
-void ResourceManager::unload_by_type(ResourceId name, void* resource) const
+void ResourceManager::unload_by_type(ResourceId name, void* resource)
 {
 	if (name.type == TEXTURE_TYPE)
 	{

src/ResourceManager.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -63,18 +64,18 @@ struct LoadedResource
 	void*		data;
 };
 
-class ResourceArchive;
+class Bundle;
 
 /// Resource manager.
 class ResourceManager
 {
 public:
 
-	/// Read resources from @archive and store resource data using @allocator.
-							ResourceManager(ResourceArchive& archive, Allocator& allocator);
+	/// Read resources from @a bundle and store resource data using @a allocator.
+							ResourceManager(Bundle& bundle);
 							~ResourceManager();
 
-	/// Loads the resource by @name and returns its ResourceId.
+	/// Loads the resource by @a name and returns its ResourceId.
 	/// @note
 	/// The resource data may be not immediately available,
 	/// the resource gets pushed in a queue of load requests and loadead as
@@ -83,15 +84,15 @@ public:
 	/// loading process is actually completed.
 	ResourceId				load(const char* name);
 
-	/// Unloads the @resource, freeing up all the memory associated by it
+	/// Unloads the @a resource, freeing up all the memory associated by it
 	/// and eventually any global object associated with it.
 	/// (Such as texture objects, vertex buffers etc.)
 	void					unload(ResourceId name);
 
-	/// Reloads the @resource
+	/// Reloads the @a resource
 	void					reload(ResourceId name);
 
-	/// Returns whether the manager has the @name resource into
+	/// Returns whether the manager has the @a name resource into
 	/// its list of resources.
 	/// @note
 	/// Having a resource does not mean that the resource is
@@ -99,18 +100,18 @@ public:
 	/// obtain the resource availability status.
 	bool					has(ResourceId name) const;
 
-	/// Returns the data associated with the @name resource.
+	/// Returns the data associated with the @a name resource.
 	/// The resource data contains resource-specific metadata
 	/// and the actual resource data. In order to correctly use
-	/// it, you have to know which type of data @name refers to
+	/// it, you have to know which type of data @a name refers to
 	/// and cast accordingly.
 	const void*				data(ResourceId name) const;
 	
-	/// Returns whether the @name resource is loaded (i.e. whether
+	/// Returns whether the @a name resource is loaded (i.e. whether
 	/// you can use the data associated with it).
 	bool					is_loaded(ResourceId name) const;
 
-	/// Returns the number of references to the @resource
+	/// Returns the number of references to the @a resource
 	uint32_t				references(ResourceId name) const;
 
 	/// Returns the number of resources still waiting to load.
@@ -136,8 +137,8 @@ private:
 
 	void					background_load();
 
-	void*					load_by_type(ResourceId name) const;
-	void					unload_by_type(ResourceId name, void* resource) const;
+	void*					load_by_type(ResourceId name);
+	void					unload_by_type(ResourceId name, void* resource);
 	void					online(ResourceId name, void* resource);
 
 private:
@@ -147,9 +148,9 @@ private:
 private:
 
 	// Archive whether to look for resources
-	ResourceArchive&		m_resource_archive;
+	Bundle&					m_resource_bundle;
 	// Used to strore resource memory
-	Allocator&				m_resource_allocator;
+	MallocAllocator			m_resource_allocator;
 
 	MallocAllocator			m_allocator;
 	// The master lookup table

src/Skybox.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/Skybox.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/TextResource.cpp

@@ -1,6 +1,6 @@
 #include "TextResource.h"
 #include "DiskFile.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
 #include "Log.h"
 #include "Allocator.h"
 
@@ -8,9 +8,9 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* TextResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* TextResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* stream = archive.open(id);
+	DiskFile* stream = bundle.open(id);
 
 	CE_ASSERT(stream != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 
@@ -24,7 +24,7 @@ void* TextResource::load(Allocator& allocator, ResourceArchive& archive, Resourc
 	
 	resource->data[resource->length] = '\0';
 
-	archive.close(stream);
+	bundle.close(stream);
 
 	return resource;
 }

src/TextResource.h

@@ -6,14 +6,14 @@
 namespace crown
 {
 
-class ResourceArchive;
+class Bundle;
 class Allocator;
 
 class TextResource
 {
 public:
 
-	static void*		load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
 	static void			unload(Allocator& allocator, void* resource);
 	static void			online(void* resource);
 	static void			offline();

src/TextureResource.cpp

@@ -1,5 +1,5 @@
 #include "TextureResource.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
 #include "Log.h"
 #include "DiskFile.h"
 #include "Assert.h"
@@ -11,9 +11,9 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* TextureResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* TextureResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* stream = archive.open(id);
+	DiskFile* stream = bundle.open(id);
 
 	CE_ASSERT(stream != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 
@@ -29,7 +29,7 @@ void* TextureResource::load(Allocator& allocator, ResourceArchive& archive, Reso
 
 	stream->read(resource->m_data, size);
 
-	archive.close(stream);
+	bundle.close(stream);
 
 	return resource;
 }

src/TextureResource.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -33,14 +34,14 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-class ResourceArchive;
+class Bundle;
 class Allocator;
 
 class TextureResource
 {
 public:
 
-	static void*		load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
 	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
 	static void			offline();

src/VertexShaderResource.cpp

@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "VertexShaderResource.h"
 #include "DiskFile.h"
-#include "ResourceArchive.h"
+#include "Bundle.h"
 #include "Allocator.h"
 #include "Device.h"
 #include "Log.h"
@@ -34,9 +34,9 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* VertexShaderResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
+void* VertexShaderResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* stream = archive.open(id);
+	DiskFile* stream = bundle.open(id);
 
 	CE_ASSERT(stream != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 
@@ -50,7 +50,7 @@ void* VertexShaderResource::load(Allocator& allocator, ResourceArchive& archive,
 	
 	resource->m_program_text[resource->m_program_text_length] = '\0';
 
-	archive.close(stream);
+	bundle.close(stream);
 
 	return resource;
 }

src/VertexShaderResource.h

@@ -32,14 +32,14 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-class ResourceArchive;
+class Bundle;
 class Allocator;
 
 class VertexShaderResource
 {
 public:
 
-	static void*		load(Allocator& allocator, ResourceArchive& archive, ResourceId id);
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
 	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
 	static void			offline();

src/core/Args.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/Args.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -77,13 +78,13 @@ public:
 	const char*			optarg() const;
 
 
-	/// Sets the @index into argv[] from where to start option scanning.
-	/// If @index >= argc nothing will be scanned.
+	/// Sets the @a index into argv[] from where to start option scanning.
+	/// If @a index >= argc nothing will be scanned.
 	void				set_optind(int32_t index);
 
 private:
 
-	// Returns the @option type
+	// Returns the @a option type
 	// Returns AOT_SHORT if option is of the form "-x" where 'x' is the option.
 	// Returns AOT_LONG if option is of the form "--option" where "option" is the option.
 	// Returns AOT_NOT_OPTION in all other cases.

src/core/Assert.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/Log.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/Log.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/Types.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/bv/Box.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -44,7 +45,7 @@ public:
 	/// Does nothing for efficiency.
 					Box();
 
-	/// Constructs from @min and @max.
+	/// Constructs from @a min and @a max.
 					Box(const Vec3& min, const Vec3& max);			
 					Box(const Box& box);
 
@@ -57,19 +58,19 @@ public:
 	real			radius() const;
 	real			volume() const;
 
-	/// Adds @count @points expanding if necessary.
+	/// Adds @a count @a points expanding if necessary.
 	void			add_points(const Vec3* points, uint32_t count);
 
-	/// Adds @count @boxes expanding if necessay.
+	/// Adds @a count @a boxes expanding if necessay.
 	void			add_boxes(const Box* boxes, uint32_t count);
 
-	/// Returns whether point @p is contained in the box.
+	/// Returns whether point @a p is contained in the box.
 	bool			contains_point(const Vec3& p) const;
 
-	/// Returns the @index -th vertex of the box.
+	/// Returns the @a index -th vertex of the box.
 	Vec3			vertex(uint32_t index) const;		
 
-	/// Returns the box trasformed according to @mat matrix into @result.
+	/// Returns the box trasformed according to @a mat matrix into @a result.
 	void			transformed(const Mat4& mat, Box& result) const;	
 
 	/// Returns the eight vertices of the box.

src/core/bv/Circle.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/bv/Circle.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -44,7 +45,7 @@ public:
 	/// Does nothing for efficiency.
 					Circle();
 					
-	/// Constructs from @center and @radius.
+	/// Constructs from @a center and @a radius.
 					Circle(const Vec2& center, real radius);	
 					Circle(const Circle& circle);				
 

src/core/bv/Frustum.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/bv/Frustum.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -53,13 +54,13 @@ public:
 				Frustum();				
 				Frustum(const Frustum& frustum);
 
-	/// Returns whether @point is contained into the frustum.
+	/// Returns whether @a point is contained into the frustum.
 	bool		contains_point(const Vec3& point) const;	
 
 	/// Returns one of the eight frustum's corners.
 	Vec3		vertex(uint32_t index) const;			
 
-	/// Builds the view frustum according to the matrix @m.
+	/// Builds the view frustum according to the matrix @a m.
 	void		from_matrix(const Mat4& m);				
 
 	/// Returns a Box containing the frustum volume.

src/core/bv/Rect.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/bv/Rect.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -43,7 +44,7 @@ public:
 	/// Does nothing for efficiency.
 					Rect();		
 
-	/// Constructs from  @min and @max
+	/// Constructs from  @a min and @a max
 					Rect(const Vec2& min, const Vec2& max);		
 					Rect(const Rect& rect);	
 
@@ -59,19 +60,19 @@ public:
 	/// Returns the diagonal of the rect.
 	Vec2			size() const;						
 
-	/// Returns whether @point point is contained into the rect.
+	/// Returns whether @a point point is contained into the rect.
 	bool			contains_point(const Vec2& point) const;
 
-	/// Returns whether the rect intersects @r.
+	/// Returns whether the rect intersects @a r.
 	bool			intersects_rect(const Rect& rect) const;	
 
-	/// Sets the Rect from a @center and a @width - @height
+	/// Sets the Rect from a @a center and a @a width - @a height
 	void			set_from_center_and_dimensions(Vec2 center, real width, real height);	
 
 	/// Returns the four vertices of the rect.
 	void			vertices(Vec2 v[4]) const;
 
-	/// Returns the @index -th vetex of the rect.
+	/// Returns the @a index -th vetex of the rect.
 	Vec2			vertex(uint32_t index) const;			
 
 	/// Returns the equivalent circle.

src/core/bv/Sphere.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -43,7 +44,7 @@ public:
 	/// Does nothing for efficiency.
 					Sphere();
 
-	/// Constructs from @center and @radius.
+	/// Constructs from @a center and @a radius.
 					Sphere(const Vec3& center, real radius);
 					Sphere(const Sphere& a);
 
@@ -54,13 +55,13 @@ public:
 	void			set_center(const Vec3& center);
 	void			set_radius(real radius);
 
-	/// Adds @count @points to the sphere expanding if necessary.
+	/// Adds @a count @a points to the sphere expanding if necessary.
 	void			add_points(const Vec3* points, uint32_t count);	
 
-	/// Adds @count @spheres expanding if necessary.
+	/// Adds @a count @a spheres expanding if necessary.
 	void			add_spheres(const Sphere* spheres, uint32_t count);	
 
-	/// Returns whether point @p is contained into the sphere.
+	/// Returns whether point @a p is contained into the sphere.
 	bool			contains_point(const Vec3& p) const;		
 
 private:

src/core/compressors/Compressor.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -37,14 +38,14 @@ public:
 						Compressor(Allocator& allocator);
 	virtual 			~Compressor() {}
 
-	/// Compresses the data pointed by @data of size @in_size (in bytes) and returns it.
-	/// The function also returns the size in bytes of the compressed data in @out_size.
+	/// Compresses the data pointed by @a data of size @a in_size (in bytes) and returns it.
+	/// The function also returns the size in bytes of the compressed data in @a out_size.
 	/// @note
 	/// The returned data is automatically allocated using the passed allocator.
 	virtual uint8_t* 	compress(const void* data, size_t in_size, size_t& out_size) = 0;
 
-	/// Uncompresses the data pointed by @data of size @in_size (in bytes) and returns it.
-	/// The function also returns the size in bytes of the uncompressed data in @out_size.
+	/// Uncompresses the data pointed by @a data of size @a in_size (in bytes) and returns it.
+	/// The function also returns the size in bytes of the uncompressed data in @a out_size.
 	/// @note
 	/// The returned data is automatically allocated using the passed allocator.
 	virtual uint8_t* 	uncompress(const void* data, size_t in_size, size_t& out_size) = 0;

src/core/compressors/ZipCompressor.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/compressors/ZipCompressor.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -38,10 +39,10 @@ public:
 				ZipCompressor(Allocator& allocator);
 				~ZipCompressor();
 	
-	/// @copydoc Compressor::compress()
+	/// @a copydoc Compressor::compress()
 	uint8_t* 	compress(const void* data, size_t in_size, size_t& out_size);
 
-	/// @copydoc Compressor::uncompress()
+	/// @a copydoc Compressor::uncompress()
 	uint8_t* 	uncompress(const void* data, size_t in_size, size_t& out_size);
 };
 

src/core/containers/Dictionary.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/containers/Generic.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/containers/Generic.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/containers/IdTable.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -48,17 +49,17 @@ class IdTable
 {
 public:
 
-	/// Creates the table for tracking exactly @max_ids - 1 unique Ids.
+	/// Creates the table for tracking exactly @a max_ids - 1 unique Ids.
 					IdTable(Allocator& allocator, uint16_t max_ids);
 					~IdTable();
 
 	/// Returns a new Id.
 	Id				create();
 
-	/// Destroys the specified @id.
+	/// Destroys the specified @a id.
 	void			destroy(Id id);
 
-	/// Returns whether the table has the specified @id
+	/// Returns whether the table has the specified @a id
 	bool			has(Id id) const;
 
 private:

src/core/containers/List.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -41,6 +42,7 @@ class List
 {
 public:
 
+	/// Does not allocate memory.
 						List(Allocator& allocator);
 
 	/// Allocates capacity * sizeof(T) bytes.
@@ -63,20 +65,20 @@ public:
 	/// Returns the maximum number of items the array can hold
 	uint32_t			capacity() const;
 
-	/// Resizes the list to the given @size.
+	/// Resizes the list to the given @a size.
 	/// @note
 	/// Old items will be copied to the newly created list.
 	/// If the new capacity is smaller than the previous one, the
 	/// list will be truncated.
 	void				resize(uint32_t size);
 
-	/// Reserves space in the list for at least @capacity items.
+	/// Reserves space in the list for at least @a capacity items.
 	void				reserve(uint32_t capacity);
 
 	/// Sets the list capacity
 	void				set_capacity(uint32_t capacity);
 
-	/// Grows the list to contain at least @min_capacity items
+	/// Grows the list to contain at least @a min_capacity items
 	void				grow(uint32_t min_capacity);
 
 	/// Condenses the array so that the capacity matches the actual number
@@ -89,7 +91,7 @@ public:
 	/// Removes the last item from the list.
 	void				pop_back();
 
-	/// Appends @count @items to the list and returns the number
+	/// Appends @a count @a items to the list and returns the number
 	/// of items in the list after the append operation.
 	uint32_t			push(const T* items, uint32_t count);
 
@@ -99,7 +101,7 @@ public:
 	/// the number of items in the list for efficiency.
 	void				clear();
 
-	/// Copies the content of the @other list into this one.
+	/// Copies the content of the @a other list into this one.
 	const List<T>&		operator=(const List<T>& other);
 
 	T*					begin();

src/core/containers/Queue.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -64,23 +65,23 @@ public:
 	/// Increase or decrease the capacity of the queue.
 	/// @note
 	/// Old items will be copied to the newly created queue.
-	/// If the new @capacity is smaller than the previous one, the
+	/// If the new @a capacity is smaller than the previous one, the
 	/// queue will be truncated.
 	void			increase_capacity(uint32_t capacity);
 
-	/// Grows the queue to contain at least @min_capacity items.
-	/// If @min_capacity is set to 0, the queue automatically
+	/// Grows the queue to contain at least @a min_capacity items.
+	/// If @a min_capacity is set to 0, the queue automatically
 	/// determines the new capacity based on its size at the 
 	/// time of call.
 	void			grow(uint32_t min_capacity);
 
-	/// Adds an @item to the back of the queue
+	/// Adds an @a item to the back of the queue
 	void			push_back(const T& item);
 
 	/// Removes the last item from the queue
 	void			pop_back();
 
-	/// Adds an @item to the front of the queue
+	/// Adds an @a item to the front of the queue
 	void			push_front(const T& item);
 
 	/// Removes the first item from the queue

src/core/containers/RBTree.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/BinaryReader.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/BinaryReader.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/BinaryWriter.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/BinaryWriter.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/DiskFile.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -27,6 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Types.h"
 #include "Log.h"
 #include "MathUtils.h"
+#include "Allocator.h"
 
 namespace crown
 {
@@ -106,7 +108,7 @@ bool DiskFile::copy_to(File& file, size_t size)
 
 	const size_t chunksize = 1024*1024;
 
-	char* buff = new char[chunksize];
+	char* buff = (char*) default_allocator().allocate(chunksize * sizeof(char));
 
 	size_t tot_read_bytes = 0;
 
@@ -127,7 +129,7 @@ bool DiskFile::copy_to(File& file, size_t size)
 				}
 			}
 
-			delete[] buff;
+			default_allocator().deallocate(buff);
 			//Either the file gave an error, or ended before size bytes could be copied
 			return false;
 		}
@@ -136,7 +138,7 @@ bool DiskFile::copy_to(File& file, size_t size)
 		tot_read_bytes += read_bytes;
 	}
 
-	delete [] buff;
+	default_allocator().deallocate(buff);
 	return true;
 }
 

src/core/filesystem/DiskFile.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -37,50 +38,50 @@ class DiskFile: public File
 {
 public:
 
-	/// Opens @filename with specified @mode
+	/// Opens @a filename with specified @a mode
 					DiskFile(FileOpenMode mode, const char* filename);
 	virtual			~DiskFile();
 
-	/// @copydoc File::seek() 
+	/// @a copydoc File::seek() 
 	void			seek(size_t position);
 
-	/// @copydoc File::seek_to_end() 
+	/// @a copydoc File::seek_to_end() 
 	void			seek_to_end();
 
-	/// @copydoc File::skip() 
+	/// @a copydoc File::skip() 
 	void			skip(size_t bytes);
 
-	/// @copydoc File::read() 
+	/// @a copydoc File::read() 
 	void			read(void* buffer, size_t size);
 
-	/// @copydoc File::write() 
+	/// @a copydoc File::write() 
 	void			write(const void* buffer, size_t size);
 
-	/// @copydoc File::copy_to() 
+	/// @a copydoc File::copy_to() 
 	bool			copy_to(File& file, size_t size = 0);
 
-	/// @copydoc File::flush() 
+	/// @a copydoc File::flush() 
 	void			flush();
 
-	/// @copydoc File::end_of_file() 
+	/// @a copydoc File::end_of_file() 
 	bool			end_of_file() const;
 
-	/// @copydoc File::is_valid() 
+	/// @a copydoc File::is_valid() 
 	bool			is_valid() const;
 
-	/// @copydoc File::size() 
+	/// @a copydoc File::size() 
 	size_t			size() const;
 
-	/// @copydoc File::position() 
+	/// @a copydoc File::position() 
 	size_t			position() const;
 
-	/// @copydoc File::can_read() 
+	/// @a copydoc File::can_read() 
 	bool			can_read() const;
 
-	/// @copydoc File::can_write() 
+	/// @a copydoc File::can_write() 
 	bool			can_write() const;
 
-	/// @copydoc File::can_seek() 
+	/// @a copydoc File::can_seek() 
 	bool			can_seek() const;
 
 protected:

src/core/filesystem/File.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/File.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -49,7 +50,7 @@ class File
 {
 public:
 
-	/// Opens the file with the given @mode
+	/// Opens the file with the given @a mode
 						File(FileOpenMode mode) : m_open_mode(mode) {}
 	virtual				~File() {};
 

src/core/filesystem/Filesystem.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -27,6 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Log.h"
 #include "OS.h"
 #include "DiskFile.h"
+#include "Memory.h"
 
 namespace crown
 {
@@ -191,13 +193,13 @@ DiskFile* Filesystem::open(const char* relative_path, FileOpenMode mode)
 	CE_ASSERT(get_info(relative_path, info), "File does not exist: %s", relative_path);
 	CE_ASSERT(info.type == FilesystemEntry::FILE, "File is not a regular file: %s", relative_path);
 
-	return new DiskFile(mode, info.os_path);
+	return CE_NEW(m_allocator, DiskFile)(mode, info.os_path);
 }
 
 //-----------------------------------------------------------------------------
 void Filesystem::close(DiskFile* stream)
 {
-	delete stream;
+	CE_DELETE(m_allocator, stream);
 }
 
 } // namespace crown

src/core/filesystem/Filesystem.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -28,6 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "String.h"
 #include "OS.h"
 #include "File.h"
+#include "MallocAllocator.h"
 
 namespace crown
 {
@@ -100,48 +102,48 @@ class Filesystem
 {
 public:
 
-	/// The @root_path must be absolute.
+	/// The @a root_path must be absolute.
 						Filesystem(const char* root_path);
 						~Filesystem();
 
 	/// Returns the root path of the filesystem
 	const char*			root_path() const;
 
-	/// Returns whether the @relative_path exists and fills @info with
-	/// with informations about the given @relative_path path
+	/// Returns whether the @a relative_path exists and fills @a info with
+	/// with informations about the given @a relative_path path
 	bool				get_info(const char* relative_path, FilesystemEntry& info);
 	
-	/// Returns whether the @relative_path exists on disk
+	/// Returns whether the @a relative_path exists on disk
 	bool				exists(const char* relative_path);
 
-	/// Returns whether @relative_path is a regular file
+	/// Returns whether @a relative_path is a regular file
 	bool				is_file(const char* relative_path);
 
-	/// Returns whether @relative_path is a directory
+	/// Returns whether @a relative_path is a directory
 	bool				is_dir(const char* relative_path);
 
-	/// Creates a regular file named @relative_path
+	/// Creates a regular file named @a relative_path
 	bool				create_file(const char* relative_path);
 
-	/// Creates a directory named @relative_path
+	/// Creates a directory named @a relative_path
 	bool				create_dir(const char* relative_path);
 
-	/// Deletes the regular file @relative_path
+	/// Deletes the regular file @a relative_path
 	bool				delete_file(const char* relative_path);
 
-	/// Deletes the directory @relative_path
+	/// Deletes the directory @a relative_path
 	bool				delete_dir(const char* relative_path);
 
-	/// Returns the os-specific path which @relative_path refers to.
+	/// Returns the os-specific path which @a relative_path refers to.
 	/// @note
 	/// In general, you typically do not want to use it for normal
 	/// file interactions. Prefer using the other methods whenever possible.
 	const char*			os_path(const char* relative_path);
 
-	/// Opens the file @relative_path with the specified access @mode
+	/// Opens the file @a relative_path with the specified access @a mode
 	DiskFile*			open(const char* relative_path, FileOpenMode mode);
 
-	/// Closes a previously opened file @stream
+	/// Closes a previously opened file @a stream
 	void				close(DiskFile* stream);
 
 private:
@@ -151,6 +153,8 @@ private:
 	
 private:
 
+	MallocAllocator		m_allocator;
+
 	char				m_root_path[MAX_PATH_LENGTH];
 
 	// Disable copying

src/core/filesystem/MemoryFile.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/MemoryFile.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -84,52 +85,52 @@ class MemoryFile: public File
 {
 public:
 
-	/// @copydoc File::File()
+	/// @a copydoc File::File()
 						MemoryFile(MemoryBuffer* buffer, FileOpenMode mode);
 
-	/// @copydoc File::~File()
+	/// @a copydoc File::~File()
 	virtual				~MemoryFile();
 
-	/// @copydoc File::seek()
+	/// @a copydoc File::seek()
 	void				seek(size_t position);
 
-	/// @copydoc File::seek_to_end()
+	/// @a copydoc File::seek_to_end()
 	void				seek_to_end();
 
-	/// @copydoc File::skip()
+	/// @a copydoc File::skip()
 	void				skip(size_t bytes);
 
-	/// @copydoc File::read()
+	/// @a copydoc File::read()
 	void				read(void* buffer, size_t size);
 
-	/// @copydoc File::write()
+	/// @a copydoc File::write()
 	void				write(const void* buffer, size_t size);
 
-	/// @copydoc File::copy_to()
+	/// @a copydoc File::copy_to()
 	bool				copy_to(File& file, size_t size = 0);
 
-	/// @copydoc File::flush()
+	/// @a copydoc File::flush()
 	void				flush();
 
-	/// @copydoc File::end_of_file()
+	/// @a copydoc File::end_of_file()
 	bool				end_of_file() const { return size() == m_memory_offset; }
 
-	/// @copydoc File::is_valid()
+	/// @a copydoc File::is_valid()
 	bool				is_valid() const { CE_ASSERT(m_memory != NULL, "Memory is NULL"); return m_memory->is_valid(); }
 
-	/// @copydoc File::size()
+	/// @a copydoc File::size()
 	size_t				size() const { CE_ASSERT(m_memory != NULL, "Memory is NULL"); return m_memory->size(); }
 
-	/// @copydoc File::position()
+	/// @a copydoc File::position()
 	size_t				position() const { return m_memory_offset; }
 
-	/// @copydoc File::can_read()
+	/// @a copydoc File::can_read()
 	bool				can_read() const { return true; }
 
-	/// @copydoc File::can_write()
+	/// @a copydoc File::can_write()
 	bool				can_write() const { return true; }
 
-	/// @copydoc File::can_seek()
+	/// @a copydoc File::can_seek()
 	bool				can_seek() const { return true; }
 
 	/// Dumps the data to the console.

src/core/filesystem/NullFile.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -37,22 +38,22 @@ class NullFile: public File
 {
 public:
 
-	/// @copydoc File::File()
+	/// @a copydoc File::File()
 				NullFile(FileOpenMode mode) : File(mode) {}
 
-	/// @copydoc File::~File()
+	/// @a copydoc File::~File()
 	virtual		~NullFile() {}
 
-	/// @copydoc File::seek()
+	/// @a copydoc File::seek()
 	void		seek(size_t position) { (void)position; }
 
-	/// @copydoc File::seek_to_end()
+	/// @a copydoc File::seek_to_end()
 	void		seek_to_end() {}
 
-	/// @copydoc File::skip()
+	/// @a copydoc File::skip()
 	void		skip(size_t bytes) { (void)bytes; }
 				
-	/// @copydoc File::read()
+	/// @a copydoc File::read()
 	/// @note
 	///	Fills buffer with zeroes
 	void		read(void* buffer, size_t size)
@@ -63,10 +64,10 @@ public:
 		}
 	}
 
-	/// @copydoc File::write()
+	/// @a copydoc File::write()
 	void		write(const void* buffer, size_t size) { (void)buffer; (void)size; }
 
-	/// @copydoc File::copy_to()
+	/// @a copydoc File::copy_to()
 	/// @note
 	///	Returns always true
 	bool		copy_to(File& file, size_t size = 0)
@@ -76,40 +77,40 @@ public:
 		return true;
 	}
 
-	/// @copydoc File::flush()
+	/// @a copydoc File::flush()
 	void		flush() {};
 				
-	/// @copydoc File::is_valid()
+	/// @a copydoc File::is_valid()
 	/// @note
 	///	Returns always true
 	bool		is_valid() { return true; }
 				
-	/// @copydoc File::end_of_file()
+	/// @a copydoc File::end_of_file()
 	/// @note
 	///	Returns always false
 	bool		end_of_file() { return false; }
 				
-	/// @copydoc File::size()
+	/// @a copydoc File::size()
 	/// @note
 	///	Returns always 0xFFFFFFFF
 	size_t		size() { return ~0; }
 				
-	/// @copydoc File::position()
+	/// @a copydoc File::position()
 	/// @note
 	///	Returns always zero
 	size_t		position() { return 0; }
 				
-	/// @copydoc File::can_read()
+	/// @a copydoc File::can_read()
 	/// @note
 	///	Returns always true
 	bool		can_read() { return true; }
 				
-	/// @copydoc File::can_write()
+	/// @a copydoc File::can_write()
 	/// @note
 	///	Returns always true
 	bool		can_write() { return true; }
 				
-	/// @copydoc File::can_seek()
+	/// @a copydoc File::can_seek()
 	/// @note
 	///	Returns always true
 	bool		can_seek() { return true; }

src/core/filesystem/TextReader.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/TextReader.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/TextWriter.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/filesystem/TextWriter.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Color4.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Color4.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Interpolation.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -32,15 +33,15 @@ namespace crown
 namespace interpolation
 {
 
-/// Returns the linear interpolated value between @p0 and @p1 at time @t
+/// Returns the linear interpolated value between @a p0 and @a p1 at time @a t
 template <typename T>
 static T	linear(const T& p0, const T& p1, real t);
 
-/// Returns the cosine interpolated value between @p0 and @p1 at time @t
+/// Returns the cosine interpolated value between @a p0 and @a p1 at time @a t
 template <typename T>
 static T	cosine(const T& p0, const T& p1, real t);
 
-/// Returns the cubic interpolated value between @p0 and @p1 at time @t
+/// Returns the cubic interpolated value between @a p0 and @a p1 at time @a t
 template <typename T>
 static T	cubic(const T& p0, const T& p1, real t);
 

src/core/math/Intersection.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Mat3.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Mat3.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -45,7 +46,7 @@ class Vec3;
 /// to write something like: matrix vector. Since we are also using column vectors, inverting
 /// the operands would result in an impossible operation.
 /// 
-/// @verbatim:
+/// @a verbatim:
 ///   X base vector
 ///     | Y base vector
 ///     |   | Z base vector
@@ -67,7 +68,7 @@ public:
 	/// Constructs from a set of real
 						Mat3(real r1c1, real r2c1, real r3c1, real r1c2, real r2c2, real r3c2, real r1c3, real r2c3, real r3c3);
 	
-	/// Constructs from the @v array
+	/// Constructs from the @a v array
 						Mat3(const real v[9]);						
 						Mat3(const Mat3& a);	
 
@@ -98,13 +99,13 @@ public:
 	/// For simmetry
 	friend Mat3			operator*(real k, const Mat3& a);			
 
-	/// Builds a rotation matrix about the X axis of @radians radians
+	/// Builds a rotation matrix about the X axis of @a radians radians
 	void				build_rotation_x(real radians);			
 
-	/// Builds a rotation matrix about the Y axis of @radians radians	
+	/// Builds a rotation matrix about the Y axis of @a radians radians	
 	void				build_rotation_y(real radians);	
 
-	/// Builds a rotation matrix about the Z axis of @radians radians			
+	/// Builds a rotation matrix about the Z axis of @a radians radians			
 	void				build_rotation_z(real radians);	
 
 	/// Builds a rotation matrix about an arbitrary axis of "radians" radians			
@@ -122,7 +123,7 @@ public:
 	/// Returns a Vec3 containing the matrix's scale portion
 	Vec3				get_scale() const;	
 
-	/// Fills the matrix's scale portion with the values contained in @scale				
+	/// Fills the matrix's scale portion with the values contained in @a scale				
 	void				set_scale(const Vec3& scale);				
 
 	/// Returns the pointer to the matrix's data

src/core/math/Mat4.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Mat4.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -46,7 +47,7 @@ class Vec4;
 /// to write something like: matrix * vector. Since we are also using column vectors, inverting
 /// the operands would result in an impossible operation.
 /// 
-/// @verbatim:
+/// @a verbatim:
 ///   X base vector
 ///     | Y base vector
 ///     |   | Z base vector
@@ -70,7 +71,7 @@ public:
 	/// Constructs from a set of real
 						Mat4(real r1c1, real r2c1, real r3c1, real r4c1, real r1c2, real r2c2, real r3c2, real r4c2, real r1c3, real r2c3, real r3c3, real r4c3, real r1c4, real r2c4, real r3c4, real r4c4);
 	
-	/// Contructs from the @v array
+	/// Contructs from the @a v array
 						Mat4(const real v[16]);						
 						Mat4(const Mat4& a);					
 
@@ -101,13 +102,13 @@ public:
 	/// For simmetry
 	friend Mat4			operator*(real k, const Mat4& a);			
 
-	/// Builds a rotation matrix about the X axis of @radians radians
+	/// Builds a rotation matrix about the X axis of @a radians radians
 	void				build_rotation_x(real radians);
 
 	/// Builds a rotation matrix about the Y axis of "radians" radians	
 	void				build_rotation_y(real radians);	
 
-	/// Builds a rotation matrix about the Z axis of @radians radians			
+	/// Builds a rotation matrix about the Z axis of @a radians radians			
 	void				build_rotation_z(real radians);		
 
 	/// Builds a rotation matrix about an arbitrary axis of "radians" radians		
@@ -152,13 +153,13 @@ public:
 	/// Returns a Vec3 containing the matrix's translation portion
 	Vec3				get_translation() const;	
 
-	/// Fills the matrix's translation portion values contained in @trans				
+	/// Fills the matrix's translation portion values contained in @a trans				
 	void				set_translation(const Vec3& trans);			
 
 	/// Returns a Vec3 containing the matrix's scale portion
 	Vec3				get_scale() const;
 
-	/// Fills the matrix's scale portion with the values contained in @scale							
+	/// Fills the matrix's scale portion with the values contained in @a scale							
 	void				set_scale(const Vec3& scale);				
 
 	/// Returns the pointer to the matrix's data

src/core/math/MathUtils.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/MathUtils.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -60,73 +61,73 @@ const double	DOUBLE_PRECISION			= (real)1.0e-9;
 bool			equals(float a, float b, float precision = FLOAT_PRECISION);
 bool			equals(double a, double b, double precision = DOUBLE_PRECISION);
 
-/// Tests agains the specified @bitmask and returns true only if all bits are satisfied
+/// Tests agains the specified @a bitmask and returns true only if all bits are satisfied
 bool			test_bitmask(int32_t value, int32_t bitmask);
 
-/// Sets the specified @bitmask	
+/// Sets the specified @a bitmask	
 int32_t			set_bitmask(int32_t value, int32_t bitmask);
 
-/// Removes the specified @bitmask	
+/// Removes the specified @a bitmask	
 int32_t			unset_bitmask(int32_t value, int32_t bitmask);	
 
-/// Returns minimum between @a and @b
+/// Returns minimum between @a a and @a b
 template <typename T> T		min(const T& a, const T& b);
 
-/// Returns maximum between @a and @b
+/// Returns maximum between @a a and @a b
 template <typename T> T		max(const T& a, const T& b);
 
-/// Returns the arithmetic mean of @a and @b	
+/// Returns the arithmetic mean of @a a and @a b	
 template <typename T> T		avg(const T& a, const T& b);
 
 /// Clamps a value to a specific range (min < max)	
 template <typename T> T		clamp_to_range(const T& min, const T& max, const T& value);	
 
-/// Swaps @a and @b
+/// Swaps @a a and @a b
 template <typename T> void	swap(T& a, T& b);				
 
-/// Returns @deg in radians
+/// Returns @a deg in radians
 real			deg_to_rad(real deg);
 
-/// Returns @rad in degrees
+/// Returns @a rad in degrees
 real			rad_to_deg(real rad);
 
-/// Returns the nearest power of two to @x
+/// Returns the nearest power of two to @a x
 uint32_t		next_pow_2(uint32_t x);
 
-/// Returns whether @x is a power of two			
+/// Returns whether @a x is a power of two			
 bool			is_pow_2(uint32_t x);	
 
-/// Returns the smallest integral value that is not less than @x
+/// Returns the smallest integral value that is not less than @a x
 real			ceil(real x);		
 
-/// Returns the largest integral value that is not greater than @x			
+/// Returns the largest integral value that is not greater than @a x			
 real			floor(real x);	
 
-/// Returns the square root of @x				
+/// Returns the square root of @a x				
 real			sqrt(real x);	
 
-/// Returns the inverse square root of @x				
+/// Returns the inverse square root of @a x				
 real			inv_sqrt(real x);
 
-/// Returns the sine of @x				
+/// Returns the sine of @a x				
 real			sin(real x);	
 
-/// Returns the cosine of @x				
+/// Returns the cosine of @a x				
 real			cos(real x);
 
-/// Returns the arc sine of @x					
+/// Returns the arc sine of @a x					
 real			asin(real x);	
 
-/// Returns the arc cosine of @x				
+/// Returns the arc cosine of @a x				
 real			acos(real x);	
 
-/// Returns the tangent of @x				
+/// Returns the tangent of @a x				
 real			tan(real x);		
 
-/// Returns the arc tangent of @y/@x			
+/// Returns the arc tangent of @a y/@a x			
 real			atan2(real y, real x);	
 
-/// Returns the absolute value of @x		
+/// Returns the absolute value of @a x		
 real			abs(real x);			
 
 /// Returns the realing-point remainder of numerator/denominator		

src/core/math/Plane.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Plane.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -55,10 +56,10 @@ public:
 	/// Normalizes the plane
 	Plane&				normalize();							
 
-	/// Returns the signed distance between point @p and the plane
+	/// Returns the signed distance between point @a p and the plane
 	real				distance_to_point(const Vec3& p) const;	
 
-	/// Returns whether the plane contains the point @p	
+	/// Returns whether the plane contains the point @a p	
 	bool				contains_point(const Vec3& p) const;		
 
 	static const Plane	ZERO;

src/core/math/Point2.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Point2.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Quat.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Quat.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -36,7 +37,7 @@ class Mat4;
 
 /// Quaternion.
 ///
-/// @Note:
+/// @a Note:
 /// This implementation uses the standard quaternion
 /// multiplication equation, so, the order of multiplication
 /// for multiple rotations is in a reverse fashion:

src/core/math/Random.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -35,7 +36,7 @@ class Random
 {
 public:
 
-	/// Initializes the generator with the given @seed.
+	/// Initializes the generator with the given @a seed.
 				Random(int32_t seed);
 
 	/// Returns a pseudo-random integer in the range [0, 32767].

src/core/math/Ray.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -41,7 +42,7 @@ public:
 	/// Does nothing for efficiency.
 					Ray();
 
-	/// Constructs from @origin and @direction
+	/// Constructs from @a origin and @a direction
 					Ray(const Vec3& origin, const Vec3& direction);
 					Ray(const Ray& ray);
 

src/core/math/Shape.cpp

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Shape.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person

src/core/math/Triangle.h

@@ -1,4 +1,5 @@
 /*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
 Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
 
 Permission is hereby granted, free of charge, to any person
@@ -50,10 +51,10 @@ public:
 	/// Returns the center of gravity (a.k.a. "centroid").
 	Vec3		centroid() const;
 
-	/// Returns the barycentric coordinates of point @p in respect to the triangle.
+	/// Returns the barycentric coordinates of point @a p in respect to the triangle.
 	Vec3		barycentric_coords(const Vec3& p) const;
 
-	/// Returns whether the triangle contains the @p point.
+	/// Returns whether the triangle contains the @a p point.
 	bool		contains_point(const Vec3& p) const;
 
 	/// Returns the plane containing the triangle.