improved examples

__startTracingLeaks/__stopTracingLeaks
added Serializing/Deserializing
minor fixes
added new textures format
reworked xml loading
added relative paths <set path = "./rel/path" />
reworked xml.meta format
reworked readme

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 6850a8755222320c505549684d3ae5256d7e2bd1
+node: a0da173aafc1fe91ab5d005a567cd1ea12b85875
 branch: default
 latesttag: oldrender
-latesttagdistance: 236
+latesttagdistance: 275

.hgignore

@@ -114,5 +114,13 @@ examples/DemoBox2D/box2d/Debug/
 examples/DemoBox2D/box2d/Release/
 examples/DemoBox2D/proj.marmalade/build_demobox2d_*
 examples/TutorialResources/proj.win32/Debug/
+oxygine/SDL/qt/build-oxygine-*
+examples/HelloWorld/build-hello-*
+examples/DemoBox2D/proj.win32/Debug/
+oxygine/SDL/qt/build-oxygine-Debug
+examples/Demo/proj.android/local.properties
+proguard-project.txt
+examples/Demo/proj.marmalade/build_demo_
+examples/Demo/proj.marmalade/build_demo_*
 syntax: regexp
 ^build/

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

@@ -1 +1 @@
-<resources><bmfc_font sf="1.0" size="16"/><bmfc_font sf="1.0" size="26"/></resources>
+<resources><set/><bmfc_font sf="1.0" size="16"/><bmfc_font sf="1.0" size="26"/></resources>

examples/Demo/data/xmls/res.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <resources>
-	<set path = "images" />
+	<set path = "./../images" />
 	<atlas id = "primary" format="8888">
 		<image file="gray.png"/>
 		<image file="logo2.png" /> <!-- border=2 adds 2 pixel border from each side of image in atlas to avoid problem with mask -->
@@ -17,6 +17,7 @@
 		<image file="t2p.png"/>
 		<image file="slide.png"/>
 		<image file="box9.png"/>
+		<image file="box9a.png"/>
 	</atlas>
 	
 	<set load = "false" /> <!--do not load next atlasses by default-->

examples/Demo/prepare_res.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+python ../../tools/process_xml2.py -x xmls/res.xml --src_data data --dest_data data/ext
+python ../../tools/process_xml2.py -x demo/res_ui.xml --src_data data --dest_data data/ext

examples/Demo/prepare_res_pvrtc.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+python ../../tools/process_xml2.py -x xmls/res.xml --src_data data --dest_data data/ext --compress pvrtc
+python ../../tools/process_xml2.py -x demo/res_ui.xml --src_data data --dest_data data/ext --compress pvrtc

examples/Demo/prepare_res_pvrtc_high_quality.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+python ../../tools/process_xml2.py -x xmls/res.xml --src_data data --dest_data data/ext --compress pvrtc -q best
+python ../../tools/process_xml2.py -x demo/res_ui.xml --src_data data --dest_data data/ext --compress pvrtc -q best

examples/Demo/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (Demo)
 
-add_subdirectory(../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Demo/proj.ios/demo_ios.xcodeproj/project.pbxproj

@@ -65,7 +65,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* Demo_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -74,8 +74,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = Demo/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
@@ -390,7 +390,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -424,7 +424,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -443,7 +443,7 @@
 				INFOPLIST_FILE = "Demo/Demo_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Demo_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -466,7 +466,7 @@
 				INFOPLIST_FILE = "Demo/Demo_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Demo_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Demo/proj.macosx/demo_macosx.xcodeproj/project.pbxproj

@@ -82,10 +82,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -120,7 +120,7 @@
 		5DE458993031811A4C7D28C1 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		BA41FC88D76540A6905224D6 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -434,7 +434,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -469,7 +469,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -485,8 +485,8 @@
 				INFOPLIST_FILE = "Demo_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Demo_macosx;
 				WRAPPER_EXTENSION = app;
@@ -504,8 +504,8 @@
 				INFOPLIST_FILE = "Demo_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Demo_macosx;
 				WRAPPER_EXTENSION = app;

examples/Demo/proj.win32/Demo_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Demo/proj.win32/Demo_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Demo/proj.win32/Demo_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Demo/proj.win32/Demo_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Demo/src/TestBox9Sprite.h

@@ -6,22 +6,65 @@ class TestBox9Sprite: public Test
 public:
 	TestBox9Sprite()
 	{
-		ResAnim *rs = resources.getResAnim("box9");
+		ResAnim *rs = resources.getResAnim("box9a");
 		spSprite original = new Sprite;
 		original->setPosition(10, 70);
 		original->setResAnim(rs);
 		addChild(original);
 
-		spBox9Sprite sprite = new Box9Sprite;			
-		sprite->setPosition(270, 70);
+
+
+		spBox9Sprite sprite;
+
+		sprite = new Box9Sprite;			
+		sprite->setPosition(270, 10);
 		sprite->setResAnim(rs);
-		sprite->setSize(300, 400);
+		sprite->setSize(300, 250);
+		sprite->setVerticalMode(Box9Sprite::TILING_FULL);
+		sprite->setHorizontalMode(Box9Sprite::TILING_FULL);
+
+		//you could also define guides from xml  
+		//<image file="box9.png" guideX1="50" guideX2="210" guideY1="50" guideY2="125" />
+		sprite->setGuides(40, 160, 40, 160);
+		addChild(sprite);
+
+
+		sprite = new Box9Sprite;			
+		sprite->setPosition(600, 10);
+		sprite->setResAnim(rs);
+		sprite->setSize(300, 250);
 		//sprite->setVerticalMode(Box9Sprite::TILING_FULL);
-		//sprite->setHorizontalMode(Box9Sprite::TILING);
+		//sprite->setHorizontalMode(Box9Sprite::TILING_FULL);
+
+		//you could also define guides from xml  
+		//<image file="box9.png" guideX1="50" guideX2="210" guideY1="50" guideY2="125" />
+		sprite->setGuides(40, 160, 40, 160);
+		addChild(sprite);
+
+
+		sprite = new Box9Sprite;			
+		sprite->setPosition(getWidth()/4, 300);
+		sprite->setResAnim(rs);
+		sprite->setSize(getWidth()/2, 150);
+		//sprite->setVerticalMode(Box9Sprite::TILING_FULL);
+		//sprite->setHorizontalMode(Box9Sprite::TILING_FULL);
+
+		//you could also define guides from xml  
+		//<image file="box9.png" guideX1="50" guideX2="210" guideY1="50" guideY2="125" />
+		sprite->setGuides(40, 160, 40, 160);
+		addChild(sprite);
+
+
+		sprite = new Box9Sprite;			
+		sprite->setPosition(getWidth()/4, 480);
+		sprite->setResAnim(rs);
+		sprite->setSize(getWidth()/2, 150);
+		sprite->setVerticalMode(Box9Sprite::TILING_FULL);
+		sprite->setHorizontalMode(Box9Sprite::TILING_FULL);
 
 		//you could also define guides from xml  
 		//<image file="box9.png" guideX1="50" guideX2="210" guideY1="50" guideY2="125" />
-		sprite->setGuides(50, 210, 50, 125);
+		sprite->setGuides(40, 160, 40, 160);
 		addChild(sprite);
 	}
 };

examples/Demo/src/TestManageRes.h

@@ -56,6 +56,8 @@ public:
 	{
 		notify("Loaded!");
 		ui->getChild("loading")->addTween(Sprite::TweenAlpha(0), 400)->setDetachActor(true);
+
+		releaseRef();//added ref earlier from void clicked(id)
 	}
 
 	void toggleClicked(string id, const toggle *data)
@@ -86,6 +88,9 @@ public:
 
 			spThreadLoading l = new ThreadLoading;
 			l->addEventListener(ThreadLoading::COMPLETE, CLOSURE(this, &ManageResTest::_loaded));
+			
+			addRef();//protect Test instance from automatic delete if you close it to fast
+
 			l->add(&resources);
 			if (id == "mt_slow")
 				l->setUpdateSize(128);

examples/Demo/src/entry_point.cpp

@@ -72,6 +72,8 @@ int mainloop()
 //it is application entry point
 void run()
 {
+	ObjectBase::__startTracingLeaks();
+
 	//initialize oxygine's internal stuff
 	core::init_desc desc;
 
@@ -150,6 +152,8 @@ void run()
 	//dump list should be empty now
 	//we deleted everything and could be sure that there aren't any memory leaks
 	ObjectBase::dumpCreatedObjects();
+
+	ObjectBase::__stopTracingLeaks();
 	//end
 }
 

examples/Game/part1/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (GamePart1)
 
-add_subdirectory(../../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Game/part1/proj.ios/GamePart1_ios.xcodeproj/project.pbxproj

@@ -66,7 +66,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* GamePart1_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart1_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -75,8 +75,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = GamePart1/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
@@ -372,7 +372,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -406,7 +406,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -425,7 +425,7 @@
 				INFOPLIST_FILE = "GamePart1/GamePart1_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart1_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -448,7 +448,7 @@
 				INFOPLIST_FILE = "GamePart1/GamePart1_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart1_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Game/part1/proj.macosx/GamePart1_macosx.xcodeproj/project.pbxproj

@@ -83,10 +83,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart1_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -111,7 +111,7 @@
 		BA41FC88D76540A6905224D6 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -416,7 +416,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -451,7 +451,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -467,8 +467,8 @@
 				INFOPLIST_FILE = "GamePart1_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart1_macosx;
 				WRAPPER_EXTENSION = app;
@@ -486,8 +486,8 @@
 				INFOPLIST_FILE = "GamePart1_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart1_macosx;
 				WRAPPER_EXTENSION = app;

examples/Game/part1/proj.win32/GamePart1_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part1/proj.win32/GamePart1_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part1/proj.win32/GamePart1_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part1/proj.win32/GamePart1_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part2/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (GamePart2)
 
-add_subdirectory(../../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Game/part2/proj.ios/GamePart2_ios.xcodeproj/project.pbxproj

@@ -68,7 +68,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* GamePart2_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart2_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -77,8 +77,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = GamePart2/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/Enemy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Enemy.cpp; path = ../src/Enemy.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
@@ -384,7 +384,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -418,7 +418,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -437,7 +437,7 @@
 				INFOPLIST_FILE = "GamePart2/GamePart2_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart2_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -460,7 +460,7 @@
 				INFOPLIST_FILE = "GamePart2/GamePart2_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart2_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Game/part2/proj.macosx/GamePart2_macosx.xcodeproj/project.pbxproj

@@ -85,10 +85,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart2_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -117,7 +117,7 @@
 		F196143B0370A9D348494ACC /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -428,7 +428,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -463,7 +463,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -479,8 +479,8 @@
 				INFOPLIST_FILE = "GamePart2_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart2_macosx;
 				WRAPPER_EXTENSION = app;
@@ -498,8 +498,8 @@
 				INFOPLIST_FILE = "GamePart2_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart2_macosx;
 				WRAPPER_EXTENSION = app;

examples/Game/part2/proj.win32/GamePart2_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part2/proj.win32/GamePart2_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part2/proj.win32/GamePart2_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part2/proj.win32/GamePart2_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part3/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (GamePart3)
 
-add_subdirectory(../../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Game/part3/proj.ios/GamePart3_ios.xcodeproj/project.pbxproj

@@ -72,7 +72,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* GamePart3_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart3_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -81,8 +81,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = GamePart3/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/Enemy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Enemy.cpp; path = ../src/Enemy.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
@@ -408,7 +408,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -442,7 +442,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -461,7 +461,7 @@
 				INFOPLIST_FILE = "GamePart3/GamePart3_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart3_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -484,7 +484,7 @@
 				INFOPLIST_FILE = "GamePart3/GamePart3_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart3_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Game/part3/proj.macosx/GamePart3_macosx.xcodeproj/project.pbxproj

@@ -89,10 +89,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart3_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -129,7 +129,7 @@
 		7623D793B59EF0CD569E6EC2 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		AFA30E959880563E6ABBBC4F /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -452,7 +452,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -487,7 +487,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -503,8 +503,8 @@
 				INFOPLIST_FILE = "GamePart3_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart3_macosx;
 				WRAPPER_EXTENSION = app;
@@ -522,8 +522,8 @@
 				INFOPLIST_FILE = "GamePart3_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart3_macosx;
 				WRAPPER_EXTENSION = app;

examples/Game/part3/proj.win32/GamePart3_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part3/proj.win32/GamePart3_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part3/proj.win32/GamePart3_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part3/proj.win32/GamePart3_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part4/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (GamePart4)
 
-add_subdirectory(../../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Game/part4/proj.ios/GamePart4_ios.xcodeproj/project.pbxproj

@@ -74,7 +74,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* GamePart4_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart4_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -83,8 +83,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = GamePart4/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/Enemy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Enemy.cpp; path = ../src/Enemy.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
@@ -418,7 +418,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -452,7 +452,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -471,7 +471,7 @@
 				INFOPLIST_FILE = "GamePart4/GamePart4_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart4_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -494,7 +494,7 @@
 				INFOPLIST_FILE = "GamePart4/GamePart4_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart4_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Game/part4/proj.macosx/GamePart4_macosx.xcodeproj/project.pbxproj

@@ -91,10 +91,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GamePart4_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -134,7 +134,7 @@
 		B52CCD463855CF91A7FBDB8E /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		7EEFDEEC289FCBB5FA67F822 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -462,7 +462,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -497,7 +497,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../../..//oxygine-framework/oxygine/src ../../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine/src ../../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -513,8 +513,8 @@
 				INFOPLIST_FILE = "GamePart4_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart4_macosx;
 				WRAPPER_EXTENSION = app;
@@ -532,8 +532,8 @@
 				INFOPLIST_FILE = "GamePart4_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../../..//oxygine/third_party/macosx/libraries",
+					"../../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = GamePart4_macosx;
 				WRAPPER_EXTENSION = app;

examples/Game/part4/proj.win32/GamePart4_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part4/proj.win32/GamePart4_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Game/part4/proj.win32/GamePart4_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Game/part4/proj.win32/GamePart4_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine/src;../../../../..//SDL/include;../../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/HelloWorld/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (HelloWorld)
 
-add_subdirectory(../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/HelloWorld/proj.ios/HelloWorld_ios.xcodeproj/project.pbxproj

@@ -26,6 +26,7 @@
 		1E839D002B2BA83FC83A695A /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../data/fonts */; };
 		3A631A475DE035FC53ADE5EA /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/images */; };
 		CD59C69314E9E74CD0A11E03 /* ../data/res.xml in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/res.xml */; };
+		EFF139F8BA484314F7AAF645 /* ../data/xml in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/xml */; };
 
 /* End PBXBuildFile section */
 
@@ -63,7 +64,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* HelloWorld_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -72,16 +73,17 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = HelloWorld/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
+		BA41FC88D76540A6905224D6 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../data/app.config.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = app.config.txt; path = ../data/app.config.txt; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../data/fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../data/res.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = res.xml; path = ../data/res.xml; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../data/xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xml; path = ../data/xml; sourceTree = "<group>"; };
 
 /* End PBXFileReference section */
 
@@ -162,6 +164,7 @@
 				04FE4D4FB640E0DF92DFB865 /* fonts */, 
 				7F3B12E3C9D554D9FE28101D /* images */, 
 				F6123B1E6FE4471A00F49751 /* res.xml */, 
+				5DE458993031811A4C7D28C1 /* xml */, 
 
 			);
 			name = "Supporting Files";
@@ -180,7 +183,7 @@
 			children = (
 				360377333740D8A2FD15BBE6 /* entry_point.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */, 
-				5DE458993031811A4C7D28C1 /* example.h */, 
+				BA41FC88D76540A6905224D6 /* example.h */, 
 
 			);
 			name = src;
@@ -280,6 +283,7 @@
 				1E839D002B2BA83FC83A695A /* fonts */, 
 				3A631A475DE035FC53ADE5EA /* images */, 
 				CD59C69314E9E74CD0A11E03 /* res.xml */, 
+				EFF139F8BA484314F7AAF645 /* xml */, 
 
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -350,7 +354,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -384,7 +388,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -403,7 +407,7 @@
 				INFOPLIST_FILE = "HelloWorld/HelloWorld_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = HelloWorld_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -426,7 +430,7 @@
 				INFOPLIST_FILE = "HelloWorld/HelloWorld_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = HelloWorld_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/HelloWorld/proj.macosx/HelloWorld_macosx.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		1E839D002B2BA83FC83A695A /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../data/fonts */; };
 		3A631A475DE035FC53ADE5EA /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/images */; };
 		CD59C69314E9E74CD0A11E03 /* ../data/res.xml in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/res.xml */; };
+		EFF139F8BA484314F7AAF645 /* ../data/xml in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/xml */; };
 
 		
 /* End PBXBuildFile section */
@@ -80,10 +81,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -94,13 +95,14 @@
 		049B57501871FBE900EF3C66 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
+		BA41FC88D76540A6905224D6 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../data/app.config.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = app.config.txt; path = ../data/app.config.txt; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../data/fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../data/res.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = res.xml; path = ../data/res.xml; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../data/xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xml; path = ../data/xml; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -191,6 +193,7 @@
 				04FE4D4FB640E0DF92DFB865 /* fonts */, 
 				7F3B12E3C9D554D9FE28101D /* images */, 
 				F6123B1E6FE4471A00F49751 /* res.xml */, 
+				5DE458993031811A4C7D28C1 /* xml */, 
 
 				049B57391871FBE900EF3C66 /* HelloWorld_macosx-Info.plist */,
 			);
@@ -202,7 +205,7 @@
 			children = (
 				360377333740D8A2FD15BBE6 /* entry_point.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */, 
-				5DE458993031811A4C7D28C1 /* example.h */, 
+				BA41FC88D76540A6905224D6 /* example.h */, 
 
 			);
 			name = src;
@@ -325,6 +328,7 @@
 				1E839D002B2BA83FC83A695A /* fonts */, 
 				3A631A475DE035FC53ADE5EA /* images */, 
 				CD59C69314E9E74CD0A11E03 /* res.xml */, 
+				EFF139F8BA484314F7AAF645 /* xml */, 
 
 				049B574A1871FBE900EF3C66 /* Images.xcassets in Resources */,
 			);
@@ -394,7 +398,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -429,7 +433,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -445,8 +449,8 @@
 				INFOPLIST_FILE = "HelloWorld_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = HelloWorld_macosx;
 				WRAPPER_EXTENSION = app;
@@ -464,8 +468,8 @@
 				INFOPLIST_FILE = "HelloWorld_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = HelloWorld_macosx;
 				WRAPPER_EXTENSION = app;

examples/HelloWorld/proj.win32/HelloWorld_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/HelloWorld/proj.win32/HelloWorld_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/HelloWorld/proj.win32/HelloWorld_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/HelloWorld/proj.win32/HelloWorld_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Match3/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (Match3)
 
-add_subdirectory(../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/Match3/proj.ios/Match3_ios.xcodeproj/project.pbxproj

@@ -66,7 +66,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* Match3_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Match3_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -75,8 +75,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = Match3/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
@@ -368,7 +368,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -402,7 +402,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -421,7 +421,7 @@
 				INFOPLIST_FILE = "Match3/Match3_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Match3_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -444,7 +444,7 @@
 				INFOPLIST_FILE = "Match3/Match3_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Match3_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/Match3/proj.macosx/Match3_macosx.xcodeproj/project.pbxproj

@@ -83,10 +83,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Match3_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -109,7 +109,7 @@
 		BA41FC88D76540A6905224D6 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../data/resources.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = resources.xml; path = ../data/resources.xml; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -412,7 +412,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -447,7 +447,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -463,8 +463,8 @@
 				INFOPLIST_FILE = "Match3_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Match3_macosx;
 				WRAPPER_EXTENSION = app;
@@ -482,8 +482,8 @@
 				INFOPLIST_FILE = "Match3_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = Match3_macosx;
 				WRAPPER_EXTENSION = app;

examples/Match3/proj.win32/Match3_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Match3/proj.win32/Match3_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/Match3/proj.win32/Match3_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/Match3/proj.win32/Match3_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/TutorialResources/proj.cmake/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required (VERSION 2.6)
+project (TutorialResources)
+
+add_subdirectory(../../../ oxygine-framework)
+add_definitions(${OXYGINE_DEFINITIONS})
+include_directories(${OXYGINE_INCLUDE_DIRS})
+link_directories(${OXYGINE_LIBRARY_DIRS})
+
+add_executable(TutorialResources ../src/entry_point.cpp ../src/example.cpp  ../src/example.h )
+
+target_link_libraries(TutorialResources ${OXYGINE_CORE_LIBS})

examples/TutorialResources/proj.ios/TutorialResources_ios.xcodeproj/project.pbxproj

@@ -63,7 +63,7 @@
 /* Begin PBXFileReference section */
 		04998CEC17F8A933003441C3 /* TutorialResources_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TutorialResources_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		04998D2F17F8A96E003441C3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode-iOS/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
-		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../../..//oxygine-framework/oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
+		04998D3917F8A9AA003441C3 /* oxygine_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_ios.xcodeproj; path = "../../..//oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj"; sourceTree = "<group>"; };
 		04998EE117F8ADB4003441C3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04998EE217F8ADB4003441C3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		04998EE317F8ADB4003441C3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -72,8 +72,8 @@
 		04998EEB17F8ADD4003441C3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		04998EEC17F8ADD4003441C3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		04998EED17F8ADD4003441C3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
-		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
+		04998EF517F8B6F3003441C3 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../..//oxygine/third_party/ios/libraries/libpng.a"; sourceTree = "<group>"; };
+		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = TutorialResources/Images.xcassets; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
@@ -350,7 +350,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 			};
 			name = Debug;
 		};
@@ -384,7 +384,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -403,7 +403,7 @@
 				INFOPLIST_FILE = "TutorialResources/TutorialResources_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = TutorialResources_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";
@@ -426,7 +426,7 @@
 				INFOPLIST_FILE = "TutorialResources/TutorialResources_ios-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = TutorialResources_ios;
 				PROVISIONING_PROFILE = "A34F5D84-E1EB-47B5-AD4B-67D0FA4A5BE6";

examples/TutorialResources/proj.macosx/TutorialResources_macosx.xcodeproj/project.pbxproj

@@ -80,10 +80,10 @@
 /* Begin PBXFileReference section */
 		04059FEC187202A200BA6557 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		04059FEE187202AC00BA6557 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
-		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
-		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../..//oxygine-framework/oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF01872031A00BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/macosx/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF11872031A00BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/macosx/libraries/libpng.a; sourceTree = "<group>"; };
+		04059FF4187203A600BA6557 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../../..//oxygine/third_party/ios/libraries/libjpeg.a; sourceTree = "<group>"; };
+		04059FF5187203A600BA6557 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../..//oxygine/third_party/ios/libraries/libpng.a; sourceTree = "<group>"; };
 		049B572E1871FBE900EF3C66 /* demo_macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TutorialResources_macosx.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B57311871FBE900EF3C66 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		049B57341871FBE900EF3C66 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -100,7 +100,7 @@
 		7F3B12E3C9D554D9FE28101D /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../data/res.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = res.xml; path = ../data/res.xml; sourceTree = "<group>"; };
 
-		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../../..//oxygine-framework/oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
+		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -394,7 +394,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Debug;
@@ -429,7 +429,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "../../../..//oxygine-framework/oxygine/src ../../../..//SDL/include";
+				USER_HEADER_SEARCH_PATHS = "../../..//oxygine/src ../../../..//SDL/include";
 				VALID_ARCHS = i386;
 			};
 			name = Release;
@@ -445,8 +445,8 @@
 				INFOPLIST_FILE = "TutorialResources_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = TutorialResources_macosx;
 				WRAPPER_EXTENSION = app;
@@ -464,8 +464,8 @@
 				INFOPLIST_FILE = "TutorialResources_macosx-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../../..//oxygine-framework/oxygine/third_party/macosx/libraries",
-					"../../../..//oxygine-framework/oxygine/third_party/ios/libraries",
+					"../../..//oxygine/third_party/macosx/libraries",
+					"../../..//oxygine/third_party/ios/libraries",
 				);
 				PRODUCT_NAME = TutorialResources_macosx;
 				WRAPPER_EXTENSION = app;

examples/TutorialResources/proj.win32/TutorialResources_vs2010.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/TutorialResources/proj.win32/TutorialResources_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,14 +69,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -87,7 +87,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

examples/TutorialResources/proj.win32/TutorialResources_vs2013.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\Vis
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples/TutorialResources/proj.win32/TutorialResources_vs2013.vcxproj

@@ -53,13 +53,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,14 +71,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -89,7 +89,7 @@
     <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
     </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>

oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0467086C192796A000D71824 /* Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = 0467086B192796A000D71824 /* Serialize.h */; };
+		0467086E192796E500D71824 /* Serialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0467086D192796E500D71824 /* Serialize.cpp */; };
 		0472E35717F8A1A80016A832 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0472E34817F8A1A80016A832 /* file.cpp */; };
 		0472E35817F8A1A80016A832 /* file.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472E34917F8A1A80016A832 /* file.h */; };
 		0472E35917F8A1A80016A832 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0472E34A17F8A1A80016A832 /* FileSystem.cpp */; };
@@ -201,6 +203,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		0467086B192796A000D71824 /* Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Serialize.h; path = ../../../src/Serialize.h; sourceTree = "<group>"; };
+		0467086D192796E500D71824 /* Serialize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Serialize.cpp; path = ../../../src/Serialize.cpp; sourceTree = "<group>"; };
 		0472E34817F8A1A80016A832 /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; };
 		0472E34917F8A1A80016A832 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
 		0472E34A17F8A1A80016A832 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
@@ -472,6 +476,8 @@
 		C3E86F5316EBC8C200052915 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				0467086D192796E500D71824 /* Serialize.cpp */,
+				0467086B192796A000D71824 /* Serialize.h */,
 				04B3A71718A65668004C67E3 /* InputText.cpp */,
 				04B3A71818A65668004C67E3 /* InputText.h */,
 				0472E37B17F8A2EC0016A832 /* MaskedSprite.cpp */,
@@ -771,6 +777,7 @@
 				C3E8702016EBC8EB00052915 /* Mutex.h in Headers */,
 				C3E8702216EBC8EB00052915 /* NativeTexture.h in Headers */,
 				C3E8702416EBC8EB00052915 /* Object.h in Headers */,
+				0467086C192796A000D71824 /* Serialize.h in Headers */,
 				C3E8702516EBC8EB00052915 /* ox_debug.h in Headers */,
 				C3E8702916EBC8EB00052915 /* oxygine.h in Headers */,
 				C3E8702A16EBC8EB00052915 /* pixel.h in Headers */,
@@ -977,6 +984,7 @@
 				C38EC26F1709649300568283 /* DeveloperMenu.cpp in Sources */,
 				C38EC2711709649300568283 /* TexturesInspector.cpp in Sources */,
 				C38EC2731709649300568283 /* TreeInspector.cpp in Sources */,
+				0467086E192796E500D71824 /* Serialize.cpp in Sources */,
 				C38EC2751709649300568283 /* TreeInspectorLine.cpp in Sources */,
 				C38EC2771709649300568283 /* TreeInspectorPage.cpp in Sources */,
 				C38EC2791709649300568283 /* TreeInspectorPreview.cpp in Sources */,

oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		04670867192795E700D71824 /* Serialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04670865192795E700D71824 /* Serialize.cpp */; };
+		04670868192795E700D71824 /* Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = 04670866192795E700D71824 /* Serialize.h */; };
 		049B56651871F21E00EF3C66 /* Actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B55911871F21D00EF3C66 /* Actor.cpp */; };
 		049B56661871F21E00EF3C66 /* Actor.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B55921871F21D00EF3C66 /* Actor.h */; };
 		049B56671871F21E00EF3C66 /* AnimationFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B55931871F21D00EF3C66 /* AnimationFrame.cpp */; };
@@ -200,6 +202,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		04670865192795E700D71824 /* Serialize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Serialize.cpp; path = ../../../src/Serialize.cpp; sourceTree = "<group>"; };
+		04670866192795E700D71824 /* Serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Serialize.h; path = ../../../src/Serialize.h; sourceTree = "<group>"; };
 		049B52BB1871EDE900EF3C66 /* liboxygine_macosx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liboxygine_macosx.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		049B55911871F21D00EF3C66 /* Actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Actor.cpp; path = ../../../src/Actor.cpp; sourceTree = "<group>"; };
 		049B55921871F21D00EF3C66 /* Actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Actor.h; path = ../../../src/Actor.h; sourceTree = "<group>"; };
@@ -431,6 +435,8 @@
 		049B55901871F21000EF3C66 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				04670865192795E700D71824 /* Serialize.cpp */,
+				04670866192795E700D71824 /* Serialize.h */,
 				04B3A71D18A6594D004C67E3 /* InputText.cpp */,
 				04B3A71E18A6594D004C67E3 /* InputText.h */,
 				049B55911871F21D00EF3C66 /* Actor.cpp */,
@@ -765,6 +771,7 @@
 				049B56B51871F21E00EF3C66 /* UberShaderProgram.h in Headers */,
 				049B56E21871F21E00EF3C66 /* ioapi.h in Headers */,
 				049B56A41871F21E00EF3C66 /* Renderer.h in Headers */,
+				04670868192795E700D71824 /* Serialize.h in Headers */,
 				049B56D01871F21E00EF3C66 /* Font.h in Headers */,
 				049B56DE1871F21E00EF3C66 /* vector4.h in Headers */,
 				049B56A21871F21E00EF3C66 /* ref_counter.h in Headers */,
@@ -971,6 +978,7 @@
 				049B56FF1871F21E00EF3C66 /* Resource.cpp in Sources */,
 				049B56D61871F21E00EF3C66 /* AffineTransform.cpp in Sources */,
 				049B568A1871F21E00EF3C66 /* VideoDriverGLES20.cpp in Sources */,
+				04670867192795E700D71824 /* Serialize.cpp in Sources */,
 				049B56CD1871F21E00EF3C66 /* EventDispatcher.cpp in Sources */,
 				049B56C01871F21E00EF3C66 /* TexturesInspector.cpp in Sources */,
 				049B56771871F21E00EF3C66 /* coroutines.cpp in Sources */,

oxygine/SDL/qt/oxygine-framework/oxygine-framework.pro

@@ -0,0 +1,259 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-03-20T19:06:13
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+TARGET = oxygine-framework
+TEMPLATE = lib
+CONFIG += staticlib
+
+QMAKE_CXXFLAGS_WARN_OFF -= -Wunused-parameter
+
+ROOT = ../../../../
+SRC = ../../../src
+SOURCES += \
+    $$SRC/Actor.cpp \ 
+    $$SRC/AnimationFrame.cpp \ 
+    $$SRC/blocking.cpp \ 
+    $$SRC/Box9Sprite.cpp \ 
+    $$SRC/Button.cpp \ 
+    $$SRC/ClipRectActor.cpp \ 
+    $$SRC/Clock.cpp \ 
+    $$SRC/ColorRectSprite.cpp \ 
+    $$SRC/DebugActor.cpp \ 
+    $$SRC/Draggable.cpp \ 
+    $$SRC/EventDispatcher.cpp \ 
+    $$SRC/Font.cpp \ 
+    $$SRC/Input.cpp \ 
+    $$SRC/InputText.cpp \ 
+    $$SRC/MaskedSprite.cpp \ 
+    $$SRC/MemoryTexture.cpp \ 
+    $$SRC/Multithreading.cpp \ 
+    $$SRC/PointerState.cpp \ 
+    $$SRC/ProgressBar.cpp \ 
+    $$SRC/RootActor.cpp \ 
+    $$SRC/SlidingActor.cpp \ 
+    $$SRC/Sprite.cpp \ 
+    $$SRC/TextActor.cpp \ 
+    $$SRC/Tweener.cpp \ 
+    $$SRC/VisualStyle.cpp \ 
+    $$SRC/Serialize.cpp  
+
+HEADERS +=  \
+    $$SRC/Actor.h \ 
+    $$SRC/AnimationFrame.h \ 
+    $$SRC/blocking.h \ 
+    $$SRC/Box9Sprite.h \ 
+    $$SRC/Button.h \ 
+    $$SRC/ClipRectActor.h \ 
+    $$SRC/Clock.h \ 
+    $$SRC/ColorRectSprite.h \ 
+    $$SRC/DebugActor.h \ 
+    $$SRC/Draggable.h \ 
+    $$SRC/Event.h \ 
+    $$SRC/EventDispatcher.h \ 
+    $$SRC/Font.h \ 
+    $$SRC/initActor.h \ 
+    $$SRC/Input.h \ 
+    $$SRC/InputText.h \ 
+    $$SRC/MaskedSprite.h \ 
+    $$SRC/MemoryTexture.h \ 
+    $$SRC/Multithreading.h \ 
+    $$SRC/oxygine-framework.h \ 
+    $$SRC/oxygine_include.h \ 
+    $$SRC/PointerState.h \ 
+    $$SRC/ProgressBar.h \ 
+    $$SRC/RenderState.h \ 
+    $$SRC/RootActor.h \ 
+    $$SRC/SlidingActor.h \ 
+    $$SRC/Sprite.h \ 
+    $$SRC/TextActor.h \ 
+    $$SRC/TextStyle.h \ 
+    $$SRC/Tweener.h \ 
+    $$SRC/UpdateState.h \ 
+    $$SRC/VisualStyle.h \ 
+    $$SRC/Serialize.h
+
+
+SOURCES += \
+    $$SRC/core/coroutines.cpp \ 
+    $$SRC/core/file.cpp \ 
+    $$SRC/core/FileSystem.cpp \ 
+    $$SRC/core/ImageData.cpp \ 
+    $$SRC/core/ImageDataOperations.cpp \ 
+    $$SRC/core/log.cpp \ 
+    $$SRC/core/Mem2Native.cpp \ 
+    $$SRC/core/memory_pool.cpp \ 
+    $$SRC/core/Mutex.cpp \ 
+    $$SRC/core/NativeTexture.cpp \ 
+    $$SRC/core/Object.cpp \ 
+    $$SRC/core/oxygine.cpp \ 
+    $$SRC/core/Renderer.cpp \ 
+    $$SRC/core/Restorable.cpp \ 
+    $$SRC/core/STDFileSystem.cpp \ 
+    $$SRC/core/system_data.cpp \ 
+    $$SRC/core/Texture.cpp \ 
+    $$SRC/core/ThreadMessages.cpp \ 
+    $$SRC/core/UberShaderProgram.cpp \ 
+    $$SRC/core/VideoDriver.cpp \ 
+    $$SRC/core/ZipFileSystem.cpp \ 
+
+
+
+HEADERS += \
+$$SRC/core/coroutines.h \ 
+    $$SRC/core/file.h \ 
+    $$SRC/core/FileSystem.h \ 
+    $$SRC/core/files_io.h \ 
+    $$SRC/core/ImageData.h \ 
+    $$SRC/core/ImageDataOperations.h \ 
+    $$SRC/core/intrusive_ptr.h \ 
+    $$SRC/core/log.h \ 
+    $$SRC/core/logging.h \ 
+    $$SRC/core/Mem2Native.h \ 
+    $$SRC/core/memory_pool.h \ 
+    $$SRC/core/Mutex.h \ 
+    $$SRC/core/NativeTexture.h \ 
+    $$SRC/core/Object.h \ 
+    $$SRC/core/oxygine.h \ 
+    $$SRC/core/ox_debug.h \ 
+    $$SRC/core/pixel.h \ 
+    $$SRC/core/ref_counter.h \ 
+    $$SRC/core/Renderer.h \ 
+    $$SRC/core/Restorable.h \ 
+    $$SRC/core/ShaderProgram.h \ 
+    $$SRC/core/STDFileSystem.h \ 
+    $$SRC/core/system_data.h \ 
+    $$SRC/core/Texture.h \ 
+    $$SRC/core/ThreadMessages.h \ 
+    $$SRC/core/UberShaderProgram.h \ 
+    $$SRC/core/vertex.h \ 
+    $$SRC/core/VertexDeclaration.h \ 
+    $$SRC/core/VideoDriver.h \ 
+    $$SRC/core/ZipFileSystem.h \ 
+
+
+SOURCES += \
+    $$SRC/dev_tools/DeveloperMenu.cpp \ 
+    $$SRC/dev_tools/TexturesInspector.cpp \ 
+    $$SRC/dev_tools/TreeInspector.cpp \ 
+    $$SRC/dev_tools/TreeInspectorLine.cpp \ 
+    $$SRC/dev_tools/TreeInspectorPage.cpp \ 
+    $$SRC/dev_tools/TreeInspectorPreview.cpp \ 
+
+
+HEADERS +=  \
+    $$SRC/dev_tools/DeveloperMenu.h \ 
+    $$SRC/dev_tools/TexturesInspector.h \ 
+    $$SRC/dev_tools/TreeInspector.h \ 
+    $$SRC/dev_tools/TreeInspectorLine.h \ 
+    $$SRC/dev_tools/TreeInspectorPage.h \ 
+    $$SRC/dev_tools/TreeInspectorPreview.h \ 
+
+
+SOURCES += \
+    $$SRC/minizip/ioapi.c \ 
+    $$SRC/minizip/ioapi_mem.c \ 
+    $$SRC/minizip/unzip.c \ 
+
+HEADERS +=  \
+    $$SRC/minizip/ioapi.h \ 
+    $$SRC/minizip/ioapi_mem.h \ 
+    $$SRC/minizip/unzip.h \ 
+
+SOURCES += \
+    $$SRC/pugixml/pugixml.cpp \ 
+
+HEADERS +=  \
+    $$SRC/pugixml/pugiconfig.hpp \ 
+    $$SRC/pugixml/pugixml.hpp \ 
+
+SOURCES += \
+    $$SRC/res/CreateResourceContext.cpp \ 
+    $$SRC/res/ResAnim.cpp \ 
+    $$SRC/res/ResAtlas.cpp \ 
+    $$SRC/res/ResBuffer.cpp \ 
+    $$SRC/res/ResFont.cpp \ 
+    $$SRC/res/ResFontBM.cpp \ 
+    $$SRC/res/Resource.cpp \ 
+    $$SRC/res/Resources.cpp \ 
+    $$SRC/res/ResStarlingAtlas.cpp \ 
+
+HEADERS += \
+    $$SRC/res/CreateResourceContext.h \ 
+    $$SRC/res/ResAnim.h \ 
+    $$SRC/res/ResAtlas.h \ 
+    $$SRC/res/ResBuffer.h \ 
+    $$SRC/res/ResFont.h \ 
+    $$SRC/res/ResFontBM.h \ 
+    $$SRC/res/Resource.h \ 
+    $$SRC/res/Resources.h \ 
+    $$SRC/res/ResStarlingAtlas.h \ 
+
+SOURCES += \
+    $$SRC/text_utils/Aligner.cpp \ 
+    $$SRC/text_utils/Node.cpp \ 
+    $$SRC/text_utils/TextBuilder.cpp \ 
+
+HEADERS += \
+    $$SRC/text_utils/Aligner.h \ 
+    $$SRC/text_utils/Node.h \ 
+    $$SRC/text_utils/TextBuilder.h \ 
+
+SOURCES += \
+    $$SRC/utils/AtlasTool.cpp \ 
+    $$SRC/utils/ImageUtils.cpp \ 
+    $$SRC/utils/stringUtils.cpp \ 
+
+HEADERS += \
+    $$SRC/utils/AtlasTool.h \ 
+    $$SRC/utils/ImageUtils.h \ 
+    $$SRC/utils/intrusive_list.h \ 
+    $$SRC/utils/stringUtils.h \ 
+
+SOURCES += \
+    $$SRC/winnie_alloc/system_alloc.cpp \ 
+    $$SRC/winnie_alloc/winnie_alloc.cpp \ 
+
+HEADERS += \
+    $$SRC/winnie_alloc/system_alloc.h \ 
+    $$SRC/winnie_alloc/winnie_alloc.h \ 
+    $$SRC/winnie_alloc/winnie_alloc_config.h \ 
+
+SOURCES += \
+    $$SRC/core/gl/NativeTextureGLES.cpp \
+    $$SRC/core/gl/oxgl.cpp \
+    $$SRC/core/gl/VertexDeclarationGL.cpp \
+    $$SRC/core/gl/ShaderProgramGL.cpp \
+    $$SRC/core/gl/VideoDriverGL.cpp \
+    $$SRC/core/gl/VideoDriverGLES20.cpp \
+
+INCLUDEPATH += \
+    $$SRC \
+    $$SRC/../../../SDL/include/
+
+debug
+{
+    DEFINES +=_DEBUG
+    DEFINES += OXYGINE_QT
+}
+release
+{
+    DEFINES += OXYGINE_QT    
+}
+
+THIRD_PARTY = $$ROOT/oxygine/third_party/win32_mingw
+
+INCLUDEPATH += $$THIRD_PARTY/libpng
+INCLUDEPATH += $$THIRD_PARTY/zlib
+INCLUDEPATH += $$THIRD_PARTY/pthreads
+
+DEFINES += "OX_HAVE_LIBPNG=1"
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}

oxygine/SDL/win32/oxygine_vs2010.vcxproj

@@ -158,6 +158,7 @@
     <ClCompile Include="..\..\src\res\Resources.cpp" />
     <ClCompile Include="..\..\src\res\ResStarlingAtlas.cpp" />
     <ClCompile Include="..\..\src\RootActor.cpp" />
+    <ClCompile Include="..\..\src\Serialize.cpp" />
     <ClCompile Include="..\..\src\SlidingActor.cpp" />
     <ClCompile Include="..\..\src\Sprite.cpp" />
     <ClCompile Include="..\..\src\TextActor.cpp" />
@@ -255,6 +256,7 @@
     <ClInclude Include="..\..\src\res\Resources.h" />
     <ClInclude Include="..\..\src\res\ResStarlingAtlas.h" />
     <ClInclude Include="..\..\src\RootActor.h" />
+    <ClInclude Include="..\..\src\Serialize.h" />
     <ClInclude Include="..\..\src\SlidingActor.h" />
     <ClInclude Include="..\..\src\Sprite.h" />
     <ClInclude Include="..\..\src\TextActor.h" />

oxygine/SDL/win32/oxygine_vs2010.vcxproj.filters

@@ -291,6 +291,9 @@
     <ClCompile Include="..\..\src\InputText.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Serialize.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\closure\closure.h">
@@ -623,6 +626,9 @@
     <ClInclude Include="..\..\src\InputText.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Serialize.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/Actor.cpp

@@ -13,6 +13,7 @@
 #include "utils/stringUtils.h"
 #include "RenderState.h"
 #include <stdio.h>
+#include "Serialize.h"
 
 //#include ""
 
@@ -46,7 +47,7 @@ namespace oxygine
 		//addEventListener(et_MouseMove, CLOSURE(this, &Actor::_onMouseEvent));
 	}
 
-	Actor::Actor(const Actor &src, cloneOptions opt):EventDispatcher(src)
+	void Actor::copyFrom(const Actor &src, cloneOptions opt)
 	{
 		_pos = src._pos;
 		_extendedIsOn = src._extendedIsOn;
@@ -63,7 +64,7 @@ namespace oxygine
 
 		_transform = src._transform;
 		_transformInvert = src._transformInvert;
-		
+
 
 		if (!(opt & cloneOptionsDoNotCloneClildren))
 		{
@@ -82,7 +83,11 @@ namespace oxygine
 			setRotation(0);
 			setScale(1);
 		}
+
+		if (src.__getName())
+			setName(src.getName());
 	}
+	
 
 	Actor::~Actor()
 	{
@@ -454,6 +459,14 @@ namespace oxygine
 		_flags |= flag_transformDirty | flag_transformInvertDirty;
 	}
 
+	void Actor::setTransform(const AffineTransform &tr)
+	{
+		_transform = tr;
+		_flags &= ~flag_transformDirty;
+		_flags &= ~flag_fastTransform;
+		_flags |= flag_transformInvertDirty;		
+	}
+
 
 	void Actor::setPriority(short zorder)
 	{
@@ -520,10 +533,15 @@ namespace oxygine
 
 	}
 
+    void Actor::_setSize(const Vector2 &size)
+    {
+        _size = size;
+        _flags |= flag_transformDirty | flag_transformInvertDirty;
+    }
+
 	void Actor::setSize(const Vector2 &size)
 	{
-		_size = size;
-		_flags |= flag_transformDirty | flag_transformInvertDirty;
+        _setSize(size);
 		sizeChanged(size);
 	}	
 
@@ -644,6 +662,9 @@ namespace oxygine
 
 	Actor* Actor::getDescendant(const string &name, error_policy ep)
 	{
+		if (isName(name.c_str()))
+			return this;
+
 		Actor *actor = _getDescendant(name);
 		if (!actor)
 		{
@@ -654,17 +675,25 @@ namespace oxygine
 
 	Actor* Actor::_getDescendant(const string &name)
 	{
-		if (isName(name.c_str()))
-			return this;
-
 		Actor *child = _children._first.get();
 		while (child)
+		{
+			if (child->isName(name.c_str()))
+				return child;
+			
+			child = child->getNextSibling().get();
+		}
+
+		child = _children._first.get();
+		while (child)
 		{
 			Actor *des = child->_getDescendant(name);
 			if (des)
 				return des;
+
 			child = child->getNextSibling().get();
 		}
+		
 		return 0;
 	}
 
@@ -719,12 +748,13 @@ namespace oxygine
 			OX_ASSERT(insertBefore->getParent() == this);
 		}
 
-		//actor->removeFromParent();
-		
-		
+        actor->detach();
+
+        /*
 		OX_ASSERT(actor->getParent() == 0);
 		if (actor->getParent())
 			return;
+            */
 			
 
 		if (insertBefore)
@@ -783,6 +813,19 @@ namespace oxygine
 			insertChildBefore(actor, 0);
 	}
 
+    void Actor::prependChild(spActor actor)
+    {
+        prependChild(actor.get());
+    }
+
+    void Actor::prependChild(Actor *actor)
+    {
+        if (getFirstChild())
+            insertChildBefore(actor, getFirstChild());
+        else
+            addChild(actor);
+    }
+
 	void Actor::addChild(spActor actor)
 	{
 		addChild(actor.get());
@@ -1067,6 +1110,116 @@ namespace oxygine
 		}
 	}
 
+
+
+
+	void Actor::serialize(serializedata* data)
+	{
+		//node.set_name("actor");
+		pugi::xml_node node = data->node;
+		
+		node.append_attribute("name").set_value(getName().c_str());
+		setAttrV2(node, "pos", getPosition(), Vector2(0, 0));
+		setAttrV2(node, "scale", getScale(), Vector2(1, 1));
+		setAttrV2(node, "size", getSize(), Vector2(0, 0));
+		setAttr(node, "rotation", getRotation(), 0.0f);
+		setAttr(node, "visible", getVisible(), true);
+		setAttr(node, "input", getInputEnabled(), true);
+		setAttr(node, "inputch", getInputChildrenEnabled(), true);
+		setAttr(node, "alpha", getAlpha(), (unsigned char)255);		
+
+		if (data->withChildren)
+		{
+			spActor child = getFirstChild();
+			while (child)
+			{
+				serializedata d = *data;
+				d.node = node.append_child("-");
+				child->serialize(&d);
+				child = child->getNextSibling();
+			}
+		}
+
+		node.set_name("Actor");
+	}
+
+	Vector2 attr2Vector2(const char *data)
+	{
+		Vector2 v;
+		sscanf(data, "%f,%f", &v.x, &v.y);
+		return v;
+	}
+
+	void Actor::deserialize(const deserializedata* data)
+	{
+		pugi::xml_node node = data->node;
+		pugi::xml_attribute attr = node.first_attribute();
+		while (attr)
+		{
+			const char *name = attr.name();
+
+			do 
+			{
+				if (!strcmp(name, "name"))
+				{
+					setName(attr.as_string());
+					break;
+				}
+				if (!strcmp(name, "pos"))
+				{
+					setPosition(attr2Vector2(attr.as_string()));
+					break;
+				}
+				if (!strcmp(name, "scale"))
+				{
+					setScale(attr2Vector2(attr.as_string()));
+					break;
+				}
+				if (!strcmp(name, "size"))
+				{
+					setSize(attr2Vector2(attr.as_string()));
+					break;
+				}
+				if (!strcmp(name, "rotation"))
+				{
+					setRotation(attr.as_float());
+					break;
+				}
+				if (!strcmp(name, "visible"))
+				{
+					setVisible(attr.as_bool());
+					break;
+				}
+				if (!strcmp(name, "input"))
+				{
+					setInputEnabled(attr.as_bool());
+					break;
+				}
+				if (!strcmp(name, "inputch"))
+				{
+					setInputChildrenEnabled(attr.as_bool());
+					break;
+				}
+				if (!strcmp(name, "alpha"))
+				{
+					setAlpha(static_cast<unsigned char>(attr.as_int()));
+					break;
+				}
+			} while (0);
+
+
+			attr = attr.next_attribute();
+		}
+
+		pugi::xml_node item = node.first_child();
+		while (!item.empty())
+		{
+			spActor actor = deserializedata::deser(item, data->factory);
+			addChild(actor);
+			item = item.next_sibling();
+		}
+	}
+
 	Vector2 convert_global2local_(Actor *child, Actor *parent, Vector2 pos)
 	{
 		if (child->getParent() && child->getParent() != parent)
@@ -1143,4 +1296,4 @@ namespace oxygine
 		actor->setPosition(pos);
 		actor->attachTo(newParent);
 	}
-}
+}

oxygine/src/Actor.h

@@ -35,6 +35,7 @@ namespace oxygine
 	typedef std::vector<spActor> actors;
 
 	
+	/*
 	template<class T>
 	T *create(T *item, const Vector2 *pos, const char *name)
 	{
@@ -44,6 +45,7 @@ namespace oxygine
 			item->setName(name);
 		return item;
 	}
+	*/
 
 	typedef Closure<void (const UpdateState &us)> UpdateCallback;
 	typedef Closure<void (const RenderState &rs)> RenderCallback;
@@ -55,16 +57,33 @@ namespace oxygine
 
 
 #define DECLARE_COPYCLONE(type) type(const type &src, cloneOptions);\
-	virtual type* clone(cloneOptions opt=0) const {return new type(*this, opt);}
+	virtual type* clone(cloneOptions opt=0) const {return new type(*this, opt);}\
 
 
+#define DECLARE_COPYCLONE_NEW(type)  type(const type &src, cloneOptions opt = 0){copyFrom(src, opt);}\
+	virtual type* clone(cloneOptions opt=0) const {type *tp = new type(); tp->copyFrom(*this, opt); return tp;}\
+	virtual void copyFrom(const type &src, cloneOptions opt = 0);
+
+
+
+
+	struct serializedata;
+	struct deserializedata;
+
+
+	class Serializable
+	{
+	public:
+		virtual void serialize(serializedata*){}
+		virtual void deserialize(const deserializedata*){}
+	};
 	
 
-	class Actor : public EventDispatcher, public intrusive_list_item<spActor>
+	class Actor : public EventDispatcher, public intrusive_list_item<spActor>, public Serializable
 	{
 		typedef intrusive_list_item<spActor> intr_list;
 	public:
-		DECLARE_COPYCLONE(Actor);
+		DECLARE_COPYCLONE_NEW(Actor);
 
 		Actor();
 		virtual ~Actor();
@@ -103,8 +122,8 @@ namespace oxygine
 		float				getX() const {return _pos.x;}
 		float				getY() const {return _pos.y;}		
 		const Vector2&		getScale() const {return _scale;}
-		const float			getScaleX() const {return _scale.x;}
-		const float			getScaleY() const {return _scale.y;}
+		float               getScaleX() const {return _scale.x;}
+		float               getScaleY() const {return _scale.y;}
 		/**Returns rotation angle in radians*/
 		float				getRotation() const {return _rotation;}		
 		int					getPriority() const {return _zOrder;}				
@@ -117,6 +136,7 @@ namespace oxygine
 		const spClock&		getClock() const;
 		virtual RectF		getDestRect() const;
 		bool				getInputEnabled() const {return (_flags & flag_inputEnabled) != 0;}
+		bool				getInputChildrenEnabled() const {return (_flags & flag_inputChildrenEnabled) != 0;}
 		bool				getChildrenRelative() const {return (_flags & flag_childrenRelative) != 0;;}
 		UpdateCallback		getCallbackDoUpdate() const {return _cbDoUpdate;}
 		//RenderCallback		getCallbackDoRender() const {return _cbDoRender;}
@@ -133,7 +153,8 @@ namespace oxygine
 		void setPosition(float x, float y);
 		void setX(float x);
 		void setY(float y);
-
+		/**Overwrites transformation matrix. position/scale/rotation would be ignored until you change them*/
+		void setTransform(const AffineTransform &tr);
 		/** set z order draw priority, from back (low value) to front (high value). Max value is 32000, Min value -32000*/
 		void setPriority(short zorder);
 		void setScale(float scale);
@@ -180,6 +201,8 @@ namespace oxygine
 		void insertChildBefore(spActor actor, spActor where);
 		/**Inserts the specified actor after "where" actor as a child*/
 		void insertChildAfter(spActor actor, spActor where);
+		void prependChild(spActor actor);
+		void prependChild(Actor *actor);
 		void addChild(spActor actor);
 		void addChild(Actor *actor);//avoid conversion to spActor
 		void attachTo(spActor parent);
@@ -237,10 +260,18 @@ namespace oxygine
 		typedef GetSet<float, float, Actor, &Actor::getHeight, &Actor::setHeight>								TweenHeight;
 		typedef GetSet<float, float, Actor, &Actor::getRotation, &Actor::setRotation>							TweenRotation;
 		typedef GetSet2Args1Arg<float, Vector2, const Vector2 &, Actor, &Actor::getScale, &Actor::setScale>		TweenScale;
+		typedef GetSet<float, float, Actor, &Actor::getScaleX, &Actor::setScaleX>								TweenScaleX;
+		typedef GetSet<float, float, Actor, &Actor::getScaleY, &Actor::setScaleY>								TweenScaleY;
 		typedef GetSet<unsigned char, unsigned char, Actor, &Actor::getAlpha, &Actor::setAlpha>					TweenAlpha;
 		
 
+		void serialize(serializedata* data);
+		void deserialize(const deserializedata* data);
+
 	protected:
+		void _setSize(const Vector2 &);
+		
+
 		Actor*	_getDescendant(const string &name);
 		spTween _addTween(spTween tween, bool rel);
 
@@ -342,4 +373,4 @@ namespace oxygine
 		void init(Actor &){}
 		void update(Actor &, float p, const UpdateState &us){}
 	};
-}
+}

oxygine/src/AnimationFrame.h

@@ -44,6 +44,7 @@ namespace oxygine
 
 		void			setSrcRect(const RectF &r){_srcRect = r;}
 		void			setDestRect(const RectF &r){_destRect = r;}
+		void			setResAnim(ResAnim *rs){_resAnim = rs;}
 		
 
 	private:
@@ -60,4 +61,4 @@ namespace oxygine
 		ResAnim*		_resAnim;
 		//unsigned short	_flags;
 	};
-}
+}

oxygine/src/Box9Sprite.cpp

@@ -2,11 +2,14 @@
 #include "res/ResAnim.h"
 #include "math/ScalarMath.h"
 #include "RenderState.h"
+#include <sstream>
 
 namespace oxygine
 {
-	Box9Sprite::Box9Sprite(const Box9Sprite &src, cloneOptions opt):Sprite(src, opt)
+	void Box9Sprite::copyFrom(const Box9Sprite &src, cloneOptions opt)
 	{
+		Sprite::copyFrom(src, opt);
+
 		_prepared = src._prepared;
 
 		_vertMode = src._vertMode;
@@ -225,6 +228,40 @@ namespace oxygine
 		_prepared = true;
 	}
 
+	string stretchMode2String(Box9Sprite::StretchMode s)
+	{
+		switch (s)
+		{
+		case Box9Sprite::TILING:
+			return "tiling";
+		case Box9Sprite::TILING_FULL:
+			return "tiling_full";
+		case Box9Sprite::STRETCHING:
+			return "stretching";
+		}
+
+		return "";
+	}
+
+	std::string Box9Sprite::dump(const dumpOptions &options) const
+	{
+		stringstream stream;
+		stream << "{Box9Sprite}\n";
+		stream << "guideX1=" << _guideX[0] << " ";
+		stream << "guideX2=" << _guideX[1] << " ";
+		stream << "guideY1=" << _guideY[0] << " ";
+		stream << "guideY2=" << _guideY[1] << " ";
+
+		stream << "vert=" << stretchMode2String(_vertMode) << " ";
+		stream << "hor=" << stretchMode2String(_horzMode) << " ";
+
+		stream << "\n";
+
+
+		stream << Sprite::dump(options);
+		return stream.str();
+	}
+
 	void Box9Sprite::sizeChanged(const Vector2 &size)
 	{
 		_prepared = false;

oxygine/src/Box9Sprite.h

@@ -8,7 +8,7 @@ namespace oxygine
 	class Box9Sprite: public Sprite
 	{
 	public:
-		DECLARE_COPYCLONE(Box9Sprite);
+		DECLARE_COPYCLONE_NEW(Box9Sprite);
 		enum StretchMode
 		{
 			TILING, 
@@ -28,6 +28,8 @@ namespace oxygine
 		void setVerticalGuides(float x1, float x2);
 		void setHorizontalGuides(float y1, float y2);
 
+		std::string dump(const dumpOptions &) const;
+
 
 		virtual RectF getDestRect() const;
 

oxygine/src/Button.cpp

@@ -3,18 +3,13 @@
 
 namespace oxygine
 {
-
-	Button::Button(const Button &src, cloneOptions opt):Sprite(src, opt), _btnOvered(0), _btnPressed(0)
+	void Button::copyFrom(const Button &src, cloneOptions opt)
 	{
+		Sprite::copyFrom(src, opt);
+
 		_state = src._state;
 		_resAnim = src._resAnim;
 		_row = src._row;
-
-		EventCallback ncb = CLOSURE(this, &Button::_mouseEvent);
-		addEventListener(TouchEvent::TOUCH_DOWN, ncb);
-		addEventListener(TouchEvent::OVER, ncb);
-		addEventListener(TouchEvent::OUT, ncb);
-		addEventListener(TouchEvent::CLICK, ncb);
 	}
 
 	Button::Button():_state(stateNormal), _resAnim(0), _row(0), _btnPressed(0), _btnOvered(0)

oxygine/src/Button.h

@@ -10,7 +10,7 @@ namespace oxygine
 	class Button: public Sprite
 	{
 	public:
-		DECLARE_COPYCLONE(Button);
+		DECLARE_COPYCLONE_NEW(Button);
 
 		Button();
 		~Button();

oxygine/src/ClipRectActor.cpp

@@ -2,11 +2,13 @@
 #include "RootActor.h"
 #include "core/log.h"
 #include "RenderState.h"
+#include "Serialize.h"
 
 namespace oxygine
 {
-	ClipRectActor::ClipRectActor(const ClipRectActor &src, cloneOptions opt):Actor(src, opt)
+	void ClipRectActor::copyFrom(const ClipRectActor &src, cloneOptions opt)
 	{
+		Actor::copyFrom(src, opt);
 		_culling = src._culling;
 		_clipping = src._clipping;
 	}
@@ -99,4 +101,16 @@ namespace oxygine
 			rs.renderer->getDriver()->setScissorRect(scissorEnabled ? &scissorRect : 0);
 		}
 	}
+
+	void ClipRectActor::serialize(serializedata* data)
+	{
+		Actor::serialize(data);
+		pugi::xml_node node = data->node;
+		node.set_name("Sprite");
+	}
+
+	void ClipRectActor::deserialize(const deserializedata* data)
+	{
+		Actor::deserialize(data);
+	}
 }

oxygine/src/ClipRectActor.h

@@ -12,7 +12,7 @@ namespace oxygine
 	class ClipRectActor : public Actor
 	{
 	public:
-		DECLARE_COPYCLONE(ClipRectActor);
+		DECLARE_COPYCLONE_NEW(ClipRectActor);
 		ClipRectActor();
 		~ClipRectActor();
 
@@ -27,6 +27,9 @@ namespace oxygine
 
 		void handleEvent(Event *event);
 
+		void serialize(serializedata* data);
+		void deserialize(const deserializedata* data);
+
 	protected:
 
 		bool _culling;

oxygine/src/Clock.cpp

@@ -70,6 +70,8 @@ namespace oxygine
 
 		if (dt > 100)
 			dt = 100;
+		if (dt < 0)
+			dt = 1;
 
 		if (_counter > 0)
 			dt = 0;//todo destTime == srcTime ??

oxygine/src/ColorRectSprite.cpp

@@ -1,12 +1,13 @@
 #include "ColorRectSprite.h"
 #include "core/Renderer.h"
 #include "RenderState.h"
+#include "Serialize.h"
 
 namespace oxygine
 {
-	ColorRectSprite::ColorRectSprite(const ColorRectSprite &src, cloneOptions opt):Sprite(src, opt)
+	void ColorRectSprite::copyFrom(const ColorRectSprite &src, cloneOptions opt)
 	{
-
+		Sprite::copyFrom(src, opt);
 	}
 
 	ColorRectSprite::ColorRectSprite()
@@ -29,4 +30,12 @@ namespace oxygine
 		RectF destRect = getDestRect();
 		rs.renderer->draw(srcRect, destRect);
 	}
+
+	void ColorRectSprite::serialize(serializedata* data)
+	{
+		Actor::serialize(data);
+		pugi::xml_node node = data->node;
+		//node.append_attribute("")
+		data->node.set_name("ColorRectSprite");
+	}
 }

oxygine/src/ColorRectSprite.h

@@ -9,10 +9,12 @@ namespace oxygine
 	class ColorRectSprite: public Sprite
 	{
 	public:
-		DECLARE_COPYCLONE(ColorRectSprite);
+		DECLARE_COPYCLONE_NEW(ColorRectSprite);
 		ColorRectSprite();
 		~ColorRectSprite();
 
+		void serialize(serializedata* data);
+
 		void doRender(const RenderState &rs);
 
 	private:

oxygine/src/Draggable.cpp

@@ -78,10 +78,14 @@ namespace oxygine
 			_actor->removeEventListeners(this);
 			_actor = 0;
 		}
+
+        _pressed = false;
 	}
 
 	void Draggable::init(Actor *actor)
 	{
+        destroy();
+
 		_singleDrag = false;
 		_actor = actor;
 		_dragClient = actor;
@@ -235,4 +239,4 @@ namespace oxygine
 		client->setPosition(np);
 	}
 
-}
+}

oxygine/src/Draggable.h

@@ -21,6 +21,7 @@ namespace oxygine
 
 		Actor*			getDragClient() const {return _dragClient;}
 		const RectF&	getDragBounds() const {return _bounds;}
+		const Vector2&  getClientPos() const {return _clientPos;}
 		bool			isDragging() const {return _pressed;}
 
 		bool getDragEnabled() const {return _dragEnabled;}
@@ -53,4 +54,4 @@ namespace oxygine
 		bool _pressed;
 		bool _dragEnabled;
 	};
-}
+}

oxygine/src/MemoryTexture.cpp

@@ -583,6 +583,11 @@ namespace oxygine
 		return _image.h;
 	}
 
+	const Point& MemoryTexture::getSize() const
+	{
+		return *((Point*)&_image.w);
+	}
+
 	TextureFormat MemoryTexture::getFormat() const
 	{
 		return _image.format;

oxygine/src/MemoryTexture.h

@@ -25,10 +25,11 @@ namespace oxygine
 		
 		void fill_zero();
 
-		unsigned int getSizeVRAM() const {return _buffer.size();}
-		int	getWidth() const;
-		int getHeight() const;
-		TextureFormat getFormat() const;
+		unsigned int	getSizeVRAM() const {return _buffer.size();}
+		int				getWidth() const;
+		int				getHeight() const;
+		const Point&	getSize() const;
+		TextureFormat	getFormat() const;
 
 		ImageData	lock(lock_flags f = 0, const Rect *pRect = 0);
 		ImageData	lock(const Rect *pRect);

oxygine/src/Multithreading.cpp

@@ -64,8 +64,9 @@ namespace oxygine
 		Mem2Native *_m2n;
 	};
 
-	ThreadLoading::ThreadLoading(const ThreadLoading &src, cloneOptions opt):Actor(src, opt)
+	void ThreadLoading::copyFrom(const ThreadLoading &src, cloneOptions opt)
 	{
+		Actor::copyFrom(src, opt);
 		_thread = pthread_self();
 		_threadDone = false;
 

oxygine/src/Multithreading.h

@@ -15,7 +15,7 @@ namespace oxygine
 	class ThreadLoading: public Actor
 	{
 	public:
-		DECLARE_COPYCLONE(ThreadLoading);
+		DECLARE_COPYCLONE_NEW(ThreadLoading);
 
 		enum
 		{

oxygine/src/ProgressBar.cpp

@@ -1,6 +1,7 @@
 #include "ProgressBar.h"
 #include "RenderState.h"
 #include <sstream>
+#include "Serialize.h"
 namespace oxygine
 {
 	void fill_tex_coord(vertexPCT2 &vt, unsigned int rgba, const Vector2 &pnt, float nu, float nv)
@@ -45,9 +46,10 @@ namespace oxygine
 	{
 
 	}
-
-	ProgressBar::ProgressBar(const ProgressBar &src, cloneOptions opt):Sprite(src, opt)
+	
+	void ProgressBar::copyFrom(const ProgressBar &src, cloneOptions opt)
 	{
+		Sprite::copyFrom(src, opt);
 		_progress = src._progress;
 		_direction = src._direction;
 		_originalFrame = src._originalFrame;
@@ -365,4 +367,11 @@ namespace oxygine
 	{
 		return _direction;
 	}
+
+	void ProgressBar::serialize(serializedata* data)
+	{
+		Sprite::serialize(data);
+		pugi::xml_node node = data->node;
+		data->node.set_name("ProgressBar");
+	}
 }

oxygine/src/ProgressBar.h

@@ -19,7 +19,7 @@ namespace oxygine
 			__dir_radial_ccw//not implemented!!
 		};
 
-		DECLARE_COPYCLONE(ProgressBar);
+		DECLARE_COPYCLONE_NEW(ProgressBar);
 
 		ProgressBar();
 		~ProgressBar();
@@ -34,6 +34,7 @@ namespace oxygine
 		void setDirection(direction dir);
 
 		string dump(const dumpOptions &) const;
+		void serialize(serializedata* data);
 		
 		typedef GetSet<float, float, ProgressBar, &ProgressBar::getProgress, &ProgressBar::setProgress> TweenProgress;		
 

oxygine/src/Serialize.cpp

@@ -0,0 +1,35 @@
+#include "Serialize.h"
+#include "Sprite.h"
+#include "TextActor.h"
+#include "ColorRectSprite.h"
+#include "ClipRectActor.h"
+#include "ProgressBar.h"
+namespace oxygine
+{
+    //#define S(s) #s
+    //#define SS(s) ##s
+    #define CREATE(T) if (!strcmp(#T, type)) return new T
+
+	spActor creator::create(const char *type) const
+	{
+		CREATE(Sprite);
+		CREATE(TextActor);		
+		CREATE(Actor);
+		CREATE(ProgressBar);
+		CREATE(ColorRectSprite);
+		CREATE(ClipRectActor);
+
+		return 0;
+	}
+
+	spActor deserializedata::deser(pugi::xml_node node, const creator* factory)
+	{
+		deserializedata d;
+		d.node = node;
+		d.factory = factory;
+		const char *name = node.name();
+		spActor actor = factory->create(name);
+		actor->deserialize(&d);
+		return actor;
+	}
+}

oxygine/src/Serialize.h

@@ -0,0 +1,58 @@
+#pragma once
+#include "oxygine_include.h"
+#include "core/Object.h"
+#include "pugixml/pugixml.hpp"
+#include "res/ResAnim.h"
+#include "res/ResFont.h"
+#include "utils/stringUtils.h"
+
+namespace oxygine
+{
+	struct serializedata
+	{		
+		serializedata():withChildren(true){}
+		pugi::xml_node node;
+		bool withChildren;
+	};
+
+	DECLARE_SMART(Actor, spActor);
+
+	class Resource;
+	class ResAnim;
+	class ResFont;
+
+	class creator
+	{
+	public:
+		virtual spActor		create(const char *type) const;
+		virtual Resource*	getResource(const char *id) const {return 0;}
+		virtual ResAnim*	getResAnim(const char *id) const {return safeCast<ResAnim*>(getResource(id));}
+		virtual ResFont*	getResFont(const char *id) const {return safeCast<ResFont*>(getResource(id));}
+	};
+
+	struct deserializedata
+	{
+		pugi::xml_node node;
+		const creator *factory;
+		static spActor deser(pugi::xml_node node, const creator* factory);
+	};
+	
+
+	inline void setAttrV2(pugi::xml_node node, const char *name, const Vector2 &v, const Vector2 &def)
+	{
+		if (v == def)
+			return;
+		char str[255];
+		safe_sprintf(str, "%g,%g", v.x, v.y);
+		node.append_attribute(name).set_value(str);
+	}
+
+
+	template<class T>
+	void setAttr(pugi::xml_node node, const char *name, T v, T def)
+	{
+		if (v == def)
+			return;
+		node.append_attribute(name).set_value(v);
+	}
+}

oxygine/src/SlidingActor.cpp

@@ -91,8 +91,8 @@ namespace oxygine
 	{
 		if (!_content)
 			return;
-		float w = std::max(0.0f, _content->getWidth() - _clip->getWidth());
-		float h = std::max(0.0f, _content->getHeight() - _clip->getHeight());
+		float w = std::max(0.0f, _content->getWidth() * _content->getScaleX() - _clip->getWidth());
+		float h = std::max(0.0f, _content->getHeight() * _content->getScaleY() - _clip->getHeight());
 		RectF bounds(-w, -h, w, h);		
 
 		_drag.setDragBounds(bounds);

oxygine/src/Sprite.cpp

@@ -5,6 +5,7 @@
 #include "RenderState.h"
 #include "utils/stringUtils.h"
 #include "RootActor.h"
+#include "Serialize.h"
 
 namespace oxygine
 {
@@ -23,8 +24,10 @@ namespace oxygine
 		}		
 	}
 
-	Sprite::Sprite(const Sprite &src, cloneOptions opt):VStyleActor(src, opt)
+	void Sprite::copyFrom(const Sprite &src, cloneOptions opt)
 	{
+		VStyleActor::copyFrom(src, opt);
+
 		_frame = src._frame;
 		_vstyle= src._vstyle;
 		if (getManageResAnim())
@@ -140,6 +143,53 @@ namespace oxygine
 		}		
 	}
 
+	void Sprite::serialize(serializedata* data)
+	{
+		VStyleActor::serialize(data);		
+
+		pugi::xml_node node = data->node;		
+		node.remove_attribute("size");
+
+		const ResAnim *rs = getResAnim();
+		if (rs)
+		{
+			Resource *r = rs->getParent();
+			const char* hint = "";
+			if (r)
+			{
+				r = r->getParent();
+				if (r)
+					hint = r->getName().c_str();
+			}
+
+			if (rs->getName().find(':') == string::npos)
+			{
+				char name[255];
+				safe_sprintf(name, "%s:%s", hint, rs->getName().c_str());
+				node.append_attribute("resanim").set_value(name);
+			}
+			else
+			{
+				node.append_attribute("resanim").set_value(rs->getName().c_str());
+			}
+		}
+
+		node.set_name("Sprite");
+	}
+
+	void Sprite::deserialize(const deserializedata* data)
+	{
+        VStyleActor::deserialize(data);
+
+		pugi::xml_node node = data->node;
+		const char *res = node.attribute("resanim").as_string(0);
+		if (res)
+		{
+			ResAnim *rs = safeCast<ResAnim*>(data->factory->getResAnim(res));
+			setResAnim(rs);
+		}
+	}
+
 
 	TweenAnim::TweenAnim(const ResAnim *resAnim, int row):_resAnim(resAnim), _row(row), _colStart(0), _colEnd(0)
 	{
@@ -187,4 +237,4 @@ namespace oxygine
 
 		actor.setAnimFrame(_resAnim->getFrame(col, _row));
 	}
-}
+}