From 0f7c51ec80a0a51c4a78b13b7465c177c9688cb2 Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Wed, 10 Oct 2007 21:48:50 +0000
Subject: [PATCH] Removed gloss maps, added scolor and spower maps

---
 panda/src/egg/eggTexture.cxx   | 24 ++++++++++++------------
 panda/src/egg/eggTexture.h     |  4 ++--
 panda/src/egg2pg/eggLoader.cxx |  8 ++++----
 panda/src/gobj/textureStage.h  |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/panda/src/egg/eggTexture.cxx b/panda/src/egg/eggTexture.cxx
index dee7db13b5..a77755b4ad 100644
--- a/panda/src/egg/eggTexture.cxx
+++ b/panda/src/egg/eggTexture.cxx
@@ -564,8 +564,8 @@ affects_polygon_alpha() const {
     return false;
 
   case ET_normal_map:
-  case ET_gloss_map:
-  case ET_normal_gloss_map:
+  case ET_normal_spower_map:
+  case ET_scolor_spower_map:
     return false;
 
   case ET_selector_map:
@@ -883,11 +883,11 @@ string_env_type(const string &string) {
   } else if (cmp_nocase_uh(string, "normal_map") == 0) {
     return ET_normal_map;
 
-  } else if (cmp_nocase_uh(string, "gloss_map") == 0) {
-    return ET_gloss_map;
+  } else if (cmp_nocase_uh(string, "normal_spower_map") == 0) {
+    return ET_normal_spower_map;
 
-  } else if (cmp_nocase_uh(string, "normal_gloss_map") == 0) {
-    return ET_normal_gloss_map;
+  } else if (cmp_nocase_uh(string, "scolor_spower_map") == 0) {
+    return ET_scolor_spower_map;
 
   } else if (cmp_nocase_uh(string, "selector_map") == 0) {
     return ET_selector_map;
@@ -1294,12 +1294,12 @@ ostream &operator << (ostream &out, EggTexture::EnvType type) {
   case EggTexture::ET_normal_map:
     return out << "normal_map";
 
-  case EggTexture::ET_gloss_map:
-    return out << "gloss_map";
-
-  case EggTexture::ET_normal_gloss_map:
-    return out << "normal_gloss_map";
-
+  case EggTexture::ET_normal_spower_map:
+    return out << "normal_spower_map";
+    
+  case EggTexture::ET_scolor_spower_map:
+    return out << "scolor_spower_map";
+    
   case EggTexture::ET_selector_map:
     return out << "selector_map";
   }
diff --git a/panda/src/egg/eggTexture.h b/panda/src/egg/eggTexture.h
index 688031e66a..8d509a1ba7 100644
--- a/panda/src/egg/eggTexture.h
+++ b/panda/src/egg/eggTexture.h
@@ -103,8 +103,8 @@ PUBLISHED:
     ET_add,
     ET_blend_color_scale,
     ET_normal_map,
-    ET_gloss_map,
-    ET_normal_gloss_map,
+    ET_normal_spower_map,
+    ET_scolor_spower_map,
     ET_selector_map,
   };
   enum CombineMode {
diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx
index 9abf348e0a..4b4731e82e 100644
--- a/panda/src/egg2pg/eggLoader.cxx
+++ b/panda/src/egg2pg/eggLoader.cxx
@@ -1383,12 +1383,12 @@ make_texture_stage(const EggTexture *egg_tex) {
     stage->set_mode(TextureStage::M_normal_map);
     break;
 
-  case EggTexture::ET_gloss_map:
-    stage->set_mode(TextureStage::M_gloss_map);
+  case EggTexture::ET_normal_spower_map:
+    stage->set_mode(TextureStage::M_normal_spower_map);
     break;
 
-  case EggTexture::ET_normal_gloss_map:
-    stage->set_mode(TextureStage::M_normal_gloss_map);
+  case EggTexture::ET_scolor_spower_map:
+    stage->set_mode(TextureStage::M_scolor_spower_map);
     break;
 
   case EggTexture::ET_selector_map:
diff --git a/panda/src/gobj/textureStage.h b/panda/src/gobj/textureStage.h
index 20f89540cb..99d1eab482 100644
--- a/panda/src/gobj/textureStage.h
+++ b/panda/src/gobj/textureStage.h
@@ -61,8 +61,8 @@ PUBLISHED:
     // Modes that are only relevant to shader-based rendering.
     
     M_normal_map,
-    M_gloss_map,
-    M_normal_gloss_map,
+    M_normal_spower_map,
+    M_scolor_spower_map,
     M_selector_map,
   };