merge

examples/Demo/src/TestOpenGL.h

@@ -143,7 +143,7 @@ public:
         CHECKGL();
 
         //reset states to defaults after direct opengl usage
-        rc().reset();
+        rsCache().reset();
     }
 };
 

examples/Demo/src/TestRender2Texture.h

@@ -89,12 +89,12 @@ public:
         ResAnim* brush = resources.getResAnim("brush");
         AnimationFrame frame = brush->getFrame(0);
         const Diffuse& df = frame.getDiffuse();
-        rc().setTexture(0, df.base);
+        rsCache().setTexture(0, df.base);
         if (paint)
-            rc().setBlendMode(blend_premultiplied_alpha);
+            rsCache().setBlendMode(blend_premultiplied_alpha);
         else
         {
-            rc().setBlendMode(blend_add);
+            rsCache().setBlendMode(blend_add);
             oxglBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
         }
 

oxygine/SDL/win32/oxygine.vcxproj

@@ -145,7 +145,6 @@
     <ClCompile Include="..\..\src\oxygine\core\ImageData.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\ImageDataOperations.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\log.cpp" />
-    <ClCompile Include="..\..\src\oxygine\core\Mem2Native.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\Mutex.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\NativeTexture.cpp" />
     <ClCompile Include="..\..\src\oxygine\core\Object.cpp" />
@@ -203,12 +202,12 @@
     <ClCompile Include="..\..\src\oxygine\text_utils\Aligner.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\Node.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\TextBuilder.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Tween.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TweenAlphaFade.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TweenAnim.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TweenGlow.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TweenOutline.cpp" />
-    <ClCompile Include="..\..\src\oxygine\TweenQueue.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\Tween.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\TweenAlphaFade.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\TweenAnim.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\TweenGlow.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\TweenOutline.cpp" />
+    <ClCompile Include="..\..\src\oxygine\tween\TweenQueue.cpp" />
     <ClCompile Include="..\..\src\oxygine\utils\cdecode.c" />
     <ClCompile Include="..\..\src\oxygine\utils\stringUtils.cpp" />
     <ClCompile Include="..\..\src\oxygine\math\AffineTransform.cpp" />
@@ -250,7 +249,6 @@
     <ClInclude Include="..\..\src\oxygine\core\ImageDataOperations.h" />
     <ClInclude Include="..\..\src\oxygine\core\intrusive_ptr.h" />
     <ClInclude Include="..\..\src\oxygine\core\log.h" />
-    <ClInclude Include="..\..\src\oxygine\core\Mem2Native.h" />
     <ClInclude Include="..\..\src\oxygine\core\Mutex.h" />
     <ClInclude Include="..\..\src\oxygine\core\NativeTexture.h" />
     <ClInclude Include="..\..\src\oxygine\core\Object.h" />
@@ -327,12 +325,12 @@
     <ClInclude Include="..\..\src\oxygine\text_utils\Node.h" />
     <ClInclude Include="..\..\src\oxygine\text_utils\TextBuilder.h" />
     <ClInclude Include="..\..\src\oxygine\TouchEvent.h" />
-    <ClInclude Include="..\..\src\oxygine\Tween.h" />
-    <ClInclude Include="..\..\src\oxygine\TweenAlphaFade.h" />
-    <ClInclude Include="..\..\src\oxygine\TweenAnim.h" />
-    <ClInclude Include="..\..\src\oxygine\TweenGlow.h" />
-    <ClInclude Include="..\..\src\oxygine\TweenOutline.h" />
-    <ClInclude Include="..\..\src\oxygine\TweenQueue.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\Tween.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\TweenAlphaFade.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\TweenAnim.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\TweenGlow.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\TweenOutline.h" />
+    <ClInclude Include="..\..\src\oxygine\tween\TweenQueue.h" />
     <ClInclude Include="..\..\src\oxygine\UpdateState.h" />
     <ClInclude Include="..\..\src\oxygine\utils\cdecode.h" />
     <ClInclude Include="..\..\src\oxygine\utils\stringUtils.h" />

oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -49,6 +49,9 @@
     <Filter Include="src\actor">
       <UniqueIdentifier>{969670a7-a5c7-4510-9635-59c4787ea429}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\tween">
+      <UniqueIdentifier>{a6234509-4f2a-4666-966c-a848e4aae3e6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\oxygine\math\AffineTransform.cpp">
@@ -150,9 +153,6 @@
     <ClCompile Include="..\..\src\oxygine\core\log.cpp">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\core\Mem2Native.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\core\Mutex.cpp">
       <Filter>src\core</Filter>
     </ClCompile>
@@ -237,12 +237,6 @@
     <ClCompile Include="..\..\src\oxygine\MaskedRenderer.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TweenQueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Tween.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\Serializable.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -258,9 +252,6 @@
     <ClCompile Include="..\..\src\oxygine\core\curl\HttpRequestCurlTask.cpp">
       <Filter>src\core\curl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TweenAnim.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\utils\cdecode.c">
       <Filter>src\utils</Filter>
     </ClCompile>
@@ -270,9 +261,6 @@
     <ClCompile Include="..\..\src\oxygine\STDMaterial.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TweenAlphaFade.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\Material.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -288,15 +276,9 @@
     <ClCompile Include="..\..\src\oxygine\PostProcess.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TweenOutline.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\core\ThreadDispatcher.cpp">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\TweenGlow.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\key.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -357,6 +339,24 @@
     <ClCompile Include="..\..\src\oxygine\actor\WebImage.cpp">
       <Filter>src\actor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\Tween.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\TweenAlphaFade.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\TweenAnim.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\TweenGlow.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\TweenOutline.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\tween\TweenQueue.cpp">
+      <Filter>src\tween</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\oxygine\closure\closure.h">
@@ -500,9 +500,6 @@
     <ClInclude Include="..\..\src\oxygine\core\log.h">
       <Filter>src\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\core\Mem2Native.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\core\Mutex.h">
       <Filter>src\core</Filter>
     </ClInclude>
@@ -620,12 +617,6 @@
     <ClInclude Include="..\..\src\oxygine\STDRenderer.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TweenQueue.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Tween.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\Serializable.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -653,9 +644,6 @@
     <ClInclude Include="..\..\src\oxygine\oxygine_include.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TweenAnim.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\utils\cdecode.h">
       <Filter>src\utils</Filter>
     </ClInclude>
@@ -668,9 +656,6 @@
     <ClInclude Include="..\..\src\oxygine\STDMaterial.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TweenAlphaFade.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\Material.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -689,15 +674,9 @@
     <ClInclude Include="..\..\src\oxygine\PostProcess.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TweenOutline.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\core\ThreadDispatcher.h">
       <Filter>src\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\TweenGlow.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\key.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -764,6 +743,24 @@
     <ClInclude Include="..\..\src\oxygine\actor\WebImage.h">
       <Filter>src\actor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\Tween.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\TweenAlphaFade.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\TweenAnim.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\TweenGlow.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\TweenOutline.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\tween\TweenQueue.h">
+      <Filter>src\tween</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/oxygine/core/oxygine.cpp

@@ -27,7 +27,7 @@
 #include "ThreadDispatcher.h"
 #include "../PostProcess.h"
 #include "../actor/TextField.h"
-
+#include "../InputText.h"
 #ifdef __S3E__
 #include "s3e.h"
 #include "IwGL.h"