From e2afec91530eed34675a9612627225eec9311c4b Mon Sep 17 00:00:00 2001
From: Yuval Tassa <tassa@google.com>
Date: Wed, 17 Jun 2026 06:43:11 -0700
Subject: [PATCH] Make decorations lit, Rename `unlit_decor` material to
 `decor`.

PiperOrigin-RevId: 933693797
Change-Id: I37128b528296d978d4917ec65316d8d99ce017bb
---
 src/experimental/studio/live.js                 |  2 +-
 src/render/filament/CMakeLists.txt              |  2 +-
 .../assets/{unlit_decor.mat => decor.mat}       | 17 ++++++++++-------
 src/render/filament/core/material_manager.cc    |  2 +-
 src/render/filament/core/object_manager.cc      |  2 +-
 src/render/filament/core/object_manager.h       |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename src/render/filament/assets/{unlit_decor.mat => decor.mat} (64%)

diff --git a/src/experimental/studio/live.js b/src/experimental/studio/live.js
index 0a33def7..932ba04f 100644
--- a/src/experimental/studio/live.js
+++ b/src/experimental/studio/live.js
@@ -162,7 +162,7 @@ var Module = {
       "assets/outline_composite.filamat",
       "assets/outline_flatten.filamat",
       "assets/outline_jumpflood.filamat",
-      "assets/unlit_decor.filamat",
+      "assets/decor.filamat",
       "assets/unlit_depth.filamat",
       "assets/unlit_segmentation.filamat",
       "assets/unlit_ui.filamat"
diff --git a/src/render/filament/CMakeLists.txt b/src/render/filament/CMakeLists.txt
index 07b17e59..2e91a13a 100644
--- a/src/render/filament/CMakeLists.txt
+++ b/src/render/filament/CMakeLists.txt
@@ -112,7 +112,7 @@ set(MATERIAL_FILES
     outline_composite.mat
     outline_flatten.mat
     outline_jumpflood.mat
-    unlit_decor.mat
+    decor.mat
     unlit_depth.mat
     unlit_segmentation.mat
     unlit_ui.mat
diff --git a/src/render/filament/assets/unlit_decor.mat b/src/render/filament/assets/decor.mat
similarity index 64%
rename from src/render/filament/assets/unlit_decor.mat
rename to src/render/filament/assets/decor.mat
index d9cd4aff..935938a4 100644
--- a/src/render/filament/assets/unlit_decor.mat
+++ b/src/render/filament/assets/decor.mat
@@ -1,4 +1,4 @@
-// Copyright 2025 DeepMind Technologies Limited
+// Copyright 2026 DeepMind Technologies Limited
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,16 +13,19 @@
 // limitations under the License.
 
 material {
-    name : unlit_decor,
-    shadingModel : unlit,
+    name : decor,
+    shadingModel : specularGlossiness,
     parameters : [
         { type : float4, name : BaseColorFactor }
     ]
 }
 
 fragment {
-    void material(inout MaterialInputs material) {
-      prepareMaterial(material);
-      material.baseColor = materialParams.BaseColorFactor;
-    }
+  void material(inout MaterialInputs material) {
+    prepareMaterial(material);
+    material.baseColor     = materialParams.BaseColorFactor;
+    material.specularColor = vec3(0.0);
+    material.glossiness    = 0.0;
+    material.emissive      = vec4(0.0);
+  }
 }
diff --git a/src/render/filament/core/material_manager.cc b/src/render/filament/core/material_manager.cc
index 54ff0c70..207a31e5 100644
--- a/src/render/filament/core/material_manager.cc
+++ b/src/render/filament/core/material_manager.cc
@@ -111,7 +111,7 @@ MaterialManager::MaterialType MaterialManager::GetMaterialType(
     if (material.color_texture) {
       return ObjectManager::kUnlitUi;
     } else {
-      return ObjectManager::kUnlitDecor;
+      return ObjectManager::kDecor;
     }
   } else if (material.orm_texture) {
     if (material.opacity_texture) {
diff --git a/src/render/filament/core/object_manager.cc b/src/render/filament/core/object_manager.cc
index d0384376..f51c64f5 100644
--- a/src/render/filament/core/object_manager.cc
+++ b/src/render/filament/core/object_manager.cc
@@ -76,7 +76,7 @@ ObjectManager::ObjectManager(filament::Engine* engine) : engine_(engine) {
       LoadMaterial(engine, "phong_cube_reflect.filamat");
   materials_[kUnlitSegmentation] =
       LoadMaterial(engine, "unlit_segmentation.filamat");
-  materials_[kUnlitDecor] = LoadMaterial(engine, "unlit_decor.filamat");
+  materials_[kDecor] = LoadMaterial(engine, "decor.filamat");
   materials_[kUnlitDepth] = LoadMaterial(engine, "unlit_depth.filamat");
   materials_[kUnlitUi] = LoadMaterial(engine, "unlit_ui.filamat");
   materials_[kOutlineComposite] =
diff --git a/src/render/filament/core/object_manager.h b/src/render/filament/core/object_manager.h
index e3983c38..adfc2152 100644
--- a/src/render/filament/core/object_manager.h
+++ b/src/render/filament/core/object_manager.h
@@ -57,7 +57,7 @@ class ObjectManager {
     kPhongCubeFade,
     kPhongCubeReflect,
     kUnlitSegmentation,
-    kUnlitDecor,
+    kDecor,
     kUnlitDepth,
     kUnlitUi,
     kOutlineComposite,