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

.gitignore

@@ -1,14 +1,7 @@
 # Ignore build directory
-/build
 /.build
 /.installation
 
-# Ignore CMake-generated config files
-/tools/Config.h
-
-# Ignore python stuff
-__pycache__
-
 # Ignore C# stuff
 /tools/**/bin
 /tools/**/obj

CMakeLists.txt

@@ -1,132 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(crown)
-
-set (CROWN_VERSION_MAJOR 0)
-set (CROWN_VERSION_MINOR 1)
-set (CROWN_VERSION_MICRO 13)
-
-option (CROWN_BUILD_SAMPLES "Whether to build the samples" ON)
-option (CROWN_BUILD_TOOLS "Whether to build the tools" ON)
-option (CROWN_BUILD_TESTS "Whether to build unit tests" ON)
-option (CROWN_BUILD_DOC "Whether to build docs" ON)
-
-# build configuration variables
-if (CROWN_BUILD MATCHES "linux-debug-32")
-	set (LINUX 1)
-	set (CROWN_DEBUG 1)
-	set (CROWN_ARCH "x86")
-elseif (CROWN_BUILD MATCHES "linux-development-32")
-	set (LINUX 1)
-	set (CROWN_DEVELOPMENT 1)
-	set (CROWN_ARCH "x86")
-elseif (CROWN_BUILD MATCHES "linux-release-32")
-	set (LINUX 1)
-	set (CROWN_RELEASE 1)
-	set (CROWN_ARCH "x86")
-elseif (CROWN_BUILD MATCHES "linux-debug-64")
-	set (LINUX 1)
-	set (CROWN_DEBUG 1)
-	set (CROWN_ARCH "x86_64")
-elseif (CROWN_BUILD MATCHES "linux-development-64")
-	set (LINUX 1)
-	set (CROWN_DEVELOPMENT 1)
-	set (CROWN_ARCH "x86_64")
-elseif (CROWN_BUILD MATCHES "linux-release-64")
-	set (LINUX 1)
-	set (CROWN_RELEASE 1)
-	set (CROWN_ARCH "x86_64")
-elseif (CROWN_BUILD MATCHES "windows-debug-32")
-	set (WINDOWS 1)
-	set (CROWN_DEBUG 1)
-	set (CROWN_ARCH "win32")
-elseif (CROWN_BUILD MATCHES "windows-development-32")
-	set (WINDOWS 1)
-	set (CROWN_DEVELOPMENT 1)
-	set (CROWN_ARCH "win32")
-elseif (CROWN_BUILD MATCHES "windows-release-32")
-	set (WINDOWS 1)
-	set (CROWN_RELEASE 1)
-	set (CROWN_ARCH "win32")
-elseif (CROWN_BUILD MATCHES "windows-debug-64")
-	set (WINDOWS 1)
-	set (CROWN_DEBUG 1)
-	set (CROWN_ARCH "win64")
-elseif (CROWN_BUILD MATCHES "windows-development-64")
-	set (WINDOWS 1)
-	set (CROWN_DEVELOPMENT 1)
-	set (CROWN_ARCH "win64")
-elseif (CROWN_BUILD MATCHES "windows-release-64")
-	set (WINDOWS 1)
-	set (CROWN_RELEASE 1)
-	set (CROWN_ARCH "win64")
-elseif (CROWN_PLATFORM MATCHES "android")
-	set (ANDROID 1)
-	set (CROWN_ARCH "android")
-else ()
-	message (FATAL_ERROR "Wrong build configuration")
-endif (CROWN_BUILD MATCHES "linux-debug-32")
-
-# executable name
-set (CROWN_EXECUTABLE_NAME crown-${CROWN_BUILD})
-set (CROWN_LIBRARY_NAME crown-lib-${CROWN_BUILD})
-
-# architecture dependent includes
-set (CROWN_THIRD_INCLUDES
-	${CMAKE_SOURCE_DIR}/third/luajit/${CROWN_ARCH}/include/luajit-2.0
-	${CMAKE_SOURCE_DIR}/third/opengl
-	${CMAKE_SOURCE_DIR}/third/openal/include
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/common
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/characterkinematic
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/cloth
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/common
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/cooking
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/extensions
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/foundation
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/geometry
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/particles
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/physxprofilesdk
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/physxvisualdebuggersdk
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/pvd
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/pxtask
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/RepX
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/RepXUpgrader
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/include/vehicle
-	${CMAKE_SOURCE_DIR}/third/freetype
-	${CMAKE_SOURCE_DIR}/third/stb_image
-	${CMAKE_SOURCE_DIR}/third/stb_vorbis
-)
-
-# architecture dependent libraries
-set (CROWN_THIRD_LIBS
-	${CMAKE_SOURCE_DIR}/third/luajit/${CROWN_ARCH}/lib
-	${CMAKE_SOURCE_DIR}/third/openal/lib
-	${CMAKE_SOURCE_DIR}/third/physx/${CROWN_ARCH}/lib
-)
-
-add_subdirectory(third)
-
-# always build the engine
-add_subdirectory(engine)
-
-# select optional projects to build
-if (CROWN_BUILD_TOOLS)
-	add_subdirectory(tools)
-endif (CROWN_BUILD_TOOLS)
-
-if (CROWN_BUILD_SAMPLES)
-	add_subdirectory(samples)
-endif (CROWN_BUILD_SAMPLES)
-
-# add a target to generate API documentation with Doxygen
-if (CROWN_BUILD_DOC)
-  find_package(Doxygen)
-  if(DOXYGEN_FOUND)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-    add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-              COMMENT "Generating API documentation with Doxygen" VERBATIM)
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/documentation/html DESTINATION documentation)
-  endif(DOXYGEN_FOUND)
-endif (CROWN_BUILD_DOC)

engine/Android.mk

@@ -1,258 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-
-###############################################################################
-# libluajit-5.1
-###############################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := luajit-5.1
-LOCAL_SRC_FILES := libluajit-5.1.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-###############################################################################
-# nvidia physx
-###############################################################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := PhysX3
-LOCAL_SRC_FILES := libPhysX3.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SimulationController
-LOCAL_SRC_FILES := libSimulationController.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := LowLevel
-LOCAL_SRC_FILES := libLowLevel.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := LowLevelCloth
-LOCAL_SRC_FILES := libLowLevelCloth.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PxTask
-LOCAL_SRC_FILES := libPxTask.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PhysX3Extensions
-LOCAL_SRC_FILES := libPhysX3Extensions.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SceneQuery
-LOCAL_SRC_FILES := libSceneQuery.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PhysX3Common
-LOCAL_SRC_FILES := libPhysX3Common.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PhysX3CharacterKinematic
-LOCAL_SRC_FILES := libPhysX3CharacterKinematic.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PhysXProfileSDK
-LOCAL_SRC_FILES := libPhysXProfileSDK.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-PhysX_libraries :=\
-	LowLevel\
-	LowLevelCloth\
-	PhysX3\
-	PhysX3CharacterKinematic\
-	PhysX3Common\
-	PhysX3Cooking\
-	PhysX3Extensions\
-	PhysXProfileSDK\
-	PxTask\
-	SceneQuery\
-	SimulationController\
-
-###############################################################################
-# libcrown
-###############################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := crown
-LOCAL_SRC_FILES :=\
-\
-	audio/backend/SLESSoundWorld.cpp\
-\
-	core/compressors/ZipCompressor.cpp\
-\
-	core/filesystem/DiskFile.cpp\
-	core/filesystem/DiskFilesystem.cpp\
-	core/filesystem/File.cpp\
-	core/filesystem/NetworkFile.cpp\
-	core/filesystem/NetworkFilesystem.cpp\
-\
-	core/json/JSON.cpp\
-	core/json/JSONParser.cpp\
-\
-	core/math/Color4.cpp\
-\
-	core/mem/LinearAllocator.cpp\
-	core/mem/Memory.cpp\
-	core/mem/PoolAllocator.cpp\
-	core/mem/ProxyAllocator.cpp\
-	core/mem/StackAllocator.cpp\
-\
-	core/settings/FloatSetting.cpp\
-	core/settings/IntSetting.cpp\
-	core/settings/StringSetting.cpp\
-\
-	core/strings/Path.cpp\
-\
-	os/android/Android.cpp\
-	os/android/AndroidDevice.cpp\
-	os/android/ApkFile.cpp\
-	os/android/ApkFilesystem.cpp\
-	os/android/OsWindow.cpp\
-	os/posix/OsFile.cpp\
-	os/posix/Posix.cpp\
-\
-	physics/Actor.cpp\
-	physics/Controller.cpp\
-	physics/PhysicsWorld.cpp\
-	physics/Joint.cpp\
-	physics/Raycast.cpp\
-\
-	renderers/backend/gl/egl/GLContext.cpp\
-	renderers/backend/gl/GLRenderer.cpp\
-\
-	renderers/DebugLine.cpp\
-	renderers/Material.cpp\
-	renderers/Mesh.cpp\
-	renderers/RenderWorld.cpp\
-	renderers/Sprite.cpp\
-	renderers/Gui.cpp\
-\
-	resource/FileBundle.cpp\
-	resource/ResourceLoader.cpp\
-	resource/ResourceManager.cpp\
-	resource/ResourceRegistry.cpp\
-\
-lua/LuaAccelerometer.cpp\
-	lua/LuaActor.cpp\
-	lua/LuaCamera.cpp\
-	lua/LuaColor4.cpp\
-	lua/LuaController.cpp\
-	lua/LuaDebugLine.cpp\
-	lua/LuaDevice.cpp\
-	lua/LuaEnvironment.cpp\
-	lua/LuaFloatSetting.cpp\
-	lua/LuaGui.cpp\
-	lua/LuaIntSetting.cpp\
-	lua/LuaKeyboard.cpp\
-	lua/LuaMath.cpp\
-	lua/LuaMatrix4x4.cpp\
-	lua/LuaMatrix4x4Box.cpp\
-	lua/LuaMesh.cpp\
-	lua/LuaMouse.cpp\
-	lua/LuaPhysicsWorld.cpp\
-	lua/LuaQuaternion.cpp\
-	lua/LuaQuaternionBox.cpp\
-	lua/LuaRaycast.cpp\
-	lua/LuaResourcePackage.cpp\
-	lua/LuaSoundWorld.cpp\
-	lua/LuaSprite.cpp\
-	lua/LuaStringSetting.cpp\
-	lua/LuaSystem.cpp\
-	lua/LuaTouch.cpp\
-	lua/LuaUnit.cpp\
-	lua/LuaVector2.cpp\
-	lua/LuaVector2Box.cpp\
-	lua/LuaVector3.cpp\
-	lua/LuaVector3Box.cpp\
-	lua/LuaWindow.cpp\
-	lua/LuaWorld.cpp\
-\
-	world/Camera.cpp\
-	world/SceneGraph.cpp\
-	world/SceneGraphManager.cpp\
-	world/Unit.cpp\
-	world/World.cpp\
-	world/WorldManager.cpp\
-\
-	ConsoleServer.cpp\
-	Device.cpp\
-
-LOCAL_C_INCLUDES	:=\
-	$(LOCAL_PATH)/\
-	$(LOCAL_PATH)/audio\
-	$(LOCAL_PATH)/core/compressors\
-	$(LOCAL_PATH)/core/containers\
-	$(LOCAL_PATH)/core/filesystem\
-	$(LOCAL_PATH)/core/filesystem\
-	$(LOCAL_PATH)/core/json\
-	$(LOCAL_PATH)/core/math\
-	$(LOCAL_PATH)/core/mem\
-	$(LOCAL_PATH)/core/settings\
-	$(LOCAL_PATH)/core/strings\
-	$(LOCAL_PATH)/core\
-	$(LOCAL_PATH)/gui\
-	$(LOCAL_PATH)/input\
-	$(LOCAL_PATH)/lua\
-	$(LOCAL_PATH)/network\
-	$(LOCAL_PATH)/os/android\
-	$(LOCAL_PATH)/os/posix\
-	$(LOCAL_PATH)/os\
-	$(LOCAL_PATH)/physics\
-	$(LOCAL_PATH)/renderers/backend/gl/egl\
-	$(LOCAL_PATH)/renderers/backend/gl\
-	$(LOCAL_PATH)/renderers/backend\
-	$(LOCAL_PATH)/renderers\
-	$(LOCAL_PATH)/resource\
-	$(LOCAL_PATH)/world\
-\
-	$(LOCAL_PATH)/third/luajit/android/include/luajit-2.0\
-\
-	$(LOCAL_PATH)/third/opengl\
-\
-	$(LOCAL_PATH)/third/physx/android/include\
-	$(LOCAL_PATH)/third/physx/android/include/common\
-	$(LOCAL_PATH)/third/physx/android/include/characterkinematic\
-	$(LOCAL_PATH)/third/physx/android/include/cloth\
-	$(LOCAL_PATH)/third/physx/android/include/common\
-	$(LOCAL_PATH)/third/physx/android/include/cooking\
-	$(LOCAL_PATH)/third/physx/android/include/extensions\
-	$(LOCAL_PATH)/third/physx/android/include/foundation\
-	$(LOCAL_PATH)/third/physx/android/include/geometry\
-	$(LOCAL_PATH)/third/physx/android/include/particles\
-	$(LOCAL_PATH)/third/physx/android/include/physxprofilesdk\
-	$(LOCAL_PATH)/third/physx/android/include/physxvisualdebuggersdk\
-	$(LOCAL_PATH)/third/physx/android/include/pvd\
-	$(LOCAL_PATH)/third/physx/android/include/pxtask\
-	$(LOCAL_PATH)/third/physx/android/include/RepX\
-	$(LOCAL_PATH)/third/physx/android/include/RepXUpgrader\
-	$(LOCAL_PATH)/third/physx/android/include/vehicle\
-	
-LOCAL_CPPFLAGS :=\
-	-std=c++03\
-	-ansi\
-	-Wall\
-	-Wextra\
-	-Wno-long-long\
-	-Wno-variadic-macros\
-	-Wno-missing-braces\
-	-Wno-unused-parameter\
-	-Wno-unknown-pragmas\
-	-Wno-format\
-	-Wno-unused-but-set-variable\
-	-fno-rtti\
-	-fno-exceptions\
-
-LOCAL_LDLIBS := -L$(LOCAL_PATH) -Wl,--start-group $(addprefix -l, $(PhysX_libraries)) -Wl,--end-group -llog -landroid -lEGL -lGLESv2 -lz -lOpenSLES
-LOCAL_SHARED_LIBRARIES := luajit-5.1
-LOCAL_STATIC_LIBRARIES := android_native_app_glue
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)

engine/CMakeLists.txt

@@ -1,687 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-# platform independent includes
-set (CROWN_INCLUDES
-	${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/json
-	${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/renderers/backend
-	${CMAKE_SOURCE_DIR}/engine/resource
-	${CMAKE_SOURCE_DIR}/engine/rpc
-	${CMAKE_SOURCE_DIR}/engine/network
-	${CMAKE_SOURCE_DIR}/engine/lua
-	${CMAKE_SOURCE_DIR}/engine/audio
-	${CMAKE_SOURCE_DIR}/engine/compilers
-	${CMAKE_SOURCE_DIR}/engine/physics
-	${CMAKE_SOURCE_DIR}/engine/world
-)
-
-set (SRC
-	Device.cpp
-	ConsoleServer.cpp
-)
-
-set (HEADERS
-	Config.h
-	Crown.h
-	Device.h
-	ConsoleServer.h
-)
-
-set (CORE_SRC
-)
-
-set (CORE_HEADERS
-	core/Args.h
-	core/Assert.h
-	core/Log.h
-	core/Macros.h
-	core/Profiler.h
-	core/Types.h
-)
-
-set (CONTAINERS_SRC
-)
-
-set (CONTAINERS_HEADERS
-	core/containers/Array.h
-	core/containers/ContainerTypes.h
-	core/containers/EventStream.h
-	core/containers/Hash.h
-	core/containers/IdArray.h
-	core/containers/IdTable.h
-	core/containers/Map.h
-	core/containers/PriorityQueue.h
-	core/containers/Queue.h
-	core/containers/Vector.h
-)
-
-set (MATH_SRC
-	core/math/Color4.cpp
-)
-
-set (MATH_HEADERS
-	core/math/AABB.h
-	core/math/Color4.h
-	core/math/Frustum.h
-	core/math/Intersection.h
-	core/math/MathTypes.h
-	core/math/MathUtils.h
-	core/math/Matrix3x3.h
-	core/math/Matrix4x4.h
-	core/math/Plane.h
-	core/math/Quaternion.h
-	core/math/Random.h
-	core/math/Sphere.h
-	core/math/Vector2.h
-	core/math/Vector3.h
-	core/math/Vector4.h
-)
-
-set (FILESYSTEM_SRC
-	core/filesystem/DiskFile.cpp
-	core/filesystem/DiskFilesystem.cpp
-	core/filesystem/File.cpp
-	core/filesystem/NetworkFile.cpp
-	core/filesystem/NetworkFilesystem.cpp
-)
-
-set (FILESYSTEM_HEADERS
-	core/filesystem/DiskFile.h
-	core/filesystem/DiskFilesystem.h
-	core/filesystem/File.h
-	core/filesystem/Filesystem.h
-	core/filesystem/FilesystemTypes.h
-	core/filesystem/NetworkFile.h
-	core/filesystem/NetworkFilesystem.h
-	core/filesystem/NullFile.h
-	core/filesystem/ReaderWriter.h
-)
-
-set (JSON_SRC
-	core/json/JSON.cpp
-	core/json/JSONParser.cpp
-)
-
-set (JSON_HEADERS
-	core/json/JSON.h
-	core/json/JSONParser.h
-)
-
-set (STRINGS_SRC
-	core/strings/Path.cpp
-)
-
-set (STRINGS_HEADERS
-	core/strings/Path.h
-	core/strings/StringUtils.h
-	core/strings/StringStream.h
-	core/strings/DynamicString.h
-)
-
-set (MEM_SRC
-	core/mem/LinearAllocator.cpp
-	core/mem/Memory.cpp
-	core/mem/PoolAllocator.cpp
-	core/mem/ProxyAllocator.cpp
-	core/mem/StackAllocator.cpp
-)
-
-set (MEM_HEADERS
-	core/mem/Allocator.h
-	core/mem/LinearAllocator.h
-	core/mem/Memory.h
-	core/mem/MemoryTypes.h
-	core/mem/PoolAllocator.h
-	core/mem/ProxyAllocator.h
-	core/mem/StackAllocator.h
-	core/mem/TempAllocator.h
-)
-
-set (COMPRESSORS_SRC
-	core/compressors/ZipCompressor.cpp
-)
-
-set (COMPRESSORS_HEADERS
-	core/compressors/Compressor.h
-	core/compressors/ZipCompressor.h
-)
-
-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
-)
-
-set (INPUT_HEADERS
-	input/Keyboard.h
-	input/KeyCode.h
-	input/Mouse.h
-	input/Touch.h
-)
-
-set (RENDERERS_BACKEND_SRC
-)
-
-set (RENDERERS_BACKEND_HEADERS
-	renderers/backend/Renderer.h
-	renderers/backend/RenderContext.h
-	renderers/backend/PixelFormat.h
-	renderers/backend/VertexFormat.h
-)
-
-set (RENDERERS_SRC
-	renderers/DebugLine.cpp
-	renderers/Gui.cpp
-	renderers/Material.cpp
-	renderers/Mesh.cpp
-	renderers/RenderWorld.cpp
-	renderers/Sprite.cpp
-)
-
-set (RENDERERS_HEADERS
-	renderers/DebugLine.h
-	renderers/Gui.h
-	renderers/Material.h
-	renderers/Mesh.h
-	renderers/RenderWorld.h
-	renderers/RenderWorldTypes.h
-	renderers/Sprite.h
-)
-
-set (RESOURCE_SRC
-	resource/FileBundle.cpp
-	resource/FontResource.cpp
-	resource/LevelResource.cpp
-	resource/LuaResource.cpp
-	resource/MaterialResource.cpp
-	resource/MeshResource.cpp
-	resource/PackageResource.cpp
-	resource/PhysicsResource.cpp
-	resource/ResourceLoader.cpp
-	resource/ResourceManager.cpp
-	resource/ResourceRegistry.cpp
-	resource/SoundResource.cpp
-	resource/SpriteResource.cpp
-	resource/TextureResource.cpp
-	resource/UnitResource.cpp
-)
-
-set (RESOURCE_HEADERS
-	resource/Bundle.h
-	resource/FontResource.h
-	resource/FontResource.h
-	resource/LevelResource.h
-	resource/LuaResource.h
-	resource/MaterialResource.h
-	resource/MeshResource.h
-	resource/PackageResource.h
-	resource/PhysicsResource.h
-	resource/Resource.h
-	resource/ResourceLoader.h
-	resource/ResourceManager.h
-	resource/ResourcePackage.h
-	resource/ResourceRegistry.h
-	resource/SoundResource.h
-	resource/SpriteResource.h
-	resource/TextureResource.h
-	resource/UnitResource.h
-)
-
-set (OS_SRC
-)
-
-set (OS_HEADERS
-	os/OS.h
-	os/OsEventQueue.h
-	os/NetAddress.h
-	os/OsTypes.h
-	os/ScopedMutex.h
-)
-
-set (LUA_SRC
-	lua/LuaAccelerometer.cpp
-	lua/LuaActor.cpp
-	lua/LuaCamera.cpp
-	lua/LuaColor4.cpp
-	lua/LuaController.cpp
-	lua/LuaDebugLine.cpp
-	lua/LuaDevice.cpp
-	lua/LuaEnvironment.cpp
-	lua/LuaFloatSetting.cpp
-	lua/LuaGui.cpp
-	lua/LuaIntSetting.cpp
-	lua/LuaKeyboard.cpp
-	lua/LuaMath.cpp
-	lua/LuaMatrix4x4.cpp
-	lua/LuaMatrix4x4Box.cpp
-	lua/LuaMesh.cpp
-	lua/LuaMouse.cpp
-	lua/LuaPhysicsWorld.cpp
-	lua/LuaQuaternion.cpp
-	lua/LuaQuaternionBox.cpp
-	lua/LuaRaycast.cpp
-	lua/LuaResourcePackage.cpp
-	lua/LuaSoundWorld.cpp
-	lua/LuaSprite.cpp
-	lua/LuaStringSetting.cpp
-	lua/LuaSystem.cpp
-	lua/LuaTouch.cpp
-	lua/LuaUnit.cpp
-	lua/LuaVector2.cpp
-	lua/LuaVector2Box.cpp
-	lua/LuaVector3.cpp
-	lua/LuaVector3Box.cpp
-	lua/LuaWindow.cpp
-	lua/LuaWorld.cpp
-)
-
-set (LUA_HEADERS
-	lua/LuaEnvironment.h
-	lua/LuaStack.h
-	lua/LuaSystem.h
-)
-
-set (AUDIO_SRC)
-
-set (AUDIO_HEADERS
-	audio/SoundWorld.h
-)
-
-set (PHYSICS_SRC
-	physics/Actor.cpp
-	physics/Controller.cpp
-	physics/PhysicsWorld.cpp
-	physics/Joint.cpp
-	physics/Raycast.cpp
-)
-
-set (PHYSICS_HEADERS
-	physics/Actor.h
-	physics/Controller.cpp
-	physics/PhysicsTypes.h
-	physics/PhysicsWorld.h
-	physics/Joint.h
-	physics/Raycast.h
-	physics/PhysicsCallback.h
-)
-
-set (WORLD_SRC
-	world/Camera.cpp
-	world/SceneGraph.cpp
-	world/SceneGraphManager.cpp
-	world/Unit.cpp
-	world/World.cpp
-	world/WorldManager.cpp
-)
-
-set (WORLD_HEADERS
-	world/Camera.h
-	world/SceneGraph.h
-	world/SceneGraphManager.h
-	world/Unit.h
-	world/World.h
-	world/WorldManager.h
-	world/WorldTypes.h
-)
-
-set (COMPILER_SRC
-	compilers/BundleCompiler.cpp
-)
-
-set (COMPILER_HEADER
-	compilers/BundleCompiler.h
-)
-
-set (CROWN_LIBRARIES)
-
-# Platform specific stuff
-if (LINUX)
-	list (APPEND CROWN_INCLUDES
-		${CMAKE_SOURCE_DIR}/engine/os/linux
-		${CMAKE_SOURCE_DIR}/engine/renderers/backend/gl/glx
-	)
-
-	list (APPEND OS_HEADERS
-		os/linux/OsWindow.h
-		os/linux/OsFile.h
-		os/linux/OsThread.h
-		os/linux/Mutex.h
-		os/linux/Cond.h
-		os/posix/Semaphore.h
-	)
-
-	list (APPEND OS_SRC
-		os/linux/Linux.cpp
-		os/linux/OsWindow.cpp
-		os/posix/OsFile.cpp
-		os/posix/Posix.cpp
-	)
-
-	list (APPEND RENDERERS_SRC
-		renderers/backend/gl/GLRenderer.cpp
-		renderers/backend/gl/glx/GLContext.cpp
-	)
-
-	list (APPEND RENDERERS_HEADERS
-		renderers/backend/gl/glx/GLContext.h
-	)
-
-	list (APPEND AUDIO_SRC
-		audio/backend/ALSoundWorld.cpp
-	)
-
-	list (APPEND CROWN_LIBRARIES
-		X11
-		Xrandr
-		pthread
-		dl
-		GL
-		openal
-		luajit-5.1
-	)
-
-	set (COMPILER_FLAGS
-		-pipe
-		-std=c++03
-		-ansi
-		#-pedantic-errors
-		-Wall
-		-Wextra
-		-Werror
-		-Wno-long-long
-		-Wno-variadic-macros
-		-Wno-unknown-pragmas
-		-Wno-unused-parameter
-		-Wno-unused-local-typedefs
-		-fPIC
-		#-fvisibility=hidden
-		-fno-exceptions
-		-fno-rtti
-	)
-
-	if (CROWN_DEBUG)
-		list (APPEND COMPILER_FLAGS -g -D_DEBUG)
-		list (APPEND CROWN_LIBRARIES
-			LowLevelCHECKED
-			LowLevelClothCHECKED
-			PhysX3CharacterKinematicCHECKED
-			PhysX3CHECKED
-			PhysX3CommonCHECKED
-			PhysX3CookingCHECKED
-			PhysX3ExtensionsCHECKED
-			PhysXProfileSDKCHECKED
-			PhysXVisualDebuggerSDKCHECKED
-			PvdRuntimeCHECKED
-			PxTaskCHECKED
-			SceneQueryCHECKED
-			SimulationControllerCHECKED
-		)
-	elseif (CROWN_DEVELOPMENT)
-		list (APPEND COMPILER_FLAGS -O2 -DNDEBUG)
-		list (APPEND CROWN_LIBRARIES
-			LowLevelPROFILE
-			LowLevelClothPROFILE
-			PhysX3CharacterKinematicPROFILE
-			PhysX3PROFILE
-			PhysX3CommonPROFILE
-			PhysX3CookingPROFILE
-			PhysX3ExtensionsPROFILE
-			PhysXProfileSDKPROFILE
-			PhysXVisualDebuggerSDKPROFILE
-			PvdRuntimePROFILE
-			PxTaskPROFILE
-			SceneQueryPROFILE
-			SimulationControllerPROFILE
-		)
-	elseif (CROWN_RELEASE)
-		list (APPEND COMPILER_FLAGS
-			-DNDEBUG
-			-O2
-			-Wno-maybe-uninitialized
-			-Wno-unused-but-set-variable
-		)
-		list (APPEND CROWN_LIBRARIES
-			LowLevel
-			LowLevelCloth
-			PhysX3CharacterKinematic
-			PhysX3
-			PhysX3Common
-			PhysX3Cooking
-			PhysX3Extensions
-			PhysXProfileSDK
-			PhysXVisualDebuggerSDK
-			PvdRuntime
-			PxTask
-			SceneQuery
-			SimulationController
-		)
-	else ()
-		message (FATAL_ERROR "Oops, you should not be here")
-	endif (CROWN_DEBUG)
-
-	set (CROWN_MAIN_SRC os/linux/main.cpp)
-endif (LINUX)
-
-# Windows specific stuff
-if (WINDOWS)
-	list (APPEND CROWN_INCLUDES
-		${CMAKE_SOURCE_DIR}/engine/os/win
-		${CMAKE_SOURCE_DIR}/engine/renderers/backend/gl/wgl
-	)
-
-	list (APPEND OS_HEADERS
-		os/win/WinHeaders.h
-		os/win/OsFile.h
-		os/win/OsThread.h
-		os/win/OsSocket.h
-		os/win/OsWindow.h
-		os/win/Mutex.h
-		os/win/Cond.h
-		os/win/Semaphore.h
-		os/win/AtomicInt.h
-		os/win/inttypes.h
-	)
-
-	list (APPEND OS_SRC
-		os/win/WinOS.cpp
-		os/win/OsFile.cpp
-		os/win/OsWindow.cpp
-	)
-
-	list (APPEND RENDERERS_SRC
-		renderers/backend/gl/GLRenderer.cpp
-		renderers/backend/gl/wgl/GLContext.cpp
-	)
-
-	list (APPEND RENDERERS_HEADERS
-		renderers/backend/gl/wgl/GLContext.h
-		renderers/backend/gl/wgl/wglext.h
-	)
-
-	list (APPEND AUDIO_SRC
-		audio/backend/ALSoundWorld.cpp
-	)
-
-	list (APPEND CROWN_LIBRARIES
-		OpenGL32
-		lua51
-		OpenAL32
-	)
-
-	set (COMPILER_FLAGS
-	)
-	
-	if (CROWN_ARCH MATCHES "win32")
-		set (WIN_PHYSXARCH x86)
-	elseif (CROWN_ARCH MATCHES "win64")
-		set (WIN_PHYSXARCH x64)
-  else ()
-    message (FATAL_ERROR "Oops, you should not be here")
-	endif (CROWN_ARCH MATCHES "win32")
-
-	if (CROWN_DEBUG)
-		#list (APPEND COMPILER_FLAGS -g -D_DEBUG)
-		list (APPEND CROWN_LIBRARIES
-			#LowLevelCHECKED
-			#LowLevelClothCHECKED
-			PhysX3CharacterKinematicCHECKED_${WIN_PHYSXARCH}
-			PhysX3CHECKED_${WIN_PHYSXARCH}
-			PhysX3CommonCHECKED_${WIN_PHYSXARCH}
-			PhysX3CookingCHECKED_${WIN_PHYSXARCH}
-			PhysX3ExtensionsCHECKED
-			PhysXProfileSDKCHECKED
-			PhysXVisualDebuggerSDKCHECKED
-			#PvdRuntimeCHECKED
-			PxTaskCHECKED
-			#SceneQueryCHECKED
-			#SimulationControllerCHECKED
-		)
-	elseif (CROWN_DEVELOPMENT)
-		#list (APPEND COMPILER_FLAGS -O2 -DNDEBUG)
-		list (APPEND CROWN_LIBRARIES
-			#LowLevelPROFILE
-			#LowLevelClothPROFILE
-			PhysX3CharacterKinematicPROFILE_${WIN_PHYSXARCH}
-			PhysX3PROFILE_${WIN_PHYSXARCH}
-			PhysX3CommonPROFILE_${WIN_PHYSXARCH}
-			PhysX3CookingPROFILE_${WIN_PHYSXARCH}
-			PhysX3ExtensionsPROFILE
-			PhysXProfileSDKPROFILE
-			PhysXVisualDebuggerSDKPROFILE
-			#PvdRuntimePROFILE
-			PxTaskPROFILE
-			#SceneQueryPROFILE
-			#SimulationControllerPROFILE
-		)
-	elseif (CROWN_RELEASE)
-		list (APPEND COMPILER_FLAGS
-			#-DNDEBUG
-			#-O2
-			#-Wno-maybe-uninitialized
-			#-Wno-unused-but-set-variable
-		)
-		list (APPEND CROWN_LIBRARIES
-			#LowLevel
-			#LowLevelCloth
-			PhysX3CharacterKinematic_${WIN_PHYSXARCH}
-			PhysX3_${WIN_PHYSXARCH}
-			PhysX3Common_${WIN_PHYSXARCH}
-			PhysX3Cooking_${WIN_PHYSXARCH}
-			PhysX3Extensions
-			PhysXProfileSDK
-			PhysXVisualDebuggerSDK
-			#PvdRuntime
-			PxTask
-			#SceneQuery
-			#SimulationController
-		)
-	else ()
-		message (FATAL_ERROR "Oops, you should not be here")
-	endif (CROWN_DEBUG)
-
-	set (CROWN_MAIN_SRC os/win/main.cpp)
-endif(WINDOWS)
-
-
-
-set (CROWN_SOURCES
-	${SRC}
-	${CORE_SRC}
-	${CONTAINERS_SRC}
-	${MATH_SRC}
-	${FILESYSTEM_SRC}
-	${JSON_SRC}
-	${MEM_SRC}
-	${STRINGS_SRC}
-	${COMPRESSORS_SRC}
-	${SETTINGS_SRC}
-	${INPUT_SRC}
-	${RENDERERS_BACKEND_SRC}
-	${RENDERERS_SRC}
-	${RESOURCE_SRC}
-	${OS_SRC}
-	${LUA_SRC}
-	${AUDIO_SRC}
-	${PHYSICS_SRC}
-	${WORLD_SRC}
-	${COMPILER_SRC}
-)
-
-set (CROWN_HEADERS
-	${HEADERS}
-	${CORE_HEADERS}
-	${CONTAINERS_HEADERS}
-	${MATH_HEADERS}
-	${FILESYSTEM_HEADERS}
-	${JSON_HEADERS}
-	${MEM_HEADERS}
-	${STRINGS_HEADERS}
-	${COMPRESSORS_HEADERS}
-	${SETTINGS_HEADERS}
-	${INPUT_HEADERS}
-	${RENDERERS_BACKEND_HEADERS}
-	${RENDERERS_HEADERS}
-	${RESOURCE_HEADERS}
-	${OS_HEADERS}
-	${LUA_HEADERS}
-	${AUDIO_HEADERS}
-	${PHYSICS_HEADERS}
-	${WORLD_HEADERS}
-	${COMPILER_HEADERS}
-)
-
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
-
-include_directories(${CROWN_INCLUDES} ${CROWN_THIRD_INCLUDES})
-link_directories(${CROWN_THIRD_LIBS})
-link_libraries(${CROWN_LIBRARIES})
-
-add_definitions(${COMPILER_FLAGS})
-
-add_library(crown-lib SHARED ${CROWN_SOURCES} ${CROWN_HEADERS})
-set_target_properties (crown-lib PROPERTIES OUTPUT_NAME ${CROWN_LIBRARY_NAME})
-
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:$ORIGIN")
-add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC})
-target_link_libraries(${CROWN_EXECUTABLE_NAME} crown-lib)
-
-install (TARGETS crown-lib DESTINATION bin)
-install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
-
-#install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
-
-#install (FILES ${CORE_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core)
-#install (FILES ${BV_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/bv)
-#install (FILES ${CONTAINERS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/containers)
-#install (FILES ${MATH_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/math)
-#install (FILES ${FILESYSTEM_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/filesystem)
-#install (FILES ${MEM_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/mem)
-#install (FILES ${COMPRESSORS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/compressors)
-#install (FILES ${THREADS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/threads)
-#install (FILES ${SETTINGS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/settings)
-#
-#install (FILES ${INPUT_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/input)
-#install (FILES ${RENDERERS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/renderers)
-#install (FILES ${OS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/os)
-#install (FILES ${LUA_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/lua)

samples/CMakeLists.txt

@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(crown-samples)
-
-# Install samples
-install (DIRECTORY 01.hello-world DESTINATION samples)

third/CMakeLists.txt

@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-if (LINUX)
-	install (FILES     luajit/${CROWN_ARCH}/lib/libluajit-5.1.so.2.0.3 DESTINATION bin)
-	install (FILES     luajit/${CROWN_ARCH}/lib/libluajit-5.1.so.2 DESTINATION bin)
-	install (FILES     luajit/${CROWN_ARCH}/bin/luajit DESTINATION bin)
-	install (PROGRAMS  luajit/${CROWN_ARCH}/bin/luajit-2.0.3 DESTINATION bin)
-	install (DIRECTORY luajit/${CROWN_ARCH}/share/luajit-2.0.3/jit DESTINATION bin)
-elseif (WINDOWS)
-	install (FILES     luajit/${CROWN_ARCH}/lib/lua51.dll DESTINATION bin)
-	install (FILES     luajit/${CROWN_ARCH}/lib/luajit-5.1.dll DESTINATION bin)
-	install (PROGRAMS  luajit/${CROWN_ARCH}/bin/luajit.exe DESTINATION bin)
-	install (DIRECTORY luajit/${CROWN_ARCH}/share/luajit-2.0.1/jit DESTINATION bin)
-
-	install (FILES     openAL/lib/OpenAL32.dll DESTINATION bin)
-elseif (ANDROID)
-
-else ()
-	message (FATAL_ERROR "Wrong build configuration")
-endif (LINUX)

tools/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(crown-tools)
-
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
-
-#add_subdirectory(gui/resource-browser)
-#add_subdirectory(gui/toolchain)
-#add_subdirectory(gui/console)
-#add_subdirectory(pycrown)
-add_subdirectory(gui/fontgen)

tools/Config.h.in

@@ -1,29 +0,0 @@
-/*
-Copyright (c) 2013 Daniele Bartolini, Michele Rossi
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#cmakedefine LINUX
-#cmakedefine WINDOWS
-#cmakedefine CROWN_DEBUG

tools/gui/fontgen/CMakeLists.txt

@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set (FONTGEN_SRC
-	BinPacker.cpp
-)
-
-set (FONTGEN_HEADERS
-	BinPacker.hpp
-)
-
-include_directories(${CROWN_INCLUDES} ${CROWN_THIRD_INCLUDES})
-add_executable(crown-fontgen main.cpp ${FONTGEN_SRC} ${FONTGEN_HEADERS})
-install (TARGETS crown-fontgen DESTINATION bin)