13 tahun lalu · a113cc1a7c
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -13,6 +13,7 @@
 
				 # limitations under the License.
			
 
				 #
			
 
				 LOCAL_PATH := $(call my-dir)
			
 
				+
			
 
				 include $(CLEAR_VARS)
			
 
				 LOCAL_MODULE    := crown
			
 
				 LOCAL_SRC_FILES :=\
			
@@ -39,39 +40,56 @@ LOCAL_SRC_FILES :=\
 
				 	input/InputManager.cpp\
			
 
				 \
			
 
				 	loaders/BMPImageLoader.cpp\
			
 
				+	loaders/CRWDecoder.cpp\
			
 
				 	loaders/TGAImageLoader.cpp\
			
 
				 \
			
 
				 	Filesystem.cpp\
			
 
				 \
			
 
				+	renderers/gles/egl/EGLRenderWindow.cpp\
			
 
				 	renderers/gles/GLESIndexBuffer.cpp\
			
 
				 	renderers/gles/GLESRenderer.cpp\
			
 
				+	renderers/gles/GLESSupport.cpp\
			
 
				+	renderers/gles/GLESTextRenderer.cpp\
			
 
				 	renderers/gles/GLESTexture.cpp\
			
 
				 	renderers/gles/GLESTextureManager.cpp\
			
 
				 	renderers/gles/GLESVertexBuffer.cpp\
			
 
				 \
			
 
				+	App.cpp\
			
 
				 	Camera.cpp\
			
 
				 	Device.cpp\
			
 
				+	Entity.cpp\
			
 
				 	Font.cpp\
			
 
				 	FontManager.cpp\
			
 
				+	Frame.cpp\
			
 
				 	Image.cpp\
			
 
				 	ImageLoader.cpp\
			
 
				+	Light.cpp\
			
 
				 	Log.cpp\
			
 
				+	LogManager.cpp\
			
 
				 	Material.cpp\
			
 
				 	MaterialManager.cpp\
			
 
				 	MeshChunk.cpp\
			
 
				 	Mesh.cpp\
			
 
				 	MeshManager.cpp\
			
 
				 	MovableCamera.cpp\
			
 
				+	PhysicNode.cpp\
			
 
				+	PhysicsManager.cpp\
			
 
				 	Pixel.cpp\
			
 
				 	Renderer.cpp\
			
 
				+	RenderWindow.cpp\
			
 
				 	ResourceManager.cpp\
			
 
				+	Scene.cpp\
			
 
				+	SceneManager.cpp\
			
 
				+	SceneNode.cpp\
			
 
				 	Skybox.cpp\
			
 
				+	SpriteAnimator.cpp\
			
 
				+	Sprite.cpp\
			
 
				+	Timer.cpp\
			
 
				 \
			
 
				 
			
 
				 LOCAL_C_INCLUDES	:=\
			
 
				 	$(LOCAL_PATH)/core\
			
 
				 	$(LOCAL_PATH)/core/math\
			
 
				-	$(LOCAL_PATH)/core/compressors\
			
 
				 	$(LOCAL_PATH)/core/containers\
			
 
				 	$(LOCAL_PATH)/core/bv\
			
 
				 	$(LOCAL_PATH)/core/mem\
			
@@ -92,8 +110,7 @@ LOCAL_C_INCLUDES	:=\
 
				 	$(LOCAL_PATH)/renderers/gles\
			
 
				 	$(LOCAL_PATH)/renderers/gles/egl\
			
 
				 	$(LOCAL_PATH)/input\
			
 
				-	$(LOCAL_PATH)/os\
			
 
				-	$(LOCAL_PATH)/os/android\
			
 
				+	$(LOCAL_PATH)/input/android
			
 
				 
			
 
				 LOCAL_CPPFLAGS	:= -g -fexceptions
			
 
				 LOCAL_LDLIBS	:= -llog -landroid -lEGL -lGLESv1_CM
			
@@ -140,7 +157,7 @@ include $(CLEAR_VARS)
 
				 #	$(LOCAL_PATH)/tests/chainsawbuffet\
			
 
				 #	$(LOCAL_PATH)/tests/chainsawbuffet/entities\
			
 
				 #	$(LOCAL_PATH)/tests/chainsawbuffet/scenes\
			
 
				-
			
 
				+#
			
 
				 #LOCAL_CPPFLAGS	:= -g -fexceptions
			
 
				 #LOCAL_LDLIBS	:= -llog -landroid -lEGL -lGLESv1_CM -lz
			
 
				 #LOCAL_STATIC_LIBRARIES := android_native_app_glue
			
--- a/android/jni/CMakeLists.txt
+++ b/android/jni/CMakeLists.txt
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/CMakeLists.txt
			
 
				+../src/CMakeLists.txt
			
--- a/android/jni/Camera.cpp
+++ b/android/jni/Camera.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Camera.cpp
			
 
				+../src/Camera.cpp
			
--- a/android/jni/Camera.h
+++ b/android/jni/Camera.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Camera.h
			
 
				+../src/Camera.h
			
--- a/android/jni/Config.h
+++ b/android/jni/Config.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Config.h
			
 
				+../src/Config.h
			
--- a/android/jni/Crown.h
+++ b/android/jni/Crown.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Crown.h
			
 
				+../src/Crown.h
			
--- a/android/jni/Data.h
+++ b/android/jni/Data.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Data.h
			
 
				+../src/Data.h
			
--- a/android/jni/Device.cpp
+++ b/android/jni/Device.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Device.cpp
			
 
				+../src/Device.cpp
			
--- a/android/jni/Device.h
+++ b/android/jni/Device.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Device.h
			
 
				+../src/Device.h
			
--- a/android/jni/EventBuffer.cpp
+++ b/android/jni/EventBuffer.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/EventBuffer.cpp
			
 
				+../src/EventBuffer.cpp
			
--- a/android/jni/EventBuffer.h
+++ b/android/jni/EventBuffer.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/EventBuffer.h
			
 
				+../src/EventBuffer.h
			
--- a/android/jni/Filesystem.cpp
+++ b/android/jni/Filesystem.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Filesystem.cpp
			
 
				+../src/Filesystem.cpp
			
--- a/android/jni/Filesystem.h
+++ b/android/jni/Filesystem.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Filesystem.h
			
 
				+../src/Filesystem.h
			
--- a/android/jni/Font.cpp
+++ b/android/jni/Font.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Font.cpp
			
 
				+../src/Font.cpp
			
--- a/android/jni/Font.h
+++ b/android/jni/Font.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Font.h
			
 
				+../src/Font.h
			
--- a/android/jni/FontManager.cpp
+++ b/android/jni/FontManager.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/FontManager.cpp
			
 
				+../src/FontManager.cpp
			
--- a/android/jni/FontManager.h
+++ b/android/jni/FontManager.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/FontManager.h
			
 
				+../src/FontManager.h
			
--- a/android/jni/Glyph.h
+++ b/android/jni/Glyph.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Glyph.h
			
 
				+../src/Glyph.h
			
--- a/android/jni/Image.cpp
+++ b/android/jni/Image.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Image.cpp
			
 
				+../src/Image.cpp
			
--- a/android/jni/Image.h
+++ b/android/jni/Image.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Image.h
			
 
				+../src/Image.h
			
--- a/android/jni/ImageLoader.cpp
+++ b/android/jni/ImageLoader.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/ImageLoader.cpp
			
 
				+../src/ImageLoader.cpp
			
--- a/android/jni/ImageLoader.h
+++ b/android/jni/ImageLoader.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/ImageLoader.h
			
 
				+../src/ImageLoader.h
			
--- a/android/jni/IndexBuffer.h
+++ b/android/jni/IndexBuffer.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/IndexBuffer.h
			
 
				+../src/IndexBuffer.h
			
--- a/android/jni/Log.cpp
+++ b/android/jni/Log.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Log.cpp
			
 
				+../src/Log.cpp
			
--- a/android/jni/Log.h
+++ b/android/jni/Log.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Log.h
			
 
				+../src/Log.h
			
--- a/android/jni/Material.cpp
+++ b/android/jni/Material.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Material.cpp
			
 
				+../src/Material.cpp
			
--- a/android/jni/Material.h
+++ b/android/jni/Material.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Material.h
			
 
				+../src/Material.h
			
--- a/android/jni/MaterialManager.cpp
+++ b/android/jni/MaterialManager.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MaterialManager.cpp
			
 
				+../src/MaterialManager.cpp
			
--- a/android/jni/MaterialManager.h
+++ b/android/jni/MaterialManager.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MaterialManager.h
			
 
				+../src/MaterialManager.h
			
--- a/android/jni/Mesh.cpp
+++ b/android/jni/Mesh.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Mesh.cpp
			
 
				+../src/Mesh.cpp
			
--- a/android/jni/Mesh.h
+++ b/android/jni/Mesh.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Mesh.h
			
 
				+../src/Mesh.h
			
--- a/android/jni/MeshChunk.cpp
+++ b/android/jni/MeshChunk.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MeshChunk.cpp
			
 
				+../src/MeshChunk.cpp
			
--- a/android/jni/MeshChunk.h
+++ b/android/jni/MeshChunk.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MeshChunk.h
			
 
				+../src/MeshChunk.h
			
--- a/android/jni/MeshLoader.h
+++ b/android/jni/MeshLoader.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MeshLoader.h
			
 
				+../src/MeshLoader.h
			
--- a/android/jni/MeshManager.cpp
+++ b/android/jni/MeshManager.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MeshManager.cpp
			
 
				+../src/MeshManager.cpp
			
--- a/android/jni/MeshManager.h
+++ b/android/jni/MeshManager.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MeshManager.h
			
 
				+../src/MeshManager.h
			
--- a/android/jni/MovableCamera.cpp
+++ b/android/jni/MovableCamera.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MovableCamera.cpp
			
 
				+../src/MovableCamera.cpp
			
--- a/android/jni/MovableCamera.h
+++ b/android/jni/MovableCamera.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/MovableCamera.h
			
 
				+../src/MovableCamera.h
			
--- a/android/jni/OcclusionQuery.h
+++ b/android/jni/OcclusionQuery.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/OcclusionQuery.h
			
 
				+../src/OcclusionQuery.h
			
--- a/android/jni/Pixel.cpp
+++ b/android/jni/Pixel.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Pixel.cpp
			
 
				+../src/Pixel.cpp
			
--- a/android/jni/Pixel.h
+++ b/android/jni/Pixel.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Pixel.h
			
 
				+../src/Pixel.h
			
--- a/android/jni/Renderer.cpp
+++ b/android/jni/Renderer.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Renderer.cpp
			
 
				+../src/Renderer.cpp
			
--- a/android/jni/Renderer.h
+++ b/android/jni/Renderer.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Renderer.h
			
 
				+../src/Renderer.h
			
--- a/android/jni/Resource.h
+++ b/android/jni/Resource.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Resource.h
			
 
				+../src/Resource.h
			
--- a/android/jni/ResourceManager.cpp
+++ b/android/jni/ResourceManager.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/ResourceManager.cpp
			
 
				+../src/ResourceManager.cpp
			
--- a/android/jni/ResourceManager.h
+++ b/android/jni/ResourceManager.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/ResourceManager.h
			
 
				+../src/ResourceManager.h
			
--- a/android/jni/Skybox.cpp
+++ b/android/jni/Skybox.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Skybox.cpp
			
 
				+../src/Skybox.cpp
			
--- a/android/jni/Skybox.h
+++ b/android/jni/Skybox.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Skybox.h
			
 
				+../src/Skybox.h
			
--- a/android/jni/SpriteAnimator.cpp
+++ b/android/jni/SpriteAnimator.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/SpriteAnimator.cpp
			
 
				+../src/SpriteAnimator.cpp
			
--- a/android/jni/SpriteAnimator.h
+++ b/android/jni/SpriteAnimator.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/SpriteAnimator.h
			
 
				+../src/SpriteAnimator.h
			
--- a/android/jni/System.h
+++ b/android/jni/System.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/System.h
			
 
				+../src/System.h
			
--- a/android/jni/Terrain.cpp
+++ b/android/jni/Terrain.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Terrain.cpp
			
 
				+../src/Terrain.cpp
			
--- a/android/jni/Terrain.h
+++ b/android/jni/Terrain.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Terrain.h
			
 
				+../src/Terrain.h
			
--- a/android/jni/TextRenderer.cpp
+++ b/android/jni/TextRenderer.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/TextRenderer.cpp
			
 
				+../src/TextRenderer.cpp
			
--- a/android/jni/TextRenderer.h
+++ b/android/jni/TextRenderer.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/TextRenderer.h
			
 
				+../src/TextRenderer.h
			
--- a/android/jni/Texture.h
+++ b/android/jni/Texture.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/Texture.h
			
 
				+../src/Texture.h
			
--- a/android/jni/TextureManager.h
+++ b/android/jni/TextureManager.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/TextureManager.h
			
 
				+../src/TextureManager.h
			
--- a/android/jni/VertexBuffer.h
+++ b/android/jni/VertexBuffer.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/VertexBuffer.h
			
 
				+../src/VertexBuffer.h
			
--- a/android/jni/World.cpp
+++ b/android/jni/World.cpp
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/World.cpp
			
 
				+../src/World.cpp
			
--- a/android/jni/World.h
+++ b/android/jni/World.h
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/World.h
			
 
				+../src/World.h
			
--- a/android/jni/core
+++ b/android/jni/core
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/core
			
 
				+../src/core
			
--- a/android/jni/input
+++ b/android/jni/input
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/input
			
 
				+../src/input
			
--- a/android/jni/loaders
+++ b/android/jni/loaders
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/loaders
			
 
				+../src/loaders
			
--- a/android/jni/network
+++ b/android/jni/network
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/network
			
 
				+../src/network
			
--- a/android/jni/os
+++ b/android/jni/os
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/os
			
 
				+../src/os
			
--- a/android/jni/renderers
+++ b/android/jni/renderers
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/renderers
			
 
				+../src/renderers
			
--- a/android/jni/windowing
+++ b/android/jni/windowing
@@ -1 +1 @@
 
				-/home/mikymod/Repositories/git/crown/src/windowing
			
 
				+../src/windowing