Skip to content

Commit

Permalink
Merge branch 'dev/adunn/fix_api_defaults' into 'main'
Browse files Browse the repository at this point in the history
[REMIX-2633] Fixing up some mismatching material parameter defaults between API and MDL

See merge request lightspeedrtx/dxvk-remix-nv!669
  • Loading branch information
AlexDunn committed Jan 18, 2024
2 parents d24a90c + 5251ba4 commit 4eb9fe8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions public/include/remix/remix.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ namespace remix {
roughnessTexture = {};
metallicTexture = {};
anisotropy = 0.0f;
albedoConstant = { 1.0f, 1.0f, 1.0f };
albedoConstant = { 0.2f, 0.2f, 0.2f };
opacityConstant = 1.0f;
roughnessConstant = 1.0f;
roughnessConstant = 0.5f;
metallicConstant = 0.0f;
thinFilmThickness_hasvalue = false;
thinFilmThickness_value = 200.f;
Expand Down Expand Up @@ -392,14 +392,14 @@ namespace remix {
normalTexture = {};
tangentTexture = {};
emissiveTexture = {};
emissiveIntensity = 0.0f;
emissiveIntensity = 40.0f;
emissiveColorConstant = { 0.0f, 0.0f, 0.0f };
spriteSheetRow = 1;
spriteSheetCol = 1;
spriteSheetFps = 0;
filterMode = 1; // Linear
wrapModeU = 0; // Repeat
wrapModeV = 0; // Repeat
wrapModeU = 1; // Repeat
wrapModeV = 1; // Repeat
static_assert(sizeof remixapi_MaterialInfo == 80);
}

Expand Down

0 comments on commit 4eb9fe8

Please sign in to comment.