Updating vcpkg
This commit is contained in:
@@ -6,21 +6,24 @@
|
||||
|
||||
using namespace Seele;
|
||||
|
||||
static constexpr uint32 SOURCE_RESOLUTION = 2048;
|
||||
static constexpr uint32 CONVOLUTED_RESOLUTION = 64;
|
||||
|
||||
EnvironmentLoader::EnvironmentLoader(Gfx::PGraphics graphics) : graphics(graphics) {
|
||||
cubeRenderViewport = graphics->createViewport(nullptr, ViewportCreateInfo{
|
||||
.dimensions =
|
||||
{
|
||||
.size = {1024, 1024},
|
||||
.size = {SOURCE_RESOLUTION, SOURCE_RESOLUTION},
|
||||
.offset = {0, 0},
|
||||
},
|
||||
});
|
||||
convolutionViewport = graphics->createViewport(nullptr, ViewportCreateInfo{
|
||||
.dimensions =
|
||||
{
|
||||
.size = {32, 32},
|
||||
.offset = {0, 0},
|
||||
},
|
||||
});
|
||||
.dimensions =
|
||||
{
|
||||
.size = {CONVOLUTED_RESOLUTION, CONVOLUTED_RESOLUTION},
|
||||
.offset = {0, 0},
|
||||
},
|
||||
});
|
||||
cubeSampler = graphics->createSampler({
|
||||
.magFilter = Gfx::SE_FILTER_LINEAR,
|
||||
.minFilter = Gfx::SE_FILTER_LINEAR,
|
||||
@@ -120,8 +123,8 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
|
||||
set->writeChanges();
|
||||
Gfx::OTextureCube cubeMap = graphics->createTextureCube(TextureCreateInfo{
|
||||
.format = Gfx::SE_FORMAT_R32G32B32A32_SFLOAT,
|
||||
.width = 1024,
|
||||
.height = 1024,
|
||||
.width = SOURCE_RESOLUTION,
|
||||
.height = SOURCE_RESOLUTION,
|
||||
.usage = Gfx::SE_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | Gfx::SE_IMAGE_USAGE_SAMPLED_BIT,
|
||||
});
|
||||
Gfx::ORenderPass cubeRenderPass = graphics->createRenderPass(
|
||||
@@ -132,7 +135,7 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
|
||||
},
|
||||
{},
|
||||
URect{
|
||||
.size = {1024, 1024},
|
||||
.size = {SOURCE_RESOLUTION, SOURCE_RESOLUTION},
|
||||
.offset = {0, 0},
|
||||
},
|
||||
"EnvironmentRenderPass", {0b111111}, {0b111111});
|
||||
@@ -157,8 +160,8 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
|
||||
|
||||
Gfx::OTextureCube convolutedMap = graphics->createTextureCube(TextureCreateInfo{
|
||||
.format = Gfx::SE_FORMAT_R32G32B32A32_SFLOAT,
|
||||
.width = 32,
|
||||
.height = 32,
|
||||
.width = CONVOLUTED_RESOLUTION,
|
||||
.height = CONVOLUTED_RESOLUTION,
|
||||
.usage = Gfx::SE_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
|
||||
});
|
||||
Gfx::ORenderPass convolutionPass = graphics->createRenderPass(
|
||||
@@ -169,7 +172,7 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
|
||||
},
|
||||
{},
|
||||
URect{
|
||||
.size = {32, 32},
|
||||
.size = {CONVOLUTED_RESOLUTION, CONVOLUTED_RESOLUTION},
|
||||
.offset = {0, 0},
|
||||
},
|
||||
"EnvironmentRenderPass", {0b111111}, {0b111111});
|
||||
|
||||
@@ -67,7 +67,7 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
|
||||
.numLevels = 1,
|
||||
.numLayers = 1,
|
||||
.isArray = false,
|
||||
.generateMipmaps = false,
|
||||
.generateMipmaps = true,
|
||||
};
|
||||
|
||||
if (args.type == TextureImportType::TEXTURE_CUBEMAP) {
|
||||
@@ -110,14 +110,14 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
|
||||
}
|
||||
ktxBasisParams basisParams = {
|
||||
.structSize = sizeof(ktxBasisParams),
|
||||
.uastc = true,
|
||||
.uastc = false,
|
||||
.threadCount = 1,
|
||||
.compressionLevel = 2,
|
||||
.uastcFlags = KTX_PACK_UASTC_LEVEL_FASTER,
|
||||
.compressionLevel = KTX_ETC1S_DEFAULT_COMPRESSION_LEVEL,
|
||||
.uastcFlags = KTX_PACK_UASTC_LEVEL_DEFAULT,
|
||||
.uastcRDO = true,
|
||||
};
|
||||
KTX_ASSERT(ktxTexture2_CompressBasisEx(kTexture, &basisParams));
|
||||
KTX_ASSERT(ktxTexture2_DeflateZstd(kTexture, 10));
|
||||
//KTX_ASSERT(ktxTexture2_DeflateZstd(kTexture, 10));
|
||||
|
||||
char writer[100];
|
||||
snprintf(writer, sizeof(writer), "%s version %s", "SeeleEngine", "0.0.1");
|
||||
@@ -149,4 +149,5 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
|
||||
AssetRegistry::saveAsset(textureAsset, TextureAsset::IDENTIFIER, textureAsset->getFolderPath(), textureAsset->getName());
|
||||
|
||||
textureAsset->setStatus(Asset::Status::Ready);
|
||||
std::cout << "Done importing " << textureAsset->getName() << std::endl;
|
||||
}
|
||||
|
||||
@@ -315,7 +315,6 @@ void BVH::validateBVH() const {
|
||||
continue;
|
||||
while (dynamicNodes[nodeIdx].parentIndex != -1) {
|
||||
nodeIdx = dynamicNodes[nodeIdx].parentIndex;
|
||||
assert(counter-- > 0 && dynamicNodes[nodeIdx].isValid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user