move actors to actor folder

Android.mk

@@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \
 				$(wildcard $(SRC)/closure/*.cpp) \
 				$(wildcard $(SRC)/core/*.cpp) \
 				$(wildcard $(SRC)/math/*.cpp) \
+				$(wildcard $(SRC)/actor/*.cpp) \
 				$(wildcard $(SRC)/pugixml/*.cpp) \
 				$(wildcard $(SRC)/json/*.cpp) \
 				$(wildcard $(SRC)/res/*.cpp) \

CMakeLists.txt

@@ -37,7 +37,7 @@ set(OXYGINE_SRC ${OXYGINE_ROOT}/src/oxygine)
 
 set(FOLDERS oxygine oxygine/closure oxygine/minizip oxygine/core
 			oxygine/core/gl oxygine/dev_tools oxygine/minizip 
-			oxygine/math oxygine/pugixml oxygine/json oxygine/res 
+			oxygine/math oxygine/actor oxygine/pugixml oxygine/json oxygine/res 
 			oxygine/text_utils oxygine/utils oxygine/winnie_alloc)
 
 

examples/Demo/proj.cmake/CMakeLists.txt

@@ -8,7 +8,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OXYGINE_CXX_FLAGS}")
 
-add_executable(Demo ../src/Counter.cpp ../src/example.cpp ../src/main.cpp ../src/test.cpp  ../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h ../src/TestColorFont.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestEdges.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSignedDistanceFont.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTouches.h ../src/TestTweenPostProcessing.h ../src/TestTweenShine.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/example.h ../src/test.h )
+add_executable(Demo ../src/Counter.cpp ../src/example.cpp ../src/main.cpp ../src/test.cpp  ../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h ../src/TestColorFont.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestEdges.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSignedDistanceFont.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTouches.h ../src/TestTweenPostProcessing.h ../src/TestTweenShine.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/example.h ../src/test.h )
 target_link_libraries(Demo ${OXYGINE_CORE_LIBS})
 
 

examples/Demo/src/main.cpp

@@ -5,8 +5,8 @@
     You can start from example.cpp and example.h, which main functions are called from here.
 */
 #include "oxygine/core/oxygine.h"
-#include "oxygine/Stage.h"
-#include "oxygine/DebugActor.h"
+#include "oxygine/actor/Stage.h"
+#include "oxygine/actor/DebugActor.h"
 #include "example.h"
 
 

oxygine/SDL/win32/oxygine.vcxproj

@@ -116,14 +116,23 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\oxygine\Actor.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Actor.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Box9Sprite.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Button.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\ClipRectActor.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\ColorRectSprite.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\DebugActor.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\MaskedSprite.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Polygon.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\ProgressBar.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\SlidingActor.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Sprite.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\Stage.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\TextField.cpp" />
+    <ClCompile Include="..\..\src\oxygine\actor\WebImage.cpp" />
     <ClCompile Include="..\..\src\oxygine\AnimationFrame.cpp" />
     <ClCompile Include="..\..\src\oxygine\AsyncTask.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Box9Sprite.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Button.cpp" />
-    <ClCompile Include="..\..\src\oxygine\ClipRectActor.cpp" />
     <ClCompile Include="..\..\src\oxygine\Clock.cpp" />
-    <ClCompile Include="..\..\src\oxygine\ColorRectSprite.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\curl\HttpRequestCurlTask.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\file.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\FileSystem.cpp" />
@@ -150,7 +159,6 @@
     <ClCompile Include="..\..\src\oxygine\core\UberShaderProgram.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\VideoDriver.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\ZipFileSystem.cpp" />
-    <ClCompile Include="..\..\src\oxygine\DebugActor.cpp" />
     <ClCompile Include="..\..\src\oxygine\dev_tools\DeveloperMenu.cpp" />
     <ClCompile Include="..\..\src\oxygine\dev_tools\TexturesInspector.cpp" />
     <ClCompile Include="..\..\src\oxygine\dev_tools\TreeInspector.cpp" />
@@ -166,7 +174,6 @@
     <ClCompile Include="..\..\src\oxygine\json\jsoncpp.cpp" />
     <ClCompile Include="..\..\src\oxygine\key.cpp" />
     <ClCompile Include="..\..\src\oxygine\MaskedRenderer.cpp" />
-    <ClCompile Include="..\..\src\oxygine\MaskedSprite.cpp" />
     <ClCompile Include="..\..\src\oxygine\Material.cpp" />
     <ClCompile Include="..\..\src\oxygine\Image.cpp" />
     <ClCompile Include="..\..\src\oxygine\MaterialCache.cpp" />
@@ -178,8 +185,6 @@
     <ClCompile Include="..\..\src\oxygine\res\SingleResAnim.cpp" />
     <ClCompile Include="..\..\src\oxygine\ThreadLoader.cpp" />
     <ClCompile Include="..\..\src\oxygine\PointerState.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Polygon.cpp" />
-    <ClCompile Include="..\..\src\oxygine\ProgressBar.cpp" />
     <ClCompile Include="..\..\src\oxygine\res\CreateResourceContext.cpp" />
     <ClCompile Include="..\..\src\oxygine\res\ResAnim.cpp" />
     <ClCompile Include="..\..\src\oxygine\res\ResAtlas.cpp" />
@@ -192,13 +197,9 @@
     <ClCompile Include="..\..\src\oxygine\res\Resources.cpp" />
     <ClCompile Include="..\..\src\oxygine\res\ResStarlingAtlas.cpp" />
     <ClCompile Include="..\..\src\oxygine\Serializable.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Stage.cpp" />
     <ClCompile Include="..\..\src\oxygine\Serialize.cpp" />
-    <ClCompile Include="..\..\src\oxygine\SlidingActor.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Sprite.cpp" />
     <ClCompile Include="..\..\src\oxygine\STDMaterial.cpp" />
     <ClCompile Include="..\..\src\oxygine\STDRenderer.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TextField.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\Aligner.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\Node.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\TextBuilder.cpp" />
@@ -215,19 +216,27 @@
     <ClCompile Include="..\..\src\oxygine\utils\AtlasBuilder.cpp" />
     <ClCompile Include="..\..\src\oxygine\utils\ImageUtils.cpp" />
     <ClCompile Include="..\..\src\oxygine\VisualStyle.cpp" />
-    <ClCompile Include="..\..\src\oxygine\WebImage.cpp" />
     <ClCompile Include="..\..\src\oxygine\winnie_alloc\system_alloc.cpp" />
     <ClCompile Include="..\..\src\oxygine\winnie_alloc\winnie_alloc.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\oxygine\Actor.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Actor.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Box9Sprite.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Button.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\ClipRectActor.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\ColorRectSprite.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\DebugActor.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\MaskedSprite.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Polygon.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\ProgressBar.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\SlidingActor.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Sprite.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\Stage.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\TextField.h" />
+    <ClInclude Include="..\..\src\oxygine\actor\WebImage.h" />
     <ClInclude Include="..\..\src\oxygine\AnimationFrame.h" />
     <ClInclude Include="..\..\src\oxygine\AsyncTask.h" />
-    <ClInclude Include="..\..\src\oxygine\Box9Sprite.h" />
-    <ClInclude Include="..\..\src\oxygine\Button.h" />
-    <ClInclude Include="..\..\src\oxygine\ClipRectActor.h" />
     <ClInclude Include="..\..\src\oxygine\Clock.h" />
-    <ClInclude Include="..\..\src\oxygine\ColorRectSprite.h" />
     <ClInclude Include="..\..\src\oxygine\core\curl\HttpRequestCurlTask.h" />
     <ClInclude Include="..\..\src\oxygine\core\file.h" />
     <ClInclude Include="..\..\src\oxygine\core\FileSystem.h" />
@@ -261,7 +270,6 @@
     <ClInclude Include="..\..\src\oxygine\core\VertexDeclaration.h" />
     <ClInclude Include="..\..\src\oxygine\core\VideoDriver.h" />
     <ClInclude Include="..\..\src\oxygine\core\ZipFileSystem.h" />
-    <ClInclude Include="..\..\src\oxygine\DebugActor.h" />
     <ClInclude Include="..\..\src\oxygine\dev_tools\DeveloperMenu.h" />
     <ClInclude Include="..\..\src\oxygine\dev_tools\TexturesInspector.h" />
     <ClInclude Include="..\..\src\oxygine\dev_tools\TreeInspector.h" />
@@ -281,7 +289,6 @@
     <ClInclude Include="..\..\src\oxygine\key.h" />
     <ClInclude Include="..\..\src\oxygine\KeyEvent.h" />
     <ClInclude Include="..\..\src\oxygine\MaskedRenderer.h" />
-    <ClInclude Include="..\..\src\oxygine\MaskedSprite.h" />
     <ClInclude Include="..\..\src\oxygine\Material.h" />
     <ClInclude Include="..\..\src\oxygine\MaterialCache.h" />
     <ClInclude Include="..\..\src\oxygine\MaterialX.h" />
@@ -298,8 +305,6 @@
     <ClInclude Include="..\..\src\oxygine\oxygine-framework.h" />
     <ClInclude Include="..\..\src\oxygine\oxygine_include.h" />
     <ClInclude Include="..\..\src\oxygine\PointerState.h" />
-    <ClInclude Include="..\..\src\oxygine\Polygon.h" />
-    <ClInclude Include="..\..\src\oxygine\ProgressBar.h" />
     <ClInclude Include="..\..\src\oxygine\Property.h" />
     <ClInclude Include="..\..\src\oxygine\RenderState.h" />
     <ClInclude Include="..\..\src\oxygine\res\CreateResourceContext.h" />
@@ -314,13 +319,9 @@
     <ClInclude Include="..\..\src\oxygine\res\Resources.h" />
     <ClInclude Include="..\..\src\oxygine\res\ResStarlingAtlas.h" />
     <ClInclude Include="..\..\src\oxygine\Serializable.h" />
-    <ClInclude Include="..\..\src\oxygine\Stage.h" />
     <ClInclude Include="..\..\src\oxygine\Serialize.h" />
-    <ClInclude Include="..\..\src\oxygine\SlidingActor.h" />
-    <ClInclude Include="..\..\src\oxygine\Sprite.h" />
     <ClInclude Include="..\..\src\oxygine\STDMaterial.h" />
     <ClInclude Include="..\..\src\oxygine\STDRenderer.h" />
-    <ClInclude Include="..\..\src\oxygine\TextField.h" />
     <ClInclude Include="..\..\src\oxygine\TextStyle.h" />
     <ClInclude Include="..\..\src\oxygine\text_utils\Aligner.h" />
     <ClInclude Include="..\..\src\oxygine\text_utils\Node.h" />
@@ -351,7 +352,6 @@
     <ClInclude Include="..\..\src\oxygine\utils\ImageUtils.h" />
     <ClInclude Include="..\..\src\oxygine\utils\intrusive_list.h" />
     <ClInclude Include="..\..\src\oxygine\VisualStyle.h" />
-    <ClInclude Include="..\..\src\oxygine\WebImage.h" />
     <ClInclude Include="..\..\src\oxygine\winnie_alloc\system_alloc.h" />
     <ClInclude Include="..\..\src\oxygine\winnie_alloc\winnie_alloc.h" />
     <ClInclude Include="..\..\src\oxygine\winnie_alloc\winnie_alloc_config.h" />

oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -46,6 +46,9 @@
     <Filter Include="src\json">
       <UniqueIdentifier>{5363bb12-7b88-4a51-8310-818b944e0238}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\actor">
+      <UniqueIdentifier>{969670a7-a5c7-4510-9635-59c4787ea429}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\oxygine\math\AffineTransform.cpp">
@@ -189,30 +192,12 @@
     <ClCompile Include="..\..\src\oxygine\minizip\unzip.c">
       <Filter>src\minizip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Actor.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\AnimationFrame.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Box9Sprite.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Button.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\ClipRectActor.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\Clock.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\ColorRectSprite.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\DebugActor.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\Draggable.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -225,21 +210,9 @@
     <ClCompile Include="..\..\src\oxygine\Input.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\MaskedSprite.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\PointerState.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\ProgressBar.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\SlidingActor.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Sprite.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\VisualStyle.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -258,15 +231,6 @@
     <ClCompile Include="..\..\src\oxygine\InputText.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TextField.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Stage.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Polygon.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\STDRenderer.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -288,9 +252,6 @@
     <ClCompile Include="..\..\src\oxygine\AsyncTask.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\WebImage.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\HttpRequestTask.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -354,6 +315,48 @@
     <ClCompile Include="..\..\src\oxygine\MaterialCache.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Actor.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Box9Sprite.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Button.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\ClipRectActor.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\ColorRectSprite.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\DebugActor.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\MaskedSprite.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Polygon.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\ProgressBar.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\SlidingActor.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Sprite.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\Stage.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\TextField.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\actor\WebImage.cpp">
+      <Filter>src\actor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\oxygine\closure\closure.h">
@@ -557,30 +560,12 @@
     <ClInclude Include="..\..\src\oxygine\minizip\unzip.h">
       <Filter>src\minizip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Actor.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\AnimationFrame.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Box9Sprite.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Button.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\ClipRectActor.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\Clock.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\ColorRectSprite.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\DebugActor.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\Draggable.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -599,27 +584,15 @@
     <ClInclude Include="..\..\src\oxygine\Input.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\MaskedSprite.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\oxygine-framework.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\oxygine\PointerState.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\ProgressBar.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\RenderState.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\SlidingActor.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Sprite.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\TextStyle.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -641,15 +614,6 @@
     <ClInclude Include="..\..\src\oxygine\InputText.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TextField.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Stage.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Polygon.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\MaskedRenderer.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -680,9 +644,6 @@
     <ClInclude Include="..\..\src\oxygine\AsyncTask.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\WebImage.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\HttpRequestTask.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -761,6 +722,48 @@
     <ClInclude Include="..\..\src\oxygine\MaterialCache.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Actor.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Box9Sprite.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Button.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\ClipRectActor.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\ColorRectSprite.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\DebugActor.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\MaskedSprite.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Polygon.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\ProgressBar.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\SlidingActor.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Sprite.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\Stage.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\TextField.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\actor\WebImage.h">
+      <Filter>src\actor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/oxygine-framework.h

@@ -5,14 +5,14 @@
 
 //
 #include "oxygine/oxygine-include.h"
-#include "oxygine/Actor.h"
+#include "oxygine/actor/Actor.h"
 #include "oxygine/AnimationFrame.h"
-#include "oxygine/Box9Sprite.h"
-#include "oxygine/Button.h"
-#include "oxygine/ClipRectActor.h"
+#include "oxygine/actor/Box9Sprite.h"
+#include "oxygine/actor/Button.h"
+#include "oxygine/actor/ClipRectActor.h"
 #include "oxygine/Clock.h"
-#include "oxygine/ColorRectSprite.h"
-#include "oxygine/DebugActor.h"
+#include "oxygine/actor/ColorRectSprite.h"
+#include "oxygine/actor/DebugActor.h"
 #include "oxygine/Draggable.h"
 #include "oxygine/Event.h"
 #include "oxygine/EventDispatcher.h"
@@ -25,13 +25,13 @@
 #include "oxygine/MemoryTexture.h"
 #include "oxygine/ThreadLoader.h"
 #include "oxygine/PointerState.h"
-#include "oxygine/ProgressBar.h"
+#include "oxygine/actor/ProgressBar.h"
 #include "oxygine/RenderState.h"
-#include "oxygine/Stage.h"
-#include "oxygine/SlidingActor.h"
-#include "oxygine/Sprite.h"
-#include "oxygine/MaskedSprite.h"
-#include "oxygine/TextField.h"
+#include "oxygine/actor/Stage.h"
+#include "oxygine/actor/SlidingActor.h"
+#include "oxygine/actor/Sprite.h"
+#include "oxygine/actor/MaskedSprite.h"
+#include "oxygine/actor/TextField.h"
 #include "oxygine/TextStyle.h"
 #include "oxygine/Tween.h"
 #include "oxygine/TweenQueue.h"
@@ -41,9 +41,9 @@
 #include "oxygine/VisualStyle.h"
 #include "oxygine/Serialize.h"
 #include "oxygine/STDRenderer.h"
-#include "oxygine/WebImage.h"
+#include "oxygine/actor/WebImage.h"
 #include "oxygine/key.h"
-#include "oxygine/Polygon.h"
+#include "oxygine/actor/Polygon.h"
 #include "oxygine/TweenOutline.h"
 #include "oxygine/TweenGlow.h"
 #include "oxygine/TweenAlphaFade.h"

oxygine/src/oxygine/Draggable.cpp

@@ -1,7 +1,7 @@
 #include "Draggable.h"
 #include "math/AffineTransform.h"
-#include "Actor.h"
-#include "Stage.h"
+#include "actor/Actor.h"
+#include "actor/Stage.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/Draggable.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "oxygine-include.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 //#include "Event.h"
 
 namespace oxygine

oxygine/src/oxygine/Input.cpp

@@ -1,5 +1,5 @@
 #include "Input.h"
-#include "Stage.h"
+#include "actor/Stage.h"
 #include "core/log.h"
 #include <string.h>
 

oxygine/src/oxygine/InputText.cpp

@@ -1,5 +1,5 @@
 #include "InputText.h"
-#include "TextField.h"
+#include "actor/TextField.h"
 #include "utils/stringUtils.h"
 #include "core/oxygine.h"
 

oxygine/src/oxygine/PointerState.cpp

@@ -1,5 +1,5 @@
 #include "PointerState.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 namespace oxygine
 {
     PointerState::PointerState(): _index(1)

oxygine/src/oxygine/PostProcess.cpp

@@ -1,5 +1,5 @@
 #include "PostProcess.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 #include "core/gl/VertexDeclarationGL.h"
 #include "core/gl/ShaderProgramGL.h"
 #include "core/oxygine.h"

oxygine/src/oxygine/STDMaterial.cpp

@@ -1,14 +1,14 @@
 #include "STDMaterial.h"
 #include "VisualStyle.h"
-#include "Sprite.h"
-#include "TextField.h"
+#include "actor/Sprite.h"
+#include "actor/TextField.h"
 #include "text_utils/Node.h"
-#include "ColorRectSprite.h"
+#include "actor/ColorRectSprite.h"
 #include "RenderState.h"
 #include "STDRenderer.h"
 #include "MaskedRenderer.h"
-#include "MaskedSprite.h"
-#include "ClipRectActor.h"
+#include "actor/MaskedSprite.h"
+#include "actor/ClipRectActor.h"
 #include "core/oxygine.h"
 #include "res/ResFont.h"
 #include "core/UberShaderProgram.h"

oxygine/src/oxygine/STDRenderer.cpp

@@ -7,7 +7,6 @@
 #include "core/ZipFileSystem.h"
 #include "core/system_data.h"
 #include "math/Rect.h"
-#include "Actor.h"
 #include "Image.h"
 #include "core/ImageDataOperations.h"
 #include "AnimationFrame.h"

oxygine/src/oxygine/Serialize.cpp

@@ -1,13 +1,13 @@
 #include "Serialize.h"
-#include "Sprite.h"
-#include "TextField.h"
-#include "ColorRectSprite.h"
-#include "ClipRectActor.h"
-#include "ProgressBar.h"
-#include "SlidingActor.h"
-#include "Polygon.h"
-#include "MaskedSprite.h"
-#include "Box9Sprite.h"
+#include "actor/Sprite.h"
+#include "actor/TextField.h"
+#include "actor/ColorRectSprite.h"
+#include "actor/ClipRectActor.h"
+#include "actor/ProgressBar.h"
+#include "actor/SlidingActor.h"
+#include "actor/Polygon.h"
+#include "actor/MaskedSprite.h"
+#include "actor/Box9Sprite.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/ThreadLoader.cpp

@@ -3,7 +3,7 @@
 #include "res/Resources.h"
 #include "res/Resource.h"
 #include "core/oxygine.h"
-#include "Stage.h"
+#include "actor/Stage.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/Tween.cpp

@@ -1,6 +1,6 @@
 #include "Tween.h"
-#include "Actor.h"
-#include "ColorRectSprite.h"
+#include "actor/Actor.h"
+#include "actor/ColorRectSprite.h"
 #include <limits.h>
 
 namespace oxygine

oxygine/src/oxygine/TweenAlphaFade.cpp

@@ -1,6 +1,6 @@
 #include "TweenAlphaFade.h"
 #include "STDMaterial.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TweenAnim.cpp

@@ -1,5 +1,5 @@
 #include "TweenAnim.h"
-#include "Sprite.h"
+#include "actor/Sprite.h"
 #include "res/ResAnim.h"
 
 namespace oxygine

oxygine/src/oxygine/TweenGlow.cpp

@@ -1,6 +1,6 @@
 #include "TweenGlow.h"
 #include "STDMaterial.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 #include "RenderState.h"
 
 #include "core/gl/VertexDeclarationGL.h"

oxygine/src/oxygine/TweenOutline.cpp

@@ -1,6 +1,6 @@
 #include "TweenOutline.h"
 #include "STDMaterial.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 #include "RenderState.h"
 #include "core/gl/VertexDeclarationGL.h"
 

oxygine/src/oxygine/VisualStyle.cpp

@@ -1,5 +1,5 @@
 #include "VisualStyle.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 #include <sstream>
 #include "RenderState.h"
 #include "Serialize.h"

oxygine/src/oxygine/VisualStyle.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "oxygine-include.h"
-#include "Actor.h"
+#include "actor/Actor.h"
 #include "MaterialX.h"
 namespace oxygine
 {

oxygine/src/oxygine/Actor.h → oxygine/src/oxygine/actor/Actor.h

@@ -1,15 +1,15 @@
 #pragma once
 #include "oxygine-include.h"
-#include "oxygine-forwards.h"
-#include "core/Object.h"
-#include "core/Renderer.h"
-#include "math/Rect.h"
-#include "math/AffineTransform.h"
-#include "utils/intrusive_list.h"
-#include "Serializable.h"
-#include "EventDispatcher.h"
-#include "TouchEvent.h"
-#include "Tween.h"
+#include "../oxygine-forwards.h"
+#include "../core/Object.h"
+#include "../core/Renderer.h"
+#include "../math/Rect.h"
+#include "../math/AffineTransform.h"
+#include "../utils/intrusive_list.h"
+#include "../Serializable.h"
+#include "../EventDispatcher.h"
+#include "../TouchEvent.h"
+#include "../Tween.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/SlidingActor.h → oxygine/src/oxygine/actor/SlidingActor.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "oxygine-include.h"
 #include "Actor.h"
-#include "math/Vector2.h"
-#include "Draggable.h"
+#include "../math/Vector2.h"
+#include "../Draggable.h"
 #include "ClipRectActor.h"
 
 namespace oxygine

oxygine/src/oxygine/Sprite.h → oxygine/src/oxygine/actor/Sprite.h

@@ -1,12 +1,12 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/Texture.h"
-#include "math/Rect.h"
-#include "res/ResAnim.h"
+#include "../core/Texture.h"
+#include "../math/Rect.h"
+#include "../res/ResAnim.h"
 #include "Actor.h"
-#include "AnimationFrame.h"
-#include "VisualStyle.h"
-#include "TweenAnim.h"
+#include "../AnimationFrame.h"
+#include "../VisualStyle.h"
+#include "../TweenAnim.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TextField.cpp → oxygine/src/oxygine/actor/TextField.cpp

@@ -1,5 +1,6 @@
 #include <sstream>
 
+
 #include "TextField.h"
 #include "Font.h"
 #include "DebugActor.h"

oxygine/src/oxygine/WebImage.h → oxygine/src/oxygine/actor/WebImage.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
 #include "Actor.h"
-#include "res/ResAnim.h"
+#include "../res/ResAnim.h"
 #include <string>
 
 namespace oxygine

oxygine/src/oxygine/core/oxygine.cpp

@@ -14,8 +14,8 @@
 #include "../PointerState.h"
 #include "../Input.h"
 
-#include "../DebugActor.h"
-#include "../Stage.h"
+#include "../actor/DebugActor.h"
+#include "../actor/Stage.h"
 #include "../KeyEvent.h"
 #include "../res/ResStarlingAtlas.h"
 
@@ -26,7 +26,7 @@
 #include "../winnie_alloc/winnie_alloc.h"
 #include "ThreadDispatcher.h"
 #include "../PostProcess.h"
-#include "../TextField.h"
+#include "../actor/TextField.h"
 
 #ifdef __S3E__
 #include "s3e.h"

oxygine/src/oxygine/dev_tools/DeveloperMenu.cpp

@@ -1,8 +1,8 @@
 #include "DeveloperMenu.h"
-#include "../ColorRectSprite.h"
-#include "../ClipRectActor.h"
-#include "../TextField.h"
-#include "../DebugActor.h"
+#include "../actor/ColorRectSprite.h"
+#include "../actor/ClipRectActor.h"
+#include "../actor/TextField.h"
+#include "../actor/DebugActor.h"
 #include "../res/Resources.h"
 #include "../res/ResFont.h"
 #include "../initActor.h"

oxygine/src/oxygine/dev_tools/DeveloperMenu.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../ClipRectActor.h"
-#include "../ColorRectSprite.h"
+#include "../actor/ClipRectActor.h"
+#include "../actor/ColorRectSprite.h"
 #include "../Draggable.h"
 
 namespace oxygine

oxygine/src/oxygine/dev_tools/TexturesInspector.cpp

@@ -1,13 +1,13 @@
 #include "TexturesInspector.h"
 #include "../core/NativeTexture.h"
 #include "../AnimationFrame.h"
-#include "../Sprite.h"
+#include "../actor/Sprite.h"
 #include "../initActor.h"
-#include "../SlidingActor.h"
-#include "../DebugActor.h"
+#include "../actor/SlidingActor.h"
+#include "../actor/DebugActor.h"
 #include "../res/Resources.h"
-#include "../TextField.h"
-#include "../ColorRectSprite.h"
+#include "../actor/TextField.h"
+#include "../actor/ColorRectSprite.h"
 #include "../utils/stringUtils.h"
 
 namespace oxygine

oxygine/src/oxygine/dev_tools/TexturesInspector.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../Actor.h"
-#include "../Box9Sprite.h"
+#include "../actor/Actor.h"
+#include "../actor/Box9Sprite.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspector.cpp

@@ -1,6 +1,6 @@
 #include "TreeInspector.h"
 #include "../initActor.h"
-#include "../ColorRectSprite.h"
+#include "../actor/ColorRectSprite.h"
 #include "../RenderState.h"
 #include "../Clock.h"
 
@@ -13,12 +13,12 @@
 
 #include "../Image.h"
 #include "../Font.h"
-#include "../Stage.h"
+#include "../actor/Stage.h"
 
-#include "../TextField.h"
-#include "../DebugActor.h"
+#include "../actor/TextField.h"
+#include "../actor/DebugActor.h"
 
-#include "../SlidingActor.h"
+#include "../actor/SlidingActor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspector.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../Actor.h"
-#include "../ClipRectActor.h"
+#include "../actor/Actor.h"
+#include "../actor/ClipRectActor.h"
 #include "../Draggable.h"
 
 namespace oxygine

oxygine/src/oxygine/dev_tools/TreeInspectorLine.cpp

@@ -2,11 +2,11 @@
 #include "TreeInspectorPage.h"
 #include "TreeInspectorPreview.h"
 #include "TreeInspector.h"
-#include "../TextField.h"
+#include "../actor/TextField.h"
 #include "../res/ResFont.h"
 #include "../res/Resources.h"
-#include "../Stage.h"
-#include "../DebugActor.h"
+#include "../actor/Stage.h"
+#include "../actor/DebugActor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspectorLine.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../Actor.h"
+#include "../actor/Actor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspectorPage.cpp

@@ -1,7 +1,7 @@
 #include "TreeInspectorPage.h"
 #include "TreeInspectorLine.h"
 #include "TreeInspector.h"
-#include "../Button.h"
+#include "../actor/Button.h"
 #include "../res/Resources.h"
 
 

oxygine/src/oxygine/dev_tools/TreeInspectorPage.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../Actor.h"
+#include "../actor/Actor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.cpp

@@ -1,12 +1,12 @@
 #include "TreeInspectorPreview.h"
 #include "TreeInspector.h"
-#include "../Stage.h"
-#include "../TextField.h"
+#include "../actor/Stage.h"
+#include "../actor/TextField.h"
 #include "../res/Resources.h"
 #include "../RenderState.h"
 #include "../STDRenderer.h"
 #include "../STDMaterial.h"
-#include "../DebugActor.h"
+#include "../actor/DebugActor.h"
 #include "../core/NativeTexture.h"
 
 namespace oxygine

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../Sprite.h"
+#include "../actor/Sprite.h"
 #include "../core/VertexDeclaration.h"
 
 namespace oxygine

oxygine/src/oxygine/initActor.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
-#include "Actor.h"
-#include "Sprite.h"
-#include "Button.h"
-#include "TextField.h"
+#include "actor/Actor.h"
+#include "actor/Sprite.h"
+#include "actor/Button.h"
+#include "actor/TextField.h"
 namespace oxygine
 {
 

oxygine/src/oxygine/oxygine-include.h

@@ -113,7 +113,7 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 
 #define OXYGINE_RENDERER 5
 
-#define OXYGINE_VERSION 6
+#define OXYGINE_VERSION 7
 
 #ifdef __GNUC__
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))