Merge branch 'texture-refactoring' into scene-refactor-base

tangrams · Nov 30, 2018 · 1639f03 · 1639f03
2 parents 2c76931 + f7eb842
commit 1639f03
Show file tree

Hide file tree

Showing 19 changed files with 1,640 additions and 950 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -86,6 +86,7 @@ add_library(tangram-core
   src/util/json.cpp
   src/util/mapProjection.cpp
   src/util/rasterize.cpp
+  src/util/stbImage.cpp
   src/util/url.cpp
   src/util/yamlPath.cpp
   src/util/yamlUtil.cpp

diff --git a/core/deps/stb/stb_image.h b/core/deps/stb/stb_image.h
diff --git a/core/src/gl/framebuffer.cpp b/core/src/gl/framebuffer.cpp
@@ -119,10 +119,10 @@ void FrameBuffer::init(RenderState& _rs) {
 
         m_texture = std::make_unique<Texture>(options);
         m_texture->resize(m_width, m_height);
-        m_texture->update(_rs, 0);
+        m_texture->bind(_rs, 0);
 
         GL::framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                 GL_TEXTURE_2D, m_texture->getGlHandle(), 0);
+                                 GL_TEXTURE_2D, m_texture->glHandle(), 0);
     }
 
     {

diff --git a/core/src/gl/primitives.cpp b/core/src/gl/primitives.cpp
@@ -129,8 +129,8 @@ void drawTexture(RenderState& rs, Texture& _tex, glm::vec2 _pos, glm::vec2 _dim)
     rs.vertexBuffer(0);
     rs.depthTest(GL_FALSE);
 
-    float w = _tex.getWidth();
-    float h = _tex.getHeight();
+    float w = _tex.width();
+    float h = _tex.height();
 
     if (_dim != glm::vec2(0)) {
         w = _dim.x;

diff --git a/core/src/gl/renderState.cpp b/core/src/gl/renderState.cpp
@@ -333,24 +333,17 @@ bool RenderState::shaderProgram(GLuint program) {
     return true;
 }
 
-bool RenderState::texture(GLenum target, GLuint handle) {
-    if (!m_texture.set || m_texture.target != target || m_texture.handle != handle) {
-        m_texture = { target, handle, true };
-        GL::bindTexture(target, handle);
-        return false;
-    }
-    return true;
-}
-
-bool RenderState::textureUnit(GLuint unit) {
+void RenderState::texture(GLuint handle, GLuint unit, GLenum target) {
     if (!m_textureUnit.set || m_textureUnit.unit != unit) {
         m_textureUnit = { unit, true };
         // Our cached texture handle is irrelevant on the new unit, so unset it.
         m_texture.set = false;
         GL::activeTexture(getTextureUnit(unit));
-        return false;
     }
-    return true;
+    if (!m_texture.set || m_texture.target != target || m_texture.handle != handle) {
+        m_texture = { target, handle, true };
+        GL::bindTexture(target, handle);
+    }
 }
 
 bool RenderState::vertexBuffer(GLuint handle) {

diff --git a/core/src/gl/renderState.h b/core/src/gl/renderState.h
@@ -88,9 +88,7 @@ class RenderState {
 
     bool shaderProgram(GLuint program);
 
-    bool texture(GLenum target, GLuint handle);
-
-    bool textureUnit(GLuint unit);
+    void texture(GLuint handle, GLuint unit, GLenum target);
 
     bool vertexBuffer(GLuint handle);