From f5d66e79eec07384ef6f4fd3f516f7a9d010fb9e Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 15 Jun 2022 17:03:38 -0500 Subject: SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports the first material in the GLTF file to the Material Editor --- indra/newview/llmaterialeditor.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'indra/newview/llmaterialeditor.h') diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index febdb3bbc1..f0c5dca44d 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -33,26 +33,49 @@ class LLMaterialEditor : public LLFloater public: LLMaterialEditor(const LLSD& key); + // open a file dialog and select a gltf/glb file for import + void importMaterial(); + void onClickSave(); // llpanel BOOL postBuild() override; LLUUID getAlbedoId(); + void setAlbedoId(const LLUUID& id); + LLColor4 getAlbedoColor(); + + // sets both albedo color and transparency + void setAlbedoColor(const LLColor4& color); + F32 getTransparency(); + std::string getAlphaMode(); + void setAlphaMode(const std::string& alpha_mode); + F32 getAlphaCutoff(); + void setAlphaCutoff(F32 alpha_cutoff); LLUUID getMetallicRoughnessId(); + void setMetallicRoughnessId(const LLUUID& id); + F32 getMetalnessFactor(); + void setMetalnessFactor(F32 factor); + F32 getRoughnessFactor(); + void setRoughnessFactor(F32 factor); LLUUID getEmissiveId(); + void setEmissiveId(const LLUUID& id); + LLColor4 getEmissiveColor(); + void setEmissiveColor(const LLColor4& color); LLUUID getNormalId(); + void setNormalId(const LLUUID& id); bool getDoubleSided(); + void setDoubleSided(bool double_sided); }; -- cgit v1.3