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

Use new Vulkan texture class (Refs #260)

Browse source
This commit is contained in:
saschawillems 2017-02-09 21:55:35 +01:00
parent 83ad186ce5
commit 9822cde6e2
32 changed files with 232 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

21
displacement/displacement.cpp
View file

@ -20,6 +20,7 @@
#include <vulkan/vulkan.h>
#include "vulkanexamplebase.h"
#include "VulkanTexture.hpp"
#include "vulkanMeshLoader.hpp"
#define VERTEX_BUFFER_BIND_ID 0
@ -36,7 +37,7 @@ class VulkanExample : public VulkanExampleBase
{
private:
struct {
vkTools::VulkanTexture colorHeightMap;
vks::Texture2D colorHeightMap;
} textures;
public:
bool splitScreen = true;
@ -104,15 +105,13 @@ public:
uniformBuffers.tessEval.destroy();
vkMeshLoader::freeMeshBufferResources(device, &meshes.object);
textureLoader->destroyTexture(textures.colorHeightMap);
textures.colorHeightMap.destroy();
}
void loadTextures()
void loadAssets()
{
textureLoader->loadTexture(
getAssetPath() + "textures/pattern_36_bc3.ktx",
VK_FORMAT_BC3_UNORM_BLOCK,
&textures.colorHeightMap);
loadMesh(getAssetPath() + "models/plane.obj", &meshes.object, vertexLayout, 0.25f);
textures.colorHeightMap.loadFromFile(getAssetPath() + "textures/pattern_36_bc3.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
}
void reBuildCommandBuffers()
@ -182,11 +181,6 @@ public:
}
}
void loadMeshes()
{
loadMesh(getAssetPath() + "models/plane.obj", &meshes.object, vertexLayout, 0.25f);
}
void setupVertexDescriptions()
{
// Binding description
@ -498,8 +492,7 @@ public:
}
VulkanExampleBase::prepare();
loadMeshes();
loadTextures();
loadAssets();
setupVertexDescriptions();
prepareUniformBuffers();
setupDescriptorSetLayout();