minor

examples/Demo/src/TestColorFont.h

@@ -98,18 +98,12 @@ private:
     Color _outer;
     unsigned char _adata;
 
-    Vector4 tovec(const Color& c)
-    {
-        return Vector4(c.getRedF(), c.getGreenF(), c.getBlueF(), c.getAlphaF());
-    }
-
     void setUniforms(IVideoDriver* driver, ShaderProgram* prog)
     {
         Color q(_adata, _adata, _adata, _adata);
-        Vector4 c;
-        c = tovec(_outer * q);
+        Vector4 c = (_outer * q).toVector();
         driver->setUniform("_black", &c, 1);
-        c = tovec(getColor() * _style.color * q);
+        c = (getColor() * _style.color * q).toVector();
         driver->setUniform("_white", &c, 1);
     }
 

oxygine/src/STDRenderer.cpp

@@ -598,8 +598,7 @@ namespace oxygine
         ShaderProgram* prog = _uberShader->getShaderProgram(_shaderFlags);
         setShader(prog);
 
-        Vector4 c;
-        c = Vector4(outlineColor.getRedF(), outlineColor.getGreenF(), outlineColor.getBlueF(), outlineColor.getAlphaF());
+        Vector4 c = outlineColor.toVector();
         _driver->setUniform("sdf_outline_color", &c, 1);
 
         c = Vector4(offset, contrast, outlineOffset, contrast);

oxygine/src/core/gl/VideoDriverGL.cpp

@@ -136,7 +136,8 @@ namespace oxygine
         glDisable(GL_SCISSOR_TEST);
         if (clearColor)
         {
-            glClearColor(clearColor->getRedF(), clearColor->getGreenF(), clearColor->getBlueF(), clearColor->getAlphaF());
+            Vector4 c = clearColor->toVector();
+            glClearColor(c.x, c.y, c.z, c.w);
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         }
         else

oxygine/src/core/gl/VideoDriverGLES20.cpp

@@ -53,11 +53,6 @@ namespace oxygine
         //_currentProgram = 0;
     }
 
-    void VideoDriverGLES20::updateConstants()
-    {
-        //_currentProgram->setUniform("mat", &_matrixVP);
-    }
-
 
     void VideoDriverGLES20::begin(const Rect& viewport, const Color* clearColor)
     {
@@ -66,7 +61,8 @@ namespace oxygine
 
     void VideoDriverGLES20::clear(const Color& color)
     {
-        glClearColor(color.getRedF(), color.getGreenF(), color.getBlueF(), color.getAlphaF());
+        Vector4 c = color.toVector();
+        glClearColor(c.x, c.y, c.z, c.w);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         CHECKGL();
@@ -228,5 +224,4 @@ namespace oxygine
         oxglUniform1f(p, val);
         CHECKGL();
     }
-
 }

oxygine/src/core/gl/VideoDriverGLES20.h

@@ -17,7 +17,7 @@ namespace oxygine
         void restore();
 
         spNativeTexture createTexture();
-        //const file::buffer& getShaderBody() const {return _shaderBody;}
+
         bool isReady() const;
 
         void begin(const Rect& viewport, const Color* clearColor);
@@ -45,6 +45,5 @@ namespace oxygine
 
         int _programID;
         ShaderProgram* _p;
-        void updateConstants();
     };
 }

oxygine/src/dev_tools/TexturesInspector.cpp

@@ -107,7 +107,7 @@ namespace oxygine
 
         int n = 0;
         int mem = 0;
-        for (std::vector<spNativeTexture>::iterator i = textures.begin(); i != textures.end(); ++i)
+        for (std::vector<spNativeTexture>::reverse_iterator i = textures.rbegin(); i != textures.rend(); ++i)
         {
             spNativeTexture t = *i;
             TextureLine* line = new TextureLine(t);

oxygine/src/math/Color.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "oxygine_include.h"
 #include "ScalarMath.h"
+#include "Vector4.h"
 
 namespace oxygine
 {
@@ -215,6 +216,8 @@ namespace oxygine
         float getBlueF() const {return b / 255.0f;}
         float getAlphaF() const {return a / 255.0f;}
 
+        Vector4 toVector()const { return Vector4(getRedF(), getGreenF(), getBlueF(), getAlphaF()); }
+
         Color operator + (const Color& c) const
         {
             Color v(