Skip to content

Commit

Permalink
added warning for SoS
Browse files Browse the repository at this point in the history
  • Loading branch information
hakasapl committed Dec 9, 2024
1 parent f67056a commit cc2d0f3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [0.7.3] - UNRELEASED

- Added a warning for simplicity of snow users if PBR or CM is enabled (SoS is incompatible with these shaders)
- Fixed thread gridlock that casued mesh patching to get suck occasionally
- Fixed PBR JSON delete: true not working
- Fixed uncaught exception if mod folder does not exist in MO2
Expand Down
25 changes: 15 additions & 10 deletions ParallaxGen/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ auto getGameTypeMapStr() -> string {
return GameTypeStr;
}

auto deployAssets(const filesystem::path &OutputDir,
const filesystem::path &ExePath) -> void {
auto deployAssets(const filesystem::path &OutputDir, const filesystem::path &ExePath) -> void {
// Install default cubemap file if needed
static const filesystem::path DynCubeMapPath = "textures/cubemaps/dynamic1pxcubemap_black.dds";

Expand Down Expand Up @@ -200,6 +199,20 @@ void mainRunner(ParallaxGenCLIArgs &Args, const filesystem::path &ExePath) {
exit(1);
}

// Check if dyndolod.esp exists
const auto ActivePlugins = BG.getActivePlugins(false, true);
if (find(ActivePlugins.begin(), ActivePlugins.end(), L"dyndolod.esp") != ActivePlugins.end()) {
spdlog::critical("DynDoLOD and TexGen outputs must be disabled prior to running ParallaxGen. It is recommended to "
"generate LODs after running ParallaxGen with the ParallaxGen output enabled.");
exit(1);
}

if (find(ActivePlugins.begin(), ActivePlugins.end(), L"simplicity of snow.esp") != ActivePlugins.end() &&
(Params.ShaderPatcher.TruePBR || Params.ShaderPatcher.ComplexMaterial)) {
spdlog::warn("You have Simplicity of Snow installed. SoS is incompatible with complex material and PBR. Use a "
"single-pass snow mod such as Better Dynamic Snow v3 instead.");
}

// Init PGP library
if (Params.Processing.PluginPatching) {
spdlog::info("Initializing plugin patcher");
Expand Down Expand Up @@ -229,14 +242,6 @@ void mainRunner(ParallaxGenCLIArgs &Args, const filesystem::path &ExePath) {
exit(1);
}

// Check if dyndolod.esp exists
const auto ActivePlugins = BG.getActivePlugins(false, true);
if (find(ActivePlugins.begin(), ActivePlugins.end(), L"dyndolod.esp") != ActivePlugins.end()) {
spdlog::critical("DynDoLOD and TexGen outputs must be disabled prior to running ParallaxGen. It is recommended to "
"generate LODs after running ParallaxGen with the ParallaxGen output enabled.");
exit(1);
}

// Init file map
PGD.populateFileMap(Params.Processing.BSA);

Expand Down

0 comments on commit cc2d0f3

Please sign in to comment.