From ab78d2edd6a58dda59290ea6140f0679fed8b809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20N=C3=A4hrig?=
 <mathias.naehrig@easterngraphics.com>
Date: Thu, 15 Aug 2024 16:23:07 +0200
Subject: [PATCH] adding emissive color for previewsurface

---
 hdOSPRay/material.cpp | 8 ++++++++
 hdOSPRay/material.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/hdOSPRay/material.cpp b/hdOSPRay/material.cpp
index eb7f399..0c1650d 100644
--- a/hdOSPRay/material.cpp
+++ b/hdOSPRay/material.cpp
@@ -304,6 +304,8 @@ HdOSPRayMaterial::_ProcessUsdPreviewSurfaceNode(HdMaterialNode node)
         const auto& value = param->second;
         if (name == HdOSPRayMaterialTokens->diffuseColor) {
             diffuseColor = value.Get<GfVec3f>();
+        } else if (name == HdOSPRayMaterialTokens->emissiveColor) {
+            emissiveColor = value.Get<GfVec3f>();
         } else if (name == HdOSPRayMaterialTokens->specularColor) {
             specularColor = value.Get<GfVec3f>();
         } else if (name == HdOSPRayMaterialTokens->metallic) {
@@ -621,6 +623,7 @@ HdOSPRayMaterial::UpdatePrincipledMaterial(const std::string& rendererType)
     bool hasMetallicTex = false;
     bool hasRoughnessTex = false;
     bool hasOpacityTex = false;
+    bool hasEmissiveTex = false;
     // set texture maps
     // TODO: we can skip the name mapping if we require them to be in ospray nomenclature
     for (const auto& [key, value] : _textures) {
@@ -680,6 +683,9 @@ HdOSPRayMaterial::UpdatePrincipledMaterial(const std::string& rendererType)
             || key == HdOSPRayMaterialTokens->map_roughness) {
             name = "map_roughness";
             hasRoughnessTex = true;
+        } else if (key == HdOSPRayMaterialTokens->emissiveColor) {
+            name = "map_emissiveColor";
+            hasEmissiveTex = true;
         }
 
         if (name != "") {
@@ -735,6 +741,8 @@ HdOSPRayMaterial::UpdatePrincipledMaterial(const std::string& rendererType)
     _ospMaterial.setParam("sheenColor", GfToOSP(sheenColor));
     _ospMaterial.setParam("sheenTint", sheenTint);
     _ospMaterial.setParam("sheenRoughness", sheenRoughness);
+    _ospMaterial.setParam("emissiveColor",
+                          (hasEmissiveTex ? vec3f( 1.f, 1.f, 1.f) : GfToOSP(emissiveColor)));
 }
 
 void
diff --git a/hdOSPRay/material.h b/hdOSPRay/material.h
index f9f45a0..2b379d7 100644
--- a/hdOSPRay/material.h
+++ b/hdOSPRay/material.h
@@ -175,6 +175,7 @@ class HdOSPRayMaterial final : public HdMaterial {
     GfVec3f sheenColor { 1.f, 1.f, 1.f };
     float sheenTint { 0.f };
     float sheenRoughness { 0.2f };
+    GfVec3f emissiveColor { 0.f, 0.f, 0.f };
     TfToken type;
     bool hasPtex { false };