claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed old texture loader class [skip CI]

Browse source
This commit is contained in:
saschawillems 2017-02-09 21:51:10 +01:00
parent 20ed54bbb6
commit 83ad186ce5
4 changed files with 3 additions and 1093 deletions
Download patch file Download diff file Expand all files Collapse all files

1083
base/vulkanTextureLoader.hpp
View file

File diff suppressed because it is too large Load diff

8
base/vulkanexamplebase.cpp
View file

@ -173,8 +173,7 @@ void VulkanExampleBase::prepare()
setupRenderPass(); setupRenderPass();
createPipelineCache(); createPipelineCache();
setupFrameBuffer(); setupFrameBuffer();
// Create a simple texture loader class
textureLoader = new vkTools::VulkanTextureLoader(vulkanDevice, queue, cmdPool);
if (enableTextOverlay) if (enableTextOverlay)
{ {
// Load the text rendering shaders // Load the text rendering shaders
@ -702,11 +701,6 @@ VulkanExampleBase::~VulkanExampleBase()
vkDestroyPipelineCache(device, pipelineCache, nullptr); vkDestroyPipelineCache(device, pipelineCache, nullptr);
if (textureLoader)
{
delete textureLoader;
}
vkDestroyCommandPool(device, cmdPool, nullptr); vkDestroyCommandPool(device, cmdPool, nullptr);
vkDestroySemaphore(device, semaphores.presentComplete, nullptr); vkDestroySemaphore(device, semaphores.presentComplete, nullptr);

4
base/vulkanexamplebase.h
View file

@ -30,6 +30,7 @@
#define GLM_FORCE_RADIANS #define GLM_FORCE_RADIANS
#define GLM_FORCE_DEPTH_ZERO_TO_ONE #define GLM_FORCE_DEPTH_ZERO_TO_ONE
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <string> #include <string>
#include <array> #include <array>
@ -43,7 +44,6 @@
#include "VulkanInitializers.hpp" #include "VulkanInitializers.hpp"
#include "vulkandevice.hpp" #include "vulkandevice.hpp"
#include "vulkanswapchain.hpp" #include "vulkanswapchain.hpp"
#include "vulkanTextureLoader.hpp"
#include "vulkanMeshLoader.hpp" #include "vulkanMeshLoader.hpp"
#include "vulkantextoverlay.hpp" #include "vulkantextoverlay.hpp"
#include "camera.hpp" #include "camera.hpp"
@ -128,7 +128,7 @@ protected:
VkSemaphore textOverlayComplete; VkSemaphore textOverlayComplete;
} semaphores; } semaphores;
// Simple texture loader // Simple texture loader
vkTools::VulkanTextureLoader *textureLoader = nullptr; //vkTools::VulkanTextureLoader *textureLoader = nullptr;
// Returns the base asset path (for shaders, models, textures) depending on the os // Returns the base asset path (for shaders, models, textures) depending on the os
const std::string getAssetPath(); const std::string getAssetPath();
public: public:

1
vulkanExamples.sln
View file

@ -95,7 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{09B9A54B-F
base\vulkanswapchain.hpp = base\vulkanswapchain.hpp base\vulkanswapchain.hpp = base\vulkanswapchain.hpp
base\vulkantextoverlay.hpp = base\vulkantextoverlay.hpp base\vulkantextoverlay.hpp = base\vulkantextoverlay.hpp
base\VulkanTexture.hpp = base\VulkanTexture.hpp base\VulkanTexture.hpp = base\VulkanTexture.hpp
base\vulkanTextureLoader.hpp = base\vulkanTextureLoader.hpp
base\vulkantools.cpp = base\vulkantools.cpp base\vulkantools.cpp = base\vulkantools.cpp
base\vulkantools.h = base\vulkantools.h base\vulkantools.h = base\vulkantools.h
EndProjectSection EndProjectSection