goodbuy marmalade

examples/Demo/src/TestTweenShine.h

@@ -11,7 +11,7 @@ public:
     {
     }
 
-    void _loopDone(Actor& actor, const UpdateState& us) OVERRIDE
+    void _loopDone(Actor& actor, const UpdateState& us) override
     {
         for (int i = 0; i < 5; ++i)
         {

oxygine/src/Box9Sprite.h

@@ -32,7 +32,7 @@ namespace oxygine
         void setVerticalGuides(float x1, float x2);
         void setHorizontalGuides(float y1, float y2);
 
-        bool isOn(const Vector2& localPosition, float localScale) OVERRIDE;
+        bool isOn(const Vector2& localPosition, float localScale) override;
 
         std::string dump(const dumpOptions&) const;
 
@@ -44,7 +44,7 @@ namespace oxygine
     protected:
         void sizeChanged(const Vector2& size);
         void animFrameChanged(const AnimationFrame& f);
-        void changeAnimFrame(const AnimationFrame& f) OVERRIDE;
+        void changeAnimFrame(const AnimationFrame& f) override;
 
         bool _prepared;
 

oxygine/src/Button.h

@@ -16,7 +16,7 @@ namespace oxygine
 
         int getRow() const {return _row;}
 
-        void setResAnim(const ResAnim* r, int  col = 0, int row = 0) OVERRIDE;
+        void setResAnim(const ResAnim* r, int  col = 0, int row = 0) override;
 
         /**Sets which row from ResAnim should be used. Default value is 0. Could be used for CheckBoxes*/
         void setRow(int row);

oxygine/src/ColorRectSprite.h

@@ -19,10 +19,10 @@ namespace oxygine
 
         void doRender(const RenderState& rs);
 
-        RectF getDestRect() const OVERRIDE { return Actor::getDestRect(); }
+        RectF getDestRect() const override { return Actor::getDestRect(); }
 
     protected:
-        void sizeChanged(const Vector2& size) OVERRIDE;
+        void sizeChanged(const Vector2& size) override;
     };
 }
 

oxygine/src/HttpRequestTask.h

@@ -57,9 +57,9 @@ namespace oxygine
 
     protected:
         void _prerun();
-        void _onError() OVERRIDE;
-        void _onComplete() OVERRIDE;
-        void _dispatchComplete() OVERRIDE;
+        void _onError() override;
+        void _onComplete() override;
+        void _dispatchComplete() override;
 
         //async
         void progress(int loaded, int total);

oxygine/src/PostProcess.h

@@ -76,13 +76,13 @@ namespace oxygine
         TweenPostProcess(const PostProcessOptions& opt);
         ~TweenPostProcess();
 
-        void renderPP() OVERRIDE;
-        void addRefPP() OVERRIDE;
-        void releaseRefPP() OVERRIDE;
+        void renderPP() override;
+        void addRefPP() override;
+        void releaseRefPP() override;
 
-        void init(Actor& actor) OVERRIDE;
-        void update(Actor& actor, float p, const UpdateState& us) OVERRIDE;
-        void done(Actor& actor) OVERRIDE;
+        void init(Actor& actor) override;
+        void update(Actor& actor, float p, const UpdateState& us) override;
+        void done(Actor& actor) override;
     protected:
         virtual void _renderPP() {}
 

oxygine/src/STDMaterial.h

@@ -13,15 +13,15 @@ namespace oxygine
 
         STDMaterial(STDRenderer* r): _renderer(r) {}
 
-        void apply(Material* prev) OVERRIDE;
-        void finish() OVERRIDE;
-
-        void render(ClipRectActor*, const RenderState& rs) OVERRIDE;
-        void render(MaskedSprite*, const RenderState& rs) OVERRIDE;
-        void doRender(Sprite*, const RenderState& rs) OVERRIDE;
-        void doRender(TextField*, const RenderState& rs) OVERRIDE;
-        void doRender(ColorRectSprite*, const RenderState& rs) OVERRIDE;
-        void doRender(ProgressBar*, const RenderState& rs) OVERRIDE;
+        void apply(Material* prev) override;
+        void finish() override;
+
+        void render(ClipRectActor*, const RenderState& rs) override;
+        void render(MaskedSprite*, const RenderState& rs) override;
+        void doRender(Sprite*, const RenderState& rs) override;
+        void doRender(TextField*, const RenderState& rs) override;
+        void doRender(ColorRectSprite*, const RenderState& rs) override;
+        void doRender(ProgressBar*, const RenderState& rs) override;
 
         void setViewProj(const Matrix& vp);
 

oxygine/src/STDRenderer.h

@@ -57,7 +57,7 @@ namespace oxygine
         void beginElementRendering(bool basePremultiplied);// OVERRIDE;
         void beginSDFont(float contrast, float offset, const Color& outlineColor, float outlineOffset);
         void endSDFont();
-        void drawElement(const spNativeTexture& texture, unsigned int color, const RectF& src, const RectF& dest) OVERRIDE;
+        void drawElement(const spNativeTexture& texture, unsigned int color, const RectF& src, const RectF& dest) override;
         void draw(const Color&, const RectF& srcRect, const RectF& destRect);
         /**Draws existing batch immediately.*/
         void drawBatch();

oxygine/src/Sprite.h

@@ -21,7 +21,7 @@ namespace oxygine
         ~Sprite();
 
         const AnimationFrame&   getAnimFrame() const {return _frame;}
-        RectF                   getDestRect() const OVERRIDE;
+        RectF                   getDestRect() const override;
         const Diffuse&          getDiffuse() const {return _frame.getDiffuse();}
         bool                    getManageResAnim() const {return (_flags & flag_manageResAnim) != 0;}
         const RectF&            getSrcRect() const {return _frame.getSrcRect();}
@@ -42,7 +42,7 @@ namespace oxygine
         void                    setColumnRow(int column, int row);
         void                    setLocalScale(const Vector2& s);
 
-        bool                    isOn(const Vector2& localPosition, float localScale) OVERRIDE;
+        bool                    isOn(const Vector2& localPosition, float localScale) override;
 
         bool                    isFlippedX() const {return (_flags & flag_flipX) != 0;}
         bool                    isFlippedY() const {return (_flags & flag_flipY) != 0;}
@@ -66,7 +66,7 @@ namespace oxygine
         };
         virtual void changeAnimFrame(const AnimationFrame& f);
         virtual void animFrameChanged(const AnimationFrame& f);
-        void sizeChanged(const Vector2& size) OVERRIDE;
+        void sizeChanged(const Vector2& size) override;
 
         Vector2 _localScale;
         AnimationFrame _frame;

oxygine/src/Stage.h

@@ -60,7 +60,7 @@ namespace oxygine
 
         //bool _active;
 
-        bool isOn(const Vector2& localPosition, float localScale) OVERRIDE;
+        bool isOn(const Vector2& localPosition, float localScale) override;
 
     private:
 

oxygine/src/TextField.h

@@ -45,7 +45,7 @@ namespace oxygine
         unsigned int                getOptions() const;
 
 
-        bool getBounds(RectF&) const OVERRIDE;
+        bool getBounds(RectF&) const override;
 
         /**Overwrites TextStyle Vertical align*/
         void setVAlign(TextStyle::VerticalAlign align);
@@ -92,7 +92,7 @@ namespace oxygine
         void setHtmlText(const std::string& str);
         void setHtmlText(const std::wstring& str);
 
-        bool isOn(const Vector2& localPosition, float localScale = 1.0f) OVERRIDE;
+        bool isOn(const Vector2& localPosition, float localScale = 1.0f) override;
 
 
         typedef Property<Color, const Color&, TextField, &TextField::getOutlineColor, &TextField::setOutlineColor>  TweenOutlineColor;

oxygine/src/TweenGlow.cpp

@@ -20,7 +20,7 @@ namespace oxygine
 
         TweenGlowImpl(const Color& c, const PostProcessOptions& opt) : TweenPostProcess(opt), _color(c), _downsample(1) {}
 
-        void render(Actor* actor, const RenderState& rs) OVERRIDE
+        void render(Actor* actor, const RenderState& rs) override
         {
             STDMaterial* mat = STDMaterial::instance;
             STDRenderer* renderer = mat->getRenderer();
@@ -52,7 +52,7 @@ namespace oxygine
             renderer->drawBatch();
         }
 
-        void _renderPP() OVERRIDE
+        void _renderPP() override
         {
             PostProcess::initShaders();
 

oxygine/src/TweenOutline.cpp

@@ -20,7 +20,7 @@ namespace oxygine
 
         TweenOutlineImpl(const Color& c, const PostProcessOptions& opt) : TweenPostProcess(opt), _color(c), _downsample(1) {}
 
-        void render(Actor* actor, const RenderState& rs) OVERRIDE
+        void render(Actor* actor, const RenderState& rs) override
         {
             STDMaterial* mat = STDMaterial::instance;
             STDRenderer* renderer = mat->getRenderer();
@@ -49,7 +49,7 @@ namespace oxygine
             actor->setMaterial(this);
         }
 
-        void _renderPP() OVERRIDE
+        void _renderPP() override
         {
             PostProcess::initShaders();
 

oxygine/src/VisualStyle.h

@@ -45,7 +45,7 @@ namespace oxygine
 
         typedef Property<Color, const Color&, VStyleActor, &VStyleActor::getColor, &VStyleActor::setColor> TweenColor;
 
-        bool getBounds(RectF& b) const  OVERRIDE { b = getDestRect();  return true; }
+        bool getBounds(RectF& b) const  override { b = getDestRect();  return true; }
 
     protected:
         VisualStyle _vstyle;

oxygine/src/WebImage.h

@@ -22,7 +22,7 @@ namespace oxygine
     private:
         void loaded(Event*);
         void error(Event*);
-        void sizeChanged(const Vector2& size) OVERRIDE;
+        void sizeChanged(const Vector2& size) override;
         void fit();
 
         ResAnim _rs;

oxygine/src/core/ThreadDispatcher.cpp

@@ -17,40 +17,7 @@ namespace oxygine
 #define  LOGDN(...)  ((void)0)
 
 #endif
-
-
-    void addtime(timespec& ts, int ms)
-    {
-        ts.tv_nsec += ms * 1000000;
-        while (ts.tv_nsec >= 1000000000)
-        {
-            ts.tv_nsec -= 1000000000;
-            ++ts.tv_sec;
-        }
-    }
-
-
-    void mywait(pthread_cond_t* cond, pthread_mutex_t* mutex)
-    {
-        /*
-        #ifdef __S3E__
-        timespec ts;
-        clock_gettime(CLOCK_REALTIME, &ts);
-        addtime(ts, 300);
-        pthread_cond_timedwait(cond, mutex, &ts);
-        #elif __ANDROID__
-        timespec ts;
-        clock_gettime(CLOCK_REALTIME, &ts);
-        addtime(ts, 500);
-        pthread_cond_timedwait(cond, mutex, &ts);
-        #else
-        pthread_cond_wait(cond, mutex);
-        #endif
-        */
-
-        pthread_cond_wait(cond, mutex);
-    }
-
+    
 
     MutexPthreadLock::MutexPthreadLock(pthread_mutex_t& m, bool lock) : _mutex(m), _locked(lock)
     {
@@ -227,7 +194,7 @@ namespace oxygine
             //pthread_cond_signal(&_cond);
             pthread_cond_broadcast(&_cond);
 #endif
-            mywait(&_cond, &_mutex);
+            pthread_cond_wait(&_cond, &_mutex);
         }
     }
 
@@ -241,7 +208,7 @@ namespace oxygine
 #ifndef OX_NO_MT
             pthread_cond_signal(&_cond);
 #endif
-            mywait(&_cond, &_mutex);
+            pthread_cond_wait(&_cond, &_mutex);
         }
         while (_replyingTo != id);
 

oxygine/src/core/UberShaderProgram.h

@@ -66,12 +66,12 @@ namespace oxygine
             SAMPLER_NUM,
         };
 
-        ShaderProgram*  getShaderProgram(int flags) OVERRIDE;
+        ShaderProgram*  getShaderProgram(int flags) override;
 
         void apply(IVideoDriver* driver, spNativeTexture base, spNativeTexture alpha);
 
     protected:
-        void releaseShaders() OVERRIDE;
+        void releaseShaders() override;
         shader _shaders[_SIZE];
     };
 }

oxygine/src/core/gl/VideoDriverGLES20.h

@@ -23,7 +23,7 @@ namespace oxygine
         void begin(const Rect& viewport, const Color* clearColor);
         void clear(const Color& color);
 
-        ShaderProgram*  getShaderProgram() const OVERRIDE { return _p; }
+        ShaderProgram*  getShaderProgram() const override { return _p; }
 
         void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize);
         void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize, const unsigned short* indicesData, unsigned int numIndices);

oxygine/src/dev_tools/TreeInspectorPreview.h

@@ -79,7 +79,7 @@ namespace oxygine
 
         void setRenderTarget(spNativeTexture);
 
-        spNativeTexture getRenderTarget() const OVERRIDE;
+        spNativeTexture getRenderTarget() const override;
 
         void setShaderProgram(ShaderProgram* program);
 
@@ -104,7 +104,7 @@ namespace oxygine
         void setBlendFunc(BLEND_TYPE src, BLEND_TYPE dest);
 
         void setScissorRect(const Rect*);
-        bool getScissorRect(Rect&) const OVERRIDE;
+        bool getScissorRect(Rect&) const override;
 
         void nextBatch();
 

oxygine/src/oxygine-include.h

@@ -128,7 +128,7 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 #ifdef _MSC_VER
 #   define OVERRIDE override
 #else
-#   define OVERRIDE
+#   define override
 #endif
 
 

oxygine/src/res/CreateResourceContext.h

@@ -110,23 +110,23 @@ namespace oxygine
     {
     public:
         static SingleThreadResourcesContext instance;
-        void createTexture(const CreateTextureTask& opt) OVERRIDE;
-        bool isNeedProceed(spNativeTexture t) OVERRIDE;
+        void createTexture(const CreateTextureTask& opt) override;
+        bool isNeedProceed(spNativeTexture t) override;
     };
 
     class MTLoadingResourcesContext : public LoadResourcesContext
     {
     public:
         static MTLoadingResourcesContext instance;
-        void createTexture(const CreateTextureTask& opt) OVERRIDE;
-        bool isNeedProceed(spNativeTexture t) OVERRIDE;
+        void createTexture(const CreateTextureTask& opt) override;
+        bool isNeedProceed(spNativeTexture t) override;
     };
 
     class RestoreResourcesContext: public LoadResourcesContext
     {
     public:
         static RestoreResourcesContext instance;
-        void createTexture(const CreateTextureTask& opt) OVERRIDE;
+        void createTexture(const CreateTextureTask& opt) override;
         bool isNeedProceed(spNativeTexture t);
     };
 }

oxygine/src/res/ResAtlasGeneric.h

@@ -21,7 +21,7 @@ namespace oxygine
         void loadAtlas(CreateResourceContext& context);
         void loadAtlas2(CreateResourceContext& context);
 
-        void _load(LoadResourcesContext*) OVERRIDE;
-        void _unload() OVERRIDE;
+        void _load(LoadResourcesContext*) override;
+        void _unload() override;
     };
 }

oxygine/src/res/ResFontBM.h

@@ -22,11 +22,11 @@ namespace oxygine
 
         void cleanup();
 
-        const Font* getFont(const char* name = 0, int size = 0) const OVERRIDE;
+        const Font* getFont(const char* name = 0, int size = 0) const override;
 
-        bool isSDF(int& size) const OVERRIDE;
+        bool isSDF(int& size) const override;
 
-        const Font* getClosestFont(float worldScale, int styleFontSize, float& resScale) const OVERRIDE;
+        const Font* getClosestFont(float worldScale, int styleFontSize, float& resScale) const override;
 
     private:
         struct page

oxygine/src/res/SingleResAnim.h

@@ -8,7 +8,7 @@ namespace oxygine
     {
     public:
         void init(const std::string& file, int columns = 1, int rows = 1, float scaleFactor = 1.0f);
-        void init(Image* original, int columns = 1, int rows = 1, float scaleFactor = 1.0f) OVERRIDE;
+        void init(Image* original, int columns = 1, int rows = 1, float scaleFactor = 1.0f) override;
 
         spNativeTexture getTexture() const;
 

oxygine/src/text_utils/Node.h

@@ -73,7 +73,7 @@ namespace oxygine
             void _finalPass(Aligner& rd);
             void draw(DrawContext& dc);
 
-            Symbol* getSymbol(int& pos) OVERRIDE;
+            Symbol* getSymbol(int& pos) override;
 
 #ifdef OX_DEBUG
             std::string _text;//only for debug