min

Android.mk

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

examples/Demo/src/test.cpp

@@ -1,5 +1,5 @@
 #include "test.h"
-#include "oxygine/oxygine-framework.h"
+#include "oxygine-framework.h"
 
 Resources Test::resourcesUI;
 file::STDFileSystem extfs(true);

oxygine/src/oxygine-framework.h

@@ -22,7 +22,6 @@
 #include "oxygine/Input.h"
 #include "oxygine/InputText.h"
 #include "oxygine/Image.h"
-#include "oxygine/MemoryTexture.h"
 #include "oxygine/ThreadLoader.h"
 #include "oxygine/PointerState.h"
 #include "oxygine/actor/ProgressBar.h"
@@ -60,7 +59,6 @@
 #include "oxygine/core/ImageDataOperations.h"
 #include "oxygine/core/intrusive_ptr.h"
 #include "oxygine/core/log.h"
-#include "oxygine/core/Mem2Native.h"
 #include "oxygine/core/Mutex.h"
 #include "oxygine/core/NativeTexture.h"
 #include "oxygine/core/Object.h"

oxygine/src/oxygine/MaterialCache.cpp

@@ -14,7 +14,7 @@ namespace oxygine
         other.update(hash, cm);
 
 
-        materials::iterator itl = _materials.lower_bound(hash);
+        materials::iterator itl = _materials.find(hash);
 
         if (itl != _materials.end())
         {
@@ -22,11 +22,14 @@ namespace oxygine
             if (cm == sec->_compare && cm(sec, &other))
                 return sec;
 
-            ++itl;
+            //hash collision?
 
-            //same hash but not same object
-            materials::iterator ith = _materials.upper_bound(hash);
-            for (; itl != ith; itl++)
+            std::pair<materials::iterator, materials::iterator> it = _materials.equal_range(hash);
+
+            itl = it.first;
+            itl++;//skip first, already checked
+
+            for (; itl != it.second; itl++)
             {
                 MaterialX* sec = itl->second.get();
                 if (cm == sec->_compare && cm(sec, &other))

oxygine/src/oxygine/MemoryTexture.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "oxygine_include.h"
-#include "Image.h"
-
-namespace oxygine
-{
-
-    typedef Image MemoryTexture;
-    typedef intrusive_ptr<Image> spMemoryTexture;
-}

oxygine/src/oxygine/core/oxygine.cpp

@@ -5,7 +5,7 @@
 #include "../MaterialCache.h"
 #include "../res/CreateResourceContext.h"
 #include "../res/Resources.h"
-
+#include "STDFileSystem.h"
 
 #include "../res/ResBuffer.h"
 #include "../res/ResFontBM.h"

oxygine/src/oxygine/oxygine-framework.h

@@ -1,139 +0,0 @@
-#pragma once
-#ifndef OXYGINE_FRAMEWORK
-#define OXYGINE_FRAMEWORK
-//oxygine single include
-
-//
-#include "oxygine-include.h"
-#include "Actor.h"
-#include "AnimationFrame.h"
-#include "Box9Sprite.h"
-#include "Button.h"
-#include "ClipRectActor.h"
-#include "Clock.h"
-#include "ColorRectSprite.h"
-#include "DebugActor.h"
-#include "Draggable.h"
-#include "Event.h"
-#include "EventDispatcher.h"
-#include "HttpRequestTask.h"
-#include "Font.h"
-#include "initActor.h"
-#include "Input.h"
-#include "InputText.h"
-#include "Image.h"
-#include "MemoryTexture.h"
-#include "ThreadLoader.h"
-#include "PointerState.h"
-#include "ProgressBar.h"
-#include "RenderState.h"
-#include "Stage.h"
-#include "SlidingActor.h"
-#include "Sprite.h"
-#include "MaskedSprite.h"
-#include "TextField.h"
-#include "TextStyle.h"
-#include "tween/Tween.h"
-#include "TweenQueue.h"
-#include "TouchEvent.h"
-#include "KeyEvent.h"
-#include "UpdateState.h"
-#include "VisualStyle.h"
-#include "Serialize.h"
-#include "STDRenderer.h"
-#include "WebImage.h"
-#include "key.h"
-#include "Polygon.h"
-#include "TweenOutline.h"
-#include "TweenGlow.h"
-#include "TweenAlphaFade.h"
-
-
-//closure/
-#include "closure/closure.h"
-//#include "closure/closure_impl.h"
-
-//core/
-#include "core/file.h"
-#include "core/ImageData.h"
-#include "core/ImageDataOperations.h"
-#include "core/intrusive_ptr.h"
-#include "core/log.h"
-#include "core/Mem2Native.h"
-#include "core/Mutex.h"
-#include "core/NativeTexture.h"
-#include "core/Object.h"
-#include "core/oxygine.h"
-#include "core/ox_debug.h"
-#include "core/pixel.h"
-#include "core/ref_counter.h"
-#include "core/Renderer.h"
-#include "core/ShaderProgram.h"
-#include "core/Texture.h"
-#include "core/vertex.h"
-#include "core/VertexDeclaration.h"
-#include "core/VideoDriver.h"
-#include "core/STDFileSystem.h"
-#include "core/UberShaderProgram.h"
-
-//core/gl/
-#include "core/gl/NativeTextureGLES.h"
-#include "core/gl/oxgl.h"
-#include "core/gl/VertexDeclarationGL.h"
-#include "core/gl/VideoDriverGLES20.h"
-#include "core/gl/ShaderProgramGL.h"
-
-//dev_tools/
-//#include "dev_tools/DeveloperMenu.h"
-//#include "dev_tools/TexturesInspector.h"
-//#include "dev_tools/TreeInspector.h"
-//#include "dev_tools/TreeInspectorLine.h"
-//#include "dev_tools/TreeInspectorPage.h"
-//#include "dev_tools/TreeInspectorPreview.h"
-
-//math/
-#include "math/AffineTransform.h"
-#include "math/Color.h"
-#include "math/Matrix.h"
-#include "math/Rect.h"
-#include "math/ScalarMath.h"
-#include "math/Vector2.h"
-#include "math/Vector3.h"
-#include "math/Vector4.h"
-
-//pugixml/
-//#include "pugixml/pugiconfig.hpp"
-#include "pugixml/pugixml.hpp"
-
-//res/
-#include "res/CreateResourceContext.h"
-#include "res/ResAnim.h"
-#include "res/ResAtlas.h"
-#include "res/ResBuffer.h"
-#include "res/ResFont.h"
-#include "res/ResFontBM.h"
-#include "res/Resource.h"
-#include "res/Resources.h"
-#include "res/ResStarlingAtlas.h"
-#include "res/SingleResAnim.h"
-
-//text_utils/
-#include "text_utils/Aligner.h"
-#include "text_utils/Node.h"
-#include "text_utils/TextBuilder.h"
-
-//tree_inspector/
-
-//tree_inspector/internal/
-
-//utils/
-#include "utils/AtlasBuilder.h"
-#include "utils/ImageUtils.h"
-#include "utils/intrusive_list.h"
-#include "utils/stringUtils.h"
-
-//winnie_alloc/
-//#include "winnie_alloc/system_alloc.h"
-//#include "winnie_alloc/winnie_alloc.h"
-//#include "winnie_alloc/winnie_alloc_config.h"
-#endif