experimental index buffer

examples/Demo/src/test.h

@@ -17,20 +17,24 @@ public:
     Content() : driver(0) { setName("content"); }
     IVideoDriver* driver;
 
-    /*
+
     void render(const RenderState& parentRS)
     {
-
-        parentRS.renderer->drawBatch();
-
-        RenderState rs = parentRS;
-        STDRenderer renderer(driver ? driver : IVideoDriver::instance);
-        renderer.Renderer::begin(parentRS.renderer);
-        rs.renderer = &renderer;
-        Actor::render(rs);
-        renderer.end();
+        if (!driver)
+        {
+            Actor::render(parentRS);
+            return;
+        }
+        IVideoDriver* prev = IVideoDriver::instance;
+
+        IVideoDriver::instance = driver;
+        STDRenderer::instance->setDriver(driver);
+        Actor::render(parentRS);
+        STDRenderer::instance->setDriver(prev);
+
+        IVideoDriver::instance = prev;
     }
-    */
+
 };
 
 DECLARE_SMART(Test, spTest);

oxygine/src/STDRenderer.cpp

@@ -184,6 +184,8 @@ namespace oxygine
         invisible->init(im, false);
         invisible->setLinearFilter(false);
 
+        IVideoDriver::instance->restore();
+
         setDefaultSettings();
         _restored = true;
     }

oxygine/src/core/gl/VideoDriverGLES20.cpp

@@ -10,6 +10,8 @@
 #include "../ZipFileSystem.h"
 #include "../system_data.h"
 
+#include "STDRenderer.h"
+
 #if OXYGINE_SDL
 #include "SDL_config.h"
 #endif
@@ -21,8 +23,10 @@
 
 namespace oxygine
 {
+    GLuint ib = 0;
     VideoDriverGLES20::VideoDriverGLES20(): _programID(0), _p(0)
     {
+
     }
 
     VideoDriverGLES20::~VideoDriverGLES20()
@@ -35,6 +39,14 @@ namespace oxygine
     {
         //_us.restore();
         setDefaultSettings();
+
+        if (!ib)
+        {
+            oxglGenBuffers(1, &ib);
+            oxglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib);
+            oxglBufferData(GL_ELEMENT_ARRAY_BUFFER, STDRenderer::indices16.size() * sizeof(unsigned short), &STDRenderer::indices16.front(), GL_STATIC_DRAW);
+            oxglBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+        }
     }
 
     bool VideoDriverGLES20::isReady() const
@@ -49,6 +61,7 @@ namespace oxygine
 
     void VideoDriverGLES20::reset()
     {
+        int q = 0;
         //_currentProgram = 0;
     }
 
@@ -139,6 +152,10 @@ namespace oxygine
 
         const unsigned char* verticesData = (const unsigned char*)vdata;
 
+        //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib);
+        if (indicesData != &STDRenderer::indices16.front())
+            int q = 0;
+
         const VertexDeclarationGL::Element* el = decl->elements;
         for (int i = 0; i < decl->numElements; ++i)
         {