TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated some comments

Browse Source
This commit is contained in:
Josh Yelon 2008-01-29 17:07:11 +00:00
parent c7895b7c07
commit a918cb5ee1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panda/src/pgraph/shaderGenerator.cxx
View File

@ -182,12 +182,14 @@ analyze_renderstate(const RenderState *rs) {
rs->store_into_slots(&_attribs); rs->store_into_slots(&_attribs);
// Count number of textures. // Count number of textures.
_num_textures = 0; _num_textures = 0;
if (_attribs._texture) { if (_attribs._texture) {
_num_textures = _attribs._texture->get_num_on_stages(); _num_textures = _attribs._texture->get_num_on_stages();
} }
// Determine whether or not vertex colors or flat colors are present. // Determine whether or not vertex colors or flat colors are present.
if (_attribs._color != 0) { if (_attribs._color != 0) {
if (_attribs._color->get_color_type() == ColorAttrib::T_vertex) { if (_attribs._color->get_color_type() == ColorAttrib::T_vertex) {
_vertex_colors = true; _vertex_colors = true;
@ -375,19 +377,22 @@ create_shader_attrib(const string &txt) {
// fixed function pipeline by synthesizing a shader. // fixed function pipeline by synthesizing a shader.
// //
// Currently supports: // Currently supports:
// - 2D textures
// - lights
// - vertex colors
// - flat colors // - flat colors
// - materials // - vertex colors
// - lighting
// - normal maps
// - materials, but not updates to materials
// - modulated 2D textures
// //
// Not yet supported: // Not yet supported:
// - 3D textures, cube textures // - 3D textures
// - cube textures
// - texture stage modes: decal, blend, replace, add, etc.
// - color scale attrib // - color scale attrib
// - texgen // - texgen
// - texmatrix // - texmatrix
// - normal and gloss // - gloss maps
// - lots of other things // - glow maps
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
CPT(RenderAttrib) ShaderGenerator:: CPT(RenderAttrib) ShaderGenerator::
@ -664,7 +669,8 @@ synthesize_shader(const RenderState *rs) {
} }
for (int i=0; i<_num_textures; i++) { for (int i=0; i<_num_textures; i++) {
TextureStage *stage = _attribs._texture->get_on_stage(i); TextureStage *stage = _attribs._texture->get_on_stage(i);
if (stage->get_mode() != TextureStage::M_normal) { if ((stage->get_mode() != TextureStage::M_normal)&&
(stage->get_mode() != TextureStage::M_normal_height)) {
text << "\t o_color *= tex" << i << ";\n"; text << "\t o_color *= tex" << i << ";\n";
} }
} }