fix crash invalid input

[convexer.git] / config.py

diff --git a/config.py b/config.py
index 364363dde1e0770742a4581eab1632bcb291c58e..5ee294d8d77efa50ab8d997b12b307845678d6ed 100644 (file)
--- a/config.py
+++ b/config.py
@@ -107,14 +107,14 @@ cxr_shader_params = \
       "name": "Color",
       "type": "intrinsic",
       "default": None,
-      "exponent": 2.2
+      "exponent": 1.0
    },
    "$color2":
    {
       "name": "Color2",
       "type": "intrinsic",
       "default": None,
-      "exponent": 2.2
+      "exponent": 1.0
    },
    "Lighting":
    {
@@ -144,6 +144,12 @@ cxr_shader_params = \
             "name": "Fresnel Ranges",
             "type": "vector",
             "default":(1.0,1.0,1.0)
+         },
+         "$basemapalphaphongmask":
+         {
+            "name": "Base alpha mask",
+            "type": "bool",
+            "default": False
          }
       },
       "$envmap":
@@ -170,7 +176,25 @@ cxr_shader_params = \
             "name": "Min/Max",
             "type": "vector",
             "default": (0.0,1.0)
+         },
+         "$normalmapalphaenvmapmask":
+         {
+            "name": "Normal map mask",
+            "type": "bool",
+            "default": False
+         },
+         "$basealphaenvmapmask":
+         {
+            "name": "Base map mask",
+            "type": "bool",
+            "default": False
          }
+      },
+      "$selfillum":
+      {
+         "name": "Emission",
+         "type": "bool",
+         "default": False
       }
    },
    "Transparency":
@@ -182,7 +206,14 @@ cxr_shader_params = \
       {
          "name": "Translucent",
          "type": "bool",
-         "default": False
+         "default": False,
+
+         "$additive":
+         {
+            "name": "Additive",
+            "type": "bool",
+            "default": False
+         }
       },
       "$alphatest":
       {
@@ -216,8 +247,10 @@ cxr_entities = \
    # Builtin/intrinsic entities, you probably dont want to modify these
    "light": { "keyvalues": ent_lights },
    "light_spot": { "keyvalues": ent_lights },
+   "light_environment": { "keyvalues": ent_lights },
    "env_cubemap": { "keyvalues": ent_cubemap },
    "prop_static": { "keyvalues": ent_prop },
+   "sky_camera": { "keyvalues": ent_sky_camera },
    
    # CSGO.fgd
    # --------
@@ -251,5 +284,26 @@ cxr_entities = \
       {
          "TeamNum": {"type": "int", "default": 0 }
       }
+   },
+   "func_bomb_target":
+   {
+      "allow": ('MESH',),
+      "keyvalues": {}
+   },
+   "func_detail":
+   {
+      "allow": ('MESH',),
+      "keyvalues": {}
+   },
+   "trigger_hurt":
+   {
+      "allow": ('MESH',),
+      "keyvalues":
+      {
+         "damage": { "type":"int", "default": 10},
+         "damagecap": { "type":"int", "default": 20},
+         "damagetype": { "type":"int", "default": 0},
+         "damagemodel": { "type":"int", "default": 0}
+      }
    }
 }