From a0c98d1c7299a0a396fd8c8e67ce6b36ceaa970f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Fri, 14 Oct 2022 18:48:31 +0200
Subject: [PATCH] Implement initial Blender FBX metallic support
---
libraries/model-serializers/src/FBXSerializer.cpp | 11 +++++++++--
.../model-serializers/src/FBXSerializer_Material.cpp | 7 ++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/libraries/model-serializers/src/FBXSerializer.cpp b/libraries/model-serializers/src/FBXSerializer.cpp
index 1445012761..9305cc7de0 100644
--- a/libraries/model-serializers/src/FBXSerializer.cpp
+++ b/libraries/model-serializers/src/FBXSerializer.cpp
@@ -4,6 +4,7 @@
//
// Created by Andrzej Kapolka on 9/18/13.
// Copyright 2013 High Fidelity, Inc.
+// Copyright 2022 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -859,6 +860,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
if (properties) {
std::vector<std::string> unknowns;
+ // Blender
static const QVariant DIFFUSE_COLOR = hifi::ByteArray("DiffuseColor");
static const QVariant DIFFUSE_FACTOR = hifi::ByteArray("DiffuseFactor");
static const QVariant DIFFUSE = hifi::ByteArray("Diffuse");
@@ -871,6 +873,9 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
static const QVariant AMBIENT_FACTOR = hifi::ByteArray("AmbientFactor");
static const QVariant SHININESS = hifi::ByteArray("Shininess");
static const QVariant OPACITY = hifi::ByteArray("Opacity");
+ static const QVariant REFLECTION_FACTOR = hifi::ByteArray("ReflectionFactor");
+
+ // Maya Stingray
static const QVariant MAYA_USE_NORMAL_MAP = hifi::ByteArray("Maya|use_normal_map");
static const QVariant MAYA_BASE_COLOR = hifi::ByteArray("Maya|base_color");
static const QVariant MAYA_USE_COLOR_MAP = hifi::ByteArray("Maya|use_color_map");
@@ -921,12 +926,14 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
} else if (property.properties.at(0) == AMBIENT_FACTOR) {
material.ambientFactor = property.properties.at(index).value<double>();
- // Detected just for BLender AO vs lightmap
+ // Detected just for Blender AO vs lightmap
} else if (property.properties.at(0) == SHININESS) {
material.shininess = property.properties.at(index).value<double>();
-
} else if (property.properties.at(0) == OPACITY) {
material.opacity = property.properties.at(index).value<double>();
+ } else if (property.properties.at(0) == REFLECTION_FACTOR) {
+ material.isPBSMaterial = true;
+ material.metallic = property.properties.at(index).value<double>();
}
// Sting Ray Material Properties!!!!
diff --git a/libraries/model-serializers/src/FBXSerializer_Material.cpp b/libraries/model-serializers/src/FBXSerializer_Material.cpp
index 81f9ca45e3..0ff57c5f37 100644
--- a/libraries/model-serializers/src/FBXSerializer_Material.cpp
+++ b/libraries/model-serializers/src/FBXSerializer_Material.cpp
@@ -236,7 +236,12 @@ void FBXSerializer::consolidateHFMMaterials() {
material._material->setAlbedo(diffuse);
if (material.isPBSMaterial) {
- material._material->setRoughness(material.roughness);
+ // Blender sets shininess for PBS
+ if (material.roughness > 0.0f) {
+ material._material->setRoughness(material.roughness);
+ } else {
+ material._material->setRoughness(graphics::Material::shininessToRoughness(material.shininess));
+ }
material._material->setMetallic(material.metallic);
} else {
material._material->setRoughness(graphics::Material::shininessToRoughness(material.shininess));