Removed old texture loader class [skip CI]
This commit is contained in:
parent
20ed54bbb6
commit
83ad186ce5
4 changed files with 3 additions and 1093 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -173,8 +173,7 @@ void VulkanExampleBase::prepare()
|
|||
setupRenderPass();
|
||||
createPipelineCache();
|
||||
setupFrameBuffer();
|
||||
// Create a simple texture loader class
|
||||
textureLoader = new vkTools::VulkanTextureLoader(vulkanDevice, queue, cmdPool);
|
||||
|
||||
if (enableTextOverlay)
|
||||
{
|
||||
// Load the text rendering shaders
|
||||
|
|
@ -702,11 +701,6 @@ VulkanExampleBase::~VulkanExampleBase()
|
|||
|
||||
vkDestroyPipelineCache(device, pipelineCache, nullptr);
|
||||
|
||||
if (textureLoader)
|
||||
{
|
||||
delete textureLoader;
|
||||
}
|
||||
|
||||
vkDestroyCommandPool(device, cmdPool, nullptr);
|
||||
|
||||
vkDestroySemaphore(device, semaphores.presentComplete, nullptr);
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
#define GLM_FORCE_RADIANS
|
||||
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include <glm/glm.hpp>
|
||||
#include <string>
|
||||
#include <array>
|
||||
|
|
@ -43,7 +44,6 @@
|
|||
#include "VulkanInitializers.hpp"
|
||||
#include "vulkandevice.hpp"
|
||||
#include "vulkanswapchain.hpp"
|
||||
#include "vulkanTextureLoader.hpp"
|
||||
#include "vulkanMeshLoader.hpp"
|
||||
#include "vulkantextoverlay.hpp"
|
||||
#include "camera.hpp"
|
||||
|
|
@ -128,7 +128,7 @@ protected:
|
|||
VkSemaphore textOverlayComplete;
|
||||
} semaphores;
|
||||
// Simple texture loader
|
||||
vkTools::VulkanTextureLoader *textureLoader = nullptr;
|
||||
//vkTools::VulkanTextureLoader *textureLoader = nullptr;
|
||||
// Returns the base asset path (for shaders, models, textures) depending on the os
|
||||
const std::string getAssetPath();
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{09B9A54B-F
|
|||
base\vulkanswapchain.hpp = base\vulkanswapchain.hpp
|
||||
base\vulkantextoverlay.hpp = base\vulkantextoverlay.hpp
|
||||
base\VulkanTexture.hpp = base\VulkanTexture.hpp
|
||||
base\vulkanTextureLoader.hpp = base\vulkanTextureLoader.hpp
|
||||
base\vulkantools.cpp = base\vulkantools.cpp
|
||||
base\vulkantools.h = base\vulkantools.h
|
||||
EndProjectSection
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue