Skip to content

Commit 8cd3223

Browse files
committed
Example07 fix
1 parent cb0fb23 commit 8cd3223

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

examples_tests/07.SubpassBaking/main.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class SubpassBaking : public ApplicationBase
122122
const auto swapchainImageUsage = static_cast<asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
123123
const video::ISurface::SFormat surfaceFormat(asset::EF_B8G8R8A8_SRGB, asset::ECP_COUNT, asset::EOTF_UNKNOWN);
124124

125-
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_VULKAN, "SubpassBaking", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
125+
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL, "SubpassBaking", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
126126
window = std::move(initOutput.window);
127127
apiConnection = std::move(initOutput.apiConnection);
128128
surface = std::move(initOutput.surface);
@@ -145,27 +145,24 @@ class SubpassBaking : public ApplicationBase
145145
const asset::COBJMetadata* metaOBJ = nullptr;
146146
{
147147
auto* quantNormalCache = assetManager->getMeshManipulator()->getQuantNormalCache();
148-
quantNormalCache->loadCacheFromFile<asset::EF_A2B10G10R10_SNORM_PACK32>(system.get(), "../../tmp/normalCache101010.sse");
148+
quantNormalCache->loadCacheFromFile<asset::EF_A2B10G10R10_SNORM_PACK32>(system.get(), sharedOutputCWD / "normalCache101010.sse");
149149

150150
system::path archPath = sharedInputCWD / "sponza.zip";
151151
auto arch = system->openFileArchive(archPath);
152-
system->mount(std::move(arch), "resources");
152+
// test no alias loading (TODO: fix loading from absolute paths)
153+
system->mount(std::move(arch));
153154
asset::IAssetLoader::SAssetLoadParams loadParams;
154-
#if 0 // @sadiuk unfuck this please
155-
loadParams.workingDirectory = "resources";
156-
#else
157-
loadParams.workingDirectory = archPath;
158-
#endif
155+
loadParams.workingDirectory = sharedInputCWD;
159156
loadParams.logger = logger.get();
160-
auto meshes_bundle = assetManager->getAsset("sponza.obj", loadParams);
157+
auto meshes_bundle = assetManager->getAsset((sharedInputCWD / "sponza.zip/sponza.obj").string(), loadParams);
161158
assert(!meshes_bundle.getContents().empty());
162159

163160
metaOBJ = meshes_bundle.getMetadata()->selfCast<const asset::COBJMetadata>();
164161

165162
auto cpuMesh = meshes_bundle.getContents().begin()[0];
166163
meshRaw = static_cast<asset::ICPUMesh*>(cpuMesh.get());
167164

168-
quantNormalCache->saveCacheToFile<asset::EF_A2B10G10R10_SNORM_PACK32>(system.get(), "../../tmp/normalCache101010.sse");
165+
quantNormalCache->saveCacheToFile<asset::EF_A2B10G10R10_SNORM_PACK32>(system.get(), sharedOutputCWD / "normalCache101010.sse");
169166
}
170167

171168
core::smart_refctd_ptr<video::IGPUDescriptorSet> perCameraDescSet;

0 commit comments

Comments
 (0)