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

Removed gloss maps, added scolor and spower maps

Browse Source
This commit is contained in:
Josh Yelon 2007-10-10 21:48:50 +00:00
parent dbeb35bd5e
commit 0f7c51ec80
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panda/src/egg/eggTexture.cxx
View File

@ -564,8 +564,8 @@ affects_polygon_alpha() const {
return false; return false;
case ET_normal_map: case ET_normal_map:
case ET_gloss_map: case ET_normal_spower_map:
case ET_normal_gloss_map: case ET_scolor_spower_map:
return false; return false;
case ET_selector_map: case ET_selector_map:
@ -883,11 +883,11 @@ string_env_type(const string &string) {
} else if (cmp_nocase_uh(string, "normal_map") == 0) { } else if (cmp_nocase_uh(string, "normal_map") == 0) {
return ET_normal_map; return ET_normal_map;
} else if (cmp_nocase_uh(string, "gloss_map") == 0) { } else if (cmp_nocase_uh(string, "normal_spower_map") == 0) {
return ET_gloss_map; return ET_normal_spower_map;
} else if (cmp_nocase_uh(string, "normal_gloss_map") == 0) { } else if (cmp_nocase_uh(string, "scolor_spower_map") == 0) {
return ET_normal_gloss_map; return ET_scolor_spower_map;
} else if (cmp_nocase_uh(string, "selector_map") == 0) { } else if (cmp_nocase_uh(string, "selector_map") == 0) {
return ET_selector_map; return ET_selector_map;
@ -1294,11 +1294,11 @@ ostream &operator << (ostream &out, EggTexture::EnvType type) {
case EggTexture::ET_normal_map: case EggTexture::ET_normal_map:
return out << "normal_map"; return out << "normal_map";
case EggTexture::ET_gloss_map: case EggTexture::ET_normal_spower_map:
return out << "gloss_map"; return out << "normal_spower_map";
case EggTexture::ET_normal_gloss_map: case EggTexture::ET_scolor_spower_map:
return out << "normal_gloss_map"; return out << "scolor_spower_map";
case EggTexture::ET_selector_map: case EggTexture::ET_selector_map:
return out << "selector_map"; return out << "selector_map";

4
panda/src/egg/eggTexture.h
View File

@ -103,8 +103,8 @@ PUBLISHED:
ET_add, ET_add,
ET_blend_color_scale, ET_blend_color_scale,
ET_normal_map, ET_normal_map,
ET_gloss_map, ET_normal_spower_map,
ET_normal_gloss_map, ET_scolor_spower_map,
ET_selector_map, ET_selector_map,
}; };
enum CombineMode { enum CombineMode {

8
panda/src/egg2pg/eggLoader.cxx
View File

@ -1383,12 +1383,12 @@ make_texture_stage(const EggTexture *egg_tex) {
stage->set_mode(TextureStage::M_normal_map); stage->set_mode(TextureStage::M_normal_map);
break; break;
case EggTexture::ET_gloss_map: case EggTexture::ET_normal_spower_map:
stage->set_mode(TextureStage::M_gloss_map); stage->set_mode(TextureStage::M_normal_spower_map);
break; break;
case EggTexture::ET_normal_gloss_map: case EggTexture::ET_scolor_spower_map:
stage->set_mode(TextureStage::M_normal_gloss_map); stage->set_mode(TextureStage::M_scolor_spower_map);
break; break;
case EggTexture::ET_selector_map: case EggTexture::ET_selector_map:

4
panda/src/gobj/textureStage.h
View File

@ -61,8 +61,8 @@ PUBLISHED:
// Modes that are only relevant to shader-based rendering. // Modes that are only relevant to shader-based rendering.
M_normal_map, M_normal_map,
M_gloss_map, M_normal_spower_map,
M_normal_gloss_map, M_scolor_spower_map,
M_selector_map, M_selector_map,
}; };