Fixing gitignore

.gitignore

@@ -0,0 +1,69 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+.DS_Store
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+xcshareddata/
+xcworkspace/
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+/proj.ios_mac/.idea
+
+Debug/
+x64/
+*.VC.db
+.vs/

Android_Engine.mk

@@ -1,340 +0,0 @@
-#Engine and libs path for Android projects
-
-
-ENGINE_PATH = $(SalmonEnginePathCygwin)
-
-#BOOST_PATH = $(LibsPathCygwin)/boost_1_47_0
-BOOST_PATH = $(LibsPathCygwin)/boost_1_52_0
-
-OGG_PATH = $(LibsPathCygwin)/libogg-1.3.0
-
-VORBIS_PATH = $(LibsPathCygwin)/libvorbis-1.3.2
-
-SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
-
-LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
-
-ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
-
-#ENGINE_PATH = $(SalmonEnginePath)
-
-#BOOST_PATH = $(LibsPath)/boost_1_47_0
-
-#OGG_PATH = $(LibsPath)/libogg-1.3.0
-
-#VORBIS_PATH = $(LibsPath)/libvorbis-1.3.2
-
-#SQUIRREL_PATH = $(LibsPath)/sqplus
-
-#LIBPNG_PATH = $(LibsPath)/libpng_1.4.1_android
-
-#ZIP_PATH = $(LibsPath)/julienr-libzip-android/jni
-
-
-#================== ZIP =================
-
-LOCAL_PATH := $(ZIP_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := zip
-
-LOCAL_SRC_FILES :=\
-	zip_add.c \
-	zip_add_dir.c \
-	zip_close.c \
-	zip_delete.c \
-	zip_dirent.c \
-	zip_entry_free.c \
-	zip_entry_new.c \
-	zip_err_str.c \
-	zip_error.c \
-	zip_error_clear.c \
-	zip_error_get.c \
-	zip_error_get_sys_type.c \
-	zip_error_strerror.c \
-	zip_error_to_str.c \
-	zip_fclose.c \
-	zip_file_error_clear.c \
-	zip_file_error_get.c \
-	zip_file_get_offset.c \
-	zip_file_strerror.c \
-	zip_filerange_crc.c \
-	zip_fopen.c \
-	zip_fopen_index.c \
-	zip_fread.c \
-	zip_free.c \
-	zip_get_archive_comment.c \
-	zip_get_archive_flag.c \
-	zip_get_file_comment.c \
-	zip_get_num_files.c \
-	zip_get_name.c \
-	zip_memdup.c \
-	zip_name_locate.c \
-	zip_new.c \
-	zip_open.c \
-	zip_rename.c \
-	zip_replace.c \
-	zip_set_archive_comment.c \
-	zip_set_archive_flag.c \
-	zip_set_file_comment.c \
-	zip_source_buffer.c \
-	zip_source_file.c \
-	zip_source_filep.c \
-	zip_source_free.c \
-	zip_source_function.c \
-	zip_source_zip.c \
-	zip_set_name.c \
-	zip_stat.c \
-	zip_stat_index.c \
-	zip_stat_init.c \
-	zip_strerror.c \
-	zip_unchange.c \
-	zip_unchange_all.c \
-	zip_unchange_archive.c \
-	zip_unchange_data.c
-
-LOCAL_LDLIBS := -lz
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    +=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-#================== PNG =================
-
-LOCAL_PATH := $(LIBPNG_PATH)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := png_lib
-LOCAL_SRC_FILES :=\
-	png.c \
-	pngerror.c \
-	pngget.c \
-	pngmem.c \
-	pngpread.c \
-	pngread.c \
-	pngrio.c \
-	pngrtran.c \
-	pngrutil.c \
-	pngset.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c 
-	
-LOCAL_LDLIBS := -lz
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    +=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== SQUIRREL =================
-
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE     := squirrel
-LOCAL_PATH       := $(SQUIRREL_PATH)
-LOCAL_C_INCLUDES := $(SQUIRREL_PATH)/include $(SQUIRREL_PATH)/sqplus/sqplus $(SQUIRREL_PATH)/squirrel $(SQUIRREL_PATH)/sqstdlib
-LOCAL_SRC_FILES  := squirrel/sqapi.cpp \
-					squirrel/sqbaselib.cpp \
-					squirrel/sqclass.cpp \
-					squirrel/sqcompiler.cpp \
-					squirrel/sqdebug.cpp \
-					squirrel/sqfuncstate.cpp \
-					squirrel/sqlexer.cpp \
-					squirrel/sqmem.cpp \
-					squirrel/sqobject.cpp \
-					squirrel/sqstate.cpp \
-					squirrel/sqtable.cpp \
-					squirrel/sqvm.cpp \
-					sqplus/SqPlus.cpp \
-					sqplus/SqPlusOCharBuf.cpp \
-					sqplus/SqPlusUtf8.cpp \
-					sqplus/SquirrelBindingsUtils.cpp \
-					sqplus/SquirrelObject.cpp \
-					sqplus/SquirrelVM.cpp \
-					sqstdlib/sqstdblob.cpp \
-					sqstdlib/sqstdio.cpp \
-					sqstdlib/sqstdmath.cpp \
-					sqstdlib/sqstdrex.cpp \
-					sqstdlib/sqstdstream.cpp \
-					sqstdlib/sqstdstring.cpp \
-					sqstdlib/sqstdsystem.cpp \
-					sqstdlib/sqstdaux.cpp \
-
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    :=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== OGG / VORBIS / VORBISFILE ===================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vorbis
-
-LOCAL_PATH       := $(VORBIS_PATH)/lib
-LOCAL_C_INCLUDES := $(VORBIS_PATH)/include
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/src
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
-LOCAL_C_INCLUDES += $(OGG_PATH)/include
-LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
-LOCAL_SRC_FILES := ../../libogg-1.3.0/src/framing.c ../../libogg-1.3.0/src/bitwise.c
-LOCAL_SRC_FILES += mdct.c smallft.c block.c envelope.c window.c lsp.c \
-			lpc.c analysis.c synthesis.c psy.c info.c \
-			floor1.c floor0.c\
-			res0.c mapping0.c registry.c codebook.c sharedbook.c\
-			lookup.c bitrate.c
-LOCAL_SRC_FILES += vorbisfile.c
-
-#debug
-#LOCAL_CFLAGS     := -g -ggdb -O0
-#LOCAL_LDLIBS    :=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== BOOST ====================
-
-LOCAL_PATH := $(BOOST_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := boost
-LOCAL_C_INCLUDES := $(BOOST_PATH)
-
-LOCAL_CFLAGS := -std=gnu++11 --std=c++11
-
-#thread
-LOCAL_SRC_FILES := /libs/thread/src/pthread/thread.cpp
-LOCAL_SRC_FILES += /libs/thread/src/pthread/once.cpp
-
-#signals
-LOCAL_SRC_FILES += /libs/signals/src/connection.cpp
-LOCAL_SRC_FILES += /libs/signals/src/named_slot_map.cpp
-LOCAL_SRC_FILES += /libs/signals/src/signal_base.cpp
-LOCAL_SRC_FILES += /libs/signals/src/slot.cpp
-LOCAL_SRC_FILES += /libs/signals/src/trackable.cpp
-
-#system
-LOCAL_SRC_FILES += /libs/system/src/error_code.cpp
-
-#regex
-LOCAL_SRC_FILES += /libs/regex/src/c_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/cpp_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/cregex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/fileiter.cpp
-LOCAL_SRC_FILES += /libs/regex/src/icu.cpp
-LOCAL_SRC_FILES += /libs/regex/src/instances.cpp
-LOCAL_SRC_FILES += /libs/regex/src/posix_api.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_debug.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_raw_buffer.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_traits_defaults.cpp
-LOCAL_SRC_FILES += /libs/regex/src/static_mutex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/usinstances.cpp
-LOCAL_SRC_FILES += /libs/regex/src/w32_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/wc_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/wide_posix_api.cpp
-LOCAL_SRC_FILES += /libs/regex/src/winstances.cpp
-
-#date_time
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/greg_month.cpp
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/greg_weekday.cpp
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/date_generators.cpp
-
-#asio
-#nothing
-
-
-
-LOCAL_LDLIBS     := -llog -Wl
-
-#debug
-#LOCAL_CFLAGS += -g -ggdb -O0
-#LOCAL_LDLIBS     += -g -ggdb 
-
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#============= HALIBUT ENGINE ================
-
-LOCAL_PATH := $(ENGINE_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := HalibutEngine
-LOCAL_CFLAGS := -DTARGET_ANDROID -DTARGET_HALIBUT -std=gnu++11 --std=c++11
-
-LOCAL_STATIC_LIBRARIES := boost
-LOCAL_STATIC_LIBRARIES += ogg
-LOCAL_STATIC_LIBRARIES += vorbis
-LOCAL_STATIC_LIBRARIES += squirrel
-LOCAL_STATIC_LIBRARIES += png_lib
-LOCAL_STATIC_LIBRARIES += zip
-LOCAL_SHARED_LIBRARIES := gnustl_shared
-LOCAL_C_INCLUDES := $(BOOST_PATH)
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
-LOCAL_C_INCLUDES += $(OGG_PATH)/include
-LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/include
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
-LOCAL_C_INCLUDES += $(LIBPNG_PATH)
-LOCAL_C_INCLUDES += $(ZIP_PATH)
-LOCAL_SRC_FILES := src/Utils/DataTypes/DataTypes.cpp
-LOCAL_SRC_FILES += src/Utils/DataTypes/NewDataTypes.cpp
-LOCAL_SRC_FILES += src/Utils/FileUtils/FileUtils.cpp
-LOCAL_SRC_FILES += src/Utils/JniApi/JniApi.cpp
-LOCAL_SRC_FILES += src/Utils/Console/Console.cpp
-LOCAL_SRC_FILES += src/Utils/SerializeInterface/SerializeInterface.cpp
-LOCAL_SRC_FILES += src/Utils/PngHelper.cpp
-LOCAL_SRC_FILES += src/Utils/SimpleTimer.cpp
-LOCAL_SRC_FILES += src/TextureManager/SalmonTexture.cpp
-LOCAL_SRC_FILES += src/ShaderManager/ShaderManager.cpp
-LOCAL_SRC_FILES += src/FrameManager/FrameManager.cpp
-LOCAL_SRC_FILES += src/SoundManager/SoundManagerAndroid.cpp
-LOCAL_SRC_FILES += src/SoundManager/SoundManagerDataTypes.cpp
-LOCAL_SRC_FILES += src/FontManager/FontManager.cpp
-LOCAL_SRC_FILES += src/ScriptManager/ScriptManager.cpp
-LOCAL_SRC_FILES += src/GUIManager/GUIManager.cpp
-LOCAL_SRC_FILES += src/GUIManager/ButtonWidget.cpp
-LOCAL_SRC_FILES += src/GUIManager/WidgetXmlParsers.cpp
-LOCAL_SRC_FILES += src/HalibutAnimation/HalibutAnimation.cpp
-LOCAL_SRC_FILES += src/SmartValueManager/SmartValueManager.cpp
-LOCAL_SRC_FILES += src/ApplicationInterface.cpp
-LOCAL_SRC_FILES += src/Render/RenderInterface.cpp
-LOCAL_SRC_FILES += src/Render/HalibutRender/HalibutRenderInterface.cpp
-LOCAL_SRC_FILES += src/Render/HalibutRender/HalibutRenderGLES20.cpp
-LOCAL_SRC_FILES += src/Render/HalibutRender/HalibutRenderAndroid.cpp
-LOCAL_SRC_FILES += src/Render/RenderMisc.cpp
-LOCAL_SRC_FILES += src/HalibutEngineAndroid.cpp
-LOCAL_SRC_FILES += src/HalibutEngineInterface.cpp
-LOCAL_LDLIBS    := -lGLESv2
-
-LOCAL_LDLIBS    += -llog -Wl -lz
-
-#debug
-#LOCAL_CFLAGS += -g -ggdb -O0
-#LOCAL_LDLIBS    += -g -ggdb
-#no -s cause no need stripping!!!!
-
-include $(BUILD_SHARED_LIBRARY)

Android_Salmon_Engine.mk

@@ -1,351 +0,0 @@
-#Engine and libs path for Android projects
-
-
-ENGINE_PATH = $(SalmonEnginePathCygwin)
-
-BOOST_PATH = $(LibsPathCygwin)/boost_1_52_0
-
-OGG_PATH = $(LibsPathCygwin)/libogg-1.3.0
-
-VORBIS_PATH = $(LibsPathCygwin)/libvorbis-1.3.2
-
-SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
-
-LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
-
-ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
-
-#ENGINE_PATH = $(SalmonEnginePath)
-
-#BOOST_PATH = $(LibsPath)/boost_1_52_0
-
-#OGG_PATH = $(LibsPath)/libogg-1.3.0
-
-#VORBIS_PATH = $(LibsPath)/libvorbis-1.3.2
-
-#SQUIRREL_PATH = $(LibsPath)/sqplus
-
-#LIBPNG_PATH = $(LibsPath)/libpng_1.4.1_android
-
-#ZIP_PATH = $(LibsPath)/julienr-libzip-android/jni
-
-
-#================== ZIP =================
-
-LOCAL_PATH := $(ZIP_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := zip
-
-LOCAL_SRC_FILES :=\
-	zip_add.c \
-	zip_add_dir.c \
-	zip_close.c \
-	zip_delete.c \
-	zip_dirent.c \
-	zip_entry_free.c \
-	zip_entry_new.c \
-	zip_err_str.c \
-	zip_error.c \
-	zip_error_clear.c \
-	zip_error_get.c \
-	zip_error_get_sys_type.c \
-	zip_error_strerror.c \
-	zip_error_to_str.c \
-	zip_fclose.c \
-	zip_file_error_clear.c \
-	zip_file_error_get.c \
-	zip_file_get_offset.c \
-	zip_file_strerror.c \
-	zip_filerange_crc.c \
-	zip_fopen.c \
-	zip_fopen_index.c \
-	zip_fread.c \
-	zip_free.c \
-	zip_get_archive_comment.c \
-	zip_get_archive_flag.c \
-	zip_get_file_comment.c \
-	zip_get_num_files.c \
-	zip_get_name.c \
-	zip_memdup.c \
-	zip_name_locate.c \
-	zip_new.c \
-	zip_open.c \
-	zip_rename.c \
-	zip_replace.c \
-	zip_set_archive_comment.c \
-	zip_set_archive_flag.c \
-	zip_set_file_comment.c \
-	zip_source_buffer.c \
-	zip_source_file.c \
-	zip_source_filep.c \
-	zip_source_free.c \
-	zip_source_function.c \
-	zip_source_zip.c \
-	zip_set_name.c \
-	zip_stat.c \
-	zip_stat_index.c \
-	zip_stat_init.c \
-	zip_strerror.c \
-	zip_unchange.c \
-	zip_unchange_all.c \
-	zip_unchange_archive.c \
-	zip_unchange_data.c
-
-LOCAL_LDLIBS := -lz
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    +=  -g -ggdb
-
-
-include $(BUILD_STATIC_LIBRARY)
-
-#================== PNG =================
-
-LOCAL_PATH := $(LIBPNG_PATH)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := png_lib
-LOCAL_SRC_FILES :=\
-	png.c \
-	pngerror.c \
-	pngget.c \
-	pngmem.c \
-	pngpread.c \
-	pngread.c \
-	pngrio.c \
-	pngrtran.c \
-	pngrutil.c \
-	pngset.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c 
-	
-LOCAL_LDLIBS := -lz
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    +=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== SQUIRREL =================
-
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE     := squirrel
-LOCAL_PATH       := $(SQUIRREL_PATH)
-LOCAL_C_INCLUDES := $(SQUIRREL_PATH)/include $(SQUIRREL_PATH)/sqplus/sqplus $(SQUIRREL_PATH)/squirrel $(SQUIRREL_PATH)/sqstdlib
-LOCAL_SRC_FILES  := squirrel/sqapi.cpp \
-					squirrel/sqbaselib.cpp \
-					squirrel/sqclass.cpp \
-					squirrel/sqcompiler.cpp \
-					squirrel/sqdebug.cpp \
-					squirrel/sqfuncstate.cpp \
-					squirrel/sqlexer.cpp \
-					squirrel/sqmem.cpp \
-					squirrel/sqobject.cpp \
-					squirrel/sqstate.cpp \
-					squirrel/sqtable.cpp \
-					squirrel/sqvm.cpp \
-					sqplus/SqPlus.cpp \
-					sqplus/SqPlusOCharBuf.cpp \
-					sqplus/SqPlusUtf8.cpp \
-					sqplus/SquirrelBindingsUtils.cpp \
-					sqplus/SquirrelObject.cpp \
-					sqplus/SquirrelVM.cpp \
-					sqstdlib/sqstdblob.cpp \
-					sqstdlib/sqstdio.cpp \
-					sqstdlib/sqstdmath.cpp \
-					sqstdlib/sqstdrex.cpp \
-					sqstdlib/sqstdstream.cpp \
-					sqstdlib/sqstdstring.cpp \
-					sqstdlib/sqstdsystem.cpp \
-					sqstdlib/sqstdaux.cpp \
-
-
-#debug
-#LOCAL_CFLAGS := -g -ggdb -O0
-#LOCAL_LDLIBS    :=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== OGG / VORBIS / VORBISFILE ===================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vorbis
-
-LOCAL_PATH       := $(VORBIS_PATH)/lib
-LOCAL_C_INCLUDES := $(VORBIS_PATH)/include
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/src
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
-LOCAL_C_INCLUDES += $(OGG_PATH)/include
-LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
-LOCAL_SRC_FILES := ../../libogg-1.3.0/src/framing.c ../../libogg-1.3.0/src/bitwise.c
-LOCAL_SRC_FILES += mdct.c smallft.c block.c envelope.c window.c lsp.c \
-			lpc.c analysis.c synthesis.c psy.c info.c \
-			floor1.c floor0.c\
-			res0.c mapping0.c registry.c codebook.c sharedbook.c\
-			lookup.c bitrate.c
-LOCAL_SRC_FILES += vorbisfile.c
-
-#debug
-#LOCAL_CFLAGS     := -g -ggdb -O0
-#LOCAL_LDLIBS    :=  -g -ggdb
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#================== BOOST ====================
-
-LOCAL_PATH := $(BOOST_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := boost
-LOCAL_C_INCLUDES := $(BOOST_PATH)
-
-LOCAL_CFLAGS := -std=gnu++11 --std=c++11
-
-
-#thread
-LOCAL_SRC_FILES := /libs/thread/src/pthread/thread.cpp
-LOCAL_SRC_FILES += /libs/thread/src/pthread/once.cpp
-
-#signals
-LOCAL_SRC_FILES += /libs/signals/src/connection.cpp
-LOCAL_SRC_FILES += /libs/signals/src/named_slot_map.cpp
-LOCAL_SRC_FILES += /libs/signals/src/signal_base.cpp
-LOCAL_SRC_FILES += /libs/signals/src/slot.cpp
-LOCAL_SRC_FILES += /libs/signals/src/trackable.cpp
-
-#system
-LOCAL_SRC_FILES += /libs/system/src/error_code.cpp
-
-#regex
-LOCAL_SRC_FILES += /libs/regex/src/c_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/cpp_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/cregex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/fileiter.cpp
-LOCAL_SRC_FILES += /libs/regex/src/icu.cpp
-LOCAL_SRC_FILES += /libs/regex/src/instances.cpp
-LOCAL_SRC_FILES += /libs/regex/src/posix_api.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_debug.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_raw_buffer.cpp
-LOCAL_SRC_FILES += /libs/regex/src/regex_traits_defaults.cpp
-LOCAL_SRC_FILES += /libs/regex/src/static_mutex.cpp
-LOCAL_SRC_FILES += /libs/regex/src/usinstances.cpp
-LOCAL_SRC_FILES += /libs/regex/src/w32_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/wc_regex_traits.cpp
-LOCAL_SRC_FILES += /libs/regex/src/wide_posix_api.cpp
-LOCAL_SRC_FILES += /libs/regex/src/winstances.cpp
-
-#date_time
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/greg_month.cpp
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/greg_weekday.cpp
-LOCAL_SRC_FILES += /libs/date_time/src/gregorian/date_generators.cpp
-
-#asio
-#nothing
-
-LOCAL_LDLIBS     := -llog -Wl
-
-#debug
-#LOCAL_CFLAGS += -g -ggdb -O0
-#LOCAL_LDLIBS     += -g -ggdb 
-
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#============= SALMON ENGINE ================
-
-LOCAL_PATH := $(ENGINE_PATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := SalmonEngine
-
-
-LOCAL_CFLAGS := -DTARGET_ANDROID -DTARGET_SALMON -std=gnu++11 --std=c++11
-
-LOCAL_STATIC_LIBRARIES := boost
-LOCAL_STATIC_LIBRARIES += ogg
-LOCAL_STATIC_LIBRARIES += vorbis
-LOCAL_STATIC_LIBRARIES += squirrel
-LOCAL_STATIC_LIBRARIES += png_lib
-LOCAL_STATIC_LIBRARIES += zip
-LOCAL_SHARED_LIBRARIES := gnustl_shared
-LOCAL_C_INCLUDES := $(BOOST_PATH)
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
-LOCAL_C_INCLUDES += $(OGG_PATH)/include
-LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/include
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
-LOCAL_C_INCLUDES += $(LIBPNG_PATH)
-LOCAL_C_INCLUDES += $(ZIP_PATH)
-LOCAL_SRC_FILES := src/Utils/DataTypes/DataTypes.cpp
-LOCAL_SRC_FILES += src/Utils/DataTypes/NewDataTypes.cpp
-LOCAL_SRC_FILES += src/Utils/FileUtils/FileUtils.cpp
-LOCAL_SRC_FILES += src/Utils/JniApi/JniApi.cpp
-LOCAL_SRC_FILES += src/Utils/Console/Console.cpp
-LOCAL_SRC_FILES += src/Utils/SerializeInterface/SerializeInterface.cpp
-LOCAL_SRC_FILES += src/Utils/PngHelper.cpp
-LOCAL_SRC_FILES += src/Utils/SimpleTimer.cpp
-LOCAL_SRC_FILES += src/TextureManager/SalmonTexture.cpp
-LOCAL_SRC_FILES += src/ShaderManager/ShaderManager.cpp
-LOCAL_SRC_FILES += src/FrameManager/FrameManager.cpp
-LOCAL_SRC_FILES += src/LightManager/LightManager.cpp
-LOCAL_SRC_FILES += src/SoundManager/SoundManagerAndroid.cpp
-LOCAL_SRC_FILES += src/SoundManager/SoundManagerDataTypes.cpp
-LOCAL_SRC_FILES += src/FontManager/FontManager.cpp
-LOCAL_SRC_FILES += src/ScriptManager/ScriptManager.cpp
-LOCAL_SRC_FILES += src/SmartValueManager/SmartValueManager.cpp
-#LOCAL_SRC_FILES += src/GUIManager/GUIManager.cpp
-#LOCAL_SRC_FILES += src/GUIManager/ButtonWidget.cpp
-
-LOCAL_SRC_FILES += src/ModelManager/ModelManager.cpp
-LOCAL_SRC_FILES += src/ModelManager/NewModelManager.cpp
-LOCAL_SRC_FILES += src/SimpleLand/SimpleLand.cpp
-
-
-LOCAL_SRC_FILES += src/Render/RenderMisc.cpp
-LOCAL_SRC_FILES += src/Render/RenderParams.cpp
-LOCAL_SRC_FILES += src/Render/SalmonRender/BackgroundCubemap.cpp
-
-LOCAL_SRC_FILES += src/Animation/SalmonAnimation.cpp
-LOCAL_SRC_FILES += src/Render/RenderInterface.cpp
-LOCAL_SRC_FILES += src/ApplicationInterface.cpp
-LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderInterface.cpp
-LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderGLES20.cpp
-LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderAndroid.cpp
-LOCAL_SRC_FILES += src/SalmonEngineAndroid.cpp
-LOCAL_SRC_FILES += src/SalmonEngineInterface.cpp
-LOCAL_LDLIBS    := -lGLESv2
-
-LOCAL_LDLIBS    += -llog -Wl -lz
-
-#debug
-#LOCAL_CFLAGS += -g -ggdb -O0
-#LOCAL_LDLIBS    += -g -ggdb
-
-#no -s cause no need stripping!!!!
-
-include $(BUILD_SHARED_LIBRARY)

Halibut Engine/Halibut Engine.vcxproj

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_nosound|Win32">
-      <Configuration>Debug_nosound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E274B19-10B2-4987-96C5-76F35A149502}</ProjectGuid>
-    <RootNamespace>HalibutEngine</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_nosound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_nosound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)include;$(SolutionDir)include\Animation;$(SolutionDir)include\FrameManager;$(SolutionDir)include\LightManager;$(SolutionDir)include\ModelManager;$(SolutionDir)include\OpenGLExt;$(SolutionDir)include\SalmonRender;$(SolutionDir)include\ShaderManager;$(SolutionDir)include\TextureManager;$(SolutionDir)include\Utils;$(SolutionDir)include\Utils\Console;$(SolutionDir)include\Utils\DataTypes;$(SolutionDir)include\Utils\ErrorTypes;$(SolutionDir)include\Utils\FileUtils</IncludePath>
-    <OutDir>$(SalmonEnginePath)$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_nosound|Win32'">
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)include;$(SolutionDir)include\Animation;$(SolutionDir)include\FrameManager;$(SolutionDir)include\LightManager;$(SolutionDir)include\ModelManager;$(SolutionDir)include\OpenGLExt;$(SolutionDir)include\SalmonRender;$(SolutionDir)include\ShaderManager;$(SolutionDir)include\TextureManager;$(SolutionDir)include\Utils;$(SolutionDir)include\Utils\Console;$(SolutionDir)include\Utils\DataTypes;$(SolutionDir)include\Utils\ErrorTypes;$(SolutionDir)include\Utils\FileUtils</IncludePath>
-    <OutDir>$(SalmonEnginePath)$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)include;$(SolutionDir)include\Animation;$(SolutionDir)include\FrameManager;$(SolutionDir)include\LightManager;$(SolutionDir)include\ModelManager;$(SolutionDir)include\OpenGLExt;$(SolutionDir)include\SalmonRender;$(SolutionDir)include\ShaderManager;$(SolutionDir)include\TextureManager;$(SolutionDir)include\Utils;$(SolutionDir)include\Utils\Console;$(SolutionDir)include\Utils\DataTypes;$(SolutionDir)include\Utils\ErrorTypes;$(SolutionDir)include\Utils\FileUtils</IncludePath>
-    <OutDir>$(SalmonEnginePath)$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TARGET_HALIBUT;TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_nosound|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TARGET_HALIBUT;TARGET_WIN32;NOSOUND;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>TARGET_HALIBUT;TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;NDEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\ApplicationInterface.h" />
-    <ClInclude Include="..\include\Engine.h" />
-    <ClInclude Include="..\include\FontManager\FontManager.h" />
-    <ClInclude Include="..\include\FrameManager\FrameManager.h" />
-    <ClInclude Include="..\include\GlobalConst.h" />
-    <ClInclude Include="..\include\GUIManager\ButtonWidget.h" />
-    <ClInclude Include="..\include\GUIManager\GUIManager.h" />
-    <ClInclude Include="..\include\GUIManager\WidgetTemplatesImpl.h" />
-    <ClInclude Include="..\include\GUIManager\WidgetXmlParsers.h" />
-    <ClInclude Include="..\include\HalibutAnimation\HalibutAnimation.h" />
-    <ClInclude Include="..\include\HalibutEngineInterface.h" />
-    <ClInclude Include="..\include\HalibutEngineWindows.h" />
-    <ClInclude Include="..\include\OpenGLExt\OpenGlExt.h" />
-    <ClInclude Include="..\include\Render\HalibutRender\HalibutRenderWindows.h" />
-    <ClInclude Include="..\include\Render\HalibutRender\HalibutRenderInterface.h" />
-    <ClInclude Include="..\include\Render\RenderInterface.h" />
-    <ClInclude Include="..\include\Render\RenderMisc.h" />
-    <ClInclude Include="..\include\Render\RenderParams.h" />
-    <ClInclude Include="..\include\ScriptManager\ScriptManager.h" />
-    <ClInclude Include="..\include\ShaderManager\ShaderManager.h" />
-    <ClInclude Include="..\include\SmartValueManager\SmartValueManager.h" />
-    <ClInclude Include="..\include\SoundManager\SoundManagerDataTypes.h" />
-    <ClInclude Include="..\include\SoundManager\SoundManagerInterface.h" />
-    <ClInclude Include="..\include\SoundManager\SoundManagerWindows.h" />
-    <ClInclude Include="..\include\TextureManager\SalmonTexture.h" />
-    <ClInclude Include="..\include\Utils\BindableVar.h" />
-    <ClInclude Include="..\include\Utils\Console\console.h" />
-    <ClInclude Include="..\include\Utils\DataTypes\DataTypes.h" />
-    <ClInclude Include="..\include\Utils\DataTypes\NewDataTypes.h" />
-    <ClInclude Include="..\include\Utils\ErrorTypes\ErrorTypes.h" />
-    <ClInclude Include="..\include\Utils\FileUtils\FileUtils.h" />
-    <ClInclude Include="..\include\Utils\PngHelper.h" />
-    <ClInclude Include="..\include\Utils\SerializeInterface\SerializeInterface.h" />
-    <ClInclude Include="..\include\Utils\SimpleTimer.h" />
-    <ClInclude Include="..\include\Utils\Utils.h" />
-    <ClInclude Include="..\include\Utils\WinApi\WinApi.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\ApplicationInterface.cpp" />
-    <ClCompile Include="..\src\FontManager\FontManager.cpp" />
-    <ClCompile Include="..\src\FrameManager\FrameManager.cpp" />
-    <ClCompile Include="..\src\GlobalConst.cpp" />
-    <ClCompile Include="..\src\GUIManager\ButtonWidget.cpp" />
-    <ClCompile Include="..\src\GUIManager\GUIManager.cpp" />
-    <ClCompile Include="..\src\GUIManager\WidgetXmlParsers.cpp" />
-    <ClCompile Include="..\src\HalibutAnimation\HalibutAnimation.cpp" />
-    <ClCompile Include="..\src\HalibutEngineInterface.cpp" />
-    <ClCompile Include="..\src\HalibutEngineWindows.cpp" />
-    <ClCompile Include="..\src\OpenGLExt\OpenGlExt.cpp" />
-    <ClCompile Include="..\src\Render\HalibutRender\HalibutRenderWindows.cpp" />
-    <ClCompile Include="..\src\Render\HalibutRender\HalibutRenderInterface.cpp" />
-    <ClCompile Include="..\src\Render\RenderInterface.cpp" />
-    <ClCompile Include="..\src\Render\RenderMisc.cpp" />
-    <ClCompile Include="..\src\Render\RenderParams.cpp" />
-    <ClCompile Include="..\src\ScriptManager\ScriptManager.cpp" />
-    <ClCompile Include="..\src\ShaderManager\ShaderManager.cpp" />
-    <ClCompile Include="..\src\SmartValueManager\SmartValueManager.cpp" />
-    <ClCompile Include="..\src\SoundManager\SoundManagerDataTypes.cpp" />
-    <ClCompile Include="..\src\SoundManager\SoundManagerWindows.cpp" />
-    <ClCompile Include="..\src\TextureManager\SalmonTexture.cpp" />
-    <ClCompile Include="..\src\Utils\Console\Console.cpp" />
-    <ClCompile Include="..\src\Utils\DataTypes\DataTypes.cpp" />
-    <ClCompile Include="..\src\Utils\DataTypes\NewDataTypes.cpp" />
-    <ClCompile Include="..\src\Utils\FileUtils\FileUtils.cpp" />
-    <ClCompile Include="..\src\Utils\PngHelper.cpp" />
-    <ClCompile Include="..\src\Utils\SerializeInterface\SerializeInterface.cpp" />
-    <ClCompile Include="..\src\Utils\SimpleTimer.cpp" />
-    <ClCompile Include="..\src\Utils\WinApi\WinApi.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Salmon Engine.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Halibut Engine", "Halibut Engine\Halibut Engine.vcxproj", "{4E274B19-10B2-4987-96C5-76F35A149502}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Salmon Engine", "Salmon Engine\Salmon Engine.vcxproj", "{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_nosound|Win32 = Debug_nosound|Win32
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug|Win32.Build.0 = Debug|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Release|Win32.ActiveCfg = Release|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Release|Win32.Build.0 = Release|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.Build.0 = Debug|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.ActiveCfg = Release|Win32
-		{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Salmon Engine/Salmon Engine.vcxproj

@@ -16,18 +16,25 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\Animation\SalmonAnimation.h" />
-    <ClInclude Include="..\include\ApplicationInterface.h" />
     <ClInclude Include="..\include\Engine.h" />
+    <ClInclude Include="..\include\FontManager\FontManager.h" />
     <ClInclude Include="..\include\FrameManager\FrameManager.h" />
     <ClInclude Include="..\include\GlobalConst.h" />
+    <ClInclude Include="..\include\GUIManager\ButtonWidget.h" />
+    <ClInclude Include="..\include\GUIManager\GUIManager.h" />
+    <ClInclude Include="..\include\GUIManager\KeyboardWidget.h" />
+    <ClInclude Include="..\include\GUIManager\WidgetTemplatesImpl.h" />
+    <ClInclude Include="..\include\GUIManager\WidgetXmlParsers.h" />
+    <ClInclude Include="..\include\HalibutAnimation\HalibutAnimation.h" />
     <ClInclude Include="..\include\LightManager\LightManager.h" />
     <ClInclude Include="..\include\ModelManager\ModelManager.h" />
     <ClInclude Include="..\include\ModelManager\NewModelManager.h" />
     <ClInclude Include="..\include\OpenGLExt\OpenGlExt.h" />
-    <ClInclude Include="..\include\Render\RenderInterface.h" />
+    <ClInclude Include="..\include\PhysicsManager\PhysicsManager.h" />
     <ClInclude Include="..\include\Render\RenderMisc.h" />
     <ClInclude Include="..\include\Render\RenderParams.h" />
     <ClInclude Include="..\include\Render\SalmonRender\BackgroundCubemap.h" />
+    <ClInclude Include="..\include\Render\SalmonRender\Cameras.h" />
     <ClInclude Include="..\include\Render\SalmonRender\SalmonRenderWindows.h" />
     <ClInclude Include="..\include\Render\SalmonRender\SalmonRenderInterface.h" />
     <ClInclude Include="..\include\SalmonEngineInterface.h" />
@@ -46,25 +53,37 @@
     <ClInclude Include="..\include\Utils\DataTypes\NewDataTypes.h" />
     <ClInclude Include="..\include\Utils\ErrorTypes\ErrorTypes.h" />
     <ClInclude Include="..\include\Utils\FileUtils\FileUtils.h" />
+    <ClInclude Include="..\include\Utils\JpegHelper.h" />
+    <ClInclude Include="..\include\Utils\Network\Network.h" />
+    <ClInclude Include="..\include\Utils\Network\SignalSender.h" />
     <ClInclude Include="..\include\Utils\PngHelper.h" />
     <ClInclude Include="..\include\Utils\SerializeInterface\SerializeInterface.h" />
+    <ClInclude Include="..\include\Utils\SimpleTimer.h" />
+    <ClInclude Include="..\include\Utils\TgaLoader.h" />
+    <ClInclude Include="..\include\Utils\ThreadUtils.h" />
+    <ClInclude Include="..\include\Utils\ThreadUtilsImpl.h" />
     <ClInclude Include="..\include\Utils\Utils.h" />
     <ClInclude Include="..\include\Utils\WinApi\WinApi.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Animation\SalmonAnimation.cpp" />
-    <ClCompile Include="..\src\ApplicationInterface.cpp" />
     <ClCompile Include="..\src\FontManager\FontManager.cpp" />
     <ClCompile Include="..\src\FrameManager\FrameManager.cpp" />
     <ClCompile Include="..\src\GlobalConst.cpp" />
+    <ClCompile Include="..\src\GUIManager\ButtonWidget.cpp" />
+    <ClCompile Include="..\src\GUIManager\GUIManager.cpp" />
+    <ClCompile Include="..\src\GUIManager\KeyboardWidget.cpp" />
+    <ClCompile Include="..\src\GUIManager\WidgetXmlParsers.cpp" />
+    <ClCompile Include="..\src\HalibutAnimation\HalibutAnimation.cpp" />
     <ClCompile Include="..\src\LightManager\LightManager.cpp" />
     <ClCompile Include="..\src\ModelManager\ModelManager.cpp" />
     <ClCompile Include="..\src\ModelManager\NewModelManager.cpp" />
     <ClCompile Include="..\src\OpenGLExt\OpenGlExt.cpp" />
-    <ClCompile Include="..\src\Render\RenderInterface.cpp" />
+    <ClCompile Include="..\src\PhysicsManager\PhysicsManager.cpp" />
     <ClCompile Include="..\src\Render\RenderMisc.cpp" />
     <ClCompile Include="..\src\Render\RenderParams.cpp" />
     <ClCompile Include="..\src\Render\SalmonRender\BackgroundCubemap.cpp" />
+    <ClCompile Include="..\src\Render\SalmonRender\Cameras.cpp" />
     <ClCompile Include="..\src\Render\SalmonRender\SalmonRenderWindows.cpp" />
     <ClCompile Include="..\src\Render\SalmonRender\SalmonRenderInterface.cpp" />
     <ClCompile Include="..\src\SalmonEngineInterface.cpp" />
@@ -80,9 +99,13 @@
     <ClCompile Include="..\src\Utils\DataTypes\DataTypes.cpp" />
     <ClCompile Include="..\src\Utils\DataTypes\NewDataTypes.cpp" />
     <ClCompile Include="..\src\Utils\FileUtils\FileUtils.cpp" />
+    <ClCompile Include="..\src\Utils\JpegHelper.cpp" />
+    <ClCompile Include="..\src\Utils\Network\Network.cpp" />
     <ClCompile Include="..\src\Utils\PngHelper.cpp" />
     <ClCompile Include="..\src\Utils\SerializeInterface\SerializeInterface.cpp" />
     <ClCompile Include="..\src\Utils\SimpleTimer.cpp" />
+    <ClCompile Include="..\src\Utils\TgaLoader.cpp" />
+    <ClCompile Include="..\src\Utils\ThreadUtils.cpp" />
     <ClCompile Include="..\src\Utils\WinApi\WinApi.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -135,8 +158,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TARGET_SALMON;TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(LibsPath)\jpeg-9;$(LibsPath)\jpeg-9\vc10</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,8 +170,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>TARGET_SALMON;TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG;NOSOUND</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;DEBUG;NOSOUND</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>/wd 4503</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -159,9 +184,10 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>TARGET_SALMON;TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;NDEBUG</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TARGET_WIN32;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0501;NDEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SalmonEnginePath);$(LibsPath)\boost_1_52_0;$(LibsPath)\openal\OpenAL11_windows_sdk;$(LibsPath)\libogg-1.3.0\include;$(LibsPath)\libvorbis-1.3.2\include;$(LibsPath)\sqplus\sqplus;$(LibsPath)\sqplus\include;$(LibsPath)\DirectXsdk\Include;$(LibsPath)\lpng1510;$(LibsPath)\jpeg-9;$(LibsPath)\jpeg-9\vc10</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

SalmonEngineAndroid/.gitignore

@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+.idea
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild

SalmonEngineAndroid/.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

SalmonEngineAndroid/.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

SalmonEngineAndroid/.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

SalmonEngineAndroid/.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="LOCAL" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="C:\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

SalmonEngineAndroid/.idea/misc.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="mySupportsUserInfoFilter" value="true" />
+  </component>
+</project>

SalmonEngineAndroid/.idea/modules.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/SalmonEngineAndroid.iml" filepath="$PROJECT_DIR$/SalmonEngineAndroid.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+    </modules>
+  </component>
+</project>

SalmonEngineAndroid/.idea/runConfigurations.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

SalmonEngineAndroid/.idea/vcs.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../libs/jpeg-9" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$/../../libs/julienr-libzip-android/jni" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$/../../libs/libogg-1.3.0/src" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$/../../libs/libpng_1.4.1_android" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$/../../libs/libvorbis-1.3.2/lib" vcs="svn" />
+  </component>
+</project>

SalmonEngineAndroid/app/.gitignore

@@ -0,0 +1 @@
+/build

SalmonEngineAndroid/app/CMakeLists.txt

@@ -0,0 +1,372 @@
+
+# Sets the minimum version of CMake required to build the native
+# library. You should either keep the default value or only pass a
+# value of 3.4.0 or lower.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds it for you.
+# Gradle automatically packages shared libraries with your APK.
+
+
+
+#ENGINE_PATH = $(SalmonEnginePathCygwin)
+
+#BOOST_PATH = $(LibsPathCygwin)/boost_1_52_0
+
+#OGG_PATH = $(LibsPathCygwin)/libogg-1.3.0
+
+#VORBIS_PATH = $(LibsPathCygwin)/libvorbis-1.3.2
+
+#SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
+
+#LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
+
+#LIBJPEG_PATH = $(LibsPathCygwin)/jpeg-9
+
+#ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
+
+set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_63_0)
+
+set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension)
+
+set(ZIP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/julienr-libzip-android/jni)
+
+set(LIBPNG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libpng_1.4.1_android)
+
+set(LIBJPEG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9")
+
+set(SQUIRREL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/sqplus)
+
+set(OGG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libogg-1.3.0)
+
+set(VORBIS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libvorbis-1.3.2)
+
+
+#include_directories(ZIP_PATH)
+
+add_library(zip
+	${ZIP_PATH}/zip_add.c
+	${ZIP_PATH}/zip_add_dir.c
+	${ZIP_PATH}/zip_close.c
+	${ZIP_PATH}/zip_delete.c
+	${ZIP_PATH}/zip_dirent.c
+	${ZIP_PATH}/zip_entry_free.c
+	${ZIP_PATH}/zip_entry_new.c
+	${ZIP_PATH}/zip_err_str.c
+	${ZIP_PATH}/zip_error.c
+	${ZIP_PATH}/zip_error_clear.c
+	${ZIP_PATH}/zip_error_get.c
+	${ZIP_PATH}/zip_error_get_sys_type.c
+	${ZIP_PATH}/zip_error_strerror.c
+	${ZIP_PATH}/zip_error_to_str.c
+	${ZIP_PATH}/zip_fclose.c
+	${ZIP_PATH}/zip_file_error_clear.c
+	${ZIP_PATH}/zip_file_error_get.c
+	${ZIP_PATH}/zip_file_get_offset.c
+	${ZIP_PATH}/zip_file_strerror.c
+	${ZIP_PATH}/zip_filerange_crc.c
+	${ZIP_PATH}/zip_fopen.c
+	${ZIP_PATH}/zip_fopen_index.c
+	${ZIP_PATH}/zip_fread.c
+	${ZIP_PATH}/zip_free.c
+	${ZIP_PATH}/zip_get_archive_comment.c
+	${ZIP_PATH}/zip_get_archive_flag.c
+	${ZIP_PATH}/zip_get_file_comment.c
+	${ZIP_PATH}/zip_get_num_files.c
+	${ZIP_PATH}/zip_get_name.c
+	${ZIP_PATH}/zip_memdup.c
+	${ZIP_PATH}/zip_name_locate.c
+	${ZIP_PATH}/zip_new.c
+	${ZIP_PATH}/zip_open.c
+	${ZIP_PATH}/zip_rename.c
+	${ZIP_PATH}/zip_replace.c
+	${ZIP_PATH}/zip_set_archive_comment.c
+	${ZIP_PATH}/zip_set_archive_flag.c
+	${ZIP_PATH}/zip_set_file_comment.c
+	${ZIP_PATH}/zip_source_buffer.c
+	${ZIP_PATH}/zip_source_file.c
+	${ZIP_PATH}/zip_source_filep.c
+	${ZIP_PATH}/zip_source_free.c
+	${ZIP_PATH}/zip_source_function.c
+	${ZIP_PATH}/zip_source_zip.c
+	${ZIP_PATH}/zip_set_name.c
+	${ZIP_PATH}/zip_stat.c
+	${ZIP_PATH}/zip_stat_index.c
+	${ZIP_PATH}/zip_stat_init.c
+	${ZIP_PATH}/zip_strerror.c
+	${ZIP_PATH}/zip_unchange.c
+	${ZIP_PATH}/zip_unchange_all.c
+	${ZIP_PATH}/zip_unchange_archive.c
+	${ZIP_PATH}/zip_unchange_data.c
+	)
+	
+#include_directories(LIBPNG_PATH)
+
+add_library(png
+	${LIBPNG_PATH}/png.c
+	${LIBPNG_PATH}/pngerror.c
+	${LIBPNG_PATH}/pngget.c
+	${LIBPNG_PATH}/pngmem.c
+	${LIBPNG_PATH}/pngpread.c
+	${LIBPNG_PATH}/pngread.c
+	${LIBPNG_PATH}/pngrio.c
+	${LIBPNG_PATH}/pngrtran.c
+	${LIBPNG_PATH}/pngrutil.c
+	${LIBPNG_PATH}/pngset.c
+	${LIBPNG_PATH}/pngtrans.c
+	${LIBPNG_PATH}/pngwio.c
+	${LIBPNG_PATH}/pngwrite.c
+	${LIBPNG_PATH}/pngwtran.c
+	${LIBPNG_PATH}/pngwutil.c 
+	)
+
+include_directories(${LIBJPEG_PATH}/vc10)
+
+add_library(jpeg
+	${LIBJPEG_PATH}/jaricom.c
+	${LIBJPEG_PATH}/jcapimin.c
+	${LIBJPEG_PATH}/jcapistd.c
+	${LIBJPEG_PATH}/jcarith.c
+	${LIBJPEG_PATH}/jccoefct.c
+	${LIBJPEG_PATH}/jccolor.c
+	${LIBJPEG_PATH}/jcdctmgr.c
+	${LIBJPEG_PATH}/jchuff.c
+	${LIBJPEG_PATH}/jcinit.c
+	${LIBJPEG_PATH}/jcmainct.c
+	${LIBJPEG_PATH}/jcmarker.c
+	${LIBJPEG_PATH}/jcmaster.c
+	${LIBJPEG_PATH}/jcomapi.c
+	${LIBJPEG_PATH}/jcparam.c
+	${LIBJPEG_PATH}/jcprepct.c
+	${LIBJPEG_PATH}/jcsample.c
+	${LIBJPEG_PATH}/jctrans.c
+	${LIBJPEG_PATH}/jdapimin.c
+	${LIBJPEG_PATH}/jdapistd.c
+	${LIBJPEG_PATH}/jdarith.c
+	${LIBJPEG_PATH}/jdatadst.c
+	${LIBJPEG_PATH}/jdatasrc.c
+	${LIBJPEG_PATH}/jdcoefct.c
+	${LIBJPEG_PATH}/jdcolor.c
+	${LIBJPEG_PATH}/jddctmgr.c
+	${LIBJPEG_PATH}/jdhuff.c
+	${LIBJPEG_PATH}/jdinput.c
+	${LIBJPEG_PATH}/jdmainct.c
+	${LIBJPEG_PATH}/jdmarker.c
+	${LIBJPEG_PATH}/jdmaster.c
+	${LIBJPEG_PATH}/jdmerge.c
+	${LIBJPEG_PATH}/jdpostct.c
+	${LIBJPEG_PATH}/jdsample.c
+	${LIBJPEG_PATH}/jdtrans.c
+	${LIBJPEG_PATH}/jerror.c
+	${LIBJPEG_PATH}/jfdctflt.c
+	${LIBJPEG_PATH}/jfdctfst.c
+	${LIBJPEG_PATH}/jfdctint.c
+	${LIBJPEG_PATH}/jidctflt.c
+	${LIBJPEG_PATH}/jidctfst.c
+	${LIBJPEG_PATH}/jidctint.c
+	${LIBJPEG_PATH}/jmemmgr.c
+	${LIBJPEG_PATH}/jmemnobs.c
+	${LIBJPEG_PATH}/jquant1.c
+	${LIBJPEG_PATH}/jquant2.c
+	${LIBJPEG_PATH}/jutils.c
+	)
+
+
+
+#LOCAL_PATH       := $(VORBIS_PATH)/lib
+#LOCAL_C_INCLUDES := $(VORBIS_PATH)/include
+#LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
+#LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/src
+#LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
+#LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
+#LOCAL_C_INCLUDES += $(OGG_PATH)/include
+#LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
+
+include_directories(${OGG_PATH}/include)
+include_directories(${VORBIS_PATH}/include)
+
+add_library(ogg
+	${OGG_PATH}/src/framing.c 
+	${OGG_PATH}/src/bitwise.c
+	)
+
+add_library(vorbis
+	${VORBIS_PATH}/lib/mdct.c
+	${VORBIS_PATH}/lib/smallft.c
+	${VORBIS_PATH}/lib/block.c
+	${VORBIS_PATH}/lib/envelope.c
+	${VORBIS_PATH}/lib/window.c
+	${VORBIS_PATH}/lib/lsp.c
+	${VORBIS_PATH}/lib/lpc.c
+	${VORBIS_PATH}/lib/analysis.c
+	${VORBIS_PATH}/lib/synthesis.c
+	${VORBIS_PATH}/lib/psy.c
+	${VORBIS_PATH}/lib/info.c
+	${VORBIS_PATH}/lib/floor1.c
+	${VORBIS_PATH}/lib/floor0.c
+	${VORBIS_PATH}/lib/res0.c
+	${VORBIS_PATH}/lib/mapping0.c
+	${VORBIS_PATH}/lib/registry.c
+	${VORBIS_PATH}/lib/codebook.c
+	${VORBIS_PATH}/lib/sharedbook.c
+	${VORBIS_PATH}/lib/lookup.c
+	${VORBIS_PATH}/lib/bitrate.c
+	${VORBIS_PATH}/lib/vorbisfile.c
+	)
+
+
+include_directories(${BOOST_PATH})
+
+add_library(boost
+	${BOOST_PATH}/libs/thread/src/pthread/thread.cpp
+
+
+#thread
+${BOOST_PATH}/libs/thread/src/pthread/thread.cpp
+${BOOST_PATH}/libs/thread/src/pthread/once.cpp
+
+#signals
+${BOOST_PATH}/libs/signals/src/connection.cpp
+${BOOST_PATH}/libs/signals/src/named_slot_map.cpp
+${BOOST_PATH}/libs/signals/src/signal_base.cpp
+${BOOST_PATH}/libs/signals/src/slot.cpp
+${BOOST_PATH}/libs/signals/src/trackable.cpp
+
+#system
+${BOOST_PATH}/libs/system/src/error_code.cpp
+
+#regex
+${BOOST_PATH}/libs/regex/src/c_regex_traits.cpp
+${BOOST_PATH}/libs/regex/src/cpp_regex_traits.cpp
+${BOOST_PATH}/libs/regex/src/cregex.cpp
+${BOOST_PATH}/libs/regex/src/fileiter.cpp
+${BOOST_PATH}/libs/regex/src/icu.cpp
+${BOOST_PATH}/libs/regex/src/instances.cpp
+${BOOST_PATH}/libs/regex/src/posix_api.cpp
+${BOOST_PATH}/libs/regex/src/regex.cpp
+${BOOST_PATH}/libs/regex/src/regex_debug.cpp
+${BOOST_PATH}/libs/regex/src/regex_raw_buffer.cpp
+${BOOST_PATH}/libs/regex/src/regex_traits_defaults.cpp
+${BOOST_PATH}/libs/regex/src/static_mutex.cpp
+${BOOST_PATH}/libs/regex/src/usinstances.cpp
+${BOOST_PATH}/libs/regex/src/w32_regex_traits.cpp
+${BOOST_PATH}/libs/regex/src/wc_regex_traits.cpp
+${BOOST_PATH}/libs/regex/src/wide_posix_api.cpp
+${BOOST_PATH}/libs/regex/src/winstances.cpp
+
+#date_time
+${BOOST_PATH}/libs/date_time/src/gregorian/greg_month.cpp
+${BOOST_PATH}/libs/date_time/src/gregorian/greg_weekday.cpp
+${BOOST_PATH}/libs/date_time/src/gregorian/date_generators.cpp
+)
+
+
+
+find_library( # Sets the name of the path variable.
+              z-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              z )
+			  
+find_library( # Sets the name of the path variable.
+              GLESv2-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              GLESv2 )
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+			  
+			  
+			  
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../)
+
+
+include_directories(${BOOST_PATH})
+include_directories(${LIBPNG_PATH})
+include_directories(${LIBJPEG_PATH})
+include_directories(${ZIP_PATH})
+
+include_directories(${BOOST_GIL_PATH})
+
+
+
+add_definitions(-DTARGET_ANDROID)
+
+
+add_library( # Sets the name of the library.
+             engine
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             # Associated headers in the same location as their source
+             # file are automatically included.
+
+             #testcpp.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/DataTypes/DataTypes.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/DataTypes/NewDataTypes.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/FileUtils/FileUtils.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/JniApi/JniApi.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/JniApi/JniApplication.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/Console/Console.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/SerializeInterface/SerializeInterface.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/Network/Network.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/PngHelper.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/JpegHelper.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/TgaLoader.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/SimpleTimer.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils/ThreadUtils.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/TextureManager/SalmonTexture.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/ShaderManager/ShaderManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/FrameManager/FrameManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/LightManager/LightManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SoundManager/SoundManagerAndroid.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SoundManager/SoundManagerDataTypes.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/FontManager/FontManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/ScriptManager/ScriptManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SmartValueManager/SmartValueManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/GUIManager/GUIManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/GUIManager/ButtonWidget.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/GUIManager/WidgetXmlParsers.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/HalibutAnimation/HalibutAnimation.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/ModelManager/ModelManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/ModelManager/NewModelManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SimpleLand/SimpleLand.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/PhysicsManager/PhysicsManager.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/RenderMisc.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/RenderParams.cpp
+
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/SalmonRender/BackgroundCubemap.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/SalmonRender/SalmonRenderInterface.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/SalmonRender/SalmonRenderGLES20.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/SalmonRender/SalmonRenderAndroid.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Render/SalmonRender/Cameras.cpp
+
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Animation/SalmonAnimation.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SalmonEngineAndroid.cpp
+             ${CMAKE_CURRENT_SOURCE_DIR}/../../src/SalmonEngineInterface.cpp
+             )
+
+
+target_link_libraries(engine
+${z-lib}
+${log-lib}
+${GLESv2-lib}
+png
+zip
+boost
+jpeg
+ogg
+vorbis
+)

SalmonEngineAndroid/app/build.gradle

@@ -0,0 +1,38 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11 -frtti -fexceptions -Wno-c++11-narrowing"
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile 'junit:junit:4.12'
+}

SalmonEngineAndroid/app/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

SalmonEngineAndroid/app/src/androidTest/java/fishrungames/salmonengineandroid/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package fishrungames.salmonengineandroid;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("fishrungames.salmonengineandroid", appContext.getPackageName());
+    }
+}

SalmonEngineAndroid/app/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="fishrungames.salmonengineandroid">
+
+    <uses-feature android:glEsVersion="0x00020000"/>
+
+</manifest>

SalmonEngineAndroid/app/src/main/cpp/native-lib.cpp

@@ -0,0 +1,3 @@
+#include <jni.h>
+#include <string>
+

SalmonEngineAndroid/app/src/main/java/fishrungames/salmonengineandroid/EngineWrapper.java

@@ -0,0 +1,448 @@
+package fishrungames.salmonengineandroid;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.SoundPool;
+import android.opengl.GLSurfaceView;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.GestureDetector.SimpleOnGestureListener;
+//import android.net.Uri;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+public class EngineWrapper {
+	
+	static class CustomGestureListener extends SimpleOnGestureListener
+	{
+			
+		@Override
+		public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+					float velocityY)
+		{
+			EngineWrapper.OnFling(velocityX, velocityY, e2.getEventTime());
+
+			return true;
+		}
+
+	}
+	
+	static class JniDestroyRunnable implements Runnable
+	{
+		public void run()
+		{
+			EngineWrapper.Destroy();
+		}
+	}
+
+	static ContextWrapper Instance = null;
+	
+	static Map<String, Integer> FileMap = new HashMap<String, Integer>();
+	
+	static Map<String, Integer> SoundMap = new HashMap<String, Integer>();
+	
+	static Context context;
+	
+	static SoundPool soundPool;
+	
+	static MediaPlayer mp;
+	
+	static GLSurfaceView mView;
+	
+	static GestureDetector customGestureDetector  = new GestureDetector(new CustomGestureListener());
+
+	
+	public static void SetActivityInstance(ContextWrapper inst)
+	{
+		Instance = inst;
+		context = Instance.getBaseContext();
+		
+		soundPool = new SoundPool(4, AudioManager.STREAM_MUSIC, 0);
+		
+		mp = new MediaPlayer();
+		
+	}
+	
+	public static void SetView(GLSurfaceView view)
+	{
+		
+		mView = view;
+	
+	}
+	
+	public static String GetApplicationDir()
+	{
+		return Instance.getFilesDir().getPath();
+	}
+	
+	public static void AddToFileMap(String s, Integer i)
+	{
+		FileMap.put(s, i);
+		
+	}
+	
+	
+	
+	public synchronized static int OpenFile(String fileName)
+	{
+		String newFileName;
+		
+		int i = fileName.lastIndexOf(".");
+		
+		if (i == -1)
+		{
+			
+			newFileName = fileName;
+		}
+		else
+		{
+			newFileName = fileName.substring(0, i);
+		}
+
+		
+		if (!FileMap.containsKey(newFileName))
+		{
+			return 0;
+		}
+		
+        Integer id = FileMap.get(newFileName);
+        
+        try 
+        {
+        	
+        	InputStream is = Instance.getResources().openRawResource(id);
+
+        	byte[] buffer = new byte[256];
+        	int bytesRead;
+        	
+        	CreateFile(is.available());
+
+        	while ((bytesRead = is.read(buffer, 0, 256)) != -1)
+        	{
+        		WriteToFile(buffer, bytesRead);
+        	}
+        	
+        	
+		} catch (Throwable t) {
+			ConsoleOut("Exception in FileWrapper::OpenFile!\n");
+			return 0;
+			
+		}
+        
+        return 1;
+        
+	}
+	
+	public static native void SetupEnviroment();
+	
+	public static native void SetupApkFilePath(String s);
+	
+	public static native void ConsoleOut(String s);
+	
+	public static native void CreateFile(int fileSize);
+	
+	public static native void WriteToFile(byte [] buffer, int bufferSize);
+	
+	
+	public static void LoadSound(String soundFileName)
+	{
+		
+		if (SoundMap.containsKey(soundFileName))
+		{
+			return;
+		}
+		/*
+		String newFileName;
+		
+		int i = soundFileName.lastIndexOf(".");
+		
+		if (i == -1)
+		{
+			
+			newFileName = soundFileName;
+		}
+		else
+		{
+			newFileName = soundFileName.substring(0, i);
+		}*/
+		
+		//int soundId = soundPool.load(context, FileMap.get(newFileName), 1);
+		
+		AssetFileDescriptor afd = null;
+		
+		try
+		{
+			afd = Instance.getAssets().openFd(soundFileName);
+		} catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+		
+		int soundId = soundPool.load(afd, 1);
+		
+		SoundMap.put(soundFileName, soundId);
+
+	}
+	
+	public static void ReleaseAllSoundsAndMusic()
+	{
+		
+		mp.stop();
+		mp.reset();
+		
+		//soundPool.autoPause();
+		
+		Enumeration<Integer> i = Collections.enumeration(SoundMap.values());
+		
+		while(i.hasMoreElements())
+		{
+			soundPool.stop(i.nextElement());
+		}
+		
+		SoundMap.clear();
+		
+	}
+	
+	public static void PauseAllSoundsAndMusic()
+	{
+		//NIU right now
+		
+		soundPool.autoPause();
+
+		mp.pause();
+	}
+	
+	public static void ResumeAllSoundsAndMusic()
+	{
+		
+		//NIU right now
+	
+		soundPool.autoResume();
+		
+		mp.start();
+	}
+		
+	
+	public static void StopMusic()
+	{
+		mp.stop();
+		mp.reset();
+	}
+	
+	public static void PlayMusic(String musicFileName)
+	{
+		InnerPlayMusic(musicFileName, false);
+	}
+	
+	
+	public static void PlayMusicLooped(String musicFileName)
+	{
+		InnerPlayMusic(musicFileName, true);
+	}
+	
+	private static void InnerPlayMusic(String musicFileName, boolean looped)
+	{
+		/*
+		String newFileName;
+		
+		int i = musicFileName.lastIndexOf(".");
+		
+		if (i == -1)
+		{
+			
+			newFileName = musicFileName;
+		}
+		else
+		{
+			newFileName = musicFileName.substring(0, i);
+		}
+		*/
+		try
+		{
+			//Uri path = Uri.parse("android.resource://"+Instance.getPackageName()+"/assets/"+newFileName);
+			
+			AssetFileDescriptor afd = null;
+			
+			try
+			{
+				afd = Instance.getAssets().openFd(musicFileName);
+			} catch (IOException e)
+			{
+				e.printStackTrace();
+			}
+			
+			//mp.setDataSource(context, path);
+			
+			mp.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength());
+			
+			mp.prepare();
+			mp.setLooping(looped);
+			mp.start();
+		} catch (IllegalArgumentException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalStateException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+	}
+	
+	public static void PlaySound(String soundFileName)
+	{
+		if (!SoundMap.containsKey(soundFileName))
+		{
+			return;
+		}
+		
+		int soundId = SoundMap.get(soundFileName);
+		
+		soundPool.play(soundId, 1,1,1,0,1);
+	}
+	
+	
+	public static void LoadSalmonEngineLibrary()
+	{
+		System.loadLibrary("engine");
+	}
+	
+	static 
+	{
+		//System.loadLibrary("gnustl_shared");
+    }
+	
+	//Application methods
+	
+	public static native void Update(long dt);
+	  
+    public static native void Destroy();
+    public static native int IsInited();
+    public static native void OnTapDown(float x, float y, long time);
+    public static native void OnTapUp(float x, float y, long time);
+    public static native void OnTapUpAfterMove(float x, float y, long time);
+    public static native void OnTapMove(float x, float y, long time);
+    
+    public static native void OnFling(float velocityX, float velocityY, long time);
+    public static native void OnScroll(float distanceX, float distanceY, long time);
+    
+    public static native void OnKeyPress(int keyCode);
+    
+    
+    public static void CallDestroy()
+    {
+    	mView.queueEvent(new JniDestroyRunnable());
+    }
+    
+    
+    
+    
+    public static void ProcessKeyDown(int keyCode, KeyEvent event)
+	{
+		int ascii_keycode = keyCode;
+			
+		if (keyCode == KeyEvent.KEYCODE_DEL)
+		{
+			ascii_keycode = 8; //Hack - getUnicodeChar does not recognize backspace
+		}
+		else
+		{
+			ascii_keycode = event.getUnicodeChar();
+		}
+		
+		OnKeyPress(ascii_keycode);
+	
+	}
+    
+    static boolean IsScrolling = false;
+    static float PrevMovePosX = 0;
+    static float PrevMovePosY = 0; 
+    static boolean EnableFlingGesture = false;
+    
+    public static void ProcessTouchEvent(MotionEvent event)
+	{
+    	
+    	if (EnableFlingGesture)
+    	{
+    		if (customGestureDetector.onTouchEvent(event))
+    		{
+    			return;
+    		}
+    	}
+		
+		
+		if (event.getAction() == MotionEvent.ACTION_MOVE)
+		{
+			float x = event.getX();
+			float y = (float) mView.getHeight() - event.getY();
+			
+			float oldX = PrevMovePosX;
+			float oldY = (float) mView.getHeight() - PrevMovePosY;
+			
+		
+			float shiftX = x - oldX;
+			float shiftY = y - oldY;
+			
+			if (Math.abs(shiftX) > 0.001f || Math.abs(shiftY) > 0.001f)
+			{
+				OnScroll(-shiftX, -shiftY, event.getEventTime());
+			}
+			
+			PrevMovePosX = event.getX();
+			PrevMovePosY = event.getY();
+			
+			IsScrolling = true;
+			
+		}
+		
+
+
+		if (event.getAction() == MotionEvent.ACTION_UP)
+		{
+			
+			
+			float x = event.getX();
+			float y = (float) mView.getHeight() - event.getY();
+
+			if (IsScrolling)
+			{
+				IsScrolling = false;
+				OnTapUpAfterMove(x, y, event.getEventTime());
+			}
+			else
+			{
+				OnTapUp(x, y, event.getEventTime());
+			}
+
+		}
+		
+		if (event.getAction() == MotionEvent.ACTION_DOWN)
+		{
+			float x = event.getX();
+			float y = (float) mView.getHeight() - event.getY();
+			
+			PrevMovePosX = event.getX();
+			PrevMovePosY = event.getY();
+		
+			OnTapDown(x, y, event.getEventTime());
+
+		}
+	}
+    
+}

SalmonEngineAndroid/app/src/main/java/fishrungames/salmonengineandroid/GLViewAncestor.java

@@ -0,0 +1,289 @@
+package fishrungames.salmonengineandroid;
+
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+/*
+ This is a OpenGL View template. Do not change this code - derive your own class instead!!
+ */
+
+public class GLViewAncestor extends GLSurfaceView
+{
+	private static String TAG = "GL2JNIView";
+	private static final boolean DEBUG = false;
+
+	public GLViewAncestor(Context context)
+	{
+		super(context);
+	}
+
+	public void init(boolean translucent, int depth, int stencil)
+	{
+
+		/*
+		 * By default, GLSurfaceView() creates a RGB_565 opaque surface. If we
+		 * want a translucent one, we should change the surface's format here,
+		 * using PixelFormat.TRANSLUCENT for GL Surfaces is interpreted as any
+		 * 32-bit surface with alpha by SurfaceFlinger.
+		 */
+		if (translucent)
+		{
+			this.getHolder().setFormat(PixelFormat.TRANSLUCENT);
+		}
+
+		/*
+		 * Setup the context factory for 2.0 rendering. See ContextFactory class
+		 * definition below
+		 */
+		setEGLContextFactory(new ContextFactory());
+
+		/*
+		 * We need to choose an EGLConfig that matches the format of our surface
+		 * exactly. This is going to be done in our custom config chooser. See
+		 * ConfigChooser class definition below.
+		 */
+		setEGLConfigChooser(translucent ? new ConfigChooser(8, 8, 8, 8, depth,
+				stencil) : new ConfigChooser(5, 6, 5, 0, depth, stencil));
+		
+	}
+
+	private static class ContextFactory implements
+			GLSurfaceView.EGLContextFactory
+	{
+		private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+
+		@Override
+		public EGLContext createContext(EGL10 egl, EGLDisplay display,
+				EGLConfig eglConfig)
+		{
+			Log.w(TAG, "creating OpenGL ES 2.0 context");
+			checkEglError("Before eglCreateContext", egl);
+			int[] attrib_list =
+				{ EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
+			EGLContext context = egl.eglCreateContext(display, eglConfig,
+					EGL10.EGL_NO_CONTEXT, attrib_list);
+			checkEglError("After eglCreateContext", egl);
+			return context;
+		}
+
+		@Override
+		public void destroyContext(EGL10 egl, EGLDisplay display,
+				EGLContext context)
+		{
+			egl.eglDestroyContext(display, context);
+		}
+	}
+
+	private static void checkEglError(String prompt, EGL10 egl)
+	{
+		int error;
+		while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS)
+		{
+			Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
+		}
+	}
+
+	private static class ConfigChooser implements
+			GLSurfaceView.EGLConfigChooser
+	{
+
+		public ConfigChooser(int r, int g, int b, int a, int depth, int stencil)
+		{
+			mRedSize = r;
+			mGreenSize = g;
+			mBlueSize = b;
+			mAlphaSize = a;
+			mDepthSize = depth;
+			mStencilSize = stencil;
+		}
+
+		/*
+		 * This EGL config specification is used to specify 2.0 rendering. We
+		 * use a minimum size of 4 bits for red/green/blue, but will perform
+		 * actual matching in chooseConfig() below.
+		 */
+		private static int EGL_OPENGL_ES2_BIT = 4;
+		private static int[] s_configAttribs2 =
+			{ EGL10.EGL_RED_SIZE, 4, EGL10.EGL_GREEN_SIZE, 4,
+					EGL10.EGL_BLUE_SIZE, 4, EGL10.EGL_RENDERABLE_TYPE,
+					EGL_OPENGL_ES2_BIT, EGL10.EGL_NONE };
+
+		@Override
+		public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display)
+		{
+
+			/*
+			 * Get the number of minimally matching EGL configurations
+			 */
+			int[] num_config = new int[1];
+			egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
+
+			int numConfigs = num_config[0];
+
+			if (numConfigs <= 0)
+			{
+				throw new IllegalArgumentException(
+						"No configs match configSpec");
+			}
+
+			/*
+			 * Allocate then read the array of minimally matching EGL configs
+			 */
+			EGLConfig[] configs = new EGLConfig[numConfigs];
+			egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs,
+					num_config);
+
+			if (DEBUG)
+			{
+				printConfigs(egl, display, configs);
+			}
+			/*
+			 * Now return the "best" one
+			 */
+			return chooseConfig(egl, display, configs);
+		}
+
+		public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
+				EGLConfig[] configs)
+		{
+			for (EGLConfig config : configs)
+			{
+				int d = findConfigAttrib(egl, display, config,
+						EGL10.EGL_DEPTH_SIZE, 0);
+				int s = findConfigAttrib(egl, display, config,
+						EGL10.EGL_STENCIL_SIZE, 0);
+
+				// We need at least mDepthSize and mStencilSize bits
+				if (d < mDepthSize || s < mStencilSize)
+					continue;
+
+				// We want an *exact* match for red/green/blue/alpha
+				int r = findConfigAttrib(egl, display, config,
+						EGL10.EGL_RED_SIZE, 0);
+				int g = findConfigAttrib(egl, display, config,
+						EGL10.EGL_GREEN_SIZE, 0);
+				int b = findConfigAttrib(egl, display, config,
+						EGL10.EGL_BLUE_SIZE, 0);
+				int a = findConfigAttrib(egl, display, config,
+						EGL10.EGL_ALPHA_SIZE, 0);
+
+				if (r == mRedSize && g == mGreenSize && b == mBlueSize
+						&& a == mAlphaSize)
+					return config;
+			}
+			return null;
+		}
+
+		private int findConfigAttrib(EGL10 egl, EGLDisplay display,
+				EGLConfig config, int attribute, int defaultValue)
+		{
+
+			if (egl.eglGetConfigAttrib(display, config, attribute, mValue))
+			{
+				return mValue[0];
+			}
+			return defaultValue;
+		}
+
+		private void printConfigs(EGL10 egl, EGLDisplay display,
+				EGLConfig[] configs)
+		{
+			int numConfigs = configs.length;
+			Log.w(TAG, String.format("%d configurations", numConfigs));
+			for (int i = 0; i < numConfigs; i++)
+			{
+				Log.w(TAG, String.format("Configuration %d:\n", i));
+				printConfig(egl, display, configs[i]);
+			}
+		}
+
+		private void printConfig(EGL10 egl, EGLDisplay display, EGLConfig config)
+		{
+			int[] attributes =
+				{
+						EGL10.EGL_BUFFER_SIZE,
+						EGL10.EGL_ALPHA_SIZE,
+						EGL10.EGL_BLUE_SIZE,
+						EGL10.EGL_GREEN_SIZE,
+						EGL10.EGL_RED_SIZE,
+						EGL10.EGL_DEPTH_SIZE,
+						EGL10.EGL_STENCIL_SIZE,
+						EGL10.EGL_CONFIG_CAVEAT,
+						EGL10.EGL_CONFIG_ID,
+						EGL10.EGL_LEVEL,
+						EGL10.EGL_MAX_PBUFFER_HEIGHT,
+						EGL10.EGL_MAX_PBUFFER_PIXELS,
+						EGL10.EGL_MAX_PBUFFER_WIDTH,
+						EGL10.EGL_NATIVE_RENDERABLE,
+						EGL10.EGL_NATIVE_VISUAL_ID,
+						EGL10.EGL_NATIVE_VISUAL_TYPE,
+						0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
+						EGL10.EGL_SAMPLES,
+						EGL10.EGL_SAMPLE_BUFFERS,
+						EGL10.EGL_SURFACE_TYPE,
+						EGL10.EGL_TRANSPARENT_TYPE,
+						EGL10.EGL_TRANSPARENT_RED_VALUE,
+						EGL10.EGL_TRANSPARENT_GREEN_VALUE,
+						EGL10.EGL_TRANSPARENT_BLUE_VALUE,
+						0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
+						0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
+						0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
+						0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
+						EGL10.EGL_LUMINANCE_SIZE, EGL10.EGL_ALPHA_MASK_SIZE,
+						EGL10.EGL_COLOR_BUFFER_TYPE, EGL10.EGL_RENDERABLE_TYPE,
+						0x3042 // EGL10.EGL_CONFORMANT
+				};
+			String[] names =
+				{ "EGL_BUFFER_SIZE", "EGL_ALPHA_SIZE", "EGL_BLUE_SIZE",
+						"EGL_GREEN_SIZE", "EGL_RED_SIZE", "EGL_DEPTH_SIZE",
+						"EGL_STENCIL_SIZE", "EGL_CONFIG_CAVEAT",
+						"EGL_CONFIG_ID", "EGL_LEVEL", "EGL_MAX_PBUFFER_HEIGHT",
+						"EGL_MAX_PBUFFER_PIXELS", "EGL_MAX_PBUFFER_WIDTH",
+						"EGL_NATIVE_RENDERABLE", "EGL_NATIVE_VISUAL_ID",
+						"EGL_NATIVE_VISUAL_TYPE", "EGL_PRESERVED_RESOURCES",
+						"EGL_SAMPLES", "EGL_SAMPLE_BUFFERS",
+						"EGL_SURFACE_TYPE", "EGL_TRANSPARENT_TYPE",
+						"EGL_TRANSPARENT_RED_VALUE",
+						"EGL_TRANSPARENT_GREEN_VALUE",
+						"EGL_TRANSPARENT_BLUE_VALUE",
+						"EGL_BIND_TO_TEXTURE_RGB", "EGL_BIND_TO_TEXTURE_RGBA",
+						"EGL_MIN_SWAP_INTERVAL", "EGL_MAX_SWAP_INTERVAL",
+						"EGL_LUMINANCE_SIZE", "EGL_ALPHA_MASK_SIZE",
+						"EGL_COLOR_BUFFER_TYPE", "EGL_RENDERABLE_TYPE",
+						"EGL_CONFORMANT" };
+			int[] value = new int[1];
+			for (int i = 0; i < attributes.length; i++)
+			{
+				int attribute = attributes[i];
+				String name = names[i];
+				if (egl.eglGetConfigAttrib(display, config, attribute, value))
+				{
+					Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
+				} else
+				{
+					// Log.w(TAG, String.format("  %s: failed\n", name));
+					while (egl.eglGetError() != EGL10.EGL_SUCCESS)
+						;
+				}
+			}
+		}
+
+		// Subclasses can adjust these values:
+		protected int mRedSize;
+		protected int mGreenSize;
+		protected int mBlueSize;
+		protected int mAlphaSize;
+		protected int mDepthSize;
+		protected int mStencilSize;
+		private int[] mValue = new int[1];
+	}
+
+}

SalmonEngineAndroid/app/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>

SalmonEngineAndroid/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">SalmonEngineAndroid</string>
+</resources>

SalmonEngineAndroid/app/src/main/res/values/styles.xml

@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+</resources>

SalmonEngineAndroid/app/src/test/java/fishrungames/salmonengineandroid/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package fishrungames.salmonengineandroid;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

SalmonEngineAndroid/build.gradle

@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.2'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

SalmonEngineAndroid/gradle.properties

@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

SalmonEngineAndroid/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

SalmonEngineAndroid/gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

SalmonEngineAndroid/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

SalmonEngineAndroid/settings.gradle

@@ -0,0 +1 @@
+include ':app'

Templates/HalibutUniversalTemplate/.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding=".svn/" kind="src" path="src"/>
-	<classpathentry excluding=".svn/" kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="C:/Workplace/Projects/Android/EngineWrapper/jar/EngineWrapper.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Templates/HalibutUniversalTemplate/.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>EngineWrapper</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Templates/HalibutUniversalTemplate/AndroidManifest.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="1" android:versionName="1.0.0" package="fishrungames.halibutjnitemplate">
-    <application
-            android:icon="@drawable/ic_menu_template" android:label="Halibut Jni Template">
-        <activity android:name="fishrungames.halibutjnitemplate.MainActivity"
-        		android:screenOrientation="landscape"
-                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            	android:launchMode="singleTask"
-            	android:configChanges="orientation|keyboardHidden"
-            	android:noHistory="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-sdk android:minSdkVersion="8"/>
-</manifest>

Templates/HalibutUniversalTemplate/assets/droid_sans14_font_charmap.txt

@@ -1,95 +0,0 @@
-32 0.00976562 0.0195312 0 0.0546875 0 0 0.0078125
-49 0.0195312 0.0195312 0.00390625 0.015625 0.0078125 0.0390625 0.015625
-50 0.0371094 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
-51 0.0605469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-52 0.0820312 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
-53 0.105469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-54 0.126953 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-55 0.148438 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-56 0.169922 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-57 0.191406 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-48 0.212891 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-97 0.234375 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719
-98 0.253906 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
-99 0.275391 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719
-100 0.294922 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
-101 0.316406 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
-102 0.337891 0.0195312 0 0.0117188 0.00976562 0.0429688 0.0078125
-103 0.357422 0.0195312 0.00195312 0.0234375 0.0136719 0.0429688 0.0136719
-104 0.380859 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
-105 0.402344 0.0195312 0 0.0117188 0.00585938 0.0429688 0.0078125
-106 0.417969 0.0195312 -0.00195312 0.0117188 0.0078125 0.0546875 0.0078125
-107 0.435547 0.0195312 0.00195312 0.0117188 0.0136719 0.0429688 0.0136719
-108 0.458984 0.0195312 0.00195312 0.0117188 0.00390625 0.0429688 0.0078125
-109 0.472656 0.0195312 0.00195312 0.0234375 0.0214844 0.03125 0.0253906
-110 0.503906 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
-111 0.525391 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
-112 0.546875 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625
-113 0.568359 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625
-114 0.589844 0.0195312 0.00195312 0.0234375 0.0078125 0.03125 0.00976562
-115 0.607422 0.0195312 0 0.0234375 0.0117188 0.03125 0.0136719
-116 0.628906 0.0195312 0 0.015625 0.00976562 0.0390625 0.00976562
-117 0.648438 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
-118 0.669922 0.0195312 -0.00195312 0.0234375 0.0175781 0.03125 0.0136719
-119 0.697266 0.0195312 -0.00195312 0.0234375 0.0234375 0.03125 0.0195312
-120 0.730469 0.0195312 0 0.0234375 0.0136719 0.03125 0.0136719
-121 0.753906 0.0195312 -0.00195312 0.0234375 0.0175781 0.0429688 0.0136719
-122 0.78125 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.0136719
-65 0.802734 0.0195312 -0.00195312 0.015625 0.0214844 0.0390625 0.0175781
-66 0.833984 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.0175781
-67 0.857422 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
-68 0.880859 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312
-69 0.90625 0.0195312 0.00195312 0.015625 0.00976562 0.0390625 0.0136719
-70 0.925781 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.0136719
-71 0.947266 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312
-72 0.00976562 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
-73 0.0351562 0.09375 0 0.015625 0.00976562 0.0390625 0.00976562
-74 0.0546875 0.09375 -0.00390625 0.015625 0.00976562 0.0507812 0.00585938
-75 0.0742188 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.015625
-76 0.0996094 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.0136719
-77 0.121094 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375
-78 0.150391 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
-79 0.175781 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0214844
-80 0.203125 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-81 0.224609 0.09375 0.00195312 0.015625 0.0175781 0.046875 0.0214844
-82 0.251953 0.09375 0.00195312 0.015625 0.0136719 0.0390625 0.015625
-83 0.275391 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719
-84 0.298828 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719
-85 0.322266 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
-86 0.347656 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625
-87 0.376953 0.09375 -0.00195312 0.015625 0.0292969 0.0390625 0.0253906
-88 0.416016 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625
-89 0.445312 0.09375 -0.00195312 0.015625 0.0175781 0.0390625 0.0136719
-90 0.472656 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625
-46 0.494141 0.09375 0.00195312 0.046875 0.00390625 0.0078125 0.0078125
-44 0.507812 0.09375 0.00195312 0.046875 0.00390625 0.0117188 0.0078125
-58 0.521484 0.09375 0.00195312 0.0234375 0.00390625 0.03125 0.0078125
-59 0.535156 0.09375 0.00195312 0.0234375 0.00390625 0.0351562 0.0078125
-64 0.548828 0.09375 0.00195312 0.015625 0.0195312 0.0429688 0.0234375
-35 0.578125 0.09375 0 0.015625 0.015625 0.0390625 0.0175781
-36 0.603516 0.09375 0.00195312 0.0117188 0.0117188 0.046875 0.015625
-37 0.625 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375
-94 0.654297 0.09375 0 0.015625 0.0136719 0.0234375 0.0136719
-38 0.677734 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0195312
-42 0.705078 0.09375 0 0.0117188 0.0136719 0.0234375 0.015625
-33 0.728516 0.09375 0.00195312 0.015625 0.00390625 0.0390625 0.0078125
-63 0.742188 0.09375 0 0.015625 0.00976562 0.0390625 0.0117188
-40 0.761719 0.09375 0.00195312 0.015625 0.0078125 0.046875 0.0078125
-41 0.779297 0.09375 0 0.015625 0.00585938 0.046875 0.0078125
-91 0.794922 0.09375 0.00195312 0.015625 0.00585938 0.046875 0.0078125
-93 0.810547 0.09375 0 0.015625 0.00585938 0.046875 0.0078125
-123 0.826172 0.09375 0 0.015625 0.00976562 0.046875 0.00976562
-125 0.845703 0.09375 0 0.015625 0.00976562 0.046875 0.00976562
-60 0.865234 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625
-62 0.886719 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625
-95 0.908203 0.09375 0 0.0585938 0.0117188 0.00390625 0.0117188
-45 0.929688 0.09375 0.00195312 0.0390625 0.00585938 0.0078125 0.00976562
-43 0.945312 0.09375 0 0.0234375 0.0136719 0.0273438 0.015625
-61 0.00976562 0.167969 0 0.0273438 0.0136719 0.0195312 0.015625
-124 0.0332031 0.167969 0.00585938 0.0117188 0.00390625 0.0546875 0.0136719
-92 0.046875 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562
-47 0.0703125 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562
-126 0.09375 0.167969 0.00195312 0.03125 0.0117188 0.0117188 0.015625
-96 0.115234 0.167969 0.00585938 0.0117188 0.00585938 0.0078125 0.015625
-34 0.130859 0.167969 0.00195312 0.015625 0.00976562 0.015625 0.0117188
-39 0.150391 0.167969 0.00195312 0.015625 0.00390625 0.015625 0.00585938

Templates/HalibutUniversalTemplate/assets/shader_fragment.txt

@@ -1,14 +0,0 @@
-precision mediump float;
-uniform sampler2D Texture;
-uniform float Transparency;
-varying vec2 texCoord;
-
-void main() 
-{
-	vec4 color = texture2D(Texture,texCoord).rgba;
-
-	gl_FragColor = vec4(color.rgb, color.a * Transparency);
-	
-	
-	
-}

Templates/HalibutUniversalTemplate/assets/shader_vertex.txt

@@ -1,12 +0,0 @@
-attribute vec3 vPosition;
-attribute vec2 vTexCoord;
-varying vec2 texCoord;
-
-uniform mat4 ProjectionMatrix;
-
-void main() 
-{
-	//480x320
-	gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0);
-	texCoord = vTexCoord;
-}

Templates/HalibutUniversalTemplate/default.properties

@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8

Templates/HalibutUniversalTemplate/iOS/AppDelegate.h

@@ -1,19 +0,0 @@
-//
-//  AppDelegate.h
-//  doublehitballs
-//
-//  Created by vvv ооо on 13.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class ViewController;
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) ViewController *viewController;
-
-@end

Templates/HalibutUniversalTemplate/iOS/AppDelegate.m

@@ -1,59 +0,0 @@
-//
-//  AppDelegate.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 13.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import "AppDelegate.h"
-
-#import "ViewController.h"
-
-@implementation AppDelegate
-
-@synthesize window = _window;
-@synthesize viewController = _viewController;
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    // Override point for customization after application launch.
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPhone" bundle:nil];
-    } else {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPad" bundle:nil];
-    }
-    self.window.rootViewController = self.viewController;
-    [self.window makeKeyAndVisible];
-    return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end

Templates/HalibutUniversalTemplate/iOS/CustomGLKView.m

@@ -1,68 +0,0 @@
-//
-//  CustomGLKView.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 15.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import "CustomGLKView.h"
-#import "ios_api.h"
-
-bool touchMoved = false;
-CGPoint prev_loc;
-
-
-@implementation CustomGLKView
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        // Initialization code
-    }
-    return self;
-}
-
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    prev_loc = location;
-    
-    touchMoved = false;
-    
-    AppOnTapDown(location.x, self.bounds.size.height - location.y);
-
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    CGPoint prevLocation = [[[touches allObjects] objectAtIndex:0] previousLocationInView:self];
-    
-    if (abs(prev_loc.x - location.x) > 10 || abs(prev_loc.y - location.y) > 10)
-    {
-        touchMoved = true;
-    }
-    
-    AppOnScroll(prevLocation.x - location.x, prevLocation.y - location.y);
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    if (!touchMoved)
-    {
-        AppOnTapUp(location.x, self.bounds.size.height - location.y);
-    }
-}
-
-
-
-
-@end

Templates/HalibutUniversalTemplate/iOS/ViewController.m

@@ -1,106 +0,0 @@
-//
-//  ViewController.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 13.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import "ViewController.h"
-#import "ios_api.h"
-
-@interface ViewController () {
-}
-
-@property (strong, nonatomic) EAGLContext *context;
-@property (strong, nonatomic) GLKBaseEffect *effect;
-
-- (void)setupGL;
-- (void)tearDownGL;
-
-@end
-
-@implementation ViewController
-
-@synthesize context = _context;
-@synthesize effect = _effect;
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-
-    if (!self.context) {
-        NSLog(@"Failed to create ES context");
-    }
-    
-    GLKView *view = (GLKView *)self.view;
-    view.context = self.context;
-    view.drawableDepthFormat = GLKViewDrawableDepthFormat24;
-    
-    
-    [self setupGL];
-}
-
-- (void)viewDidUnload
-{    
-    [super viewDidUnload];
-    
-    [self tearDownGL];
-    
-    if ([EAGLContext currentContext] == self.context) {
-        [EAGLContext setCurrentContext:nil];
-    }
-	self.context = nil;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Release any cached data, images, etc. that aren't in use.
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    /*
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown);
-    } else {
-        return YES;
-    }*/
-    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
-}
-
-- (void)setupGL
-{
-    [EAGLContext setCurrentContext:self.context];
-    
-    AppInit();
-    }
-
-- (void)tearDownGL
-{
-    [EAGLContext setCurrentContext:self.context];
-    
-    AppDeinit();
-    
-}
-
-#pragma mark - GLKView and GLKViewController delegate methods
-
-- (void)update
-{
-    
-    AppUpdate(self.timeSinceLastUpdate * 1000);
-}
-
-- (void)glkView:(GLKView *)view drawInRect:(CGRect)rect
-{
-    
-    AppDraw();
-    
-}
-
-
-@end

Templates/HalibutUniversalTemplate/iOS/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

Templates/HalibutUniversalTemplate/iOS/en.lproj/ViewController_iPad.xib

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
-					<int key="IBUIStatusBarStyle">2</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.CustomClassName">CustomGLKView</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">3</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">CustomGLKView</string>
-					<string key="superclassName">GLKView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CustomGLKView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ViewController</string>
-					<string key="superclassName">GLKViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
-	</data>
-</archive>

Templates/HalibutUniversalTemplate/iOS/en.lproj/ViewController_iPhone.xib

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="841351856">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="371349661">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="184854543">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="184854543"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="841351856"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="371349661"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="184854543"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="2.CustomClassName">CustomGLKView</string>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">4</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
-	</data>
-</archive>

Templates/HalibutUniversalTemplate/iOS/halibuttemplate.xcodeproj/project.pbxproj

@@ -1,504 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		4C49B2BE15B0991B003512CD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C49B2BD15B0991B003512CD /* UIKit.framework */; };
-		4C49B2C015B0991B003512CD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C49B2BF15B0991B003512CD /* Foundation.framework */; };
-		4C49B2C215B0991B003512CD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C49B2C115B0991B003512CD /* CoreGraphics.framework */; };
-		4C49B2C415B0991B003512CD /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C49B2C315B0991B003512CD /* GLKit.framework */; };
-		4C49B2C615B0991B003512CD /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C49B2C515B0991B003512CD /* OpenGLES.framework */; };
-		4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2CA15B0991B003512CD /* InfoPlist.strings */; };
-		4C49B2CE15B0991B003512CD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2CD15B0991B003512CD /* main.m */; };
-		4C49B2D215B0991B003512CD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2D115B0991B003512CD /* AppDelegate.m */; };
-		4C49B2D915B0991B003512CD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2D815B0991B003512CD /* ViewController.m */; };
-		4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */; };
-		4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */; };
-		4C4C807515BA8F460037C6CE /* libsquirrel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C807415BA8F460037C6CE /* libsquirrel.a */; };
-		4C4C807715BA8F5B0037C6CE /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C807615BA8F5B0037C6CE /* libz.a */; };
-		4C6EB44515C3CFD300316CB6 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C6EB44415C3CFD300316CB6 /* libpng.a */; };
-		4C74848615C5AD6E0056EC44 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C74848315C5AD6E0056EC44 /* Icon.png */; };
-		4C74848715C5AD6E0056EC44 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 4C74848415C5AD6E0056EC44 /* iTunesArtwork */; };
-		4C74848815C5AD6E0056EC44 /* Splash-landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C74848515C5AD6E0056EC44 /* Splash-landscape.png */; };
-		4C74849815C5AF7C0056EC44 /* main_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C74849615C5AF7C0056EC44 /* main_code.cpp */; };
-		4C7484AC15C5BF580056EC44 /* libHalibut Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7484AB15C5BDD70056EC44 /* libHalibut Engine.a */; };
-		4C77831315BABD68003D5142 /* libvorbis-tremor-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */; };
-		4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831415BABD8B003D5142 /* AudioToolbox.framework */; };
-		4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; };
-		4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; };
-		4C7C584B15C31E6500CAE4F4 /* libboost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7C584A15C31E6500CAE4F4 /* libboost.a */; };
-		4CCC0ECC15B30D6B005432FB /* CustomGLKView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */; };
-		4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		4C7484AA15C5BDD70056EC44 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 4C7484A315C5BDD60056EC44 /* Halibut Engine.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 4C8CE90215B0A0F400078175;
-			remoteInfo = "Halibut Engine";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		4C49B2B915B0991B003512CD /* halibuttemplate.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = halibuttemplate.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		4C49B2BD15B0991B003512CD /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		4C49B2BF15B0991B003512CD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		4C49B2C115B0991B003512CD /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		4C49B2C315B0991B003512CD /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
-		4C49B2C515B0991B003512CD /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		4C49B2C915B0991B003512CD /* template-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "template-Info.plist"; sourceTree = "<group>"; };
-		4C49B2CB15B0991B003512CD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		4C49B2CD15B0991B003512CD /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		4C49B2CF15B0991B003512CD /* template-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "template-Prefix.pch"; sourceTree = "<group>"; };
-		4C49B2D015B0991B003512CD /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		4C49B2D115B0991B003512CD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		4C49B2D715B0991B003512CD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		4C49B2D815B0991B003512CD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		4C49B2DB15B0991B003512CD /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPhone.xib; sourceTree = "<group>"; };
-		4C49B2DE15B0991B003512CD /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPad.xib; sourceTree = "<group>"; };
-		4C4C807415BA8F460037C6CE /* libsquirrel.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquirrel.a; path = "../../libs/SQUIRREL2_1_1_sqplus/build-ios/ios-device/libsquirrel.a"; sourceTree = "<group>"; };
-		4C4C807615BA8F5B0037C6CE /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libz.a; path = "../../libs/zlib-1.2.7/build-ios/ios-device/libz.a"; sourceTree = "<group>"; };
-		4C6EB44415C3CFD300316CB6 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../libs/libpng-1.5.12/build-ios/ios-simulator/libpng.a"; sourceTree = "<group>"; };
-		4C74848315C5AD6E0056EC44 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = res/Icon.png; sourceTree = "<group>"; };
-		4C74848415C5AD6E0056EC44 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; name = iTunesArtwork; path = res/iTunesArtwork; sourceTree = "<group>"; };
-		4C74848515C5AD6E0056EC44 /* Splash-landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Splash-landscape.png"; path = "res/Splash-landscape.png"; sourceTree = "<group>"; };
-		4C74849615C5AF7C0056EC44 /* main_code.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_code.cpp; path = ../jni/main_code.cpp; sourceTree = "<group>"; };
-		4C74849715C5AF7C0056EC44 /* main_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main_code.h; path = ../jni/main_code.h; sourceTree = "<group>"; };
-		4C7484A315C5BDD60056EC44 /* Halibut Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Halibut Engine.xcodeproj"; path = "../../Engine/iOS/Halibut Engine/Halibut Engine.xcodeproj"; sourceTree = "<group>"; };
-		4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libvorbis-tremor-ios.a"; path = "../../libs/vorbis-tremor-ios/build-ios/ios-device/libvorbis-tremor-ios.a"; sourceTree = "<group>"; };
-		4C77831415BABD8B003D5142 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		4C77831515BABD8B003D5142 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
-		4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = "<group>"; };
-		4C7C584A15C31E6500CAE4F4 /* libboost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost.a; path = "../../libs/boost_1_47_0/build-ios/ios-simulator/libboost.a"; sourceTree = "<group>"; };
-		4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomGLKView.h; sourceTree = "<group>"; };
-		4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomGLKView.m; sourceTree = "<group>"; };
-		4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = "<group>"; };
-		4CE6A9D115B2F979006A3965 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../assets; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		4C49B2B615B0991B003512CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4C7484AC15C5BF580056EC44 /* libHalibut Engine.a in Frameworks */,
-				4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */,
-				4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */,
-				4C49B2BE15B0991B003512CD /* UIKit.framework in Frameworks */,
-				4C49B2C015B0991B003512CD /* Foundation.framework in Frameworks */,
-				4C49B2C215B0991B003512CD /* CoreGraphics.framework in Frameworks */,
-				4C49B2C415B0991B003512CD /* GLKit.framework in Frameworks */,
-				4C49B2C615B0991B003512CD /* OpenGLES.framework in Frameworks */,
-				4C4C807515BA8F460037C6CE /* libsquirrel.a in Frameworks */,
-				4C4C807715BA8F5B0037C6CE /* libz.a in Frameworks */,
-				4C77831315BABD68003D5142 /* libvorbis-tremor-ios.a in Frameworks */,
-				4C7C584B15C31E6500CAE4F4 /* libboost.a in Frameworks */,
-				4C6EB44515C3CFD300316CB6 /* libpng.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		4C49B2AE15B0991B003512CD = {
-			isa = PBXGroup;
-			children = (
-				4C7484A315C5BDD60056EC44 /* Halibut Engine.xcodeproj */,
-				4C7B819515C40F770024D61A /* Libs */,
-				4CC1FC3415B200130025C6F7 /* Resources */,
-				4C49B2C715B0991B003512CD /* Sources */,
-				4C49B2BC15B0991B003512CD /* Frameworks */,
-				4C49B2BA15B0991B003512CD /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		4C49B2BA15B0991B003512CD /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				4C49B2B915B0991B003512CD /* halibuttemplate.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		4C49B2BC15B0991B003512CD /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				4C77831415BABD8B003D5142 /* AudioToolbox.framework */,
-				4C77831515BABD8B003D5142 /* OpenAL.framework */,
-				4C49B2BD15B0991B003512CD /* UIKit.framework */,
-				4C49B2BF15B0991B003512CD /* Foundation.framework */,
-				4C49B2C115B0991B003512CD /* CoreGraphics.framework */,
-				4C49B2C315B0991B003512CD /* GLKit.framework */,
-				4C49B2C515B0991B003512CD /* OpenGLES.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		4C49B2C715B0991B003512CD /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				4CE6A9E315B2F9A4006A3965 /* Game */,
-				4CCC0ECD15B310FB005432FB /* ios_api.h */,
-				4C7AD44B15B1D77700A599F6 /* ios_api.cpp */,
-				4C49B2D015B0991B003512CD /* AppDelegate.h */,
-				4C49B2D115B0991B003512CD /* AppDelegate.m */,
-				4C49B2D715B0991B003512CD /* ViewController.h */,
-				4C49B2D815B0991B003512CD /* ViewController.m */,
-				4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */,
-				4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */,
-				4C49B2C815B0991B003512CD /* Supporting Files */,
-				4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */,
-				4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */,
-			);
-			name = Sources;
-			sourceTree = "<group>";
-		};
-		4C49B2C815B0991B003512CD /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				4C49B2C915B0991B003512CD /* template-Info.plist */,
-				4C49B2CA15B0991B003512CD /* InfoPlist.strings */,
-				4C49B2CD15B0991B003512CD /* main.m */,
-				4C49B2CF15B0991B003512CD /* template-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		4C7484A415C5BDD60056EC44 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				4C7484AB15C5BDD70056EC44 /* libHalibut Engine.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		4C7B819515C40F770024D61A /* Libs */ = {
-			isa = PBXGroup;
-			children = (
-				4C6EB44415C3CFD300316CB6 /* libpng.a */,
-				4C7C584A15C31E6500CAE4F4 /* libboost.a */,
-				4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */,
-				4C4C807615BA8F5B0037C6CE /* libz.a */,
-				4C4C807415BA8F460037C6CE /* libsquirrel.a */,
-			);
-			name = Libs;
-			sourceTree = "<group>";
-		};
-		4CC1FC3415B200130025C6F7 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				4C74848315C5AD6E0056EC44 /* Icon.png */,
-				4C74848415C5AD6E0056EC44 /* iTunesArtwork */,
-				4C74848515C5AD6E0056EC44 /* Splash-landscape.png */,
-				4CE6A9D115B2F979006A3965 /* assets */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		4CE6A9E315B2F9A4006A3965 /* Game */ = {
-			isa = PBXGroup;
-			children = (
-				4C74849615C5AF7C0056EC44 /* main_code.cpp */,
-				4C74849715C5AF7C0056EC44 /* main_code.h */,
-			);
-			name = Game;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		4C49B2B815B0991B003512CD /* halibuttemplate */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 4C49B2E215B0991B003512CD /* Build configuration list for PBXNativeTarget "halibuttemplate" */;
-			buildPhases = (
-				4C49B2B515B0991B003512CD /* Sources */,
-				4C49B2B615B0991B003512CD /* Frameworks */,
-				4C49B2B715B0991B003512CD /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = halibuttemplate;
-			productName = doublehitballs;
-			productReference = 4C49B2B915B0991B003512CD /* halibuttemplate.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		4C49B2B015B0991B003512CD /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0430;
-			};
-			buildConfigurationList = 4C49B2B315B0991B003512CD /* Build configuration list for PBXProject "halibuttemplate" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 4C49B2AE15B0991B003512CD;
-			productRefGroup = 4C49B2BA15B0991B003512CD /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 4C7484A415C5BDD60056EC44 /* Products */;
-					ProjectRef = 4C7484A315C5BDD60056EC44 /* Halibut Engine.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				4C49B2B815B0991B003512CD /* halibuttemplate */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		4C7484AB15C5BDD70056EC44 /* libHalibut Engine.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libHalibut Engine.a";
-			remoteRef = 4C7484AA15C5BDD70056EC44 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		4C49B2B715B0991B003512CD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */,
-				4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */,
-				4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */,
-				4CE6A9D215B2F979006A3965 /* assets in Resources */,
-				4C74848615C5AD6E0056EC44 /* Icon.png in Resources */,
-				4C74848715C5AD6E0056EC44 /* iTunesArtwork in Resources */,
-				4C74848815C5AD6E0056EC44 /* Splash-landscape.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		4C49B2B515B0991B003512CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4C49B2CE15B0991B003512CD /* main.m in Sources */,
-				4C49B2D215B0991B003512CD /* AppDelegate.m in Sources */,
-				4C49B2D915B0991B003512CD /* ViewController.m in Sources */,
-				4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */,
-				4CCC0ECC15B30D6B005432FB /* CustomGLKView.m in Sources */,
-				4C74849815C5AF7C0056EC44 /* main_code.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		4C49B2CA15B0991B003512CD /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				4C49B2CB15B0991B003512CD /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				4C49B2DB15B0991B003512CD /* en */,
-			);
-			name = ViewController_iPhone.xib;
-			sourceTree = "<group>";
-		};
-		4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				4C49B2DE15B0991B003512CD /* en */,
-			);
-			name = ViewController_iPad.xib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		4C49B2E015B0991B003512CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		4C49B2E115B0991B003512CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
-				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		4C49B2E315B0991B003512CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "template-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_IOS,
-					TARGET_HALIBUT,
-					DEBUG,
-					"$(inherited)",
-					BOOST_NO_CXX11_NUMERIC_LIMITS,
-				);
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
-				"GCC_THUMB_SUPPORT[arch=armv6]" = "";
-				HEADER_SEARCH_PATHS = (
-					"$(SalmonEnginePath)",
-					"$(LibsPath)/lpng1510",
-					"$(LibsPath)/sqplus/sqplus",
-					"$(LibsPath)/sqplus/include",
-					"$(LibsPath)/boost_1_52_0",
-					../jni,
-					"$(LibsPath)/vorbis-tremor-ios/vorbis",
-				);
-				INFOPLIST_FILE = "template-Info.plist";
-				LIBRARY_SEARCH_PATHS = "";
-				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"$(LibsPath)/lpng1510/build-ios/ios-device",
-					"$(LibsPath)/boost_1_52_0/build-ios/ios-device",
-					"$(LibsPath)/sqplus/build-ios/ios-device",
-					"$(LibsPath)/zlib-1.2.6/build-ios/ios-device",
-					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"$(LibsPath)/lpng1510/build-ios/ios-simulator",
-					"$(LibsPath)/sqplus/build-ios/ios-simulator",
-					"$(LibsPath)/boost_1_52_0/build-ios/ios-simulator",
-					"$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator",
-					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SYMROOT = build;
-				TARGETED_DEVICE_FAMILY = 1;
-				USER_HEADER_SEARCH_PATHS = "";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		4C49B2E415B0991B003512CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "template-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_IOS,
-					TARGET_HALIBUT,
-					BOOST_NO_CXX11_NUMERIC_LIMITS,
-				);
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				"GCC_THUMB_SUPPORT[arch=armv6]" = "";
-				HEADER_SEARCH_PATHS = (
-					"$(SalmonEnginePath)",
-					"$(LibsPath)/lpng1510",
-					"$(LibsPath)/sqplus/sqplus",
-					"$(LibsPath)/sqplus/include",
-					"$(LibsPath)/boost_1_52_0",
-					../jni,
-					"$(LibsPath)/vorbis-tremor-ios/vorbis",
-				);
-				INFOPLIST_FILE = "template-Info.plist";
-				LIBRARY_SEARCH_PATHS = "";
-				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"$(LibsPath)/lpng1510/build-ios/ios-device",
-					"$(LibsPath)/boost_1_52_0/build-ios/ios-device",
-					"$(LibsPath)/sqplus/build-ios/ios-device",
-					"$(LibsPath)/zlib-1.2.6/build-ios/ios-device",
-					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"$(LibsPath)/lpng1510/build-ios/ios-simulator",
-					"$(LibsPath)/sqplus/build-ios/ios-simulator",
-					"$(LibsPath)/boost_1_52_0/build-ios/ios-simulator",
-					"$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator",
-					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = 1;
-				USER_HEADER_SEARCH_PATHS = "";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		4C49B2B315B0991B003512CD /* Build configuration list for PBXProject "halibuttemplate" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				4C49B2E015B0991B003512CD /* Debug */,
-				4C49B2E115B0991B003512CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		4C49B2E215B0991B003512CD /* Build configuration list for PBXNativeTarget "halibuttemplate" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				4C49B2E315B0991B003512CD /* Debug */,
-				4C49B2E415B0991B003512CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 4C49B2B015B0991B003512CD /* Project object */;
-}

Templates/HalibutUniversalTemplate/iOS/ios_api.cpp

@@ -1,47 +0,0 @@
-#include "include/Engine.h"
-#include "main_code.h"
-
-TMyApplication App;
-
-
-extern "C" void AppInit()
-{
-    
-    App.OuterInit(480, 320, 480, 320);
-}
-
-
-extern "C" void AppDeinit()
-{
-    App.OuterDeinit();
-
-}
-
-
-extern "C" void AppUpdate(int dt)
-{
-    App.OuterUpdate(dt);
-}
-
-
-
-extern "C" void AppDraw()
-{
-    App.OuterDraw();
-}
-
-extern "C" void AppOnTapDown(int posx, int posy)
-{
-    //App.OuterOnTapDown(vec2(posx, posy));
-}
-
-extern "C" void AppOnTapUp(int posx, int posy)
-{
-    //App.OuterOnTapUp(vec2(posx, posy));
-}
-
-extern "C" void AppOnScroll(int shiftx, int shifty)
-{
-    //App.OuterOnMove(vec2(shiftx, shifty));
-}
-

Templates/HalibutUniversalTemplate/iOS/ios_api.h

@@ -1,15 +0,0 @@
-//
-//  Header.h
-//  doublehitballs
-//
-//  Created by vvv ооо on 15.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-void AppInit();
-void AppDeinit();
-void AppUpdate(int dt);
-void AppDraw();
-void AppOnTapDown(int posx, int posy);
-void AppOnTapUp(int posx, int posy);
-void AppOnScroll(int shiftx, int shifty);

Templates/HalibutUniversalTemplate/iOS/main.m

@@ -1,18 +0,0 @@
-//
-//  main.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 13.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char *argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}

Templates/HalibutUniversalTemplate/iOS/template-Info.plist

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Halibut Universal Template</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>Icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>fishrungames.template</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchImageFile</key>
-	<string>Splash-landscape.png</string>
-	<key>UIPrerenderedIcon</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

Templates/HalibutUniversalTemplate/iOS/template-Prefix.pch

@@ -1,14 +0,0 @@
-//
-// Prefix header for all source files of the 'doublehitballs' target in the 'doublehitballs' project
-//
-
-#import <Availability.h>
-
-#ifndef __IPHONE_5_0
-#warning "This project uses features only available in iOS SDK 5.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif

Templates/HalibutUniversalTemplate/jni/Android.mk

@@ -1,72 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-LPATH := $(call my-dir)
-
-ENGINE_PATH = $(SalmonEnginePathCygwin)
-
-BOOST_PATH = $(LibsPathCygwin)/boost_1_47_0
-
-OGG_PATH = $(LibsPathCygwin)/libogg-1.3.0
-
-VORBIS_PATH = $(LibsPathCygwin)/libvorbis-1.3.2
-
-SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
-
-LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
-
-ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
-
-#====== ENGINE AND LIBS =====================
-
-include $(ENGINE_PATH)/Android_Engine.mk
-
-#================= THE GAME =======================
-
-
-LOCAL_PATH:= $(LPATH)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -DTARGET_ANDROID -DTARGET_HALIBUT -DNOSOUND -std=gnu++11 --std=c++11
-LOCAL_STATIC_LIBRARIES := boost
-LOCAL_STATIC_LIBRARIES += squirrel
-LOCAL_STATIC_LIBRARIES += png_lib
-LOCAL_STATIC_LIBRARIES += zip
-LOCAL_SHARED_LIBRARIES := HalibutEngine
-LOCAL_C_INCLUDES := $(ENGINE_PATH)
-LOCAL_C_INCLUDES += $(BOOST_PATH)
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
-LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
-LOCAL_C_INCLUDES += $(OGG_PATH)/include
-LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/include
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
-LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
-LOCAL_C_INCLUDES += $(LIBPNG_PATH)
-LOCAL_C_INCLUDES += $(ZIP_PATH)
-LOCAL_MODULE    := AndroidJniTemplate
-LOCAL_SRC_FILES := main_code.cpp
-LOCAL_SRC_FILES += android_api.cpp
-
-LOCAL_LDLIBS    := -lGLESv2
-LOCAL_LDLIBS    += -llog -Wl,-s
-
-include $(BUILD_SHARED_LIBRARY)

Templates/HalibutUniversalTemplate/jni/Application.mk

@@ -1,3 +0,0 @@
-APP_STL  := gnustl_static
-APP_CPPFLAGS += -fexceptions
-APP_CPPFLAGS += -frtti

Templates/HalibutUniversalTemplate/jni/android_api.cpp

@@ -1,116 +0,0 @@
-#include "android_api.h"
-
-#include "main_code.h"
-
-boost::shared_ptr<TMyApplication> App(new TMyApplication);
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height)
-{
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDeinit(); //Clean up what is left at previous launch (if applicable)
-	}
-	
-	App->OuterInit(width, height, 480.f, 320.f);
-
-	App->Inited = true;
-	}
-	catch (...)
-	{
-		throw;
-	}
-}	
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj)
-{
-
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt)
-{
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDraw();
-		App->OuterUpdate(dt);
-	}
-	
-	}
-	catch (...)
-	{
-		throw;
-	}
-
-}
-
-JNIEXPORT int JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj)
-{   
-
-    if (App->IsInited())
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj)
-{
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDeinit();
-	}
-	
-	}
-	catch (...)
-	{
-		throw;
-	}
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-
-	try
-	{
-			
-	}
-	catch (...)
-	{
-		throw;
-	}
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time)
-{
-    
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time)
-{
-    
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode)
-{
-	App->OnKeyPress(keyCode);
-}

Templates/HalibutUniversalTemplate/jni/android_api.h

@@ -1,32 +0,0 @@
-#ifndef ANDROID_API_H_INCLUDED
-#define ANDROID_API_H_INCLUDED
-
-#include <jni.h>
-#include <android/log.h>
-
-#include <GLES/gl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include "boost/shared_ptr.hpp"
-
-#include "main_code.h"
-
-using namespace SE;
-
-extern "C" {
-    JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height);
-    JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj);
-    JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj);
-	JNIEXPORT int JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_halibutjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode);
-};
-
-
-#endif

Templates/HalibutUniversalTemplate/jni/main_code.cpp

@@ -1,60 +0,0 @@
-#include "main_code.h"
-
-#ifdef TARGET_ANDROID
-#include "android_api.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#include "include/Engine.h"
-
-#include "main_code.h"
-
-void TMyApplication::InnerInit()
-{
-#ifdef TARGET_ANDROID
-    ResourceManager->PathToResources = "";
-#endif
-#ifdef TARGET_IOS
-    ResourceManager->PathToResources = "assets/";
-#endif
-#ifdef TARGET_WIN32
-#ifdef NDEBUG
-	ResourceManager->PathToResources = "resources/";
-#else
-	ResourceManager->PathToResources = "../../../assets/";
-#endif
-#endif
-    
-	ResourceManager->ShaderManager.AddShader("DefaultShader", "shader_vertex.txt", "shader_fragment.txt");
-	Renderer->PushShader("DefaultShader");
-
-
-	ResourceManager->TexList.AddTexture(CONST_CONSOLE_TEX_NAME);
-
-	ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.bmp32", "droid_sans14_font_charmap.txt");
-	ResourceManager->FontManager.PushFont("droid_sans14");
-
-	//Inited = true; Must be set in android_api.cpp manually
-}
-
-void TMyApplication::InnerDeinit()
-{
-	Inited = false;
-}
-
-
-void TMyApplication::InnerDraw()
-{
-	//Console->Draw();
-}
-
-
-void TMyApplication::InnerUpdate(cardinal dt)
-{
-
-}
-

Templates/HalibutUniversalTemplate/jni/main_code.h

@@ -1,47 +0,0 @@
-#ifndef GL_CODE_H_INCLUDED
-#define GL_CODE_H_INCLUDED
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "boost/shared_ptr.hpp"
-#include "boost/thread/thread.hpp"
-#include "boost/asio.hpp"
-#include "boost/signal.hpp"
-#include "boost/assign.hpp"
-#include "boost/bind.hpp"
-
-#include "include/Engine.h"
-
-using namespace SE;
-
-
-class TMyApplication : public TApplication
-{
-protected:
-	
-public:
-	bool Inited;
-
-	TMyApplication() : TApplication(), Inited(false) { }
-
-	
-     virtual void InnerInit();
-    
-     virtual void InnerDeinit();
-	
-	 virtual void InnerDraw();
-	
-	 virtual void InnerUpdate(cardinal dt);
-	 
-	bool IsInited() { return Inited; }
-
-};
-
-
-static void checkGlError(const std::string& op);
-
-
-#endif

Templates/HalibutUniversalTemplate/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">AndroidJniTemplate</string>
-</resources>

Templates/HalibutUniversalTemplate/src/fishrungames/halibutjnitemplate/GLView.java

@@ -1,72 +0,0 @@
-package fishrungames.halibutjnitemplate;
-
-
-import java.util.Calendar;
-
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import fishrungames.engine.GLViewAncestor;
-
-class GLView extends GLViewAncestor
-{
-	static long lastTimeStamp;
-	static boolean gameIsInited = false;
-
-	public GLView(Context context)
-	{
-		//Change this method? Don't forget to change method below!
-		super(context);
-		init(false, 0, 0);
-	}
-
-	public GLView(Context context, boolean translucent, int depth, int stencil)
-	{
-		//Change this method? Don't forget to change method above!
-		super(context);
-		init(translucent, depth, stencil);
-	}
-
-	public void init(boolean translucent, int depth, int stencil)
-	{
-		super.init(translucent, depth, stencil);
-		setRenderer(new Renderer());
-		Calendar c = Calendar.getInstance();
-		lastTimeStamp = c.getTimeInMillis();
-		gameIsInited = true;
-	}
-
-	private static class Renderer implements GLSurfaceView.Renderer
-	{
-		public void onDrawFrame(GL10 gl)
-		{
-			if (gameIsInited)
-			{
-				Calendar c = Calendar.getInstance();
-
-				long currentTimeStamp = c.getTimeInMillis();
-		
-				JniWrapper.Update(currentTimeStamp - lastTimeStamp);
-			
-				lastTimeStamp = currentTimeStamp;
-			}
-		}
-
-		public void onSurfaceChanged(GL10 gl, int width, int height)
-		{
-			
-
-		    //JniWrapper.Destroy();
-			
-			JniWrapper.Init(width,height);
-		}
-
-		public void onSurfaceCreated(GL10 gl, EGLConfig config)
-		{
-			//Do nothing.
-		}
-	}
-}

Templates/HalibutUniversalTemplate/src/fishrungames/halibutjnitemplate/JniWrapper.java

@@ -1,23 +0,0 @@
-package fishrungames.halibutjnitemplate;
-
-public class JniWrapper
-{
-    static {
-        System.loadLibrary("AndroidJniTemplate");
-    }
-
-   
-    public static native void Init(int width, int height);
-    public static native void Update(long dt);
-    public static native void StopSounds();
-    public static native void Destroy();
-    public static native int IsInited();
-    public static native void OnTapDown(float x, float y, long time);
-    public static native void OnTapUp(float x, float y, long time);
-    public static native void OnTapMove(float x, float y, long time);
-    
-    public static native void OnFling(float velocityX, float velocityY, long time);
-    public static native void OnScroll(float distanceX, float distanceY, long time);
-    
-    public static native void OnKeyPress(int keyCode);
-}

Templates/HalibutUniversalTemplate/src/fishrungames/halibutjnitemplate/MainActivity.java

@@ -1,191 +0,0 @@
-package fishrungames.halibutjnitemplate;
-
-import fishrungames.engine.FileWrapper;
-
-//Deprecated
-//import fishrungames.androidjnitemplate.R;
-
-import android.app.Activity;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-
-import android.view.GestureDetector;
-import android.view.KeyEvent;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.MotionEvent;
-/*
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.LinearLayout;
-*/
-
-//Deprecated
-//import java.lang.reflect.Field;
-
-
-public class MainActivity extends Activity
-{
-
-	GLView mView;
-	
-	boolean IsScrolling = false;
-
-	private GestureDetector gestureDetector;
-	
-	@Override
-	protected void onCreate(Bundle icicle)
-	{
-		
-		super.onCreate(icicle);
-
-		gestureDetector = new GestureDetector(new MyGestureListener());
-
-		FileWrapper.LoadHalibutEngineLibrary();
-
-		FileWrapper.SetActivityInstance(this);
-		FileWrapper.SetupEnviroment();
-
-		/*
-		 * Deprecated
-		try
-		{
-			for (Field f : R.raw.class.getFields())
-			{
-				FileWrapper.AddToFileMap(f.getName(), f.getInt(null));
-			}
-
-		
-		} catch (IllegalArgumentException e)
-		{
-			FileWrapper.ConsoleOut("IllegalArgumentException\n");
-			onStop();
-		} catch (IllegalAccessException e)
-		{
-			FileWrapper.ConsoleOut("IllegalAccessException\n");
-			onStop();
-		}*/
-		
-		String apkFilePath = null;
-		ApplicationInfo appInfo = null;
-		PackageManager packMgmr = this.getPackageManager();
-		try {
-		        appInfo = packMgmr.getApplicationInfo("fishrungames.halibutjnitemplate", 0);
-		    } catch (NameNotFoundException e) {
-		 
-		 e.printStackTrace();
-		throw new RuntimeException("Unable to locate assets, aborting...");
-		    }
-		apkFilePath = appInfo.sourceDir;
-		
-		FileWrapper.SetupApkFilePath(apkFilePath);
-		
-		mView = new GLView(getApplication());
-		
-		setContentView(mView);
-		
-	}
-
-	@Override
-	protected void onPause()
-	{
-		JniWrapper.Destroy();
-		super.onPause();
-		mView.onPause();
-	}
-
-	@Override
-	protected void onResume()
-	{
-		//Don't write anything here!
-		super.onResume();
-		mView.onResume();
-	}
-
-	@Override
-	protected void onStop()
-	{
-		//Don't write anything here!
-		super.onStop();
-	}
-	
-	public boolean onKeyDown(int keyCode, KeyEvent event)
-	{
-		int ascii_keycode = keyCode;
-			
-		if (keyCode == KeyEvent.KEYCODE_DEL)
-		{
-			ascii_keycode = 8; //Hack - getUnicodeChar does not recognize backspace
-		}
-		else
-		{
-			ascii_keycode = event.getUnicodeChar();
-		}
-		
-        JniWrapper.OnKeyPress(ascii_keycode);
-		return super.onKeyDown(keyCode, event);
-	}
-
-	public boolean onTouchEvent(MotionEvent event)
-	{
-		if (gestureDetector.onTouchEvent(event))
-		{
-			return true;
-		}
-
-		if (event.getAction() == MotionEvent.ACTION_UP)
-		{
-			float x = event.getX();
-			float y = (float) mView.getHeight() - event.getY();
-
-			if (IsScrolling)
-			{
-				IsScrolling = false;
-			}
-
-			JniWrapper.OnTapUp(x, y, event.getEventTime());
-
-		}
-		return true;
-	}
-
-	class MyGestureListener extends SimpleOnGestureListener
-	{
-		
-		@Override
-		public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
-				float velocityY)
-		{
-			JniWrapper.OnFling(velocityX, velocityY, e2.getEventTime());
-			return true;
-		}
-
-		public boolean onScroll(MotionEvent e1, MotionEvent e2,
-				float distanceX, float distanceY)
-		{
-			
-			JniWrapper.OnScroll(distanceX, distanceY, e2.getEventTime());
-			IsScrolling = true;
-			return true;
-		}
-
-		public boolean onDown(MotionEvent event)
-		{
-
-			float x = event.getX();
-			float y = (float) mView.getHeight() - event.getY();
-		
-			JniWrapper.OnTapDown(x, y, event.getEventTime());
-			
-			return true;
-		}
-
-	}
-
-}

Templates/HalibutUniversalTemplate/windows/HalibutTemplate/Template.sln

@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template", "Template\Template.vcxproj", "{0080A3E1-DFBF-4557-B198-E6D5D7724393}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4E274B19-10B2-4987-96C5-76F35A149502} = {4E274B19-10B2-4987-96C5-76F35A149502}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Halibut Engine", "..\..\..\..\Engine\Halibut Engine\Halibut Engine.vcxproj", "{4E274B19-10B2-4987-96C5-76F35A149502}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_nosound|Win32 = Debug_nosound|Win32
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.Build.0 = Debug|Win32
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.Build.0 = Debug|Win32
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.ActiveCfg = Release|Win32
-		{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.Build.0 = Release|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Debug|Win32.Build.0 = Debug|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Release|Win32.ActiveCfg = Release|Win32
-		{4E274B19-10B2-4987-96C5-76F35A149502}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Templates/HalibutUniversalTemplate/windows/HalibutTemplate/Template/main.cpp

@@ -1,16 +0,0 @@
-#include "main.h"
-
-#include "main_code.h"
-
-int APIENTRY WinMain(HINSTANCE hCurrentInst, HINSTANCE hPreviousInst,
-	LPSTR lpszCmdLine, int nCmdShow)
-{
-	//Create application
-	TMyApplication Application;
-
-	Application.Width = 480;
-	Application.Height = 320;
-
-	//Start application
-	return MainLoop(Application);
-}

Templates/HalibutUniversalTemplate/windows/HalibutTemplate/Template/main.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "Engine.h"

Templates/SalmonUniversalTemplate/assets/droid_sans14_font_charmap.txt

@@ -1,95 +1,96 @@
-32 0.00976562 0.0195312 0 0.0546875 0 0 0.0078125
+32 0.0195312 0.0390625 0 0.109375 0 0 0.015625
-49 0.0195312 0.0195312 0.00390625 0.015625 0.0078125 0.0390625 0.015625
+49 0.0390625 0.0390625 0.0078125 0.03125 0.015625 0.078125 0.03125
-50 0.0371094 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
+50 0.0742188 0.0390625 0.00390625 0.03125 0.0273438 0.078125 0.03125
-51 0.0605469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+51 0.121094 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-52 0.0820312 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
+52 0.164062 0.0390625 0.00390625 0.03125 0.0273438 0.078125 0.03125
-53 0.105469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+53 0.210938 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-54 0.126953 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+54 0.253906 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-55 0.148438 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+55 0.296875 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-56 0.169922 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+56 0.339844 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-57 0.191406 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+57 0.382812 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-48 0.212891 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+48 0.425781 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125
-97 0.234375 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719
+97 0.46875 0.0390625 0.00390625 0.046875 0.0195312 0.0625 0.0273438
-98 0.253906 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
+98 0.507812 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125
-99 0.275391 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719
+99 0.550781 0.0390625 0.00390625 0.046875 0.0195312 0.0625 0.0273438
-100 0.294922 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
+100 0.589844 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125
-101 0.316406 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
+101 0.632812 0.0390625 0.00390625 0.046875 0.0234375 0.0625 0.03125
-102 0.337891 0.0195312 0 0.0117188 0.00976562 0.0429688 0.0078125
+102 0.675781 0.0390625 0 0.0234375 0.0195312 0.0859375 0.015625
-103 0.357422 0.0195312 0.00195312 0.0234375 0.0136719 0.0429688 0.0136719
+103 0.714844 0.0390625 0.00390625 0.046875 0.0273438 0.0859375 0.0273438
-104 0.380859 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625
+104 0.761719 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125
-105 0.402344 0.0195312 0 0.0117188 0.00585938 0.0429688 0.0078125
+105 0.804688 0.0390625 0 0.0234375 0.0117188 0.0859375 0.015625
-106 0.417969 0.0195312 -0.00195312 0.0117188 0.0078125 0.0546875 0.0078125
+106 0.835938 0.0390625 -0.00390625 0.0234375 0.015625 0.109375 0.015625
-107 0.435547 0.0195312 0.00195312 0.0117188 0.0136719 0.0429688 0.0136719
+107 0.871094 0.0390625 0.00390625 0.0234375 0.0273438 0.0859375 0.0273438
-108 0.458984 0.0195312 0.00195312 0.0117188 0.00390625 0.0429688 0.0078125
+108 0.917969 0.0390625 0.00390625 0.0234375 0.0078125 0.0859375 0.015625
-109 0.472656 0.0195312 0.00195312 0.0234375 0.0214844 0.03125 0.0253906
+109 0.945312 0.0390625 0.00390625 0.046875 0.0429688 0.0625 0.0507812
-110 0.503906 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
+110 0.0195312 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125
-111 0.525391 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
+111 0.0625 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125
-112 0.546875 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625
+112 0.105469 0.1875 0.00390625 0.046875 0.0234375 0.0859375 0.03125
-113 0.568359 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625
+113 0.148438 0.1875 0.00390625 0.046875 0.0234375 0.0859375 0.03125
-114 0.589844 0.0195312 0.00195312 0.0234375 0.0078125 0.03125 0.00976562
+114 0.191406 0.1875 0.00390625 0.046875 0.015625 0.0625 0.0195312
-115 0.607422 0.0195312 0 0.0234375 0.0117188 0.03125 0.0136719
+115 0.226562 0.1875 0 0.046875 0.0234375 0.0625 0.0273438
-116 0.628906 0.0195312 0 0.015625 0.00976562 0.0390625 0.00976562
+116 0.269531 0.1875 0 0.03125 0.0195312 0.078125 0.0195312
-117 0.648438 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625
+117 0.308594 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125
-118 0.669922 0.0195312 -0.00195312 0.0234375 0.0175781 0.03125 0.0136719
+118 0.351562 0.1875 -0.00390625 0.046875 0.0351562 0.0625 0.0273438
-119 0.697266 0.0195312 -0.00195312 0.0234375 0.0234375 0.03125 0.0195312
+119 0.40625 0.1875 -0.00390625 0.046875 0.046875 0.0625 0.0390625
-120 0.730469 0.0195312 0 0.0234375 0.0136719 0.03125 0.0136719
+120 0.472656 0.1875 0 0.046875 0.0273438 0.0625 0.0273438
-121 0.753906 0.0195312 -0.00195312 0.0234375 0.0175781 0.0429688 0.0136719
+121 0.519531 0.1875 -0.00390625 0.046875 0.0351562 0.0859375 0.0273438
-122 0.78125 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.0136719
+122 0.574219 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.0273438
-65 0.802734 0.0195312 -0.00195312 0.015625 0.0214844 0.0390625 0.0175781
+65 0.617188 0.1875 -0.00390625 0.03125 0.0429688 0.078125 0.0351562
-66 0.833984 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.0175781
+66 0.679688 0.1875 0.00390625 0.03125 0.0273438 0.078125 0.0351562
-67 0.857422 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625
+67 0.726562 0.1875 0.00390625 0.03125 0.0273438 0.078125 0.03125
-68 0.880859 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312
+68 0.773438 0.1875 0.00390625 0.03125 0.03125 0.078125 0.0390625
-69 0.90625 0.0195312 0.00195312 0.015625 0.00976562 0.0390625 0.0136719
+69 0.824219 0.1875 0.00390625 0.03125 0.0195312 0.078125 0.0273438
-70 0.925781 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.0136719
+70 0.863281 0.1875 0.00390625 0.03125 0.0234375 0.078125 0.0273438
-71 0.947266 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312
+71 0.90625 0.1875 0.00390625 0.03125 0.03125 0.078125 0.0390625
-72 0.00976562 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
+72 0.0195312 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625
-73 0.0351562 0.09375 0 0.015625 0.00976562 0.0390625 0.00976562
+73 0.0703125 0.335938 0 0.03125 0.0195312 0.078125 0.0195312
-74 0.0546875 0.09375 -0.00390625 0.015625 0.00976562 0.0507812 0.00585938
+74 0.109375 0.335938 -0.0078125 0.03125 0.0195312 0.101562 0.0117188
-75 0.0742188 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.015625
+75 0.148438 0.335938 0.00390625 0.03125 0.03125 0.078125 0.03125
-76 0.0996094 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.0136719
+76 0.199219 0.335938 0.00390625 0.03125 0.0234375 0.078125 0.0273438
-77 0.121094 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375
+77 0.242188 0.335938 0.00390625 0.03125 0.0390625 0.078125 0.046875
-78 0.150391 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
+78 0.300781 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625
-79 0.175781 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0214844
+79 0.351562 0.335938 0.00390625 0.03125 0.0351562 0.078125 0.0429688
-80 0.203125 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+80 0.40625 0.335938 0.00390625 0.03125 0.0234375 0.078125 0.03125
-81 0.224609 0.09375 0.00195312 0.015625 0.0175781 0.046875 0.0214844
+81 0.449219 0.335938 0.00390625 0.03125 0.0351562 0.09375 0.0429688
-82 0.251953 0.09375 0.00195312 0.015625 0.0136719 0.0390625 0.015625
+82 0.503906 0.335938 0.00390625 0.03125 0.0273438 0.078125 0.03125
-83 0.275391 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719
+83 0.550781 0.335938 0 0.03125 0.0273438 0.078125 0.0273438
-84 0.298828 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719
+84 0.597656 0.335938 0 0.03125 0.0273438 0.078125 0.0273438
-85 0.322266 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312
+85 0.644531 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625
-86 0.347656 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625
+86 0.695312 0.335938 -0.00390625 0.03125 0.0390625 0.078125 0.03125
-87 0.376953 0.09375 -0.00195312 0.015625 0.0292969 0.0390625 0.0253906
+87 0.753906 0.335938 -0.00390625 0.03125 0.0585938 0.078125 0.0507812
-88 0.416016 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625
+88 0.832031 0.335938 -0.00390625 0.03125 0.0390625 0.078125 0.03125
-89 0.445312 0.09375 -0.00195312 0.015625 0.0175781 0.0390625 0.0136719
+89 0.890625 0.335938 -0.00390625 0.03125 0.0351562 0.078125 0.0273438
-90 0.472656 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625
+90 0.0195312 0.484375 0.00390625 0.03125 0.0234375 0.078125 0.03125
-46 0.494141 0.09375 0.00195312 0.046875 0.00390625 0.0078125 0.0078125
+46 0.0625 0.484375 0.00390625 0.09375 0.0078125 0.015625 0.015625
-44 0.507812 0.09375 0.00195312 0.046875 0.00390625 0.0117188 0.0078125
+44 0.0898438 0.484375 0.00390625 0.09375 0.0078125 0.0234375 0.015625
-58 0.521484 0.09375 0.00195312 0.0234375 0.00390625 0.03125 0.0078125
+58 0.117188 0.484375 0.00390625 0.046875 0.0078125 0.0625 0.015625
-59 0.535156 0.09375 0.00195312 0.0234375 0.00390625 0.0351562 0.0078125
+59 0.144531 0.484375 0.00390625 0.046875 0.0078125 0.0703125 0.015625
-64 0.548828 0.09375 0.00195312 0.015625 0.0195312 0.0429688 0.0234375
+64 0.171875 0.484375 0.00390625 0.03125 0.0390625 0.0859375 0.046875
-35 0.578125 0.09375 0 0.015625 0.015625 0.0390625 0.0175781
+35 0.230469 0.484375 0 0.03125 0.03125 0.078125 0.0351562
-36 0.603516 0.09375 0.00195312 0.0117188 0.0117188 0.046875 0.015625
+36 0.28125 0.484375 0.00390625 0.0234375 0.0234375 0.09375 0.03125
-37 0.625 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375
+37 0.324219 0.484375 0.00390625 0.03125 0.0390625 0.078125 0.046875
-94 0.654297 0.09375 0 0.015625 0.0136719 0.0234375 0.0136719
+94 0.382812 0.484375 0 0.03125 0.0273438 0.046875 0.0273438
-38 0.677734 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0195312
+38 0.429688 0.484375 0.00390625 0.03125 0.0351562 0.078125 0.0390625
-42 0.705078 0.09375 0 0.0117188 0.0136719 0.0234375 0.015625
+42 0.484375 0.484375 0 0.0234375 0.0273438 0.046875 0.03125
-33 0.728516 0.09375 0.00195312 0.015625 0.00390625 0.0390625 0.0078125
+33 0.53125 0.484375 0.00390625 0.03125 0.0078125 0.078125 0.015625
-63 0.742188 0.09375 0 0.015625 0.00976562 0.0390625 0.0117188
+63 0.558594 0.484375 0 0.03125 0.0195312 0.078125 0.0234375
-40 0.761719 0.09375 0.00195312 0.015625 0.0078125 0.046875 0.0078125
+40 0.597656 0.484375 0.00390625 0.03125 0.015625 0.09375 0.015625
-41 0.779297 0.09375 0 0.015625 0.00585938 0.046875 0.0078125
+41 0.632812 0.484375 0 0.03125 0.0117188 0.09375 0.015625
-91 0.794922 0.09375 0.00195312 0.015625 0.00585938 0.046875 0.0078125
+91 0.664062 0.484375 0.00390625 0.03125 0.0117188 0.09375 0.015625
-93 0.810547 0.09375 0 0.015625 0.00585938 0.046875 0.0078125
+93 0.695312 0.484375 0 0.03125 0.0117188 0.09375 0.015625
-123 0.826172 0.09375 0 0.015625 0.00976562 0.046875 0.00976562
+123 0.726562 0.484375 0 0.03125 0.0195312 0.09375 0.0195312
-125 0.845703 0.09375 0 0.015625 0.00976562 0.046875 0.00976562
+125 0.765625 0.484375 0 0.03125 0.0195312 0.09375 0.0195312
-60 0.865234 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625
+60 0.804688 0.484375 0.00390625 0.046875 0.0234375 0.0546875 0.03125
-62 0.886719 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625
+62 0.847656 0.484375 0.00390625 0.046875 0.0234375 0.0546875 0.03125
-95 0.908203 0.09375 0 0.0585938 0.0117188 0.00390625 0.0117188
+95 0.890625 0.484375 0 0.117188 0.0234375 0.0078125 0.0234375
-45 0.929688 0.09375 0.00195312 0.0390625 0.00585938 0.0078125 0.00976562
+45 0.933594 0.484375 0.00390625 0.078125 0.0117188 0.015625 0.0195312
-43 0.945312 0.09375 0 0.0234375 0.0136719 0.0273438 0.015625
+43 0.0195312 0.632812 0 0.046875 0.0273438 0.0546875 0.03125
-61 0.00976562 0.167969 0 0.0273438 0.0136719 0.0195312 0.015625
+61 0.0664062 0.632812 0 0.0546875 0.0273438 0.0390625 0.03125
-124 0.0332031 0.167969 0.00585938 0.0117188 0.00390625 0.0546875 0.0136719
+124 0.113281 0.632812 0.0117188 0.0234375 0.0078125 0.109375 0.0273438
-92 0.046875 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562
+92 0.140625 0.632812 -0.00390625 0.03125 0.0273438 0.078125 0.0195312
-47 0.0703125 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562
+47 0.1875 0.632812 -0.00390625 0.03125 0.0273438 0.078125 0.0195312
-126 0.09375 0.167969 0.00195312 0.03125 0.0117188 0.0117188 0.015625
+126 0.234375 0.632812 0.00390625 0.0625 0.0234375 0.0234375 0.03125
-96 0.115234 0.167969 0.00585938 0.0117188 0.00585938 0.0078125 0.015625
+96 0.277344 0.632812 0.0117188 0.0234375 0.0117188 0.015625 0.03125
-34 0.130859 0.167969 0.00195312 0.015625 0.00976562 0.015625 0.0117188
+34 0.308594 0.632812 0.00390625 0.03125 0.0195312 0.03125 0.0234375
-39 0.150391 0.167969 0.00195312 0.015625 0.00390625 0.015625 0.00585938
+39 0.347656 0.632812 0.00390625 0.03125 0.0078125 0.03125 0.0117188
+169 0.375 0.632812 0.00390625 0.03125 0.0390625 0.078125 0.046875

Templates/SalmonUniversalTemplate/assets/model.xml

@@ -1,6 +1,6 @@
 <Model>
 <SamplerMap>
-<Sampler name="Texture" value="bt_box_yellow.bmp"/>
+<Sampler name="Texture" value="bt_box_yellow.jpg"/>
 </SamplerMap>
 <Vec3ArrMap>
 <Vec3Arr name="vPosition">

Templates/SalmonUniversalTemplate/iOS/CustomGLKView.h

@@ -6,12 +6,8 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-#import <GLKit/GLKit.h>
+#import "include/Utils/IosApi/ObjC/GLKViewTemplate.h"
 
-@interface CustomGLKView : GLKView
+@interface CustomGLKView : GLKViewTemplate
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
 
 @end

Templates/SalmonUniversalTemplate/iOS/CustomGLKView.m

@@ -1,68 +0,0 @@
-//
-//  CustomGLKView.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 15.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import "CustomGLKView.h"
-#import "ios_api.h"
-
-bool touchMoved = false;
-CGPoint prev_loc;
-
-
-@implementation CustomGLKView
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        // Initialization code
-    }
-    return self;
-}
-
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    prev_loc = location;
-    
-    touchMoved = false;
-    
-    AppOnTapDown(location.x, self.bounds.size.height - location.y);
-
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    CGPoint prevLocation = [[[touches allObjects] objectAtIndex:0] previousLocationInView:self];
-    
-    if (abs(prev_loc.x - location.x) > 10 || abs(prev_loc.y - location.y) > 10)
-    {
-        touchMoved = true;
-    }
-    
-    AppOnScroll(prevLocation.x - location.x, prevLocation.y - location.y);
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self];
-    
-    if (!touchMoved)
-    {
-        AppOnTapUp(location.x, self.bounds.size.height - location.y);
-    }
-}
-
-
-
-
-@end

Templates/SalmonUniversalTemplate/iOS/CustomGLKView.mm

@@ -0,0 +1,5 @@
+#import "CustomGLKView.h"
+
+@implementation CustomGLKView
+
+@end

Templates/SalmonUniversalTemplate/iOS/ViewController.h

@@ -6,9 +6,10 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import <GLKit/GLKit.h>
 
-@interface ViewController : GLKViewController
+#import "include/Utils/IosApi/ObjC/ViewControllerTemplate.h"
+
+@interface ViewController : ViewControllerTemplate
 
 @end
+

Templates/SalmonUniversalTemplate/iOS/ViewController.m

@@ -1,106 +0,0 @@
-//
-//  ViewController.m
-//  doublehitballs
-//
-//  Created by vvv ооо on 13.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#import "ViewController.h"
-#import "ios_api.h"
-
-@interface ViewController () {
-}
-
-@property (strong, nonatomic) EAGLContext *context;
-@property (strong, nonatomic) GLKBaseEffect *effect;
-
-- (void)setupGL;
-- (void)tearDownGL;
-
-@end
-
-@implementation ViewController
-
-@synthesize context = _context;
-@synthesize effect = _effect;
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-
-    if (!self.context) {
-        NSLog(@"Failed to create ES context");
-    }
-    
-    GLKView *view = (GLKView *)self.view;
-    view.context = self.context;
-    view.drawableDepthFormat = GLKViewDrawableDepthFormat24;
-    
-    
-    [self setupGL];
-}
-
-- (void)viewDidUnload
-{    
-    [super viewDidUnload];
-    
-    [self tearDownGL];
-    
-    if ([EAGLContext currentContext] == self.context) {
-        [EAGLContext setCurrentContext:nil];
-    }
-	self.context = nil;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Release any cached data, images, etc. that aren't in use.
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    /*
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown);
-    } else {
-        return YES;
-    }*/
-    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
-}
-
-- (void)setupGL
-{
-    [EAGLContext setCurrentContext:self.context];
-    
-    AppInit();
-    }
-
-- (void)tearDownGL
-{
-    [EAGLContext setCurrentContext:self.context];
-    
-    AppDeinit();
-    
-}
-
-#pragma mark - GLKView and GLKViewController delegate methods
-
-- (void)update
-{
-    
-    AppUpdate(self.timeSinceLastUpdate * 1000);
-}
-
-- (void)glkView:(GLKView *)view drawInRect:(CGRect)rect
-{
-    
-    AppDraw();
-    
-}
-
-
-@end

Templates/SalmonUniversalTemplate/iOS/ViewController.mm

@@ -0,0 +1,20 @@
+#import "ViewController.h"
+#import "ios_api.h"
+
+
+@implementation ViewController
+
+
+- (void) appInitCaller
+{
+    CustomAppInit();
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
+}
+
+
+
+@end

Templates/SalmonUniversalTemplate/iOS/ios_api.cpp

@@ -1,47 +1,8 @@
 #include "include/Engine.h"
 #include "main_code.h"
 
-TMyApplication App;
 
-
+void CustomAppInit()
-extern "C" void AppInit()
 {
-    
+    AppInit<TMyApplication>(480, 320);
-    App.OuterInit(480, 320, 480, 320);
 }
-
-
-extern "C" void AppDeinit()
-{
-    App.OuterDeinit();
-
-}
-
-
-extern "C" void AppUpdate(int dt)
-{
-    App.OuterUpdate(dt);
-}
-
-
-
-extern "C" void AppDraw()
-{
-    App.OuterDraw();
-}
-
-extern "C" void AppOnTapDown(int posx, int posy)
-{
-    //App.OuterOnTapDown(vec2(posx, posy));
-}
-
-extern "C" void AppOnTapUp(int posx, int posy)
-{
-    //App.OuterOnTapUp(vec2(posx, posy));
-}
-
-extern "C" void AppOnScroll(int shiftx, int shifty)
-{
-    //App.OuterOnMove(vec2(shiftx, shifty));
-}
-

Templates/SalmonUniversalTemplate/iOS/ios_api.h

@@ -1,15 +1,3 @@
-//
-//  Header.h
-//  doublehitballs
-//
-//  Created by vvv ооо on 15.07.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
 
-void AppInit();
+
-void AppDeinit();
+void CustomAppInit();
-void AppUpdate(int dt);
-void AppDraw();
-void AppOnTapDown(int posx, int posy);
-void AppOnTapUp(int posx, int posy);
-void AppOnScroll(int shiftx, int shifty);

Templates/SalmonUniversalTemplate/iOS/salmontemplate.xcodeproj/project.pbxproj

@@ -15,7 +15,7 @@
 		4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2CA15B0991B003512CD /* InfoPlist.strings */; };
 		4C49B2CE15B0991B003512CD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2CD15B0991B003512CD /* main.m */; };
 		4C49B2D215B0991B003512CD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2D115B0991B003512CD /* AppDelegate.m */; };
-		4C49B2D915B0991B003512CD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2D815B0991B003512CD /* ViewController.m */; };
+		4C49B2D915B0991B003512CD /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C49B2D815B0991B003512CD /* ViewController.mm */; };
 		4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */; };
 		4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */; };
 		4C4C807515BA8F460037C6CE /* libsquirrel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C807415BA8F460037C6CE /* libsquirrel.a */; };
@@ -28,10 +28,11 @@
 		4C77831315BABD68003D5142 /* libvorbis-tremor-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */; };
 		4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831415BABD8B003D5142 /* AudioToolbox.framework */; };
 		4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; };
+		4C7804CA1754E71100566CB0 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7804C91754E71100566CB0 /* libjpeg.a */; };
 		4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; };
 		4C7C584B15C31E6500CAE4F4 /* libboost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7C584A15C31E6500CAE4F4 /* libboost.a */; };
 		4CC971AC15C57DCE00359A2B /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; };
-		4CCC0ECC15B30D6B005432FB /* CustomGLKView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */; };
+		4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */; };
 		4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; };
 /* End PBXBuildFile section */
 
@@ -59,7 +60,7 @@
 		4C49B2D015B0991B003512CD /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		4C49B2D115B0991B003512CD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		4C49B2D715B0991B003512CD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		4C49B2D815B0991B003512CD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		4C49B2D815B0991B003512CD /* ViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ViewController.mm; sourceTree = "<group>"; };
 		4C49B2DB15B0991B003512CD /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPhone.xib; sourceTree = "<group>"; };
 		4C49B2DE15B0991B003512CD /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPad.xib; sourceTree = "<group>"; };
 		4C4C807415BA8F460037C6CE /* libsquirrel.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquirrel.a; path = "../../libs/SQUIRREL2_1_1_sqplus/build-ios/ios-device/libsquirrel.a"; sourceTree = "<group>"; };
@@ -73,11 +74,12 @@
 		4C77831215BABD68003D5142 /* libvorbis-tremor-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libvorbis-tremor-ios.a"; path = "../../libs/vorbis-tremor-ios/build-ios/ios-device/libvorbis-tremor-ios.a"; sourceTree = "<group>"; };
 		4C77831415BABD8B003D5142 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		4C77831515BABD8B003D5142 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
+		4C7804C91754E71100566CB0 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../libs/jpeg-9/build-ios/ios-device/libjpeg.a"; sourceTree = "<group>"; };
 		4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = "<group>"; };
 		4C7C584A15C31E6500CAE4F4 /* libboost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost.a; path = "../../libs/boost_1_47_0/build-ios/ios-simulator/libboost.a"; sourceTree = "<group>"; };
 		4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Salmon Engine.xcodeproj"; path = "../../Engine/iOS/Salmon Engine/Salmon Engine.xcodeproj"; sourceTree = "<group>"; };
 		4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomGLKView.h; sourceTree = "<group>"; };
-		4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomGLKView.m; sourceTree = "<group>"; };
+		4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomGLKView.mm; sourceTree = "<group>"; };
 		4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = "<group>"; };
 		4CE6A9D115B2F979006A3965 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../assets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -87,6 +89,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C7804CA1754E71100566CB0 /* libjpeg.a in Frameworks */,
 				4CC971AC15C57DCE00359A2B /* libSalmon Engine.a in Frameworks */,
 				4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */,
 				4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */,
@@ -109,6 +112,7 @@
 		4C49B2AE15B0991B003512CD = {
 			isa = PBXGroup;
 			children = (
+				4C7804C91754E71100566CB0 /* libjpeg.a */,
 				4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */,
 				4C7B819515C40F770024D61A /* Libs */,
 				4CC1FC3415B200130025C6F7 /* Resources */,
@@ -149,12 +153,12 @@
 				4C49B2D015B0991B003512CD /* AppDelegate.h */,
 				4C49B2D115B0991B003512CD /* AppDelegate.m */,
 				4C49B2D715B0991B003512CD /* ViewController.h */,
-				4C49B2D815B0991B003512CD /* ViewController.m */,
+				4C49B2D815B0991B003512CD /* ViewController.mm */,
 				4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */,
 				4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */,
 				4C49B2C815B0991B003512CD /* Supporting Files */,
 				4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */,
-				4CCC0ECB15B30D6B005432FB /* CustomGLKView.m */,
+				4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -218,8 +222,8 @@
 			buildConfigurationList = 4C49B2E215B0991B003512CD /* Build configuration list for PBXNativeTarget "salmontemplate" */;
 			buildPhases = (
 				4C49B2B515B0991B003512CD /* Sources */,
-				4C49B2B615B0991B003512CD /* Frameworks */,
 				4C49B2B715B0991B003512CD /* Resources */,
+				4C49B2B615B0991B003512CD /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -295,9 +299,9 @@
 			files = (
 				4C49B2CE15B0991B003512CD /* main.m in Sources */,
 				4C49B2D215B0991B003512CD /* AppDelegate.m in Sources */,
-				4C49B2D915B0991B003512CD /* ViewController.m in Sources */,
+				4C49B2D915B0991B003512CD /* ViewController.mm in Sources */,
 				4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */,
-				4CCC0ECC15B30D6B005432FB /* CustomGLKView.m in Sources */,
+				4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */,
 				4C74849815C5AF7C0056EC44 /* main_code.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -389,7 +393,6 @@
 				GCC_PREFIX_HEADER = "template-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					TARGET_IOS,
-					TARGET_SALMON,
 					DEBUG,
 					"$(inherited)",
 					BOOST_NO_CXX11_NUMERIC_LIMITS,
@@ -404,15 +407,21 @@
 					"$(LibsPath)/boost_1_52_0",
 					../jni,
 					"$(LibsPath)/vorbis-tremor-ios/vorbis",
+					"$(LibsPath)/jpeg-9",
+					"$(LibsPath)/jpeg-9/vc10",
 				);
 				INFOPLIST_FILE = "template-Info.plist";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../libs/jpeg-9/build-ios/ios-device\"",
+				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
 					"$(LibsPath)/lpng1510/build-ios/ios-device",
 					"$(LibsPath)/boost_1_52_0/build-ios/ios-device",
 					"$(LibsPath)/sqplus/build-ios/ios-device",
 					"$(LibsPath)/zlib-1.2.6/build-ios/ios-device",
 					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device",
+					"$(LibsPath)/jpeg-9/build-ios/ios-device",
 				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
 					"$(LibsPath)/lpng1510/build-ios/ios-simulator",
@@ -420,6 +429,7 @@
 					"$(LibsPath)/boost_1_52_0/build-ios/ios-simulator",
 					"$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator",
 					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator",
+					"$(LibsPath)/jpeg-9/build-ios/ios-simulator",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SYMROOT = build;
@@ -438,7 +448,6 @@
 				GCC_PREFIX_HEADER = "template-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					TARGET_IOS,
-					TARGET_SALMON,
 					BOOST_NO_CXX11_NUMERIC_LIMITS,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
@@ -452,15 +461,21 @@
 					"$(LibsPath)/boost_1_52_0",
 					../jni,
 					"$(LibsPath)/vorbis-tremor-ios/vorbis",
+					"$(LibsPath)/jpeg-9",
+					"$(LibsPath)/jpeg-9/vc10",
 				);
 				INFOPLIST_FILE = "template-Info.plist";
-				LIBRARY_SEARCH_PATHS = "";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../libs/jpeg-9/build-ios/ios-device\"",
+				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
 					"$(LibsPath)/lpng1510/build-ios/ios-device",
 					"$(LibsPath)/boost_1_52_0/build-ios/ios-device",
 					"$(LibsPath)/sqplus/build-ios/ios-device",
 					"$(LibsPath)/zlib-1.2.6/build-ios/ios-device",
 					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-device",
+					"$(LibsPath)/jpeg-9/build-ios/ios-device",
 				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
 					"$(LibsPath)/lpng1510/build-ios/ios-simulator",
@@ -468,6 +483,7 @@
 					"$(LibsPath)/boost_1_52_0/build-ios/ios-simulator",
 					"$(LibsPath)/zlib-1.2.6/build-ios/ios-simulator",
 					"$(LibsPath)/vorbis-tremor-ios/build-ios/ios-simulator",
+					"$(LibsPath)/jpeg-9/build-ios/ios-simulator",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

Templates/SalmonUniversalTemplate/jni/Android.mk

@@ -28,6 +28,9 @@ SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
 
 LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
 
+LIBJPEG_PATH = $(LibsPathCygwin)/jpeg-9
+
+
 ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
 
 #====== ENGINE AND LIBS =====================
@@ -41,10 +44,11 @@ LOCAL_PATH:= $(LPATH)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -DTARGET_ANDROID -DNOSOUND -DTARGET_SALMON -std=gnu++11 --std=c++11
+LOCAL_CFLAGS := -DTARGET_ANDROID -DNOSOUND -std=gnu++11 --std=c++11
 LOCAL_STATIC_LIBRARIES := boost
 LOCAL_STATIC_LIBRARIES += squirrel
 LOCAL_STATIC_LIBRARIES += png_lib
+LOCAL_STATIC_LIBRARIES += jpeg
 LOCAL_STATIC_LIBRARIES += zip
 LOCAL_SHARED_LIBRARIES := SalmonEngine
 LOCAL_SHARED_LIBRARIES += gnustl_shared
@@ -62,7 +66,10 @@ LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
 LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
 LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
 LOCAL_C_INCLUDES += $(LIBPNG_PATH)
+LOCAL_C_INCLUDES += $(LIBJPEG_PATH)
+LOCAL_C_INCLUDES += $(LIBJPEG_PATH)/vc10
 LOCAL_C_INCLUDES += $(ZIP_PATH)
+
 LOCAL_MODULE    := SalmonJniTemplate
 LOCAL_SRC_FILES := main_code.cpp
 LOCAL_SRC_FILES += android_api.cpp

Templates/SalmonUniversalTemplate/jni/android_api.cpp

@@ -1,128 +1,10 @@
 #include "android_api.h"
 
 #include "main_code.h"
-#include "boost\thread.hpp"
 
-boost::shared_ptr<TMyApplication> App(new TMyApplication);
-
-boost::mutex m;
 
 JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height)
 {
-
+	JniInitApp<TMyApplication>(width, height, 480.f, 320.f);
-	m.lock();
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDeinit(); //Clean up what is left at previous launch (if applicable)
 }
 
-	App->OuterInit(width, height, 480.f, 320.f);
-	
-	App->Inited = true;
-	}
-	catch (...)
-	{
-		throw;
-	}
-	m.unlock();
-}	
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj)
-{
-
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt)
-{
-m.lock();
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDraw();
-		App->OuterUpdate(dt);
-	}
-	
-	}
-	catch (...)
-	{
-		throw;
-	}
-	m.unlock();
-
-}
-
-JNIEXPORT int JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj)
-{   
-
-    if (App->IsInited())
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj)
-{
-m.lock();
-	try
-	{
-	if (App->IsInited())
-	{
-		App->OuterDeinit();
-		App->Inited = false;
-	}
-	
-	}
-	catch (...)
-	{
-		throw;
-	}
-	m.unlock();
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-m.lock();
-	try
-	{
-		Renderer->MoveDist(1.0f);
-	}
-	catch (...)
-	{
-		throw;
-	}
-	m.unlock();
-}
-
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, float x, float y, long time)
-{
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time)
-{
-    
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time)
-{
-    
-}
-
-JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode)
-{
-	//App->OnKeyPress(keyCode);
-}

Templates/SalmonUniversalTemplate/jni/android_api.h

@@ -12,21 +12,13 @@
 
 #include "main_code.h"
 
+#include "include/Engine.h"
+
 using namespace SE;
 
 
 extern "C" {
     JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height);
-    JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj);
-    JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj);
-	JNIEXPORT int JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time);
-	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode);
 };