Refactor to use std::byte

JerboaBurrow · Aug 6, 2024 · 1cba496 · 1cba496
1 parent b452381
commit 1cba496
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 57 deletions.
diff --git a/examples/Sprite/main.cpp b/examples/Sprite/main.cpp
@@ -36,7 +36,7 @@ int main(int argv, char ** argc)
 
     std::shared_ptr<jGL::Texture> jerboa = jGLInstance->createTexture
     (
-        std::vector<unsigned char>(LOGO32,LOGO32+sizeof(LOGO32)),
+        std::vector(LOGO32.begin(), LOGO32.end()),
         jGL::Texture::Type::RGBA
     );
 

diff --git a/include/jGL/Display/desktopDisplay.h b/include/jGL/Display/desktopDisplay.h
@@ -275,17 +275,22 @@ namespace jGL
             }
         };
 
-        void setIcon(const std::vector<std::vector<unsigned char>> & icons)
+        void setIcon(const std::vector<std::vector<std::byte>> & icons)
         {
             glfwSetWindowIcon(glfwWindow, 0, NULL);
             logo.clear();
             for (auto icon : icons)
             {
                 GLFWimage image;
+                std::vector<unsigned char> chData(icon.size());
+                for (unsigned i = 0; i < chData.size(); i++)
+                {
+                    chData[i] = (unsigned char)(icon[i]);
+                }
                 image.pixels = stbi_load_from_memory
                 (
-                    icon.data(), 
-                    icon.size(), 
+                    chData.data(), 
+                    chData.size(), 
                     &image.width, 
                     &image.height, 
                     0, 

diff --git a/include/jGL/OpenGL/Texture/glTexture.h b/include/jGL/OpenGL/Texture/glTexture.h
@@ -3,6 +3,7 @@
 
 #include <jGL/OpenGL/gl.h>
 #include <jGL/texture.h>
+#include <jGL/util.h>
 
 #include <stdexcept>
 #include <filesystem>
@@ -46,7 +47,7 @@ namespace jGL::GL
         GLuint id;
         unsigned textureUnit;
 
-        std::vector<unsigned char> load_image(std::filesystem::path imageFilePath)
+        std::vector<std::byte> load_image(std::filesystem::path imageFilePath)
         {
             unsigned char * pixels = stbi_load(imageFilePath.generic_string().c_str(), &width, &height, &channels, 0);
 
@@ -57,22 +58,27 @@ namespace jGL::GL
 
             size_t dim = width*height;
             if (channels > 0) { dim *= channels; }
-            std::vector<unsigned char> vdata(pixels, pixels+dim);
+            std::vector<std::byte> vdata = ptrToByteVector<unsigned char>(pixels, dim);
             stbi_image_free(pixels);
             return vdata;
         }
 
-        std::vector<unsigned char> load_image(std::vector<unsigned char> imageFile)
+        std::vector<std::byte> load_image(std::vector<std::byte> imageFile)
         {
-            unsigned char * pixels = stbi_load_from_memory(imageFile.data(), imageFile.size(), &width, &height, &channels, 4);
+            std::vector<unsigned char> chData(imageFile.size());
+            for (unsigned i = 0; i < imageFile.size(); i++)
+            {
+                chData[i] = (unsigned char)(imageFile[i]);
+            }
+            unsigned char * pixels = stbi_load_from_memory(chData.data(), imageFile.size(), &width, &height, &channels, 4);
             if (!pixels)
             {
                 throw std::runtime_error("Failed to load texture from memory");
             }
 
             size_t dim = width*height;
             if (channels > 0) { dim *= channels; }
-            std::vector<unsigned char> vdata(pixels, pixels+dim);
+            std::vector<std::byte> vdata = ptrToByteVector<unsigned char>(pixels, dim);
             stbi_image_free(pixels);
             return vdata;
         }
@@ -87,21 +93,21 @@ namespace jGL::GL
         glTexture2DRGB(std::filesystem::path imageFile)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(imageFile);
+            std::vector<std::byte> pixels = load_image(imageFile);
             create(width, height, channels);
             upload(pixels);
         }
 
-        glTexture2DRGB(std::vector<unsigned char> data)
+        glTexture2DRGB(std::vector<std::byte> data)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(data);
+            std::vector<std::byte> pixels = load_image(data);
             create(width, height, channels);
             upload(pixels);
         }
 
         void create(int width, int height, int channels);
-        void upload(std::vector<unsigned char> pixels);
+        void upload(std::vector<std::byte> pixels);
     };
 
     class glTexture2DRGBA : public glTexture
@@ -112,21 +118,21 @@ namespace jGL::GL
         glTexture2DRGBA(std::filesystem::path imageFile)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(imageFile);
+            std::vector<std::byte> pixels = load_image(imageFile);
             create(width, height, channels);
             upload(pixels);
         }
 
-        glTexture2DRGBA(std::vector<unsigned char> data)
+        glTexture2DRGBA(std::vector<std::byte> data)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(data);
+            std::vector<std::byte> pixels = load_image(data);
             create(width, height, channels);
             upload(pixels);
         }
 
         void create(int width, int height, int channels);
-        void upload(std::vector<unsigned char> pixels);
+        void upload(std::vector<std::byte> pixels);
     };
 
     class glTexture2DByte : public glTexture
@@ -137,28 +143,28 @@ namespace jGL::GL
         glTexture2DByte(std::filesystem::path imageFile)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(imageFile);
+            std::vector<std::byte> pixels = load_image(imageFile);
             create(width, height);
             upload(pixels);
         }
 
-        glTexture2DByte(std::vector<unsigned char> data)
+        glTexture2DByte(std::vector<std::byte> data)
         : glTexture()
         {
-            std::vector<unsigned char> pixels = load_image(data);
+            std::vector<std::byte> pixels = load_image(data);
             create(width, height);
             upload(pixels);
         }
 
-        glTexture2DByte(std::vector<unsigned char> pixels, int width, int height)
+        glTexture2DByte(std::vector<std::byte> pixels, int width, int height)
         : glTexture()
         {
             create(width, height);
             upload(pixels);
         }
 
         void create(int width, int height);
-        void upload(std::vector<unsigned char> pixels);
+        void upload(std::vector<std::byte> pixels);
 
     };
 }

diff --git a/include/jGL/OpenGL/openGLInstance.h b/include/jGL/OpenGL/openGLInstance.h
@@ -88,7 +88,7 @@ namespace jGL::GL
                 }   
             }
 
-            std::shared_ptr<Texture> createTexture(std::vector<unsigned char> data, Texture::Type type)
+            std::shared_ptr<Texture> createTexture(std::vector<std::byte> data, Texture::Type type)
             { 
                 switch (type)
                 {

diff --git a/include/jGL/Vulkan/Texture/vkTexture.h b/include/jGL/Vulkan/Texture/vkTexture.h
@@ -5,6 +5,7 @@
 #include <jGL/Vulkan/Device/device.h>
 #include <jGL/Vulkan/Command/command.h>
 #include <jGL/Vulkan/buffer.h>
+#include <jGL/util.h>
 
 #include <glm/glm.hpp>
 
@@ -74,7 +75,7 @@ namespace jGL::Vulkan
             uint32_t height, 
             uint32_t channels, 
             VkFormat format, 
-            std::vector<unsigned char> pixels,
+            std::vector<std::byte> pixels,
             VkSampleCountFlagBits msaaSamples = VK_SAMPLE_COUNT_1_BIT
         );
 
@@ -96,7 +97,7 @@ namespace jGL::Vulkan
             uint32_t height, 
             uint32_t channels, 
             VkFormat format,
-            std::vector<unsigned char> pixels
+            std::vector<std::byte> pixels
         );
 
     protected:
@@ -130,7 +131,7 @@ namespace jGL::Vulkan
         void uploadImage
         (
             const Command & command,
-            std::vector<unsigned char> pixels,
+            std::vector<std::byte> pixels,
             VkFormat format,
             uint32_t width,
             uint32_t height,

diff --git a/include/jGL/Vulkan/vulkanInstance.h b/include/jGL/Vulkan/vulkanInstance.h
@@ -100,7 +100,7 @@ namespace jGL::Vulkan
                 )
             );   
         }
-        std::shared_ptr<Texture> createTexture(std::vector<unsigned char> data, Texture::Type type) 
+        std::shared_ptr<Texture> createTexture(std::vector<std::byte> data, Texture::Type type) 
         { 
             TODO("VulkanInstance::createTexture from bytes undefined");
             return std::static_pointer_cast<Texture>

diff --git a/include/jGL/font.h b/include/jGL/font.h
@@ -37,7 +37,7 @@ namespace jGL
         std::map<unsigned char, glm::vec4> glyphOffset;
 
         std::shared_ptr<Texture> fontBitmap;
-        std::vector<unsigned char> bitmapPixels;
+        std::vector<std::byte> bitmapPixels;
         uint16_t bw, bh;
 
     };

diff --git a/include/jGL/jGL.h b/include/jGL/jGL.h
@@ -52,7 +52,7 @@ namespace jGL
 
         virtual std::shared_ptr<Particles> createParticles(size_t sizeHint) = 0;
         virtual std::shared_ptr<Texture> createTexture(std::filesystem::path imageFile, Texture::Type type) = 0;
-        virtual std::shared_ptr<Texture> createTexture(std::vector<unsigned char> data, Texture::Type type) = 0;
+        virtual std::shared_ptr<Texture> createTexture(std::vector<std::byte> data, Texture::Type type) = 0;
         virtual std::shared_ptr<SpriteRenderer> createSpriteRenderer(size_t sizeHint) = 0;
         virtual std::shared_ptr<ShapeRenderer> createShapeRenderer(size_t sizeHint) = 0;
 

diff --git a/include/jGL/util.h b/include/jGL/util.h
@@ -0,0 +1,21 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#include <vector>
+#include <stdint.h>
+
+namespace jGL
+{
+    template <class C>
+    std::vector<std::byte> ptrToByteVector(const C * ch, uint64_t length)
+    {
+        std::vector<std::byte> v(length);
+        for (unsigned i = 0; i < length; i++)
+        {
+            v[i] = std::byte(ch[i]);
+        }
+        return v;
+    }   
+}
+
+#endif /* UTIL_H */
diff --git a/include/logo.h b/include/logo.h
diff --git a/src/jGL/Display/desktopDisplay.cpp b/src/jGL/Display/desktopDisplay.cpp
@@ -97,11 +97,11 @@ namespace jGL
         glfwSetMouseButtonCallback(glfwWindow, mouseButtonCallback);
         glfwSetScrollCallback(glfwWindow, mouseScrollCallback);
 
-        std::vector<std::vector<unsigned char>> logos =
+        std::vector<std::vector<std::byte>> logos =
         {
-            {std::vector<unsigned char>(LOGO32, LOGO32+sizeof(LOGO32))},
-            {std::vector<unsigned char>(LOGO64, LOGO64+sizeof(LOGO64))},
-            {std::vector<unsigned char>(LOGO128, LOGO128+sizeof(LOGO128))}
+            {std::vector(LOGO32.begin(), LOGO32.end())},
+            {std::vector(LOGO64.begin(), LOGO64.end())},
+            {std::vector(LOGO128.begin(), LOGO128.end())}
         };
 
         setIcon(logos);

diff --git a/src/jGL/OpenGL/Texture/glTexture.cpp b/src/jGL/OpenGL/Texture/glTexture.cpp
@@ -50,7 +50,7 @@ namespace jGL::GL
 
     }
 
-    void glTexture2DRGB::upload(std::vector<unsigned char> pixels)
+    void glTexture2DRGB::upload(std::vector<std::byte> pixels)
     {
         bind();
 
@@ -114,7 +114,7 @@ namespace jGL::GL
         glBindTexture(GL_TEXTURE_2D, 0);
     }
 
-    void glTexture2DRGBA::upload(std::vector<unsigned char> pixels)
+    void glTexture2DRGBA::upload(std::vector<std::byte> pixels)
     {
         bind();
         glTexImage2D(
@@ -178,7 +178,7 @@ namespace jGL::GL
 
     }
 
-    void glTexture2DByte::upload(std::vector<unsigned char> pixels)
+    void glTexture2DByte::upload(std::vector<std::byte> pixels)
     {
         bind();
 

diff --git a/src/jGL/Vulkan/Texture/vkTexture.cpp b/src/jGL/Vulkan/Texture/vkTexture.cpp
@@ -40,7 +40,7 @@ namespace jGL::Vulkan
         uploadImage
         (
             command,
-            std::vector<unsigned char> {pixels, pixels+width*height*channels},
+            ptrToByteVector<unsigned char>(pixels, width*height*channels),
             format,
             this->width,
             this->height,
@@ -64,7 +64,7 @@ namespace jGL::Vulkan
         uint32_t height, 
         uint32_t channels, 
         VkFormat format, 
-        std::vector<unsigned char> pixels,
+        std::vector<std::byte> pixels,
         VkSampleCountFlagBits msaaSamples
     )
     : device(device), msaaSamples(msaaSamples)
@@ -103,7 +103,7 @@ namespace jGL::Vulkan
         height, 
         channels, 
         format,
-        std::vector<unsigned char>(width*height*channels, 0),
+        std::vector<std::byte>(width*height*channels),
         msaaSamples
       )
     {}
@@ -299,7 +299,7 @@ namespace jGL::Vulkan
     void vkTexture::uploadImage
     (
         const Command & command,
-        std::vector<unsigned char> pixels,
+        std::vector<std::byte> pixels,
         VkFormat format,
         uint32_t width,
         uint32_t height,
@@ -373,7 +373,7 @@ namespace jGL::Vulkan
         uint32_t height, 
         uint32_t channels, 
         VkFormat format, 
-        std::vector<unsigned char> pixels
+        std::vector<std::byte> pixels
     )
     {
         if 

diff --git a/src/jGL/font.cpp b/src/jGL/font.cpp
@@ -30,7 +30,7 @@ namespace jGL
         int chWidth = s;
         int chHeight = s;
 
-        bitmapPixels = std::vector<unsigned char>(chWidth*chHeight*128, 0);
+        bitmapPixels = std::vector<std::byte>(chWidth*chHeight*128);
 
         uint16_t cursorX = 0;
         uint16_t cursorY = 0;
@@ -70,7 +70,7 @@ namespace jGL
                     px = cursorX;
                     py += 1;
                 }
-                bitmapPixels[py*width+px+cursorX*chWidth] = chPixels[i];
+                bitmapPixels[py*width+px+cursorX*chWidth] = std::byte(chPixels[i]);
                 px++;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ namespace jGL::GL @@
                     }
                 }
-                std::shared_ptr<Texture> createTexture(std::vector<unsigned char> data, Texture::Type type)
+                std::shared_ptr<Texture> createTexture(std::vector<std::byte> data, Texture::Type type)
                 {
                     switch (type)
                     {
@@ Expand Down @@