Skip to content
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

Jump to bottom

Hotfix material system #63

Merged
merged 4 commits into from
Jun 9, 2018
Merged

Hotfix material system #63

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9026b94
Merge pull request #30 from xycaleth/rend2
SomaZ May 27, 2018
dc3edb7
Merge pull request #31 from xycaleth/rend2
SomaZ May 27, 2018
b567ae2
make sure diffuse stage doesnt get a nullptr
SomaZ Jun 6, 2018
ac21c0b
fix swapped srgb2linear and vice versa
SomaZ Jun 7, 2018
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
48 changes: 28 additions & 20 deletions codemp/rd-rend2/tr_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2612,6 +2612,7 @@ void R_CreateDiffuseAndSpecMapsFromBaseColorAndRMO(shaderStage_t *stage, const c
char specularName[MAX_QPATH];
int width, height, rmoWidth, rmoHeight;
byte *rmoPic, *baseColorPic, *specGlossPic, *diffusePic;
image_t *image;

if (!name) {
return;
Expand All @@ -2623,16 +2624,23 @@ void R_CreateDiffuseAndSpecMapsFromBaseColorAndRMO(shaderStage_t *stage, const c
COM_StripExtension(name, specularName, sizeof(specularName));
Q_strcat(specularName, sizeof(specularName), "_spec");

////
//// see if the images are already loaded
////
stage->bundle[TB_COLORMAP].image[0] = R_GetLoadedImage(diffuseName, flags);
stage->bundle[TB_SPECULARMAP].image[0] = R_GetLoadedImage(specularName, flags);
//
// see if the images are already loaded
//
image = R_GetLoadedImage(diffuseName, flags);
if (image != NULL)
{
stage->bundle[TB_COLORMAP].image[0] = image;

if (stage->bundle[TB_COLORMAP].image[0] != NULL && stage->bundle[TB_SPECULARMAP].image[0] != NULL) {
ri.Printf(PRINT_DEVELOPER, "WARNING: reused Diffuse and Specular images for %s\n", name);
return;
image = R_GetLoadedImage(specularName, flags);
if (image != NULL)
{
stage->bundle[TB_SPECULARMAP].image[0] = R_GetLoadedImage(specularName, flags);
ri.Printf(PRINT_DEVELOPER, "WARNING: reused Diffuse and Specular images for %s\n", name);
return;
}
}

//
// load the pics from disk
//
Expand Down Expand Up @@ -2685,14 +2693,14 @@ void R_CreateDiffuseAndSpecMapsFromBaseColorAndRMO(shaderStage_t *stage, const c
metalness = ByteToFloat(rmoPic[i + 1]);
ao = ByteToFloat(rmoPic[i + 2]);
ao += (1.0 - ao) * (1.0 - aoStrength);
specular_variance = ByteToFloat(rmoPic[i + 3]);
specular_variance = (type == SPEC_RMOS) ? ByteToFloat(rmoPic[i + 3]) : 1.0f;
break;
case SPEC_MOXR:
case SPEC_MOSR:
metalness = ByteToFloat(rmoPic[i + 0]);
ao = ByteToFloat(rmoPic[i + 1]);
ao += (1.0 - ao) * (1.0 - aoStrength);
specular_variance = ByteToFloat(rmoPic[i + 2]);
specular_variance = (type == SPEC_MOSR) ? ByteToFloat(rmoPic[i + 2]) : 1.0f;
roughness = ByteToFloat(rmoPic[i + 3]);
gloss = (1.0 - roughness) + (0.04 * roughness);
break;
Expand All @@ -2707,27 +2715,27 @@ void R_CreateDiffuseAndSpecMapsFromBaseColorAndRMO(shaderStage_t *stage, const c

vec4_t baseColor;
// remove gamma correction because we want to work in linear space
baseColor[0] = RGBtosRGB(ByteToFloat(baseColorPic[i + 0]));
baseColor[1] = RGBtosRGB(ByteToFloat(baseColorPic[i + 1]));
baseColor[2] = RGBtosRGB(ByteToFloat(baseColorPic[i + 2]));
baseColor[0] = sRGBtoRGB(ByteToFloat(baseColorPic[i + 0]));
baseColor[1] = sRGBtoRGB(ByteToFloat(baseColorPic[i + 1]));
baseColor[2] = sRGBtoRGB(ByteToFloat(baseColorPic[i + 2]));
// don't remove gamma correction in alpha because this is data, not color
baseColor[3] = ByteToFloat(baseColorPic[i + 3]);

baseSpecular *= specular_variance;
specular_variance *= baseSpecular;

// diffuse Color = baseColor * (1.0 - metalness)
// also gamma correct again
// FIXME: AO should be handled in shader because it should only affect the ambient lighting
diffusePic[i + 0] = FloatToByte(sRGBtoRGB(baseColor[0] * (1.0f - metalness) * ao));
diffusePic[i + 1] = FloatToByte(sRGBtoRGB(baseColor[1] * (1.0f - metalness) * ao));
diffusePic[i + 2] = FloatToByte(sRGBtoRGB(baseColor[2] * (1.0f - metalness) * ao));
diffusePic[i + 0] = FloatToByte(RGBtosRGB(baseColor[0] * (1.0f - metalness) * ao));
diffusePic[i + 1] = FloatToByte(RGBtosRGB(baseColor[1] * (1.0f - metalness) * ao));
diffusePic[i + 2] = FloatToByte(RGBtosRGB(baseColor[2] * (1.0f - metalness) * ao));
diffusePic[i + 3] = FloatToByte(baseColor[3]);

// specular Color = mix(baseSpecular, baseColor, metalness)
// also gamma correct again
specGlossPic[i + 0] = FloatToByte(sRGBtoRGB(baseSpecular * (1.0f - metalness) + baseColor[0] * metalness));
specGlossPic[i + 1] = FloatToByte(sRGBtoRGB(baseSpecular * (1.0f - metalness) + baseColor[1] * metalness));
specGlossPic[i + 2] = FloatToByte(sRGBtoRGB(baseSpecular * (1.0f - metalness) + baseColor[2] * metalness));
specGlossPic[i + 0] = FloatToByte(RGBtosRGB(specular_variance * (1.0f - metalness) + baseColor[0] * metalness));
specGlossPic[i + 1] = FloatToByte(RGBtosRGB(specular_variance * (1.0f - metalness) + baseColor[1] * metalness));
specGlossPic[i + 2] = FloatToByte(RGBtosRGB(specular_variance * (1.0f - metalness) + baseColor[2] * metalness));
// don't remove gamma correction in alpha because this is data, not color
specGlossPic[i + 3] = FloatToByte(gloss);
}
Expand Down