From 26f4deca124edd3871e07e06359ce36a2d1c7bac Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Fri, 5 Aug 2022 02:28:51 +0000 Subject: [PATCH] Rename Array --- include/Orange/Core/{SmallVector.h => Array.h} | 16 ++++++++-------- include/Orange/Core/Parse.h | 6 +++--- include/Orange/Render/Swapchain.h | 14 +++++++------- src/Apps/Tools/CubeTest.cpp | 6 +++--- src/Orange/Render/RenderContext_Init.cpp | 8 ++++---- src/Orange/Render/Swapchain.cpp | 16 ++++++++-------- 6 files changed, 33 insertions(+), 33 deletions(-) rename include/Orange/Core/{SmallVector.h => Array.h} (92%) diff --git a/include/Orange/Core/SmallVector.h b/include/Orange/Core/Array.h similarity index 92% rename from include/Orange/Core/SmallVector.h rename to include/Orange/Core/Array.h index 775fe22..7428b7e 100644 --- a/include/Orange/Core/SmallVector.h +++ b/include/Orange/Core/Array.h @@ -7,23 +7,23 @@ namespace orange { template - class SmallVector + class SmallArray { public: - SmallVector() {} - SmallVector(size_t size) { Resize(size); } - SmallVector(Span span) + SmallArray() {} + SmallArray(size_t size) { Resize(size); } + SmallArray(Span span) { Reserve(span.size); for (const auto& val : span) PushBack(val); } - SmallVector (const SmallVector&) = delete; - SmallVector& operator = (const SmallVector&) = delete; + SmallArray (const SmallArray&) = delete; + SmallArray& operator = (const SmallArray&) = delete; - ~SmallVector() + ~SmallArray() { for (size_t i = 0; i < m_size; i++) Ptr(i)->~T(); @@ -177,6 +177,6 @@ namespace orange }; template - using Vector = SmallVector; + using Array = SmallArray; } diff --git a/include/Orange/Core/Parse.h b/include/Orange/Core/Parse.h index 11d3472..5064fca 100644 --- a/include/Orange/Core/Parse.h +++ b/include/Orange/Core/Parse.h @@ -1,6 +1,6 @@ #pragma once -#include "Orange/Core/SmallVector.h" +#include "Orange/Core/Array.h" #include #include @@ -68,7 +68,7 @@ namespace orange::stream return Consume(first, end, " \t"); } - template > + template > size_t ReadOrAdvance(const char*& first, const char* end, StringView delims, size_t advancement = 0, OutArray* array = nullptr) { size_t count = 0; @@ -88,7 +88,7 @@ namespace orange::stream return count; } - template > + template > size_t ReadString(const char*& first, const char* end, StringView delims, OutArray& array) { return ReadOrAdvance(first, end, delims, 0, &array); diff --git a/include/Orange/Render/Swapchain.h b/include/Orange/Render/Swapchain.h index 0134654..935a48d 100644 --- a/include/Orange/Render/Swapchain.h +++ b/include/Orange/Render/Swapchain.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -51,13 +51,13 @@ namespace orange VkExtent2D m_extent; VkSwapchainKHR m_swapchain; - SmallVector m_images; - SmallVector m_imageViews; + SmallArray m_images; + SmallArray m_imageViews; - SmallVector m_commandBuffers; - SmallVector m_imageAvailableSemaphores; - SmallVector m_renderFinishedSemaphores; - SmallVector m_inFlightFences; + SmallArray m_commandBuffers; + SmallArray m_imageAvailableSemaphores; + SmallArray m_renderFinishedSemaphores; + SmallArray m_inFlightFences; uint32_t m_currentFrame = 0; uint32_t m_currentImage = 0; diff --git a/src/Apps/Tools/CubeTest.cpp b/src/Apps/Tools/CubeTest.cpp index 6a2e9ac..fe04f12 100644 --- a/src/Apps/Tools/CubeTest.cpp +++ b/src/Apps/Tools/CubeTest.cpp @@ -1,4 +1,4 @@ -#include "Orange/Core/SmallVector.h" +#include "Orange/Core/Array.h" #include "Orange/Core/Span.h" #include #include @@ -16,7 +16,7 @@ Result ParseOBJ(StringView buffer) const char* end = buffer.data + buffer.size; while (obj != end) { - SmallVector element; + SmallArray element; stream::ReadString(obj, end, " #\n", element); if (element == "v" || element == "vn" || element == "vt") @@ -37,7 +37,7 @@ Result ParseOBJ(StringView buffer) else if (element == "g" || element == "o") { stream::ConsumeSpace(obj, end); - SmallVector name; + SmallArray name; stream::ReadString(obj, end, " #\n", name); name.PushBack('\0'); diff --git a/src/Orange/Render/RenderContext_Init.cpp b/src/Orange/Render/RenderContext_Init.cpp index 6873583..36f379f 100644 --- a/src/Orange/Render/RenderContext_Init.cpp +++ b/src/Orange/Render/RenderContext_Init.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -9,7 +9,7 @@ namespace orange { static VulkanResult CreateVkInstance(const char* appName) { - SmallVector instanceExtensions; + SmallArray instanceExtensions; { auto r_tempWindow = Window::Create(); if (!r_tempWindow) @@ -49,7 +49,7 @@ namespace orange static Result PickQueueFamilyIndex(VkPhysicalDevice physicalDevice) { - SmallVector queueFamilyProperties; + SmallArray queueFamilyProperties; VkEnumerate(vkGetPhysicalDeviceQueueFamilyProperties, queueFamilyProperties, physicalDevice); for (uint32_t i = 0; i < queueFamilyProperties.Size(); i++) @@ -80,7 +80,7 @@ namespace orange static Result PickPhysicalDevice(VkInstance instance) { - SmallVector physicalDevices; + SmallArray physicalDevices; VkEnumerate(vkEnumeratePhysicalDevices, physicalDevices, instance); VkPhysicalDevice bestPhysicalDevice = VK_NULL_HANDLE; diff --git a/src/Orange/Render/Swapchain.cpp b/src/Orange/Render/Swapchain.cpp index b1918cd..6f2b9e5 100644 --- a/src/Orange/Render/Swapchain.cpp +++ b/src/Orange/Render/Swapchain.cpp @@ -11,7 +11,7 @@ namespace orange static Result ChooseSwapChainFormat(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface) { - SmallVector surfaceFormats; + SmallArray surfaceFormats; if (!VkEnumerate(vkGetPhysicalDeviceSurfaceFormatsKHR, surfaceFormats, physicalDevice, surface)) { log::err("Surface supports no formats"); @@ -29,7 +29,7 @@ namespace orange static VkPresentModeKHR ChoosePresentMode(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface) { - SmallVector presentModes; + SmallArray presentModes; VkEnumerate(vkGetPhysicalDeviceSurfacePresentModesKHR, presentModes, physicalDevice, surface); for (auto& presentMode : presentModes) { if (presentMode == VK_PRESENT_MODE_MAILBOX_KHR) return presentMode; } @@ -99,11 +99,11 @@ namespace orange if (vkCreateSwapchainKHR(context.Device(), &swapchainInfo, nullptr, &swapchain) != VK_SUCCESS) return Result::PrintError("Failed to create swapchain"); - SmallVector swapchainImages; + SmallArray swapchainImages; if (!VkEnumerate(vkGetSwapchainImagesKHR, swapchainImages, context.Device(), swapchain)) return Result::PrintError("Failed to get swapchain images"); - SmallVector swapchainImageViews{ swapchainImages.Size() }; + SmallArray swapchainImageViews{ swapchainImages.Size() }; for (size_t i = 0; i < swapchainImages.Size(); i++) { VkImageViewCreateInfo imageViewInfo = @@ -119,7 +119,7 @@ namespace orange return Result::PrintError("Failed to get swapchain image view"); } - SmallVector commandBuffers{ DefaultFramesInFlight }; + SmallArray commandBuffers{ DefaultFramesInFlight }; { VkCommandBufferAllocateInfo commandBufferInfo = { @@ -133,9 +133,9 @@ namespace orange return Result::PrintError("Failed to get swapchain image view"); } - SmallVector imageAvailableSemaphores{ DefaultFramesInFlight }; - SmallVector renderFinishedSemaphores{ DefaultFramesInFlight }; - SmallVector inFlightFences { DefaultFramesInFlight }; + SmallArray imageAvailableSemaphores{ DefaultFramesInFlight }; + SmallArray renderFinishedSemaphores{ DefaultFramesInFlight }; + SmallArray inFlightFences { DefaultFramesInFlight }; for (uint32_t i = 0; i < DefaultFramesInFlight; i++) { auto r_fence = context.CreateFence(true);