TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pulling in 1.6.2.1. Ugh.

Browse Source
This commit is contained in:
rdb 2009-04-28 10:54:26 +00:00
parent bc384eaec1
commit f701dc5959
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/pgraphnodes/shaderGenerator.cxx
View File

@ -586,10 +586,11 @@ synthesize_shader(const RenderState *rs) {
} }
text << "\t out float4 o_color : COLOR0,\n"; text << "\t out float4 o_color : COLOR0,\n";
if (_vertex_colors) { if (_vertex_colors) {
text << "\t in float4 l_color : COLOR\n"; text << "\t in float4 l_color : COLOR,\n";
} else { } else {
text << "\t uniform float4 attr_color\n"; text << "\t uniform float4 attr_color,\n";
} }
text << "\t uniform float4 attr_colorscale\n";
text << ") {\n"; text << ") {\n";
text << "\t float4 result;\n"; text << "\t float4 result;\n";
if (_out_aux_any) { if (_out_aux_any) {
@ -812,6 +813,8 @@ synthesize_shader(const RenderState *rs) {
text << "\t result = float4(1,1,1,1);\n"; text << "\t result = float4(1,1,1,1);\n";
} }
} }
// Apply the color scale.
text << "\t result *= attr_colorscale;\n";
text << "\t float4 primary_color = result;\n"; text << "\t float4 primary_color = result;\n";
text << "\t float4 last_saved_result = result;\n"; text << "\t float4 last_saved_result = result;\n";
@ -850,10 +853,7 @@ synthesize_shader(const RenderState *rs) {
text << "\n"; text << "\n";
break; break;
case TextureStage::M_blend_color_scale: { case TextureStage::M_blend_color_scale: {
const ColorScaleAttrib *color_scale = DCAST(ColorScaleAttrib, rs->get_attrib_def(ColorScaleAttrib::get_class_slot())); text << "\t result.rgb = lerp(result, tex" << i << " * attr_colorscale, tex" << i << ".r).rgb;\n";
LVecBase4f c = color_scale->get_scale();
text << "\t result.rgb = lerp(result, tex" << i << " * float4("
<< c[0] << ", " << c[1] << ", " << c[2] << ", " << c[3] << "), tex" << i << ".r).rgb;\n";
break; } break; }
default: default:
break; break;
@ -923,14 +923,7 @@ synthesize_shader(const RenderState *rs) {
break; break;
default: break; default: break;
} }
// Apply color scale, if any.
const ColorScaleAttrib *color_scale = DCAST(ColorScaleAttrib, rs->get_attrib_def(ColorScaleAttrib::get_class_slot()));
if (!color_scale->is_identity()) {
LVecBase4f s = color_scale->get_scale();
text << "\t result *= float4(" << s[0] << ", " << s[1] << ", " << s[2] << ", " << s[3] << ");\n";
}
// The multiply is a workaround for a radeon driver bug. // The multiply is a workaround for a radeon driver bug.
// It's annoying as heck, since it produces an extra instruction. // It's annoying as heck, since it produces an extra instruction.
text << "\t o_color = result * 1.000001;\n"; text << "\t o_color = result * 1.000001;\n";