Removed remaining dds files
All textures are now loaded from ktx
This commit is contained in:
parent
90c1cb85f8
commit
36bf3dd31a
7 changed files with 3 additions and 3 deletions
|
|
@ -63,7 +63,7 @@ task copyTask {
|
||||||
copy {
|
copy {
|
||||||
from '../../../data/textures'
|
from '../../../data/textures'
|
||||||
into 'assets/textures'
|
into 'assets/textures'
|
||||||
include 'rocks_normal_height_rgba.dds'
|
include 'rocks_normal_height_rgba.ktx'
|
||||||
}
|
}
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -121,9 +121,9 @@ public:
|
||||||
models.quad.loadFromFile(getAssetPath() + "models/plane_z.obj", vertexLayout, 0.1f, vulkanDevice, queue);
|
models.quad.loadFromFile(getAssetPath() + "models/plane_z.obj", vertexLayout, 0.1f, vulkanDevice, queue);
|
||||||
|
|
||||||
// Textures
|
// Textures
|
||||||
textures.normalHeightMap.loadFromFile(getAssetPath() + "textures/rocks_normal_height_rgba.dds", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue);
|
textures.normalHeightMap.loadFromFile(getAssetPath() + "textures/rocks_normal_height_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue);
|
||||||
if (vulkanDevice->features.textureCompressionBC) {
|
if (vulkanDevice->features.textureCompressionBC) {
|
||||||
textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_bc3_unorm.dds", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
|
textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_bc3_unorm.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
|
||||||
}
|
}
|
||||||
else if (vulkanDevice->features.textureCompressionASTC_LDR) {
|
else if (vulkanDevice->features.textureCompressionASTC_LDR) {
|
||||||
textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_astc_8x8_unorm.ktx", VK_FORMAT_ASTC_8x8_UNORM_BLOCK, vulkanDevice, queue);
|
textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_astc_8x8_unorm.ktx", VK_FORMAT_ASTC_8x8_UNORM_BLOCK, vulkanDevice, queue);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue