Held light for stone torch, lamp only glow when placed, bump version

spiralhalo · Jan 12, 2021 · 45c152c · 45c152c
1 parent ad0ba28
commit 45c152c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/assets/adorn/lights/item/stone_torch.json b/assets/adorn/lights/item/stone_torch.json
@@ -0,0 +1,8 @@
+{
+  "intensity": 1.0,
+  "red": 1.0,
+  "green": 0.875,
+  "blue": 0.75,
+  "worksInFluid": false
+}
+
diff --git a/assets/lumicompat/shaders/material/adorn/lamp.frag b/assets/lumicompat/shaders/material/adorn/lamp.frag
@@ -8,11 +8,13 @@
 ******************************************************/
 
 void frx_startFragment(inout frx_FragmentData data) 
-{  
-    vec3 pos = frx_var2.xyz;
-    float mag = 2.0*abs(0.6-fract(pos.y));
-    data.emissivity = smoothstep(0.3, 1.0, 1.0-mag*mag);
-
+{
+    if (frx_modelOriginType() == MODEL_ORIGIN_REGION) {
+        vec3 pos = frx_var2.xyz;
+        float mag = 2.0*abs(0.6-fract(pos.y));
+        data.emissivity = smoothstep(0.3, 1.0, 1.0-mag*mag);
+    }
+
     vec4 c = data.spriteColor;
     float min_ = min( min(c.r, c.g), c.b );
     float max_ = max( max(c.r, c.g), c.b );

diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "pack_format": 6,
-    "description": "Lumi PBR support for mods \n§8by spiralhalo [v0.5]"
+    "description": "Lumi PBR support for mods \n§8by spiralhalo [v0.6]"
   }
 }