Fix build

include/anki/scene/Property.h

@@ -11,7 +11,6 @@
 #include "anki/resource/TextureResource.h"
 #include "anki/collision/Collision.h"
 #include "anki/util/ConstCharPtrHashMap.h"
-#include <boost/ptr_container/ptr_vector.hpp>
 
 namespace anki {
 
@@ -316,7 +315,7 @@ private:
 class PropertyMap
 {
 public:
-	typedef boost::ptr_vector<PropertyBase> Container;
+	typedef Vector<PropertyBase*> Container;
 	typedef ConstCharPtrHashMap<PropertyBase*>::Type NameToPropertyMap;
 
 	/// Add new property to the map. The map gets the ownership of this

include/anki/scene/SceneNode.h

@@ -139,8 +139,8 @@ protected:
 	} sceneNodeProtected;
 
 private:
-	SceneString name; ///< A unique name
 	SceneGraph* scene = nullptr; ///< Keep it here for unregistering
+	SceneString name; ///< A unique name
 };
 /// @}
 

include/anki/scene/Spatial.h

@@ -179,11 +179,11 @@ protected:
 	} spatialProtected;
 
 private:
-	U32 timestamp = Timestamp::getTimestamp();
 	OctreeNode* octreeNode = nullptr; ///< What octree node includes this
 	Aabb aabb; ///< A faster shape
-	Vec3 origin; ///< Cached value
 	std::bitset<256> tilerBitset;
+	Vec3 origin; ///< Cached value
+	U32 timestamp = Timestamp::getTimestamp();
 };
 /// @}
 

src/CMakeLists.txt

@@ -15,7 +15,7 @@ ADD_LIBRARY(anki Dummy.cpp)
 IF(ANKI_WINDOW_BACKEND STREQUAL "GLXX11")
 	SET(ANKI_LIBS ${ANKI_LIBS} ankiglew GL)
 ELSE()
-	SET(ANKI_LIBS ${ANKI_LIBS} GLESv2 EGL)
+	SET(ANKI_LIBS ${ANKI_LIBS} GLESv2 EGL mali)
 ENDIF()
 
 TARGET_LINK_LIBRARIES(anki ${ANKI_LIBS} ankitinyxml2 ankilua ankibullet ${_ANKI_LIBPNG} ${ANKI_GPERFTOOLS_LIBS} pthread)

src/renderer/Ssao.cpp

@@ -1,4 +1,3 @@
-#include <boost/lexical_cast.hpp>
 #include "anki/renderer/Ssao.h"
 #include "anki/renderer/Renderer.h"
 #include "anki/scene/Camera.h"

src/scene/SceneNode.cpp

@@ -8,7 +8,7 @@ namespace anki {
 
 //==============================================================================
 SceneNode::SceneNode(const char* name_, SceneGraph* scene_)
-	: name(name_, scene_->getAllocator()), scene(scene_)
+	: scene(scene_), name(name_, scene_->getAllocator())
 {
 	name.shrink_to_fit(); // Do that first
 	scene->registerNode(this);

src/util/Exception.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 
 // Instead of throwing abort. Its easier to debug
-#define ANKI_ABORT_ON_THROW ANKI_DEBUG
+#define ANKI_ABORT_ON_THROW 0
 
 namespace anki {
 

testapp/Main.cpp

@@ -480,6 +480,8 @@ void mainLoop()
 		}
 #endif
 		Timestamp::increaseTimestamp();
+
+		std::cout << "frame ends" << std::endl;
 	}
 
 #if 0
@@ -567,6 +569,8 @@ int main(int argc, char* argv[])
 {
 	int exitCode;
 
+	std::cout << sizeof(Spatial) << std::endl;
+
 	try
 	{
 		initSubsystems(argc, argv);