envmap masks, linear attn

diff --git a/__init__.py b/__init__.py
index c3dfacfda7c42633bc3fdbca514154b16c8f5709..dfc7f3a31db749ffdc797d9d2f5adbcc6d73da46 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -598,7 +598,7 @@ def ent_lights(context):
    elif obj.data.type == 'POINT':
       kvs['_light'] = [ int(x) for x in light_base]
       kvs['_quadratic_attn'] = 1.0
-      kvs['_linear_attn'] = 0.0
+      kvs['_linear_attn'] = 1.0
    
    elif obj.data.type == 'SUN':
       light_base[3] *= 300.0 * 5
@@ -710,7 +710,7 @@ def asset_uid(asset):
    name = ""
 
    if v == 0:
-      name = "A"
+      name = "a"
    else:
       dig = []
       

diff --git a/config.py b/config.py
index 51a4ca8969a4eeced464bd8a0e32c2afc78c01ac..983b1cab567525d3e21f4b3c071288e9e44e9f63 100644 (file)
--- a/config.py
+++ b/config.py
@@ -170,6 +170,18 @@ 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
          }
       }
    },
@@ -182,7 +194,14 @@ cxr_shader_params = \
       {
          "name": "Translucent",
          "type": "bool",
-         "default": False
+         "default": False,
+
+         "$additive":
+         {
+            "name": "Additive",
+            "type": "bool",
+            "default": False
+         }
       },
       "$alphatest":
       {