livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NORSPEC-291 fix materials underwater, disable attempt at materials in reflect/distort RTs

meow-7.2.2
Graham Linden 2013-07-17 08:03:09 -07:00
parent 1587999b03
commit 9aeb3b48d7
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@ -192,7 +192,7 @@ void main()
//wavef = normalize(wavef);
vec3 screenspacewavef = (norm_mat*vec4(wavef, 1.0)).xyz;
frag_data[0] = vec4(linear_to_srgb(color.rgb), 0.5); // diffuse
frag_data[0] = vec4(color.rgb, 0.5); // diffuse
frag_data[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec
frag_data[2] = vec4(encode_normal(screenspacewavef), 0.0, 0.0); // normalxyz, displace
}

16
indra/newview/pipeline.cpp
View File

@ -122,9 +122,9 @@
//#define DEBUG_INDICES
#endif
// Expensive
// Expensive and currently broken
//
#define MATERIALS_IN_REFLECTIONS 1
#define MATERIALS_IN_REFLECTIONS 0
bool gShiftFrame = false;
@ -1236,7 +1236,11 @@ void LLPipeline::createGLBuffers()
updateRenderDeferred();
bool materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
bool materials_in_water = false;
#if MATERIALS_IN_REFLECTIONS
materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
#endif
if (LLPipeline::sWaterReflections)
{ //water reflection texture
@ -9685,7 +9689,11 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
water_clip = 1;
}
bool materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
bool materials_in_water = false;
#if MATERIALS_IN_REFLECTIONS
materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
#endif
if (!LLViewerCamera::getInstance()->cameraUnderWater())
{ //generate planar reflection map