From e0e420605600fa98234788d2cb20430cc7836806 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Wed, 9 Jul 2025 08:08:54 -0400 Subject: [PATCH] Fixes Material defaults being suboptimal for material-less objects --- src/assets/TransferTest/Orbs.bin | 4 ++-- src/assets/TransferTest/Orbs.gltf | 4 ++-- src/assets/invalid.png | 4 ++-- src/engine/assets/material/Material.hpp | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/assets/TransferTest/Orbs.bin b/src/assets/TransferTest/Orbs.bin index 4b056f2..848394a 100644 --- a/src/assets/TransferTest/Orbs.bin +++ b/src/assets/TransferTest/Orbs.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ec4bff357474c050373cfa4fa977de9e24f71a092d69f5f876b4666d33d0889 -size 66846720 +oid sha256:14a63bb12d426dd02dc054d5669cc88f3dc9223b7143165ee4172a37bcc5f6b8 +size 132736 diff --git a/src/assets/TransferTest/Orbs.gltf b/src/assets/TransferTest/Orbs.gltf index 58bd7ab..cc3e8d3 100644 --- a/src/assets/TransferTest/Orbs.gltf +++ b/src/assets/TransferTest/Orbs.gltf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8356cdd06fca6e13a881e2e697a7d217f80a9140db30e3e33a33729063098bb -size 2744 +oid sha256:8cb1a22bb6a816df2bf391fb7af925c833a5e46c0c279c43548cbf7f26baf851 +size 2336 diff --git a/src/assets/invalid.png b/src/assets/invalid.png index e8b9008..5687178 100644 --- a/src/assets/invalid.png +++ b/src/assets/invalid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a98a975d0a53739ffcb54c387359b098ef601c1b5b8dcb4457e52ca4a1c7814d -size 193 +oid sha256:28fc77df0125c8b7c05eed643ad37172930e4521e7afa61c5f3bec26ba90ba0a +size 1618 diff --git a/src/engine/assets/material/Material.hpp b/src/engine/assets/material/Material.hpp index cf5dd91..b7cc0c3 100644 --- a/src/engine/assets/material/Material.hpp +++ b/src/engine/assets/material/Material.hpp @@ -45,7 +45,7 @@ namespace fgl::engine struct { std::shared_ptr< Texture > m_color_tex {}; - glm::vec4 m_color_factors { 0.0f }; + glm::vec4 m_color_factors { 1.0f }; std::shared_ptr< Texture > m_metallic_roughness_tex; float m_metallic_factor { 0.0f }; @@ -54,19 +54,19 @@ namespace fgl::engine struct { - float m_scale { 0.0f }; + float m_scale { 1.0f }; std::shared_ptr< Texture > m_texture; } m_normal; struct { - float m_strength { 0.0f }; + float m_strength { 1.0f }; std::shared_ptr< Texture > m_texture; } m_occlusion; struct { - glm::vec3 m_factors { 0.0f }; + glm::vec3 m_factors { 1.0f }; std::shared_ptr< Texture > m_texture; } m_emissive; @@ -85,7 +85,7 @@ namespace fgl::engine alignas( 16 ) struct Albedo { TextureID color_texture_id { constants::INVALID_TEXTURE_ID }; - alignas( 4 * 4 ) glm::vec4 color_factors {}; + alignas( 4 * 4 ) glm::vec4 color_factors { 1.0f, 1.0f, 1.0f, 1.0f }; } color; alignas( 16 ) struct Metallic