Merge pull request #214 from RobLoach/unmanaged

Add TextureUnmanaged

Author: RobLoach

examples/text/text_font_filters.cpp

@@ -29,15 +29,15 @@ int main(void)
 
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
-    GenTextureMipmaps(&font.texture);
+    font.GetTexture().GenMipmaps();
 
     raylib::Text msg("Loaded Font", font.GetBaseSize(), BLACK, font);
 
     Vector2 fontPosition = { 40.0f, screenHeight/2.0f - 80.0f };
     Vector2 textSize = { 0.0f, 0.0f };
 
     // Setup texture scaling filter
-    SetTextureFilter(font.texture, TEXTURE_FILTER_POINT);
+    font.GetTexture().SetFilter(TEXTURE_FILTER_POINT);
     int currentFontFilter = 0;      // TEXTURE_FILTER_POINT
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
@@ -53,18 +53,18 @@ int main(void)
         // Choose font texture filter method
         if (IsKeyPressed(KEY_ONE))
         {
-            SetTextureFilter(font.texture, TEXTURE_FILTER_POINT);
+            font.GetTexture().SetFilter(TEXTURE_FILTER_POINT);
             currentFontFilter = 0;
         }
         else if (IsKeyPressed(KEY_TWO))
         {
-            SetTextureFilter(font.texture, TEXTURE_FILTER_BILINEAR);
+            font.GetTexture().SetFilter(TEXTURE_FILTER_BILINEAR);
             currentFontFilter = 1;
         }
         else if (IsKeyPressed(KEY_THREE))
         {
             // NOTE: Trilinear filter won't be noticed on 2D drawing
-            SetTextureFilter(font.texture, TEXTURE_FILTER_TRILINEAR);
+            font.GetTexture().SetFilter(TEXTURE_FILTER_TRILINEAR);
             currentFontFilter = 2;
         }
 

include/CMakeLists.txt

@@ -36,6 +36,7 @@ install(FILES
     Sound.hpp
     Text.hpp
     Texture.hpp
+    TextureUnmanaged.hpp
     Touch.hpp
     Vector2.hpp
     Vector3.hpp

include/Font.hpp

@@ -6,6 +6,7 @@
 #include "./raylib.hpp"
 #include "./raylib-cpp-utils.hpp"
 #include "./RaylibException.hpp"
+#include "./TextureUnmanaged.hpp"
 
 namespace raylib {
 /**
@@ -106,10 +107,23 @@ class Font : public ::Font {
     GETTERSETTER(int, BaseSize, baseSize)
     GETTERSETTER(int, GlyphCount, glyphCount)
     GETTERSETTER(int, GlyphPadding, glyphPadding)
-    GETTERSETTER(::Texture2D, Texture, texture)
     GETTERSETTER(::Rectangle*, Recs, recs)
     GETTERSETTER(::GlyphInfo*, Glyphs, glyphs)
 
+    /**
+     * Get the texture atlas containing the glyphs.
+     */
+    inline TextureUnmanaged GetTexture() {
+        return texture;
+    }
+
+    /**
+     * Set the texture atlas containing the glyphs.
+     */
+    inline void SetTexture(const ::Texture& newTexture) {
+        texture = newTexture;
+    }
+
     Font& operator=(const ::Font& font) {
         Unload();
         set(font);

include/RenderTexture.hpp

@@ -4,6 +4,7 @@
 #include "./raylib.hpp"
 #include "./raylib-cpp-utils.hpp"
 #include "./RaylibException.hpp"
+#include "./TextureUnmanaged.hpp"
 
 namespace raylib {
 /**
@@ -22,7 +23,8 @@ class RenderTexture : public ::RenderTexture {
         set(renderTexture);
     }
 
-    RenderTexture(unsigned int id, const ::Texture& texture, const ::Texture& depth) : ::RenderTexture{id, texture, depth} {}
+    RenderTexture(unsigned int id, const ::Texture& texture, const ::Texture& depth) :
+        ::RenderTexture{id, texture, depth} {}
 
     /**
      * Load texture for rendering (framebuffer)
@@ -42,8 +44,28 @@ class RenderTexture : public ::RenderTexture {
     }
 
     GETTERSETTER(unsigned int, Id, id)
-    GETTERSETTER(::Texture2D, Texture, texture)
-    GETTERSETTER(::Texture2D, Depth, depth)
+
+    /**
+     * Get the color buffer attachment texture.
+     */
+    inline TextureUnmanaged GetTexture() {
+        return texture;
+    }
+
+    inline void SetTexture(const ::Texture& newTexture) {
+        texture = newTexture;
+    }
+
+    /**
+     * Depth buffer attachment texture
+     */
+    inline TextureUnmanaged GetDepth() {
+        return depth;
+    }
+
+    inline void SetDepth(const ::Texture& newDepth) {
+        depth = newDepth;
+    }
 
     RenderTexture& operator=(const ::RenderTexture& texture) {
         set(texture);