@@ -122,7 +122,7 @@ class SubpassBaking : public ApplicationBase
122
122
const auto swapchainImageUsage = static_cast <asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
123
123
const video::ISurface::SFormat surfaceFormat (asset::EF_B8G8R8A8_SRGB, asset::ECP_COUNT, asset::EOTF_UNKNOWN);
124
124
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);
126
126
window = std::move (initOutput.window );
127
127
apiConnection = std::move (initOutput.apiConnection );
128
128
surface = std::move (initOutput.surface );
@@ -145,27 +145,24 @@ class SubpassBaking : public ApplicationBase
145
145
const asset::COBJMetadata* metaOBJ = nullptr ;
146
146
{
147
147
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" );
149
149
150
150
system::path archPath = sharedInputCWD / " sponza.zip" ;
151
151
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));
153
154
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;
159
156
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);
161
158
assert (!meshes_bundle.getContents ().empty ());
162
159
163
160
metaOBJ = meshes_bundle.getMetadata ()->selfCast <const asset::COBJMetadata>();
164
161
165
162
auto cpuMesh = meshes_bundle.getContents ().begin ()[0 ];
166
163
meshRaw = static_cast <asset::ICPUMesh*>(cpuMesh.get ());
167
164
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" );
169
166
}
170
167
171
168
core::smart_refctd_ptr<video::IGPUDescriptorSet> perCameraDescSet;
0 commit comments