the asumptions were of course, incorrect

[convexer.git] / config.py

diff --git a/config.py b/config.py
index 438c044eab08ef246bd0c4c3363b373d95b716e7..e485027af5a609b50d9829093540f234a28facc8 100644 (file)
--- a/config.py
+++ b/config.py
@@ -14,7 +14,8 @@ cxr_shaders = \
    "LightMappedGeneric": { "name": "Light Mapped" },
    "VertexLitGeneric": { "name": "Vertex Lit" },
    "UnlitGeneric": { "name": "Unlit" },
-   "Builtin": { "name": "Builtin" }
+   "Builtin": { "name": "Builtin" },
+   "WorldVertexTransition": { "name": "Light Mapped Blend" }
 }
 
 # Shader graph mapping
@@ -22,7 +23,7 @@ cxr_shaders = \
 
 def material_tex_image(v):
    return {
-      "ShaderNodeTexImage":
+      "Image Texture":
       {
          "image": F"${v}"
       }
@@ -30,18 +31,29 @@ def material_tex_image(v):
 
 cxr_graph_mapping = \
 {
-   "ShaderNodeBsdfPrincipled":
+   # 'Special' shader for wvt
+   "cxr_blend":
+   {
+      "modulate": material_tex_image("blendmodulatetexture"),
+      "basetexture": material_tex_image("basetexture"),
+      "basetexture2": material_tex_image("basetexture2"),
+      "bumpmap": material_tex_image("bumpmap"),
+      "bumpmap2": material_tex_image("bumpmap2")
+   },
+
+   # Default shader setup 
+   "Principled BSDF":
    {
       "Base Color":
       {
-         "ShaderNodeMixRGB":
+         "Mix":
          {
             "Color1": material_tex_image("basetexture"),
             "Color2": material_tex_image("decaltexture")
          },
-         "ShaderNodeTexImage":
+         "Image Texture":
          {
-            "image":"$basetexture"
+            "image": "$basetexture"
          },
          "default":
             [("VertexLitGeneric","$color2"),\
@@ -50,7 +62,7 @@ cxr_graph_mapping = \
       },
       "Normal":
       {
-         "ShaderNodeNormalMap":
+         "Normal Map":
          {
             "Color": material_tex_image("bumpmap")
          }
@@ -66,7 +78,10 @@ cxr_shader_params = \
    "Textures":
    {
       "type": "ui",
-      "shaders": ("UnlitGeneric","VertexLitGeneric","LightMappedGeneric"),
+      "shaders": ("UnlitGeneric",\
+                  "VertexLitGeneric",\
+                  "LightMappedGeneric",\
+                  "WorldVertexTransition"),
 
       "$basetexture":
       {
@@ -74,6 +89,18 @@ cxr_shader_params = \
          "type": "intrinsic",
          "default": None
       },
+      "$basetexture2":
+      {
+         "name": "Base Texture 2",
+         "type": "intrinsic",
+         "default": None
+      },
+      "$blendmodulatetexture":
+      {
+         "name": "Blend Modulate",
+         "type": "intrinsic",
+         "default": None
+      },
       "$decaltexture":
       {
          "name": "Decal Texture",
@@ -100,6 +127,13 @@ cxr_shader_params = \
          "type": "intrinsic",
          "flags": NBVTF_TEXTUREFLAGS_NORMAL, # OpenGL (correct) normal maps.
          "default": None
+      },
+      "$bumpmap2":
+      {
+         "name": "Normal Map 2",
+         "type": "intrinsic",
+         "flags": NBVTF_TEXTUREFLAGS_NORMAL, 
+         "default": None
       }
    },
    "$color":
@@ -107,19 +141,19 @@ 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":
    {
       "type": "ui",
-      "shaders": ("VertexLitGeneric", "LightMappedGeneric"),
+      "shaders": ("VertexLitGeneric", "LightMappedGeneric", "WorldVertexTransition"),
 
       "$phong":
       {
@@ -144,6 +178,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 +210,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 +240,14 @@ cxr_shader_params = \
       {
          "name": "Translucent",
          "type": "bool",
-         "default": False
+         "default": False,
+
+         "$additive":
+         {
+            "name": "Additive",
+            "type": "bool",
+            "default": False
+         }
       },
       "$alphatest":
       {
@@ -203,6 +268,19 @@ cxr_shader_params = \
          "type": "bool",
          "default": False
       }
+   },
+   "$surfaceprop":
+   {
+      "name": "Surface",
+      "type": "string",
+      "default": ""
+   },
+   "$surfaceprop2":
+   {
+      "shaders": ("WorldVertexTransition",),
+      "name": "Surface 2",
+      "type": "string",
+      "default": ""
    }
 }
 
@@ -216,8 +294,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
    # --------
@@ -252,9 +332,36 @@ 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},
+         "damagetype": {"type":"int","default":0},
+         "nodmgforce": {"type":"int","default":0},
+         "spawnflags": {"type":"int","default":4097},
+         "StartDisabled": {"type":"int","default":0}
+      }
+   },
+   "env_soundscape": 
+   { 
+      "allow": ('EMPTY',),
+      "keyvalues": ent_soundscape
    }
 }
+
+cxr_visgroups = ['layout','overlap','remove','cover','user0','user1','user2','user3']