wip

oxygine/src/oxygine-include.h

@@ -0,0 +1,2 @@
+#pragma once
+#include "oxygine/oxygine-include.h"

oxygine/src/oxygine/Box9Sprite.cpp

@@ -288,17 +288,15 @@ namespace oxygine
         if (!_prepared)
             prepare();
 
-        //_vstyle._apply(rs);
-        const Diffuse& df = _frame.getDiffuse();
+
+        _mat->apply();
 
         STDRenderer* renderer = STDRenderer::getCurrent();
 
-        if (df.base)
+        if (_mat->_base)
         {
             if (_guidesX.size() >= 2 || _guidesY.size() >= 2)
             {
-                //renderer->setTexture(df.base, df.alpha, df.premultiplied);
-                rc().setBlendMode(getBlendMode());
                 renderer->setTransform(rs.transform);
 
                 Color color = rs.getFinalColor(getColor());

oxygine/src/oxygine/STDRenderer.cpp

@@ -43,15 +43,37 @@ namespace oxygine
         return r;
     }
 
-    RenderStateCache::RenderStateCache(IVideoDriver* d) : _driver(d), _program(0)
+    RenderStateCache::RenderStateCache(IVideoDriver* d) : _driver(d)
     {
-        _blend = blend_disabled;
+        reset();
     }
 
+    void RenderStateCache::reset()
+    {
+        for (int i = 0; i < MAX_TEXTURES; ++i)
+        {
+            _textures[i] = 0;
+        }
+        _blend = blend_disabled;
+        _driver->setState(IVideoDriver::STATE_BLEND, 0);
+        _program = 0;
+    }
 
     void RenderStateCache::setTexture(int sampler, const spNativeTexture& t)
     {
         OX_ASSERT(sampler < MAX_TEXTURES);
+#ifdef OX_DEBUG
+
+        if (_textures[sampler])
+        {
+            GLint whichID;
+            oxglActiveTexture(GL_TEXTURE0 + sampler);
+            glGetIntegerv(GL_TEXTURE_BINDING_2D, &whichID);
+
+            OX_ASSERT(_textures[sampler]->getHandle() == (nativeTextureHandle)whichID);
+        }
+
+#endif
         if (_textures[sampler] == t)
             return;
         _textures[sampler] = t;
@@ -64,7 +86,6 @@ namespace oxygine
         if (_blend == blend)
             return;
 
-        //drawBatch();
 
         if (blend == 0)
             _driver->setState(IVideoDriver::STATE_BLEND, 0);

oxygine/src/oxygine/STDRenderer.h

@@ -15,6 +15,7 @@ namespace oxygine
         void setTexture(int sampler, const spNativeTexture& t);
         void setBlendMode(blend_mode blend);
         bool setShader(ShaderProgram* prog);
+        void reset();
 
     protected:
         enum { MAX_TEXTURES = 8 };
@@ -117,6 +118,8 @@ namespace oxygine
         void pushShaderSetHook(ShaderProgramChangedHook* hook);
         void popShaderSetHook();
 
+        bool isEmpty() const { return _verticesData.empty(); }
+
     protected:
         virtual void shaderProgramChanged() {}
 

oxygine/src/oxygine/core/gl/NativeTextureGLES.cpp

@@ -89,6 +89,7 @@ namespace oxygine
     {
         GLuint id = 0;
         glGenTextures(1, &id);
+        oxglActiveTexture(GL_TEXTURE7);
         glBindTexture(GL_TEXTURE_2D, id);
 
         unsigned int f = GL_LINEAR;
@@ -199,6 +200,7 @@ namespace oxygine
 
     void NativeTextureGLES::setLinearFilter(bool enable)
     {
+        oxglActiveTexture(GL_TEXTURE7);
         glBindTexture(GL_TEXTURE_2D, (GLuint) _id);
 
         unsigned int f = enable ? GL_LINEAR : GL_NEAREST;
@@ -209,6 +211,7 @@ namespace oxygine
 
     void NativeTextureGLES::setClamp2Edge(bool clamp2edge)
     {
+        oxglActiveTexture(GL_TEXTURE7);
         glBindTexture(GL_TEXTURE_2D, (GLuint) _id);
 
         unsigned int f = clamp2edge ? GL_CLAMP_TO_EDGE : GL_REPEAT;
@@ -315,6 +318,7 @@ namespace oxygine
 
         if (_lockFlags & lock_write)
         {
+            oxglActiveTexture(GL_TEXTURE7);
             glBindTexture(GL_TEXTURE_2D, (GLuint) _id);
             GLenum er = glGetError();
 
@@ -354,6 +358,7 @@ namespace oxygine
         ImageData data = data_;
         assert(_width >= data.w - x);
         assert(_height >= data.h - y);
+        oxglActiveTexture(GL_TEXTURE7);
         glBindTexture(GL_TEXTURE_2D, (GLuint) _id);
 
         glPixel glp = SurfaceFormat2GL(_format);

oxygine/src/oxygine/core/oxygine.cpp

@@ -601,8 +601,10 @@ namespace oxygine
             bool ready = STDRenderer::isReady();
             if (ready)
             {
+                rc().reset();
                 IVideoDriver::_stats.start = getTimeMS();
                 updatePortProcessItems();
+                rc().reset();
             }
             else
             {

oxygine/src/oxygine/text_utils/Node.cpp

@@ -168,6 +168,7 @@ namespace oxygine
                 const Symbol& s = _data[i];
                 if (!s.mat)
                     continue;
+
                 s.mat->apply();
                 s.mat->render(dc.color, s.gl.src, s.destRect);
             }