Merge branch 'master' into console

Conflicts:
	engine/Game.cpp
	engine/Game.h
	engine/lua/LuaEnvironment.h
	src/ConsoleServer.h
	src/Game.h

.gitignore

@@ -2,7 +2,7 @@
 /build
 
 # Ignore CMake-generated config files
-/src/Config.h
+/engine/Config.h
 /tools/Config.h
 
 # Ignore some android directories

CMakeLists.txt

@@ -4,7 +4,7 @@ project(crown)
 
 set (CROWN_VERSION_MAJOR 0)
 set (CROWN_VERSION_MINOR 1)
-set (CROWN_VERSION_MICRO 6)
+set (CROWN_VERSION_MICRO 7)
 
 option (CROWN_BUILD_SAMPLES "Whether to build the samples" ON)
 option (CROWN_BUILD_TOOLS "Whether to build the tools" ON)
@@ -13,31 +13,6 @@ option (CROWN_BUILD_TESTS "Whether to build unit tests" OFF)
 # always debug mode for now
 set (CROWN_DEBUG 1)
 
-# detect architecture
-if (CROWN_ARCH MATCHES "x86")
-	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/third/x86)
-endif (CROWN_ARCH MATCHES "x86")
-
-if (CROWN_ARCH MATCHES "x86_64")
-	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/third/x86_64)
-endif (CROWN_ARCH MATCHES "x86_64")
-
-if (CROWN_ARCH MATCHES "win64")
-	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/third/win64)
-endif (CROWN_ARCH MATCHES "win64")
-
-if (CROWN_ARCH MATCHES "ARMv7")
-	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/third/ARMv7)
-endif (CROWN_ARCH MATCHES "ARMv7")
-
-set (CROWN_THIRD_INCLUDES
-	${CROWN_THIRD}/luajit/include/luajit-2.0
-)
-
-set (CROWN_THIRD_LIBS
-	${CROWN_THIRD}/luajit/lib
-)
-
 # detect operating system
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	set (LINUX 1)
@@ -47,10 +22,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set(WINDOWS 1)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
-# add build directories
-add_subdirectory(src)
-add_subdirectory(${CROWN_THIRD}) #necessary?
+# always build the engine
+add_subdirectory(engine)
 
+# select optional projects to build
 if (CROWN_BUILD_TOOLS)
 	add_subdirectory(tools)
 endif (CROWN_BUILD_TOOLS)

src/Android.mk → engine/Android.mk

@@ -33,7 +33,6 @@ LOCAL_SRC_FILES :=\
 	core/math/Color4.cpp\
 	core/math/Mat3.cpp\
 	core/math/Mat4.cpp\
-	core/math/MathUtils.cpp\
 	core/math/Plane.cpp\
 	core/math/Quat.cpp\
 	core/math/Shape.cpp\

src/CMakeLists.txt → engine/CMakeLists.txt

@@ -1,22 +1,59 @@
 cmake_minimum_required(VERSION 2.8)
 
+# detect architecture
+if (CROWN_ARCH MATCHES "x86")
+	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/engine/third/x86)
+endif (CROWN_ARCH MATCHES "x86")
+
+if (CROWN_ARCH MATCHES "x86_64")
+	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/engine/third/x86_64)
+endif (CROWN_ARCH MATCHES "x86_64")
+
+if (CROWN_ARCH MATCHES "win32")
+	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/engine/third/win32)
+endif (CROWN_ARCH MATCHES "win32")
+
+if (CROWN_ARCH MATCHES "win64")
+	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/engine/third/win64)
+endif (CROWN_ARCH MATCHES "win64")
+
+if (CROWN_ARCH MATCHES "ARMv7")
+	set (CROWN_THIRD ${CMAKE_SOURCE_DIR}/engine/third/ARMv7)
+endif (CROWN_ARCH MATCHES "ARMv7")
+
+# architecture dependent includes
+set (CROWN_THIRD_INCLUDES
+	${CROWN_THIRD}/luajit/include/luajit-2.0
+	${CROWN_THIRD}/glew-1.9.0/include
+	${CROWN_THIRD}/zlib/include	
+)
+
+# architecture dependent libraries
+set (CROWN_THIRD_LIBS
+	${CROWN_THIRD}/luajit/lib
+	${CROWN_THIRD}/glew-1.9.0/lib
+	${CROWN_THIRD}/zlib/lib
+)
+
+add_subdirectory(${CROWN_THIRD})
+
 # platform independent includes
 set (CROWN_INCLUDES
-	${CMAKE_SOURCE_DIR}/src
-	${CMAKE_SOURCE_DIR}/src/core
-	${CMAKE_SOURCE_DIR}/src/core/bv
-	${CMAKE_SOURCE_DIR}/src/core/containers
-	${CMAKE_SOURCE_DIR}/src/core/math
-	${CMAKE_SOURCE_DIR}/src/core/mem
-	${CMAKE_SOURCE_DIR}/src/core/compressors
-	${CMAKE_SOURCE_DIR}/src/core/filesystem
-	${CMAKE_SOURCE_DIR}/src/core/strings
-	${CMAKE_SOURCE_DIR}/src/core/settings
-	${CMAKE_SOURCE_DIR}/src/os
-	${CMAKE_SOURCE_DIR}/src/input
-	${CMAKE_SOURCE_DIR}/src/renderers
-	${CMAKE_SOURCE_DIR}/src/network
-	${CMAKE_SOURCE_DIR}/src/lua
+	${CMAKE_SOURCE_DIR}/engine
+	${CMAKE_SOURCE_DIR}/engine/core
+	${CMAKE_SOURCE_DIR}/engine/core/bv
+	${CMAKE_SOURCE_DIR}/engine/core/containers
+	${CMAKE_SOURCE_DIR}/engine/core/math
+	${CMAKE_SOURCE_DIR}/engine/core/mem
+	${CMAKE_SOURCE_DIR}/engine/core/compressors
+	${CMAKE_SOURCE_DIR}/engine/core/filesystem
+	${CMAKE_SOURCE_DIR}/engine/core/strings
+	${CMAKE_SOURCE_DIR}/engine/core/settings
+	${CMAKE_SOURCE_DIR}/engine/os
+	${CMAKE_SOURCE_DIR}/engine/input
+	${CMAKE_SOURCE_DIR}/engine/renderers
+	${CMAKE_SOURCE_DIR}/engine/network
+	${CMAKE_SOURCE_DIR}/engine/lua
 )
 
 set (SRC
@@ -107,7 +144,6 @@ set (MATH_SRC
 	core/math/Color4.cpp
 	core/math/Mat3.cpp
 	core/math/Mat4.cpp
-	core/math/MathUtils.cpp
 	core/math/Plane.cpp
 	core/math/Point2.cpp
 	core/math/Quat.cpp
@@ -286,29 +322,13 @@ set(LUA_HEADERS
 	lua/LuaEnvironment.h
 )
 
-
 set (CROWN_LIBRARIES)
 
-set (COMPILER_FLAGS
-	-pipe
-	-std=c++03
-	-ansi
-	-pedantic-errors
-	-Wall
-	-Wextra
-	-Wno-long-long
-	-Wno-variadic-macros
-	-g
-	-pg
-	-fPIC
-	-Wl,-E
-)
-
 # Platform specific stuff
 if (LINUX)
 	list (APPEND CROWN_INCLUDES
-		${CMAKE_SOURCE_DIR}/src/os/linux
-		${CMAKE_SOURCE_DIR}/src/renderers/gl/glx
+		${CMAKE_SOURCE_DIR}/engine/os/linux
+		${CMAKE_SOURCE_DIR}/engine/renderers/gl/glx
 	)
 
 	list (APPEND OS_HEADERS
@@ -356,14 +376,29 @@ if (LINUX)
 		luajit-5.1
 	)
 
+	set (COMPILER_FLAGS
+		-pipe
+		-std=c++03
+		-ansi
+		-pedantic-errors
+		-Wall
+		-Wextra
+		-Wno-long-long
+		-Wno-variadic-macros
+		-g
+		-pg
+		-fPIC
+		-Wl,-E
+	)
+
 	set (CROWN_EXECUTABLE_NAME crown-linux)
 	set (CROWN_MAIN_SRC os/linux/main.cpp)
 endif (LINUX)
 
 if (WINDOWS)
 	list (APPEND CROWN_INCLUDES
-		${CMAKE_SOURCE_DIR}/src/os/win
-		${CMAKE_SOURCE_DIR}/src/renderers/gl/wgl
+		${CMAKE_SOURCE_DIR}/engine/os/win
+		${CMAKE_SOURCE_DIR}/engine/renderers/gl/wgl
 	)
 
 	list (APPEND OS_HEADERS
@@ -402,7 +437,7 @@ if (WINDOWS)
 		lua51
 	)
 
-	set (COMPILER_FLAGS /link /OPT:NOREF)
+	set (COMPILER_FLAGS)
 	
 	set (CROWN_EXECUTABLE_NAME crown-win)
 	set (CROWN_MAIN_SRC os/win/main.cpp)

src/Device.cpp → engine/Device.cpp

@@ -354,7 +354,7 @@ void Device::frame()
 	m_resource_manager->bring_loaded_online();
 
 	m_window->frame();
-	m_input_manager->frame();
+	m_input_manager->frame(frame_count());
 
 	m_lua_environment->game_frame(last_delta_time());
 

src/Device.h → engine/Device.h

@@ -54,7 +54,7 @@ class ConsoleServer;
 /// The Engine.
 /// It is the place where to look for accessing all of
 /// the engine subsystems and related stuff.
-class Device
+class CE_EXPORT Device
 {
 public:
 
@@ -187,7 +187,7 @@ private:
 	Device& operator=(const Device&);
 };
 
-Device* device();
+CE_EXPORT Device* device();
 
 } // namespace crown
 

src/FontResource.cpp → engine/FontResource.cpp

@@ -32,12 +32,8 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* FontResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
+void* FontResource::load(Allocator& /*allocator*/, Bundle& /*bundle*/, ResourceId /*id*/)
 {
-	(void)allocator;
-	(void)bundle;
-	(void)id;
-
 	return NULL;
 }
 
@@ -48,10 +44,8 @@ void FontResource::online(void* resource)
 }
 
 //-----------------------------------------------------------------------------
-void FontResource::unload(Allocator& allocator, void* resource)
+void FontResource::unload(Allocator& /*allocator*/, void* /*resource*/)
 {
-	(void)allocator;
-	(void)resource;
 }
 
 //-----------------------------------------------------------------------------

src/MaterialResource.cpp → engine/MaterialResource.cpp

@@ -32,13 +32,8 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-void* MaterialResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
+void* MaterialResource::load(Allocator& /*allocator*/, Bundle& /*bundle*/, ResourceId /*id*/)
 {
-	(void)allocator;
-	(void)bundle;
-	(void)id;
-	// TODO
-
 	return NULL;
 }
 
@@ -50,10 +45,8 @@ void MaterialResource::online(void* material)
 }
 
 //-----------------------------------------------------------------------------
-void MaterialResource::unload(Allocator& allocator, void* material)
+void MaterialResource::unload(Allocator& /*allocator*/, void* /*material*/)
 {
-	(void)allocator;
-	(void)material;
 	// TODO
 }
 

src/core/Types.h → engine/core/Types.h

@@ -31,8 +31,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Config.h"
 
-namespace crown
-{
+#ifdef WINDOWS
+	#define CE_EXPORT __declspec(dllexport)
+#else
+	#define CE_EXPORT
+#endif
 
 #ifndef NULL
 #ifdef __cplusplus
@@ -42,5 +45,3 @@ namespace crown
 #endif
 #endif
 
-} // namespace crown
-

src/core/compressors/ZipCompressor.cpp → engine/core/compressors/ZipCompressor.cpp

@@ -26,7 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cstring>
 
-#include "zlib.h"
+//#include "zlib.h"
 #include "Assert.h"
 #include "ZipCompressor.h"
 
@@ -47,29 +47,13 @@ ZipCompressor::~ZipCompressor()
 //-----------------------------------------------------------------------------
 uint8_t* ZipCompressor::compress(const void* data, size_t in_size, size_t& out_size)
 {
-	out_size = in_size + in_size * 0.1f + 12;
-	
- 	uint8_t* dest = (uint8_t*)m_allocator.allocate(out_size);
-	
-	int32_t ret = ::compress((Bytef*)dest, (uLongf*)&out_size, (const Bytef*)data, (uLongf)in_size);
-	
-	CE_ASSERT(ret == Z_OK, "Failed to compress the data");
-	
-	return dest;
+	return NULL;
 }
 
 //-----------------------------------------------------------------------------
 uint8_t* ZipCompressor::uncompress(const void* data, size_t in_size, size_t& out_size)
 {
-	out_size = in_size + in_size * 0.1f + 12;
-	
- 	uint8_t* dest = (uint8_t*)m_allocator.allocate(out_size);
-	
-	int32_t ret = ::uncompress((Bytef*)dest, (uLongf*)&out_size, (const Bytef*)data, (uLongf)in_size);
-	
-	CE_ASSERT(ret == Z_OK, "Failed to uncompress the data");
-	
-	return dest;
+	return NULL;
 }
 
 } // namespace crown

src/core/math/MathUtils.h → engine/core/math/MathUtils.h

@@ -29,10 +29,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 #undef min
 #undef max
 
-#include "Assert.h"
 #include <cmath>
+
+#include "Assert.h"
 #include "Types.h"
-#include <cstdio>
 
 #define BIT(i) (1 << i)
 
@@ -56,97 +56,20 @@ const float		FOUR_OVER_THREE				= (float)(4.0 / 3.0);
 const float		FOUR_OVER_THREE_TIMES_PI	= FOUR_OVER_THREE * PI;
 
 const float		ONE_OVER_THREE				= (float)(1.0 / 3.0);
+const float		ONE_OVER_FOUR				= (float)(1.0 / 4.0);
 const float		ONE_OVER_255				= (float)(1.0 / 255.0);
 
 const float		FLOAT_PRECISION				= (float)1.0e-7f;
 const double	DOUBLE_PRECISION			= (float)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 @a bitmask and returns true only if all bits are satisfied
-bool			test_bitmask(int32_t value, int32_t bitmask);
-
-/// Sets the specified @a bitmask	
-int32_t			set_bitmask(int32_t value, int32_t bitmask);
-
-/// Removes the specified @a bitmask	
-int32_t			unset_bitmask(int32_t value, int32_t bitmask);	
-
-/// Returns minimum between @a a and @a b
-template <typename T> T		min(const T& a, const T& 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 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 a and @a b
-template <typename T> void	swap(T& a, T& b);				
-
-/// Returns @a deg in radians
-float			deg_to_rad(float deg);
-
-/// Returns @a rad in degrees
-float			rad_to_deg(float rad);
-
-/// Returns the nearest power of two to @a x
-uint32_t		next_pow_2(uint32_t x);
-
-/// 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 @a x
-float			ceil(float x);		
-
-/// Returns the largest integral value that is not greater than @a x			
-float			floor(float x);	
-
-/// Returns the square root of @a x				
-float			sqrt(float x);	
-
-/// Returns the inverse square root of @a x				
-float			inv_sqrt(float x);
-
-/// Returns the sine of @a x				
-float			sin(float x);	
-
-/// Returns the cosine of @a x				
-float			cos(float x);
-
-/// Returns the arc sine of @a x					
-float			asin(float x);	
-
-/// Returns the arc cosine of @a x				
-float			acos(float x);	
-
-/// Returns the tangent of @a x				
-float			tan(float x);		
-
-/// Returns the arc tangent of @a y/@a x			
-float			atan2(float y, float x);	
-
-/// Returns the absolute value of @a x		
-float			abs(float x);			
-
-/// Returns the floating-point remainder of numerator/denominator		
-float			fmod(float n, float d);			
-
-/// Returns true if there are solutions and puts them in 'x1' and 'x2' (x1 <= x2)
-bool			solve_quadratic_equation(float a, float b, float c, float& x1, float& x2);
-
 //-----------------------------------------------------------------------------
-inline bool equals(float a, float b, float precision)
+inline bool equals(float a, float b, float precision  = FLOAT_PRECISION)
 {
 	return ((b <= (a + precision)) && (b >= (a - precision)));
 }
 
 //-----------------------------------------------------------------------------
-inline bool equals(double a, double b, double precision)
+inline bool equals(double a, double b, double precision  = DOUBLE_PRECISION)
 {
 	return ((b <= (a + precision)) && (b >= (a - precision)));
 }
@@ -176,6 +99,20 @@ inline T min(const T& a, const T& b)
 	return a < b ? a : b;
 }
 
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T min(const T& a, const T& b, const T& c)
+{
+	return math::min(math::min(a, b), math::min(a, c));
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T min(const T& a, const T& b, const T& c, const T& d)
+{
+	return math::min(math::min(a, b, c), math::min(a, b, d), math::min(a, c, d));
+}
+
 //-----------------------------------------------------------------------------
 template <typename T>
 inline T max(const T& a, const T& b)
@@ -183,6 +120,20 @@ inline T max(const T& a, const T& b)
 	return a < b ? b : a;
 }
 
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T max(const T& a, const T& b, const T& c)
+{
+	return math::max(math::max(a, b), math::max(a, c));
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T max(const T& a, const T& b, const T& c, const T& d)
+{
+	return math::max(math::max(a, b, c), math::max(a, b, d), math::max(a, c, d));
+}
+
 //-----------------------------------------------------------------------------
 template <typename T>
 inline T avg(const T& a, const T& b)
@@ -190,6 +141,20 @@ inline T avg(const T& a, const T& b)
 	return (a + b) * 0.5;
 }
 
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T avg(const T& a, const T& b, const T& c)
+{
+	return (a + b + c) * ONE_OVER_THREE;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline T avg(const T& a, const T& b, const T& c, const T& d)
+{
+	return (a + b + c + d) * ONE_OVER_FOUR;
+}
+
 //-----------------------------------------------------------------------------
 template <typename T>
 inline T clamp_to_range(const T& min, const T& max, const T& value)