- Changing the structure to a more library friendly one. All headers in include/ and all sources in src/

- Replacing a fiew boost dependencies to C++11

CMakeLists.txt

@@ -61,7 +61,7 @@ ENDIF()
 #
 SET(ANKI_VERSION 0.1)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/anki/Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/anki/Version.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/anki/Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/anki/Version.h)
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/anki/Version.h DESTINATION ${INCLUDE_INSTALL_DIR}/anki)
 	
@@ -153,7 +153,8 @@ INCLUDE_DIRECTORIES(${ANKI_PROJ_SOURCE_DIR})
 #
 # libanki
 #
-ADD_SUBDIRECTORY(anki)
+INCLUDE_DIRECTORIES(include)
+ADD_SUBDIRECTORY(src)
 
 #
 # Unit tests

anki/script/math/Common.h

@@ -1,33 +0,0 @@
-#ifndef ANKI_SCRIPT_MATH_COMMON_H
-#define ANKI_SCRIPT_MATH_COMMON_H
-
-#include "anki/script/Common.h"
-
-
-namespace anki {
-
-
-template<typename ClassType, typename RetType,
-	RetType (ClassType::* accessor)() const>
-RetType getM(const ClassType* t)
-{
-	return (t->*accessor)();
-}
-
-
-template<typename ClassType, typename InType, InType& (ClassType::* accessor)()>
-void setM(ClassType* t, InType in)
-{
-	(t->*accessor)() = in;
-}
-
-
-#define BP_PROPERTY_MATH(ClassType__, name__) \
-	.add_property(#name__, &getM<ClassType__, float, &ClassType__::name__>, \
-		&setM<ClassType__, float, &ClassType__::name__>)
-
-
-} // end namespace
-
-
-#endif

anki/util/StdTypes.h

@@ -1,27 +0,0 @@
-#ifndef ANKI_UTIL_STD_TYPES_H
-#define ANKI_UTIL_STD_TYPES_H
-
-
-#ifndef uchar
-typedef unsigned char uchar;
-#endif
-
-#ifndef uint
-typedef unsigned int uint;
-#endif
-
-#ifndef ushort
-typedef unsigned short int ushort;
-#endif
-
-#ifndef ulong
-typedef unsigned long int ulong;
-#endif
-
-
-#if !defined(NULL)
-#	define NULL 0
-#endif
-
-
-#endif

anki/core/App.h → include/anki/core/App.h

@@ -3,7 +3,6 @@
 
 #include <SDL/SDL.h>
 #include <boost/filesystem.hpp>
-#include "anki/util/StdTypes.h"
 #include "anki/core/Logger.h"
 
 

anki/resource/Extension.h → include/anki/resource/Extension.h

@@ -1,19 +1,11 @@
 #ifndef ANKI_RESOURCE_EXTENSION_H
 #define ANKI_RESOURCE_EXTENSION_H
 
-#include "anki/util/StdTypes.h"
-
-
 namespace anki {
 
-
-/// Extension @ref Resource resource
+/// Extension resource
 class Extension
 {
-private:
-	void* libHandle;
-	int(*foobarPtr)(void*);
-
 public:
 	Extension();
 	~Extension();
@@ -21,15 +13,12 @@ public:
 	/*template<typename Type>
 	int FooBar(Type* ptr) { DEBUG_ERR(foobarPtr==NULL);
 		return (*foobarPtr)(reinterpret_cast<Type*>(ptr)); }*/
-};
-
-
-inline Extension::Extension()
-	: libHandle(NULL), foobarPtr(NULL)
-{}
 
+private:
+	void* libHandle = nullptr;
+	int(*foobarPtr)(void*) = nullptr;
+};
 
 } // end namespace
 
-
 #endif

anki/resource/Image.h → include/anki/resource/Image.h

@@ -1,14 +1,11 @@
 #ifndef ANKI_RESOURCE_IMAGE_H
 #define ANKI_RESOURCE_IMAGE_H
 
-#include "anki/util/StdTypes.h"
 #include "anki/util/Util.h"
 #include <vector>
 
-
 namespace anki {
 
-
 /// Image class.
 /// Used in Texture::load. Supported types: TGA and PNG
 class Image
@@ -49,12 +46,12 @@ public:
 
 	/// @name Accessors
 	/// @{
-	uint getWidth() const
+	uint32_t getWidth() const
 	{
 		return width;
 	}
 
-	uint getHeight() const
+	uint32_t getHeight() const
 	{
 		return height;
 	}
@@ -64,7 +61,7 @@ public:
 		return type;
 	}
 
-	const uchar* getData() const
+	const uint8_t* getData() const
 	{
 		return &data[0];
 	}
@@ -87,16 +84,16 @@ public:
 	void load(const char* filename);
 
 private:
-	uint width; ///< Image width
-	uint height; ///< Image height
+	uint32_t width; ///< Image width
+	uint32_t height; ///< Image height
 	ColorType type; ///< Image color type
-	std::vector<uchar> data; ///< Image data
+	std::vector<uint8_t> data; ///< Image data
 	DataCompression dataCompression;
 
 	/// @name TGA headers
 	/// @{
-	static uchar tgaHeaderUncompressed[12];
-	static uchar tgaHeaderCompressed[12];
+	static uint8_t tgaHeaderUncompressed[12];
+	static uint8_t tgaHeaderCompressed[12];
 	/// @}
 
 	/// Load a TGA
@@ -108,13 +105,13 @@ private:
 	/// @param[in] fs The input
 	/// @param[out] bpp Bits per pixel
 	/// @exception Exception
-	void loadUncompressedTga(std::fstream& fs, uint& bpp);
+	void loadUncompressedTga(std::fstream& fs, uint32_t& bpp);
 
 	/// Used by loadTga
 	/// @param[in] fs The input
 	/// @param[out] bpp Bits per pixel
 	/// @exception Exception
-	void loadCompressedTga(std::fstream& fs, uint& bpp);
+	void loadCompressedTga(std::fstream& fs, uint32_t& bpp);
 
 	/// Load PNG. Dont throw exception because libpng is in C
 	/// @param[in] filename The file to load
@@ -127,8 +124,6 @@ private:
 	void loadDds(const char* filename);
 };
 
-
 } // end namespace
 
-
 #endif

anki/resource/MeshLoader.h → include/anki/resource/MeshLoader.h

@@ -2,16 +2,13 @@
 #define ANKI_RESOURCE_MESH_LOADER_H
 
 #include "anki/math/Math.h"
-#include "anki/util/StdTypes.h"
 #include <boost/range/iterator_range.hpp>
 #include <boost/array.hpp>
 #include <string>
 #include <vector>
 
-
 namespace anki {
 
-
 /// Mesh data. This class loads the mesh file and the Mesh class loads it to
 /// the GPU
 ///