reworked CMakeLists.txt

reworked Android.mk
added FileSystem
zip files could be mounted

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: a30d4ad4f27c82fbc3bf6f7f5a2cfb492d0893f7
+node: ffb4ecc10d09bf61bfd16fb3b98b8f008a30bf70
 branch: default
 latesttag: null
-latesttagdistance: 176
+latesttagdistance: 183

.hgignore

@@ -79,5 +79,7 @@ examples/Match3/build_match3_src_vc11/
 oxygine-framework.zip
 examples/TutorialResources/build_tutorialresources_vc11/
 oxygine/system_data/system.zip
+examples/Demo/data/ext/res_ui.xml.ox/
+examples/Demo/data/ext/res.xml.ox/
 syntax: regexp
 ^build/

Android.mk

@@ -0,0 +1,63 @@
+LOCAL_PATH := $(call my-dir)
+OXYGINE_LIBS := $(LOCAL_PATH)/oxygine/third_party/android/libraries/$(TARGET_ARCH_ABI)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ox_libpng_static
+LOCAL_MODULE_FILENAME := png
+LOCAL_SRC_FILES := $(OXYGINE_LIBS)/libpng.a
+include $(PREBUILT_STATIC_LIBRARY) 
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ox_libjpeg_static
+LOCAL_MODULE_FILENAME := jpeg
+LOCAL_SRC_FILES := $(OXYGINE_LIBS)/libjpeg.a
+include $(PREBUILT_STATIC_LIBRARY) 
+
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := oxygine-framework_static
+LOCAL_MODULE_FILENAME := liboxygine-framework
+LOCAL_CPP_EXTENSION := .cpp
+
+OXYGINE_SRC := $(LOCAL_PATH)/oxygine/src
+
+
+LOCAL_SRC_FILES := \
+				$(subst $(LOCAL_PATH)/,, \
+				$(wildcard $(OXYGINE_SRC)/closure/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/core/*.cpp) \
+				$(OXYGINE_SRC)/core/gl/NativeTextureGLES.cpp \
+				$(OXYGINE_SRC)/core/gl/oxgl.cpp \
+				$(OXYGINE_SRC)/core/gl/VertexDeclarationGL.cpp \
+				$(OXYGINE_SRC)/core/gl/VideoDriverGL.cpp \
+				$(OXYGINE_SRC)/core/gl/VideoDriverGLES20.cpp \
+				$(wildcard $(OXYGINE_SRC)/math/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/pugixml/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/res/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/text_utils/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/dev_tools/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/utils/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/winnie_alloc/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/minizip/*.c) \
+				$(wildcard $(OXYGINE_SRC)/*.cpp) \
+				$(wildcard $(OXYGINE_SRC)/../greenlets/src/*.c) \
+				)
+
+SDL_PATH := $(LOCAL_PATH)/../SDL/include/
+THIRD_PARTY := $(LOCAL_PATH)/oxygine/third_party/android/
+
+LOCAL_C_INCLUDES := $(OXYGINE_SRC)/ \
+					$(OXYGINE_SRC)/../greenlets/src/ \
+					$(SDL_PATH) \
+					$(THIRD_PARTY)/libjpeg/ \
+					$(THIRD_PARTY)/libpng/
+
+LOCAL_EXPORT_LDLIBS += -lGLESv2 -llog -lz
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
+LOCAL_EXPORT_CFLAGS += $(LOCAL_CFLAGS)
+LOCAL_WHOLE_STATIC_LIBRARIES := ox_libpng_static ox_libjpeg_static
+					
+include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module, SDL)

CMakeLists.txt

@@ -6,7 +6,6 @@ set(SDL2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../sdl/include)
 set(SDL2_LIBRARIES sdl2)
 
 set(OXYGINE_DEFINITIONS	
-	-DOXYGINE_SDL
 	-D_CRT_SECURE_NO_WARNINGS)
 
 set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/oxygine/greenlets/src/*.c)
@@ -44,7 +43,7 @@ include_directories(
 		)
 
 add_definitions(${OXYGINE_DEFINITIONS})
-add_library(oxygine STATIC ${SOURCES})
+add_library(oxygine-framework STATIC ${SOURCES})
 
 
 set(OXYGINE_LIBRARY_DIRS
@@ -71,7 +70,7 @@ endforeach(lib)
 set(OXYGINE_CORE_LIBS 
 	${OXYGINE_CORE_LIBS}
 	${OPENGL_LIBRARIES}
-	oxygine
+	oxygine-framework
 	glew32
 )
 

examples/Demo/data/development.icf

@@ -36,7 +36,7 @@ DeviceUniqueIDInt              = Type=int, Default="01234567890", Value = "01234
 FileTotalStorageSize           = Type=int, Min=0.000000, Max=2147483648.000000, Default="67108864", Value = "67108864"
 FileUseSeparateRomRam          = Type=bool, Default="true", Value = "true"
 FileUseTotalStorageSize        = Type=bool, Default="false", Value = "false"
-GLAPI                          = Type=string, Allowed="None" "GLES 1.0 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.1 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.0 Common Profile from Imagination POWERVR(TM)" "GLES 1.1 Common Profile from Imagination POWERVR(TM)" "GLES 2.0 from Imagination POWERVR(TM)" "Obey [S3E] SysGlesVersion .icf setting" "GLES 1.1 Common Profile from Qualcomm Snapdragon(TM)" "GLES 2.0 from Qualcomm Snapdragon(TM)" "GLES 2.0 ANGLE" "GLES 2.0 ANGLE DirectX 11", Default="Obey [S3E] SysGlesVersion .icf setting", Value = "GLES 2.0 from Imagination POWERVR(TM)"
+GLAPI                          = Type=string, Allowed="None" "GLES 1.0 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.1 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.0 Common Profile from Imagination POWERVR(TM)" "GLES 1.1 Common Profile from Imagination POWERVR(TM)" "GLES 2.0 from Imagination POWERVR(TM)" "Obey [S3E] SysGlesVersion .icf setting" "GLES 1.1 Common Profile from Qualcomm Snapdragon(TM)" "GLES 2.0 from Qualcomm Snapdragon(TM)" "GLES 2.0 ANGLE", Default="Obey [S3E] SysGlesVersion .icf setting", Value = "GLES 2.0 from Imagination POWERVR(TM)"
 GLDontUseHiddenWindow          = Type=bool, Default="false", Value = "false"
 GLTerminateOnSuspend           = Type=bool, Default="false", Value = "false"
 GLUsePVRVFrame                 = Type=bool, Default="false", Value = "false"

examples/Demo/data/ext/res.xml.ox/bmfc_font/big.fnt

@@ -1,103 +0,0 @@
-<?xml version="1.0" ?><font>
-  <info aa="1" bold="1" charset="" face="Arial" italic="1" outline="2" padding="0,0,0,0" size="-26" smooth="1" spacing="1,1" stretchH="100" unicode="1"/>
-  <common alphaChnl="0" base="24" blueChnl="0" greenChnl="0" lineHeight="30" packed="0" pages="1" redChnl="0" scaleH="256" scaleW="512"/>
-  <pages>
-    <page file="big_0.png" id="0"/>
-  </pages>
-  <chars count="93">
-    <char chnl="15" height="34" id="32" page="0" width="11" x="357" xadvance="7" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="33" page="0" width="14" x="216" xadvance="10" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="34" page="0" width="18" x="38" xadvance="14" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="35" page="0" width="20" x="482" xadvance="16" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="36" page="0" width="19" x="210" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="37" page="0" width="27" x="101" xadvance="23" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="38" page="0" width="23" x="169" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="39" page="0" width="13" x="302" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="40" page="0" width="16" x="183" xadvance="12" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="41" page="0" width="14" x="231" xadvance="10" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="42" page="0" width="16" x="166" xadvance="12" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="43" page="0" width="20" x="84" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="44" page="0" width="11" x="381" xadvance="7" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="45" page="0" width="13" x="274" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="46" page="0" width="11" x="369" xadvance="7" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="47" page="0" width="17" x="94" xadvance="13" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="48" page="0" width="19" x="230" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="49" page="0" width="18" x="0" xadvance="14" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="50" page="0" width="19" x="250" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="51" page="0" width="19" x="270" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="52" page="0" width="19" x="290" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="53" page="0" width="19" x="310" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="54" page="0" width="19" x="430" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="55" page="0" width="20" x="21" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="56" page="0" width="19" x="330" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="57" page="0" width="19" x="350" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="58" page="0" width="13" x="246" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="59" page="0" width="13" x="316" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="60" page="0" width="19" x="370" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="61" page="0" width="20" x="0" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="62" page="0" width="19" x="410" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="63" page="0" width="21" x="285" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="64" page="0" width="31" x="69" xadvance="27" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="65" page="0" width="23" x="49" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="66" page="0" width="23" x="73" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="67" page="0" width="24" x="470" xadvance="20" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="68" page="0" width="23" x="97" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="69" page="0" width="23" x="145" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="70" page="0" width="22" x="216" xadvance="18" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="71" page="0" width="25" x="239" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="72" page="0" width="24" x="395" xadvance="20" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="73" page="0" width="13" x="288" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="74" page="0" width="20" x="42" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="75" page="0" width="25" x="291" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="76" page="0" width="20" x="63" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="77" page="0" width="27" x="157" xadvance="23" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="78" page="0" width="24" x="445" xadvance="20" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="79" page="0" width="25" x="265" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="80" page="0" width="23" x="25" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="81" page="0" width="25" x="343" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="82" page="0" width="24" x="420" xadvance="20" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="83" page="0" width="22" x="239" xadvance="18" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="84" page="0" width="23" x="121" xadvance="19" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="85" page="0" width="24" x="0" xadvance="20" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="86" page="0" width="25" x="317" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="87" page="0" width="32" x="36" xadvance="28" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="88" page="0" width="26" x="212" xadvance="22" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="89" page="0" width="25" x="369" xadvance="21" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="90" page="0" width="22" x="262" xadvance="18" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="92" page="0" width="12" x="344" xadvance="8" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="94" page="0" width="19" x="450" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="95" page="0" width="20" x="168" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="97" page="0" width="18" x="19" xadvance="14" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="98" page="0" width="20" x="461" xadvance="16" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="99" page="0" width="19" x="470" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="100" page="0" width="22" x="193" xadvance="18" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="101" page="0" width="19" x="490" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="102" page="0" width="17" x="76" xadvance="13" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="103" page="0" width="21" x="307" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="104" page="0" width="20" x="189" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="105" page="0" width="13" x="330" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="106" page="0" width="16" x="495" xadvance="12" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="107" page="0" width="20" x="105" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="108" page="0" width="13" x="260" xadvance="9" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="109" page="0" width="27" x="129" xadvance="23" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="110" page="0" width="20" x="126" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="111" page="0" width="20" x="147" xadvance="16" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="112" page="0" width="21" x="329" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="113" page="0" width="21" x="373" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="114" page="0" width="17" x="112" xadvance="13" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="115" page="0" width="19" x="390" xadvance="15" xoffset="-2" y="70" yoffset="-2"/>
-    <char chnl="15" height="34" id="116" page="0" width="15" x="200" xadvance="11" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="117" page="0" width="21" x="395" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="118" page="0" width="21" x="417" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="119" page="0" width="26" x="185" xadvance="22" xoffset="-2" y="0" yoffset="-2"/>
-    <char chnl="15" height="34" id="120" page="0" width="21" x="439" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="121" page="0" width="21" x="351" xadvance="17" xoffset="-2" y="35" yoffset="-2"/>
-    <char chnl="15" height="34" id="122" page="0" width="18" x="57" xadvance="14" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="123" page="0" width="17" x="130" xadvance="13" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="124" page="0" width="11" x="393" xadvance="7" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="125" page="0" width="17" x="148" xadvance="13" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="160" page="0" width="11" x="405" xadvance="7" xoffset="-2" y="105" yoffset="-2"/>
-    <char chnl="15" height="34" id="8470" page="0" width="35" x="0" xadvance="31" xoffset="-2" y="0" yoffset="-2"/>
-  </chars>
-  
-</font>

examples/Demo/data/ext/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><bmfc_font sf="1.0" size="26"/><atlas><image file="1_0.png" format="r8g8b8a8" h="1024" w="2048"/><frames fs="1,1,64,64,1.000000">0,130,953,0,0,64,64;</frames><frames fs="1,1,246,75,1.000000">0,0,880,5,4,236,71;</frames><frames fs="1,1,64,64,1.000000">0,454,959,3,7,54,55;</frames><frames fs="1,1,128,64,1.000000">0,0,953,0,0,128,64;</frames><frames fs="1,1,64,64,1.000000">0,518,960,9,7,46,49;</frames><frames fs="7,1,80,80,1.000000">0,646,880,12,1,61,76;0,454,880,8,0,62,77;0,518,880,10,0,62,78;0,709,880,14,1,59,76;0,582,880,11,2,62,74;0,831,880,11,2,58,73;0,770,880,11,1,59,73;</frames><frames fs="1,1,100,90,1.000000">0,368,880,8,5,84,81;</frames><frames fs="1,1,64,49,1.000000">0,368,963,0,0,64,47;</frames><frames fs="1,1,960,641,1.000000">0,0,237,0,0,960,641;</frames><frames fs="1,1,128,128,1.000000">0,238,880,0,0,128,128;</frames><frames fs="1,1,466,266,1.000000">0,1002,1,0,0,466,266;</frames><frames fs="1,1,1000,234,1.000000">0,0,1,0,0,1000,234;</frames><frames fs="1,1,256,167,1.000000">0,1470,1,0,0,256,167;</frames></atlas><atlas><image file="2_0.png" format="r8g8b8a8" h="1024" w="1024"/><frames fs="1,1,960,641,1.000000">0,0,1,0,0,960,641;</frames><frames fs="1,1,246,75,1.000000">0,0,644,5,4,236,71;</frames></atlas><atlas><image file="3_0.png" format="r8g8b8a8" h="1024" w="1024"/><frames fs="1,1,960,641,1.000000">0,0,1,0,0,960,641;</frames><frames fs="1,1,246,75,1.000000">0,0,644,5,4,236,71;</frames></atlas><atlas><image file="4_0.png" format="r8g8b8a8" h="1024" w="1024"/><frames fs="1,1,960,641,1.000000">0,0,1,0,0,960,641;</frames><frames fs="1,1,246,75,1.000000">0,0,644,5,4,236,71;</frames></atlas></resources>

examples/Demo/data/ext/res_ui.xml.ox/bmfc_font/main.fnt

@@ -1,103 +0,0 @@
-<?xml version="1.0" ?><font>
-  <info aa="1" bold="1" charset="" face="Arial" italic="0" outline="0" padding="0,0,0,0" size="-16" smooth="1" spacing="1,1" stretchH="100" unicode="1"/>
-  <common alphaChnl="1" base="15" blueChnl="0" greenChnl="0" lineHeight="19" packed="0" pages="1" redChnl="0" scaleH="64" scaleW="512"/>
-  <pages>
-    <page file="main_0.png" id="0"/>
-  </pages>
-  <chars count="93">
-    <char chnl="15" height="19" id="32" page="0" width="4" x="407" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="33" page="0" width="5" x="369" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="34" page="0" width="8" x="271" xadvance="8" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="35" page="0" width="9" x="121" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="36" page="0" width="9" x="131" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="37" page="0" width="14" x="53" xadvance="14" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="38" page="0" width="12" x="151" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="39" page="0" width="4" x="397" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="40" page="0" width="5" x="351" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="41" page="0" width="5" x="345" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="42" page="0" width="6" x="311" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="43" page="0" width="9" x="101" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="44" page="0" width="4" x="387" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="45" page="0" width="6" x="304" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="46" page="0" width="4" x="507" xadvance="4" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="47" page="0" width="5" x="381" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="48" page="0" width="9" x="141" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="49" page="0" width="9" x="161" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="50" page="0" width="9" x="171" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="51" page="0" width="9" x="181" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="52" page="0" width="9" x="191" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="53" page="0" width="9" x="201" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="54" page="0" width="9" x="61" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="55" page="0" width="9" x="221" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="56" page="0" width="9" x="241" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="57" page="0" width="9" x="11" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="58" page="0" width="5" x="375" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="59" page="0" width="5" x="363" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="60" page="0" width="9" x="21" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="61" page="0" width="9" x="31" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="62" page="0" width="9" x="41" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="63" page="0" width="10" x="430" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="64" page="0" width="16" x="19" xadvance="16" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="65" page="0" width="12" x="177" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="66" page="0" width="12" x="190" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="67" page="0" width="12" x="216" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="68" page="0" width="12" x="255" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="69" page="0" width="11" x="281" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="70" page="0" width="10" x="364" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="71" page="0" width="12" x="164" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="72" page="0" width="12" x="138" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="73" page="0" width="4" x="402" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="74" page="0" width="9" x="51" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="75" page="0" width="12" x="268" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="76" page="0" width="10" x="0" xadvance="10" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="77" page="0" width="13" x="111" xadvance="13" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="78" page="0" width="12" x="203" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="79" page="0" width="12" x="125" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="80" page="0" width="11" x="293" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="81" page="0" width="13" x="97" xadvance="13" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="82" page="0" width="12" x="242" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="83" page="0" width="11" x="341" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="84" page="0" width="10" x="375" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="85" page="0" width="12" x="229" xadvance="12" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="86" page="0" width="11" x="329" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="87" page="0" width="16" x="36" xadvance="16" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="88" page="0" width="11" x="317" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="89" page="0" width="11" x="305" xadvance="11" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="90" page="0" width="10" x="386" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="92" page="0" width="5" x="357" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="94" page="0" width="9" x="71" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="95" page="0" width="10" x="441" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="97" page="0" width="9" x="81" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="98" page="0" width="10" x="353" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="99" page="0" width="9" x="91" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="100" page="0" width="10" x="397" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="101" page="0" width="9" x="111" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="102" page="0" width="6" x="297" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="103" page="0" width="10" x="408" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="104" page="0" width="10" x="419" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="105" page="0" width="4" x="422" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="106" page="0" width="5" x="339" xadvance="5" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="107" page="0" width="9" x="151" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="108" page="0" width="4" x="392" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="109" page="0" width="14" x="68" xadvance="14" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="110" page="0" width="10" x="452" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="111" page="0" width="10" x="463" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="112" page="0" width="10" x="474" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="113" page="0" width="10" x="485" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="114" page="0" width="7" x="289" xadvance="7" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="115" page="0" width="9" x="211" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="116" page="0" width="6" x="318" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="117" page="0" width="10" x="496" xadvance="10" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="118" page="0" width="9" x="231" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="119" page="0" width="13" x="83" xadvance="13" xoffset="0" y="0" yoffset="0"/>
-    <char chnl="15" height="19" id="120" page="0" width="9" x="251" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="121" page="0" width="9" x="261" xadvance="9" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="122" page="0" width="8" x="280" xadvance="8" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="123" page="0" width="6" x="325" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="124" page="0" width="4" x="412" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="125" page="0" width="6" x="332" xadvance="6" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="160" page="0" width="4" x="417" xadvance="4" xoffset="0" y="20" yoffset="0"/>
-    <char chnl="15" height="19" id="8470" page="0" width="18" x="0" xadvance="18" xoffset="0" y="0" yoffset="0"/>
-  </chars>
-  
-</font>

examples/Demo/data/ext/res_ui.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="64" w="1024"/><frames fs="1,1,128,128,1.000000">0,499,1,11,21,108,58;</frames><frames fs="3,1,166,44,1.000000">0,167,1,1,1,164,42;0,0,1,1,1,165,42;0,333,1,2,2,164,42;</frames></atlas><bmfc_font sf="1.0" size="16"/></resources>

examples/Demo/data/fonts/big.bmfc

@@ -1,55 +0,0 @@
-# AngelCode Bitmap Font Generator configuration file
-fileVersion=1
-
-# font settings
-fontName=Arial
-fontFile=
-charSet=177
-fontSize=-26
-aa=1
-scaleH=100
-useSmoothing=1
-isBold=1
-isItalic=1
-useUnicode=1
-disableBoxChars=1
-outputInvalidCharGlyph=0
-dontIncludeKerningPairs=0
-useHinting=0
-renderFromOutline=1
-useClearType=0
-
-# character alignment
-paddingDown=0
-paddingUp=0
-paddingRight=0
-paddingLeft=0
-spacingHoriz=1
-spacingVert=1
-useFixedHeight=1
-forceZero=1
-
-# output file
-outWidth=512
-outHeight=256
-outBitDepth=32
-fontDescFormat=1
-fourChnlPacked=0
-textureFormat=png
-textureCompression=0
-alphaChnl=0
-redChnl=0
-greenChnl=0
-blueChnl=0
-invA=0
-invR=0
-invG=0
-invB=0
-
-# outline
-outlineThickness=2
-
-# selected chars
-chars=160
-
-# imported icon images

examples/Demo/data/fonts/main.bmfc

@@ -1,55 +0,0 @@
-# AngelCode Bitmap Font Generator configuration file
-fileVersion=1
-
-# font settings
-fontName=Arial
-fontFile=
-charSet=177
-fontSize=-16
-aa=1
-scaleH=100
-useSmoothing=1
-isBold=1
-isItalic=0
-useUnicode=1
-disableBoxChars=1
-outputInvalidCharGlyph=0
-dontIncludeKerningPairs=0
-useHinting=0
-renderFromOutline=1
-useClearType=0
-
-# character alignment
-paddingDown=0
-paddingUp=0
-paddingRight=0
-paddingLeft=0
-spacingHoriz=1
-spacingVert=1
-useFixedHeight=1
-forceZero=1
-
-# output file
-outWidth=512
-outHeight=256
-outBitDepth=32
-fontDescFormat=1
-fourChnlPacked=0
-textureFormat=png
-textureCompression=0
-alphaChnl=1
-redChnl=0
-greenChnl=0
-blueChnl=0
-invA=0
-invR=0
-invG=0
-invB=0
-
-# outline
-outlineThickness=0
-
-# selected chars
-chars=160
-
-# imported icon images

examples/Demo/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

examples/Demo/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

examples/Demo/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

examples/Demo/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

examples/Demo/data/xmls/fonts.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "fonts" />
-	<bmfc_font file="main.bmfc" chars="eng.txt"/>	
-	<bmfc_font file="big.bmfc" chars="eng.txt"/>
-</resources>

examples/Demo/data/xmls/res_ui.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "images" />
-	<atlas>
-		<image file="loading.png"/>		
-		<image file="button.png" cols = "3" />	
-	</atlas>	
-</resources>

examples/Demo/demo_src.mkb

@@ -1,34 +0,0 @@
-#!/usr/bin/env mkb
-
-options
-{
-	module_path="../../oxygine/marmalade/"
-	enable-exceptions=1
-}
-
-includepath src
-
-files
-{
-	[src]
-	(src)
-	"*.h"
-	"*.cpp"
-}
-
-subprojects
-{
-	oxygine-framework
-	iwgl 
-}
-
-assets
-{
-	(data)
-}
-#### AUTO GENERATED deployment settings from DeployTool.exe. Do not edit below this line ####
-deployments
-{
-	["Default"]
-	android-manifest='AndroidManifest.xml'
-}

examples/Demo/src/TestRender2Texture.h

@@ -68,8 +68,11 @@ public:
 		const Diffuse &df = frame.getDiffuse();
 		r.setDiffuse(df);
 		r.setPrimaryColor(color);
+		float pressure =  te->pressure;
+		//log::messageln("pressure %.2f", pressure);
+		//pressure = pressure * pressure;
 		r.draw(frame.getSrcRect(), 
-			RectF(te->localPosition - Vector2(16, 16), Vector2(32, 32)));
+			RectF(te->localPosition - Vector2(16, 16) * pressure, Vector2(32, 32)  * pressure));
 		r.end();
 	}
 };

examples/Demo/src/test.cpp

@@ -85,6 +85,12 @@ void Test::addButton(string id, string txt)
 	button->setPosition(Vector2((float)_x, (float)_y));
 	//button->setPosition(Vector2(150, _y));
 	_y += button->getHeight() + 2.0f;
+
+	if (_y >= getHeight())
+	{
+		_y = 0;
+		_x += button->getWidth() + 10;
+	}
 }
 
 void Test::updateText(string id, string txt)

examples/DemoBox2D/Box2D_src.mkb

@@ -1,29 +0,0 @@
-#!/usr/bin/env mkb
-
-options
-{
-	module_path="../../oxygine/marmalade/"
-	enable-exceptions=1
-}
-
-includepath src
-
-files
-{
-	[src]
-	(src)
-	"*.h"
-	"*.cpp"
-}
-
-subprojects
-{
-	oxygine-framework
-	iwgl 
-	box2d/box2d
-}
-
-assets
-{
-	(data)
-}

examples/DemoBox2D/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

examples/DemoBox2D/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

examples/DemoBox2D/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

examples/DemoBox2D/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

examples/GameTemplate/GameTemplate_src.mkb

@@ -1,28 +0,0 @@
-#!/usr/bin/env mkb
-
-options
-{
-	module_path="../../oxygine/marmalade/"
-	enable-exceptions=1	
-}
-
-includepath src
-
-files
-{
-	[src]
-	(src)
-	"*.h"
-	"*.cpp"
-}
-
-subprojects
-{
-	oxygine-framework
-	iwgl
-}
-
-assets
-{
-	(data)
-}

examples/GameTemplate/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

examples/GameTemplate/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

examples/GameTemplate/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

examples/GameTemplate/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

examples/HelloWorld/HelloWorld_src.mkb

@@ -1,28 +0,0 @@
-#!/usr/bin/env mkb
-
-options
-{
-	module_path="../../oxygine/marmalade/"
-	enable-exceptions=1
-}
-
-includepath src
-
-files
-{
-	[src]
-	(src)
-	"*.h"
-	"*.cpp"
-}
-
-subprojects
-{
-	oxygine-framework
-	iwgl 
-}
-
-assets
-{
-	(data)
-}

examples/HelloWorld/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

examples/HelloWorld/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

examples/HelloWorld/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

examples/HelloWorld/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

examples/Match3/data/system/fonts/system.fnt

@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Arial" size="-12" bold="0" italic="0" charset="" unicode="1" stretchH="100" smooth="1" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="15" base="12" scaleW="128" scaleH="64" pages="1" packed="0" alphaChnl="1" redChnl="0" greenChnl="0" blueChnl="0"/>
-  <pages>
-    <page id="0" file="system_0.png" />
-  </pages>
-  <chars count="95">
-    <char id="32" x="53" y="39" width="1" height="1" xoffset="0" yoffset="12" xadvance="3" page="0" chnl="15" />
-    <char id="33" x="23" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="34" x="32" y="40" width="3" height="3" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="35" x="0" y="13" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="36" x="48" y="0" width="5" height="10" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="37" x="70" y="0" width="9" height="9" xoffset="1" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="38" x="8" y="13" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="39" x="36" y="40" width="1" height="3" xoffset="1" yoffset="3" xadvance="2" page="0" chnl="15" />
-    <char id="40" x="12" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="41" x="16" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="42" x="26" y="42" width="5" height="4" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="43" x="120" y="30" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="44" x="126" y="30" width="1" height="3" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="45" x="49" y="39" width="3" height="1" xoffset="0" yoffset="8" xadvance="4" page="0" chnl="15" />
-    <char id="46" x="55" y="39" width="1" height="1" xoffset="1" yoffset="11" xadvance="3" page="0" chnl="15" />
-    <char id="47" x="15" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="48" x="0" y="33" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="49" x="11" y="33" width="3" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="50" x="20" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="51" x="26" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="52" x="32" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="53" x="38" y="22" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="54" x="110" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="55" x="44" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="56" x="50" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="57" x="62" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="58" x="112" y="30" width="1" height="7" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="59" x="125" y="0" width="1" height="9" xoffset="1" yoffset="5" xadvance="3" page="0" chnl="15" />
-    <char id="60" x="6" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="61" x="12" y="43" width="6" height="4" xoffset="0" yoffset="6" xadvance="7" page="0" chnl="15" />
-    <char id="62" x="0" y="43" width="5" height="5" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="63" x="80" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="64" x="0" y="0" width="11" height="12" xoffset="1" yoffset="3" xadvance="12" page="0" chnl="15" />
-    <char id="65" x="80" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="66" x="104" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="67" x="40" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="68" x="88" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="69" x="0" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="70" x="122" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="71" x="109" y="0" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="72" x="56" y="11" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="73" x="25" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="74" x="14" y="23" width="5" height="9" xoffset="0" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="75" x="64" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="76" x="118" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="77" x="72" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="78" x="80" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="79" x="32" y="12" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="80" x="111" y="10" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="81" x="40" y="0" width="7" height="10" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="82" x="100" y="0" width="8" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="83" x="7" y="23" width="6" height="9" xoffset="1" yoffset="3" xadvance="8" page="0" chnl="15" />
-    <char id="84" x="48" y="11" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="85" x="96" y="10" width="7" height="9" xoffset="1" yoffset="3" xadvance="9" page="0" chnl="15" />
-    <char id="86" x="90" y="0" width="9" height="9" xoffset="-1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="87" x="58" y="0" width="11" height="9" xoffset="0" yoffset="3" xadvance="11" page="0" chnl="15" />
-    <char id="88" x="24" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="89" x="16" y="12" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="90" x="117" y="0" width="7" height="9" xoffset="0" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="91" x="35" y="0" width="2" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="92" x="19" y="33" width="3" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="93" x="32" y="0" width="2" height="11" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="94" x="114" y="30" width="5" height="5" xoffset="0" yoffset="3" xadvance="5" page="0" chnl="15" />
-    <char id="95" x="41" y="40" width="7" height="1" xoffset="0" yoffset="13" xadvance="7" page="0" chnl="15" />
-    <char id="96" x="38" y="40" width="2" height="2" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="97" x="97" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="98" x="56" y="21" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="99" x="103" y="30" width="4" height="7" xoffset="1" yoffset="5" xadvance="6" page="0" chnl="15" />
-    <char id="100" x="92" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="101" x="85" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="102" x="6" y="33" width="4" height="9" xoffset="0" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="103" x="68" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="104" x="74" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="7" page="0" chnl="15" />
-    <char id="105" x="27" y="32" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="106" x="24" y="0" width="3" height="11" xoffset="-1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="107" x="86" y="20" width="5" height="9" xoffset="1" yoffset="3" xadvance="6" page="0" chnl="15" />
-    <char id="108" x="125" y="10" width="1" height="9" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="109" x="39" y="32" width="9" height="7" xoffset="1" yoffset="5" xadvance="11" page="0" chnl="15" />
-    <char id="110" x="61" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="111" x="73" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="112" x="98" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="113" x="104" y="20" width="5" height="9" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="114" x="108" y="30" width="3" height="7" xoffset="1" yoffset="5" xadvance="4" page="0" chnl="15" />
-    <char id="115" x="91" y="30" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="116" x="54" y="0" width="3" height="10" xoffset="0" yoffset="2" xadvance="3" page="0" chnl="15" />
-    <char id="117" x="49" y="31" width="5" height="7" xoffset="1" yoffset="5" xadvance="7" page="0" chnl="15" />
-    <char id="118" x="55" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="119" x="29" y="32" width="9" height="7" xoffset="0" yoffset="5" xadvance="9" page="0" chnl="15" />
-    <char id="120" x="67" y="31" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="121" x="116" y="20" width="5" height="9" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="122" x="79" y="30" width="5" height="7" xoffset="0" yoffset="5" xadvance="5" page="0" chnl="15" />
-    <char id="123" x="20" y="0" width="3" height="11" xoffset="0" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="124" x="38" y="0" width="1" height="11" xoffset="1" yoffset="3" xadvance="3" page="0" chnl="15" />
-    <char id="125" x="28" y="0" width="3" height="11" xoffset="1" yoffset="3" xadvance="4" page="0" chnl="15" />
-    <char id="126" x="19" y="43" width="6" height="4" xoffset="1" yoffset="6" xadvance="7" page="0" chnl="15" />
-  </chars>
-  <kernings count="57">
-    <kerning first="32" second="65" amount="-1" />
-    <kerning first="121" second="46" amount="-1" />
-    <kerning first="121" second="44" amount="-1" />
-    <kerning first="119" second="46" amount="-1" />
-    <kerning first="119" second="44" amount="-1" />
-    <kerning first="118" second="46" amount="-1" />
-    <kerning first="118" second="44" amount="-1" />
-    <kerning first="114" second="46" amount="-1" />
-    <kerning first="114" second="44" amount="-1" />
-    <kerning first="89" second="118" amount="-1" />
-    <kerning first="49" second="49" amount="-1" />
-    <kerning first="65" second="32" amount="-1" />
-    <kerning first="65" second="84" amount="-1" />
-    <kerning first="65" second="86" amount="-1" />
-    <kerning first="89" second="117" amount="-1" />
-    <kerning first="65" second="89" amount="-1" />
-    <kerning first="89" second="113" amount="-1" />
-    <kerning first="89" second="112" amount="-1" />
-    <kerning first="89" second="111" amount="-1" />
-    <kerning first="89" second="101" amount="-1" />
-    <kerning first="70" second="44" amount="-1" />
-    <kerning first="70" second="46" amount="-1" />
-    <kerning first="70" second="65" amount="-1" />
-    <kerning first="89" second="97" amount="-1" />
-    <kerning first="76" second="84" amount="-1" />
-    <kerning first="76" second="86" amount="-1" />
-    <kerning first="76" second="87" amount="-1" />
-    <kerning first="76" second="89" amount="-1" />
-    <kerning first="89" second="65" amount="-1" />
-    <kerning first="89" second="58" amount="-1" />
-    <kerning first="89" second="46" amount="-2" />
-    <kerning first="80" second="44" amount="-2" />
-    <kerning first="80" second="46" amount="-2" />
-    <kerning first="80" second="65" amount="-1" />
-    <kerning first="89" second="45" amount="-1" />
-    <kerning first="89" second="44" amount="-2" />
-    <kerning first="87" second="46" amount="-1" />
-    <kerning first="87" second="44" amount="-1" />
-    <kerning first="86" second="111" amount="-1" />
-    <kerning first="84" second="44" amount="-1" />
-    <kerning first="84" second="45" amount="-1" />
-    <kerning first="84" second="46" amount="-1" />
-    <kerning first="84" second="58" amount="-1" />
-    <kerning first="86" second="101" amount="-1" />
-    <kerning first="84" second="65" amount="-1" />
-    <kerning first="86" second="97" amount="-1" />
-    <kerning first="84" second="97" amount="-1" />
-    <kerning first="84" second="99" amount="-1" />
-    <kerning first="84" second="101" amount="-1" />
-    <kerning first="86" second="65" amount="-1" />
-    <kerning first="84" second="111" amount="-1" />
-    <kerning first="86" second="46" amount="-1" />
-    <kerning first="84" second="115" amount="-1" />
-    <kerning first="86" second="45" amount="-1" />
-    <kerning first="84" second="119" amount="-1" />
-    <kerning first="84" second="121" amount="-1" />
-    <kerning first="86" second="44" amount="-1" />
-  </kernings>
-</font>

examples/Match3/data/system/res.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-	<set path = "system/anims" />
-	<atlas>
-		<image file="tree.png"/>
-		<image file="finger.png"/>
-		<image file="t2p.png"/>
-		<image file="checkbox.png" rows="2"/>
-		<image file="checker.png"/>
-		<image file="remove.png"/>
-		<image file="images.png"/>
-	</atlas>
-	
-	<set path = "system/fonts" />
-	<font file="system.fnt" version="7"/>	
-</resources>

examples/Match3/data/system/res.xml.ox/meta.xml

@@ -1 +0,0 @@
-<resources><atlas><image file="1_0.png" format="r8g8b8a8" h="128" w="256"/><frames fs="1,1,32,32,1.000000">0,0,67,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,1,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,66,35,0,0,32,32;</frames><frames fs="1,2,16,16,1.000000">0,0,101,1,0,15,15;0,17,101,1,1,15,14;</frames><frames fs="1,1,64,64,1.000000">0,0,1,0,0,64,64;</frames><frames fs="1,1,32,32,1.000000">0,66,69,0,0,32,32;</frames><frames fs="1,1,32,32,1.000000">0,100,1,0,0,32,32;</frames></atlas><font sf="1.0" size="12"/></resources>

examples/Match3/data/system/shader.glsl

@@ -1,77 +0,0 @@
-//shared data between vs/ps
-varying lowp vec4 result_color;
-varying mediump vec2 result_uv;
-varying mediump vec2 result_uv2;
-
-#ifdef VS
-uniform mediump mat4 mat;
-attribute vec3 position;
-attribute vec4 color;
-attribute vec2 uv;
-attribute vec2 uv2;
-
-void program_main_vs()
-{
-	gl_Position = mat * vec4(position, 1.0); 
-
-	result_color = color;
-	result_uv = uv;
-#ifdef MASK
-	result_uv2 = uv2;
-#endif
-}
-
-#endif
-
-
-#ifdef PS
-uniform lowp vec4 clip_mask;
-uniform lowp sampler2D base_texture;
-uniform lowp sampler2D mask_texture;
-uniform lowp sampler2D alpha_texture;
-
-lowp vec4 get_base()
-{
-	lowp vec4 base = texture2D(base_texture, result_uv);	
-#ifdef SEPARATE_ALPHA
-	base.a = texture2D(alpha_texture, result_uv).r;	
-#endif
-
-#ifdef ALPHA_PREMULTIPLY
-	base.rgb = base.rgb * base.a;
-#endif
-
-#ifdef MODIFY_BASE
-	base = modify_base(base);
-#endif
-
-	return base;
-}
-
-lowp vec4 get_color()
-{
-	lowp vec4 base = get_base();
-
-
-#ifdef MASK
-	lowp vec2 uv2 = clamp(result_uv2, clip_mask.xy, clip_mask.zw);
-	lowp vec4 mask = texture2D(mask_texture, uv2);
-
-#ifdef SEPARATE_ALPHA
-	lowp float mask_alpha = mask.r;	
-#else
-	lowp float mask_alpha = mask.a;
-#endif
-
-	base = base * mask_alpha;
-#endif
-
-	return base * result_color;
-}
-
-
-void program_main_ps()
-{	
-	gl_FragColor = get_color();
-}
-#endif

examples/Match3/match3_src.mkb

@@ -1,31 +0,0 @@
-#!/usr/bin/env mkb
-
-options
-{
-	module_path="../../oxygine/marmalade/"
-	enable-exceptions=1
-}
-
-includepath src
-
-debug_define MARMALADE
-define MARMALADE
-
-files
-{
-	[src]
-	(src)
-	"*.h"
-	"*.cpp"
-}
-
-subprojects
-{
-	oxygine-framework
-	iwgl 
-}
-
-assets
-{
-	(data)
-}

oxygine/SDL/android/build.cmd

@@ -1 +0,0 @@
-ndk-build NDK_PROJECT_PATH=%CD%

oxygine/SDL/android/jni/Android.mk

@@ -1,46 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../../../src
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -DOXYGINE_SDL=1
-LOCAL_MODULE    := oxygine
-LOCAL_CPP_EXTENSION := .cpp
-
-LOCAL_SRC_FILES := \
-				$(subst $(LOCAL_PATH)/,, \
-				$(wildcard $(LOCAL_PATH)/closure/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/core/*.cpp) \
-				$(LOCAL_PATH)/core/gl/NativeTextureGLES.cpp \
-				$(LOCAL_PATH)/core/gl/oxgl.cpp \
-				$(LOCAL_PATH)/core/gl/VertexDeclarationGL.cpp \
-				$(LOCAL_PATH)/core/gl/VideoDriverGL.cpp \
-				$(LOCAL_PATH)/core/gl/VideoDriverGLES20.cpp \
-				$(wildcard $(LOCAL_PATH)/math/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/pugixml/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/res/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/text_utils/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/dev_tools/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/utils/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/winnie_alloc/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/minizip/*.c) \
-				$(wildcard $(LOCAL_PATH)/*.cpp) \
-				$(wildcard $(LOCAL_PATH)/../greenlets/src*.c) \
-				)
-
-
-SDL_PATH := $(call my-dir)/../../../../../sdl/include/
-
-
-  
-OXYGINE := $(LOCAL_PATH)
-OXYGINE_ROOT := $(OXYGINE)/../
-THIRD_PARTY := $(OXYGINE_ROOT)/third_party/android/
-
-LOCAL_C_INCLUDES := $(OXYGINE)/ \
-					$(OXYGINE)/../greenlets/src/ \
-					$(SDL_PATH) \
-					$(THIRD_PARTY)/libjpeg/ \
-					$(THIRD_PARTY)/libpng/
-					
-
-					
-include $(BUILD_STATIC_LIBRARY)

oxygine/SDL/android/jni/Application.mk

@@ -1,7 +0,0 @@
-APP_PLATFORM := android-10
-APP_MODULES := oxygine
-APP_STL := gnustl_static
-APP_CPPFLAGS += -fexceptions
-APP_CPPFLAGS += -frtti
-APP_CPPFLAGS += -lstdc++
-APP_ABI := armeabi-v7a

oxygine/src/Actor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/oxygine.h"
 #include "EventDispatcher.h"
 #include "core/Object.h"

oxygine/src/AnimationFrame.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "math/Rect.h"
 #include "core/Texture.h"
 #include "core/NativeTexture.h"

oxygine/src/Blocking.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "core/coroutines.h"
 

oxygine/src/Box9Sprite.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Sprite.h"
 namespace oxygine
 {

oxygine/src/Button.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Sprite.h"
 namespace oxygine
 {

oxygine/src/ClipRectActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "math/Rect.h"
 

oxygine/src/Clock.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/Object.h"
 
 namespace oxygine

oxygine/src/ColorRectSprite.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/DebugActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/oxygine.h"
 #include "res/ResFontBM.h"
 #include "Actor.h"

oxygine/src/Draggable.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "Event.h"
 

oxygine/src/Event.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include <list>
 #include "core/Object.h"
 #include "closure/closure.h"
@@ -70,9 +71,10 @@ namespace oxygine
 		};
 
 
-		TouchEvent(eventType type, bool Bubbles = true, const Vector2 &locPosition = Vector2(0, 0)):Event(type, Bubbles), localPosition(locPosition), position(locPosition), mouseButton(MouseButton_Touch){}
+		TouchEvent(eventType type, bool Bubbles = true, const Vector2 &locPosition = Vector2(0, 0)):Event(type, Bubbles), localPosition(locPosition), position(locPosition), mouseButton(MouseButton_Touch), pressure(1.0f){}
 		Vector2 localPosition;
 		Vector2 position;
+		float pressure;
 
 		const PointerState *getPointer() const;
 

oxygine/src/EventDispatcher.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include <list>
 #include "core/Object.h"
 #include "closure/closure.h"

oxygine/src/Font.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/Object.h"
 #include "math/Rect.h"
 

oxygine/src/InitActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "Sprite.h"
 #include "Button.h"

oxygine/src/Input.cpp

@@ -11,28 +11,14 @@ namespace oxygine
 		return Input::instance.getTouchByIndex(index);
 	}
 
-	void Input::sendPointerButtonEvent(MouseButton button, int x, int y, int type, PointerState *ps)
+	void Input::sendPointerButtonEvent(MouseButton button, float x, float y, float pressure, int type, PointerState *ps)
 	{
-		//log::message("sendPointerButtonEvent %d %d", x, y);
-		/*
-		const Rect &vp = RootActor::instance->getViewport();
-		x -= vp.pos.x;
-		y -= vp.pos.y;
-
 		Vector2 p(x, y);
-		Point ds = core::getDisplaySize();
-		p.x /= vp.size.x;
-		p.y /= vp.size.y;
-
-		p.x *= RootActor::instance->getWidth();
-		p.y *= RootActor::instance->getHeight();
-		*/
-
-		Vector2 p((float)x, (float)y);
 
 		TouchEvent me(type, true, p);
 		me.index = ps->getIndex();
 		me.mouseButton = button;
+		me.pressure = pressure;
 		
 		if (type == TouchEvent::TOUCH_DOWN)
 			ps->_isPressed[button] = true;
@@ -40,16 +26,17 @@ namespace oxygine
 		if (type == TouchEvent::TOUCH_UP)
 			ps->_isPressed[button] = false;
 
-		ps->_position = Point(x, y);
+		ps->_position = p;
 
 		RootActor::instance->handleEvent(&me);
 	}
 
-	void Input::sendPointerMotionEvent(int x, int y, PointerState *ps)
+	void Input::sendPointerMotionEvent(float x, float y, float pressure, PointerState *ps)
 	{
-		TouchEvent me(TouchEvent::MOVE, true, Vector2((float)x, (float)y));
+		TouchEvent me(TouchEvent::MOVE, true, Vector2(x, y));
 		me.index = ps->getIndex();
-		ps->_position = Point(x, y);
+		me.pressure = pressure;
+		ps->_position = Vector2(x, y);
 
 		RootActor::instance->handleEvent(&me);
 	}
@@ -59,7 +46,7 @@ namespace oxygine
 		TouchEvent me(scroll > 0 ? TouchEvent::WHEEL_UP : TouchEvent::WHEEL_DOWN, true);
 		me.index = ps->getIndex();
 
-		ps->_position = Point(0, 0);
+		ps->_position = Vector2(0, 0);
 
 		RootActor::instance->handleEvent(&me);
 	}

oxygine/src/Input.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "math/vector3.h"
 #include "math/vector2.h"
 #include "closure/closure.h"
@@ -39,8 +40,8 @@ namespace oxygine
 		int _ids[MAX_TOUCHES];
 
 
-		void sendPointerButtonEvent(MouseButton button, int x, int y, int type, PointerState *);
-		void sendPointerMotionEvent(int x, int y, PointerState *);
+		void sendPointerButtonEvent(MouseButton button, float x, float y, float pressure, int type, PointerState *);
+		void sendPointerMotionEvent(float x, float y, float pressure, PointerState *);
 		void sendPointerWheelEvent(int scroll, PointerState *);
 	};
 }

oxygine/src/MaskedSprite.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Sprite.h"
 namespace oxygine
 {

oxygine/src/MemoryTexture.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/Texture.h"
 #include "core/oxygine.h"
 #include "math/Rect.h"

oxygine/src/Multithreading.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "core/Mem2Native.h"
 #include "res/Resource.h"

oxygine/src/Options.cpp

@@ -1,103 +0,0 @@
-#include "core/oxygine.h"
-#include "Options.h"
-#include <vector>
-#include "core/files_io.h"
-
-namespace oxygine
-{
-	Options Options::instance;
-
-
-	struct xml_string_writer: pugi::xml_writer
-	{
-		std::string result;
-
-		virtual void write(const void* data, size_t size)
-		{
-			result += std::string(static_cast<const char*>(data), size);
-		}
-	};
-
-	Options::Options():_path("options.xml")
-	{
-
-	}
-
-	Options::~Options()
-	{
-
-	}
-
-	void Options::setPath(const string &path)
-	{
-		_path = path;
-	}
-
-	void Options::init(const string &version)
-	{
-		_version = version;
-		load();
-		if (_doc.child("options").attribute("version").value() != _version)
-			reset();
-	}
-
-	void Options::reset()
-	{
-		_doc.reset();
-		pugi::xml_node root = _doc.append_child("options");
-		root.append_attribute("version").set_value(_version.c_str());
-	}
-
-
-	void Options::load()
-	{
-		_doc.reset();
-		file::buffer fb;
-		file::read(_path.c_str(), fb, ep_ignore_error);
-		if (fb.getSize())
-			_doc.load_buffer(fb.getData(), fb.getSize());
-	}
-	
-	pugi::xml_attribute Options::addValue(const string &name)
-	{
-		pugi::xml_node root = _doc.child("options");
-		if (!root)
-			root = _doc.append_child("options");
-		pugi::xml_node child = root.child(name.c_str());
-		if (!child)
-			child = root.append_child(name.c_str());
-
-		pugi::xml_attribute attr = child.attribute("value");
-		if (!attr)
-			attr = child.append_attribute("value");
-		else
-			attr = pugi::xml_attribute();
-
-		return attr;
-	}
-
-	pugi::xml_attribute Options::getValue(const string &name)
-	{
-		pugi::xml_node root = _doc.child("options");
-		OX_ASSERT(root);
-		pugi::xml_node child = root.child(name.c_str());
-		OX_ASSERT(child);
-		pugi::xml_attribute attr = child.attribute("value");
-		OX_ASSERT(attr);
-
-		return attr;
-	}
-
-	void Options::save()
-	{
-		xml_string_writer sw;
-		_doc.save(sw);
-
-		int size = sw.result.size();
-		const char *buf = sw.result.c_str();
-
-		file::handle h = file::open(_path.c_str(), "wb");
-		file::write(h, buf, size);
-		file::close(h);
-	}
-}

oxygine/src/Options.h

@@ -1,36 +0,0 @@
-#pragma once
-#include <string>
-#include "pugixml/pugixml.hpp"
-
-namespace oxygine
-{
-	using namespace std;
-
-	class Options
-	{
-	public:
-		static Options instance;
-
-		Options();
-		~Options();
-
-		void init(const string &version = "1");
-		void reset();
-		void load();
-		void save();
-
-
-		void setPath(const string &path);
-
-		pugi::xml_node getRoot() const {return _doc.root();}
-
-		pugi::xml_attribute addValue(const string &name);
-		pugi::xml_attribute getValue(const string &name);
-
-
-	private:
-		string _version;
-		string _path;
-		pugi::xml_document _doc;
-	};
-}

oxygine/src/PointerState.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/oxygine.h"
 #include <list>
 
@@ -26,13 +27,13 @@ namespace oxygine
 
 		bool			isPressed(MouseButton mb = MouseButton_Touch) const {return _isPressed[mb];}
 		int				getIndex() const {return _index;}		
-		const Point&	getPosition() const {return _position;}		
+		const Vector2&	getPosition() const {return _position;}		
 		
 	private:
 		friend class Input;
 
 		int _index;
 		bool _isPressed[MouseButton_Count];
-		Point _position;
+		Vector2 _position;
 	};
 }

oxygine/src/ProgressBar.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/RenderState.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/Renderer.h"
 
 namespace oxygine

oxygine/src/RootActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 
 namespace oxygine

oxygine/src/SlidingActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "math/vector2.h"
 #include "Draggable.h"

oxygine/src/Sprite.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "core/Texture.h"
 #include "math/Rect.h"

oxygine/src/TextActor.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Actor.h"
 #include "core/Renderer.h"
 #include "TextStyle.h"

oxygine/src/TextStyle.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "math/Color.h"
 #include <string>
 

oxygine/src/Tweener.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/oxygine.h"
 #include "core/Object.h"
 #include "closure/closure.h"

oxygine/src/UpdateState.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 namespace oxygine
 {
 	class UpdateState

oxygine/src/VisualStyle.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "core/Renderer.h"
 #include "Tweener.h"
 

oxygine/src/core/FileSystem.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "Object.h"
 
 namespace oxygine

oxygine/src/core/ImageData.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "math/Rect.h"
 #include "pixel.h"
 

oxygine/src/core/ImageDataOperations.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "oxygine_include.h"
 #include "oxygine.h"
 #include "ImageData.h"