Skip to content

fix: fix missing directory ctd with DynamicCubeMap Creator #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 4 commits into from
Sep 13, 2024
Merged

fix: fix missing directory ctd with DynamicCubeMap Creator #511

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc43976
DynamicCubeMap Creator crash fix
langfod Sep 9, 2024
4df8012
style: 🎨 apply clang-format changes
langfod Sep 9, 2024
7dc3e55
Merge branch 'doodlum:dev' into dyncubemapsavefix
langfod Sep 11, 2024
6000630
Update DynamicCubemaps.cpp
langfod Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/Features/DynamicCubemaps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,28 @@ void DynamicCubemaps::DrawSettings()
DirectX::ScratchImage image;
DX::ThrowIfFailed(CaptureTexture(device, context, tempTexture, image));

std::string filename = std::format("Data\\Textures\\DynamicCubemaps\\{:.2f}{:.2f}{:.2f}R{:.2f}.dds", settings.CubemapColor.x, settings.CubemapColor.y, settings.CubemapColor.z, settings.CubemapColor.w);
bool defaultDynamicCubeMapSavePathSafe = true;
try {
if (std::filesystem::create_directories(defaultDynamicCubeMapSavePath)) {
logger::info("Missing DynamicCubeMap Creator directory created: {}", defaultDynamicCubeMapSavePath);
}
} catch (const std::exception) {
logger::error("Failed to create missing DynamicCubeMap Creator directory: {}", defaultDynamicCubeMapSavePath);
defaultDynamicCubeMapSavePathSafe = false;
}

std::wstring wfilename = std::wstring(filename.begin(), filename.end());
DX::ThrowIfFailed(SaveToDDSFile(image.GetImages(), image.GetImageCount(), image.GetMetadata(), DirectX::DDS_FLAGS::DDS_FLAGS_NONE, wfilename.c_str()));
if (defaultDynamicCubeMapSavePathSafe) {
Comment thread
langfod marked this conversation as resolved.
Outdated
std::filesystem::path DynamicCubeMapSavePath = defaultDynamicCubeMapSavePath;
std::filesystem::path filename(std::format("R{:03d}G{:03d}B{:03d}A{:03d}.dds", colorPixel.r, colorPixel.g, colorPixel.b, colorPixel.a));
DynamicCubeMapSavePath /= filename;

if (std::filesystem::exists(DynamicCubeMapSavePath)) {
logger::info("DynamicCubeMap Creator file for {} already exists, skipping.", filename.string());
} else {
DX::ThrowIfFailed(SaveToDDSFile(image.GetImages(), image.GetImageCount(), image.GetMetadata(), DirectX::DDS_FLAGS::DDS_FLAGS_NONE, DynamicCubeMapSavePath.c_str()));
logger::info("DynamicCubeMap Creator file for {} written", filename.string());
Comment thread
langfod marked this conversation as resolved.
}
}
image.Release();
tempTexture->Release();
}
Expand Down
2 changes: 2 additions & 0 deletions src/Features/DynamicCubemaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ struct DynamicCubemaps : Feature
return &singleton;
}

const std::string defaultDynamicCubeMapSavePath = "Data\\textures\\DynamicCubemaps";

// Specular irradiance

ID3D11SamplerState* computeSampler = nullptr;
Expand Down