From: hgn <hgodden00@gmail.com>
Date: Tue, 19 Apr 2022 17:29:15 +0000 (+0100)
Subject: envmap masks, linear attn
X-Git-Url: https://harrygodden.com/git/?p=convexer.git;a=commitdiff_plain;h=bf8765905390844abea94bfa7113a017740b253e

envmap masks, linear attn
---

diff --git a/__init__.py b/__init__.py
index c3dfacf..dfc7f3a 100644
--- 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 51a4ca8..983b1ca 100644
--- 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":
       {