Merge branch 'world' of https://github.com/taylor001/crown into world

engine/Config.h.in

@@ -35,14 +35,23 @@ OTHER DEALINGS IN THE SOFTWARE.
 #cmakedefine CROWN_DEVELOPMENT
 #cmakedefine CROWN_RELEASE
 
-#define CROWN_MAX_TEXTURE_UNITS		8
-#define CROWN_MAX_TEXTURES			32
-#define CROWN_MAX_RENDER_TARGETS	32
-#define CROWN_MAX_VERTEX_BUFFERS	1024
-#define CROWN_MAX_INDEX_BUFFERS		1024
-#define CROWN_MAX_SHADERS			1024
-#define CROWN_MAX_GPU_PROGRAMS		1024
-#define CROWN_MAX_UNIFORMS			128
+#define CE_MAX_TEXTURE_UNITS		8
+#define CE_MAX_TEXTURES				32
+#define CE_MAX_RENDER_TARGETS		32
+#define CE_MAX_VERTEX_BUFFERS		1024
+#define CE_MAX_INDEX_BUFFERS		1024
+#define CE_MAX_SHADERS				1024
+#define CE_MAX_GPU_PROGRAMS			1024
+#define CE_MAX_UNIFORMS				128
 
 // Including NUL character
-#define CROWN_MAX_UNIFORM_NAME_LENGTH	64
+#define CE_MAX_UNIFORM_NAME_LENGTH	64
+
+#define CE_MAX_WORLDS				1024
+#define CE_MAX_UNITS				65000
+#define CE_MAX_CAMERAS				16
+#define CE_MAX_ACTORS				1024
+#define CE_MAX_CONTROLLERS			1024
+#define CE_MAX_TRIGGERS				1024
+#define CE_MAX_JOINTS				512
+#define CE_MAX_SOUND_INSTANCES		64

engine/audio/SoundWorld.h

@@ -28,8 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 
-#define MAX_SOUND_INSTANCES 64
-
 namespace crown
 {
 

engine/audio/backend/ALSoundWorld.cpp

@@ -358,7 +358,7 @@ public:
 
 private:
 
-	IdArray<MAX_SOUND_INSTANCES, SoundInstance> m_playing_sounds;
+	IdArray<CE_MAX_SOUND_INSTANCES, SoundInstance> m_playing_sounds;
 	Matrix4x4 m_listener_pose;
 };
 

engine/audio/backend/SLESSoundWorld.cpp

@@ -484,7 +484,7 @@ public:
 
 private:
 
-	IdArray<MAX_SOUND_INSTANCES, SoundInstance> m_playing_sounds;
+	IdArray<CE_MAX_SOUND_INSTANCES, SoundInstance> m_playing_sounds;
 	Matrix4x4 m_listener_pose;
 };
 

engine/physics/PhysicsWorld.cpp

@@ -200,16 +200,16 @@ namespace physics_system
 //-----------------------------------------------------------------------------
 PhysicsWorld::PhysicsWorld()
 	: m_scene(NULL)
-	, m_actors_pool(default_allocator(), MAX_ACTORS, sizeof(Actor), CE_ALIGNOF(Actor))
-	, m_controllers_pool(default_allocator(), MAX_CONTROLLERS, sizeof(Controller), CE_ALIGNOF(Controller))
-	, m_triggers_pool(default_allocator(), MAX_TRIGGERS, sizeof(Trigger), CE_ALIGNOF(Trigger))
-	, m_joints_pool(default_allocator(), MAX_JOINTS, sizeof(Joint), CE_ALIGNOF(Joint))
+	, m_actors_pool(default_allocator(), CE_MAX_ACTORS, sizeof(Actor), CE_ALIGNOF(Actor))
+	, m_controllers_pool(default_allocator(), CE_MAX_CONTROLLERS, sizeof(Controller), CE_ALIGNOF(Controller))
+	, m_triggers_pool(default_allocator(), CE_MAX_TRIGGERS, sizeof(Trigger), CE_ALIGNOF(Trigger))
+	, m_joints_pool(default_allocator(), CE_MAX_JOINTS, sizeof(Joint), CE_ALIGNOF(Joint))
 	, m_events(default_allocator())
 	, m_callback(m_events)
 {
 	// Create the scene
 	PxSceneLimits scene_limits;
-	scene_limits.maxNbActors = MAX_ACTORS;
+	scene_limits.maxNbActors = CE_MAX_ACTORS;
 	CE_ASSERT(scene_limits.isValid(), "Scene limits is not valid");
 
 	PxSceneDesc scene_desc(physics_system::s_physics->getTolerancesScale());

engine/physics/PhysicsWorld.h

@@ -43,11 +43,6 @@ using physx::PxScene;
 using physx::PxDefaultCpuDispatcher;
 using physx::PxActor;
 
-#define MAX_ACTORS 1024
-#define MAX_CONTROLLERS 1024
-#define MAX_TRIGGERS 1024
-#define MAX_JOINTS 512
-
 namespace crown
 {
 
@@ -118,10 +113,10 @@ public:
 	PoolAllocator				m_triggers_pool;
 	PoolAllocator				m_joints_pool;
 
-	IdArray<MAX_ACTORS, Actor*>	m_actors;
-	IdArray<MAX_CONTROLLERS, Controller*> m_controllers;
-	IdArray<MAX_TRIGGERS, Trigger*> m_triggers;
-	IdArray<MAX_JOINTS, Joint*> m_joints;
+	IdArray<CE_MAX_ACTORS, Actor*>	m_actors;
+	IdArray<CE_MAX_CONTROLLERS, Controller*> m_controllers;
+	IdArray<CE_MAX_TRIGGERS, Trigger*> m_triggers;
+	IdArray<CE_MAX_JOINTS, Joint*> m_joints;
 
 	// Events management
 	EventStream m_events;

engine/renderers/backend/Renderer.h

@@ -90,11 +90,11 @@ public:
 		m_submit->m_commands.write(CommandType::INIT_RENDERER);
 		frame();
 
-		m_submit->m_transient_vb = create_transient_vertex_buffer(2 * 1024);
-		m_submit->m_transient_ib = create_transient_index_buffer(2 * 1024);
+		m_submit->m_transient_vb = create_transient_vertex_buffer(CE_TRANSIENT_VERTEX_BUFFER_SIZE);
+		m_submit->m_transient_ib = create_transient_index_buffer(CE_TRANSIENT_INDEX_BUFFER_SIZE);
 		frame();
-		m_submit->m_transient_vb = create_transient_vertex_buffer(2 * 1024);
-		m_submit->m_transient_ib = create_transient_index_buffer(2 * 1024);
+		m_submit->m_transient_vb = create_transient_vertex_buffer(CE_TRANSIENT_VERTEX_BUFFER_SIZE);
+		m_submit->m_transient_ib = create_transient_index_buffer(CE_TRANSIENT_INDEX_BUFFER_SIZE);
 		frame();
 	}
 
@@ -306,7 +306,7 @@ public:
 	{
 		CE_ASSERT(tib != NULL, "Transient buffer must be != NULL");
 
-		destroy_vertex_buffer(tib->ib);
+		destroy_index_buffer(tib->ib);
 		default_allocator().deallocate(tib);
 	}
 
@@ -404,7 +404,7 @@ public:
 		const UniformId id = m_uniforms.create();
 		size_t len = string::strlen(name);
 
-		CE_ASSERT(len < CROWN_MAX_UNIFORM_NAME_LENGTH, "Max uniform name length is %d", CROWN_MAX_UNIFORM_NAME_LENGTH);
+		CE_ASSERT(len < CE_MAX_UNIFORM_NAME_LENGTH, "Max uniform name length is %d", CE_MAX_UNIFORM_NAME_LENGTH);
 
 		m_submit->m_commands.write(CommandType::CREATE_UNIFORM);
 		m_submit->m_commands.write(id);
@@ -646,7 +646,7 @@ public:
 				{
 					UniformId id;
 					size_t len;
-					char name[CROWN_MAX_UNIFORM_NAME_LENGTH];
+					char name[CE_MAX_UNIFORM_NAME_LENGTH];
 					UniformType::Enum type;
 					uint8_t num;
 
@@ -856,13 +856,13 @@ protected:
 	RenderContext* m_draw;
 
 	// Id tables
-	IdTable<CROWN_MAX_VERTEX_BUFFERS> m_vertex_buffers;
-	IdTable<CROWN_MAX_INDEX_BUFFERS> m_index_buffers;
-	IdTable<CROWN_MAX_TEXTURES> m_textures;
-	IdTable<CROWN_MAX_SHADERS> m_shaders;
-	IdTable<CROWN_MAX_GPU_PROGRAMS> m_gpu_programs;
-	IdTable<CROWN_MAX_UNIFORMS> m_uniforms;
-	IdTable<CROWN_MAX_RENDER_TARGETS> m_render_targets;
+	IdTable<CE_MAX_VERTEX_BUFFERS> m_vertex_buffers;
+	IdTable<CE_MAX_INDEX_BUFFERS> m_index_buffers;
+	IdTable<CE_MAX_TEXTURES> m_textures;
+	IdTable<CE_MAX_SHADERS> m_shaders;
+	IdTable<CE_MAX_GPU_PROGRAMS> m_gpu_programs;
+	IdTable<CE_MAX_UNIFORMS> m_uniforms;
+	IdTable<CE_MAX_RENDER_TARGETS> m_render_targets;
 
 	bool m_is_initialized;
 	bool m_should_run;

engine/renderers/backend/gl/GLRenderer.cpp

@@ -515,14 +515,14 @@ private:
 	float				m_min_max_point_size[2];
 	float				m_min_max_line_width[2];
 
-	VertexBuffer		m_vertex_buffers[CROWN_MAX_VERTEX_BUFFERS];
-	IndexBuffer			m_index_buffers[CROWN_MAX_INDEX_BUFFERS];
-	Texture				m_textures[CROWN_MAX_TEXTURES];
-	Shader				m_shaders[CROWN_MAX_SHADERS];
-	GPUProgram			m_gpu_programs[CROWN_MAX_GPU_PROGRAMS];
+	VertexBuffer		m_vertex_buffers[CE_MAX_VERTEX_BUFFERS];
+	IndexBuffer			m_index_buffers[CE_MAX_INDEX_BUFFERS];
+	Texture				m_textures[CE_MAX_TEXTURES];
+	Shader				m_shaders[CE_MAX_SHADERS];
+	GPUProgram			m_gpu_programs[CE_MAX_GPU_PROGRAMS];
 	uint32_t			m_num_uniforms;
-	Uniform				m_uniforms[CROWN_MAX_UNIFORMS];
-	RenderTarget		m_render_targets[CROWN_MAX_RENDER_TARGETS];
+	Uniform				m_uniforms[CE_MAX_UNIFORMS];
+	RenderTarget		m_render_targets[CE_MAX_RENDER_TARGETS];
 
 private:
 

engine/renderers/backend/gl/GLRenderer.h

@@ -165,12 +165,12 @@ struct Uniform
 {
 	Uniform()
 	{
-		string::strncpy(m_name, "", CROWN_MAX_UNIFORM_NAME_LENGTH);
+		string::strncpy(m_name, "", CE_MAX_UNIFORM_NAME_LENGTH);
 	}
 
 	void create(const char* name, UniformType::Enum type, uint8_t num)
 	{
-		string::strncpy(m_name, name, CROWN_MAX_UNIFORM_NAME_LENGTH);
+		string::strncpy(m_name, name, CE_MAX_UNIFORM_NAME_LENGTH);
 		m_type = type;
 		m_num = num;
 
@@ -194,7 +194,7 @@ struct Uniform
 
 public:
 
-	char m_name[CROWN_MAX_UNIFORM_NAME_LENGTH];
+	char m_name[CE_MAX_UNIFORM_NAME_LENGTH];
 	UniformType::Enum m_type;
 	uint8_t m_num;
 	void* m_data;

engine/world/World.cpp

@@ -35,8 +35,8 @@ namespace crown
 
 //-----------------------------------------------------------------------------
 World::World()
-	: m_unit_pool(default_allocator(), MAX_UNITS, sizeof(Unit), CE_ALIGNOF(Unit))
-	, m_camera_pool(default_allocator(), MAX_CAMERAS, sizeof(Camera), CE_ALIGNOF(Camera))
+	: m_unit_pool(default_allocator(), CE_MAX_UNITS, sizeof(Unit), CE_ALIGNOF(Unit))
+	, m_camera_pool(default_allocator(), CE_MAX_CAMERAS, sizeof(Camera), CE_ALIGNOF(Camera))
 	, m_events(default_allocator())
 {
 	m_id.id = INVALID_ID;

engine/world/World.h

@@ -45,9 +45,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-#define MAX_UNITS 65000
-#define MAX_CAMERAS 16
-
 struct Mesh;
 struct Sprite;
 struct Actor;
@@ -106,8 +103,8 @@ private:
 	PoolAllocator						m_unit_pool;
 	PoolAllocator						m_camera_pool;
 
-	IdArray<MAX_UNITS, Unit*>			m_units;
-	IdArray<MAX_CAMERAS, Camera*>		m_cameras;
+	IdArray<CE_MAX_UNITS, Unit*>			m_units;
+	IdArray<CE_MAX_CAMERAS, Camera*>		m_cameras;
 
 	SceneGraphManager					m_scenegraph_manager;
 	RenderWorld							m_render_world;

engine/world/WorldManager.cpp

@@ -64,7 +64,7 @@ World* WorldManager::lookup_world(WorldId id)
 }
 
 //-----------------------------------------------------------------------------
-IdArray<MAX_WORLDS, World*>& WorldManager::worlds()
+IdArray<CE_MAX_WORLDS, World*>& WorldManager::worlds()
 {
 	return m_worlds;
 }

engine/world/WorldManager.h

@@ -34,7 +34,6 @@ namespace crown
 
 typedef Id WorldId;
 class World;
-#define MAX_WORLDS 1024
 
 /// Manages a number of worlds.
 class WorldManager
@@ -50,12 +49,12 @@ public:
 	World*			lookup_world(WorldId id);
 
 	/// Return the array of worlds.
-	IdArray<MAX_WORLDS, World*>& worlds();
+	IdArray<CE_MAX_WORLDS, World*>& worlds();
 
 private:
 
 	ProxyAllocator m_allocator;
-	IdArray<MAX_WORLDS, World*> m_worlds;
+	IdArray<CE_MAX_WORLDS, World*> m_worlds;
 };
 
 } // namespace crown