Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add <double_sided> to material spec #410

Merged
merged 4 commits into from
Nov 17, 2020
Merged

Add <double_sided> to material spec #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebd3177
add double sided materail param
iche033 Nov 3, 2020
b09d6c7
fix loading param
iche033 Nov 4, 2020
aae2e1f
Merge branch 'sdf10' into double_sided_material
iche033 Nov 16, 2020
d9bf24e
Merge branch 'sdf10' into double_sided_material
iche033 Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions include/sdf/Material.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@ namespace sdf
/// \param[in] _lighting False disables dynamic lighting.
public: void SetLighting(const bool _lighting);

/// \brief Get whether double sided material is enabled. The default
/// value is false.
/// \return False if double sided material should be disabled.
public: bool DoubleSided() const;

/// \brief Set whether double sided material is enabled.
/// \param[in] _lighting False disables double sided material.
public: void SetDoubleSided(bool _doubleSided);

/// \brief Get a pointer to the SDF element that was used during
/// load.
/// \return SDF element pointer. The value will be nullptr if Load has
Expand Down
5 changes: 5 additions & 0 deletions sdf/1.7/material.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
<description>The emissive color of a material specified by set of four numbers representing red/green/blue, each in the range of [0,1].</description>
</element>

<element name="double_sided" type="bool" default="false" required="0">
<description>If true, the mesh that this material is applied to will be rendered as double sided</description>
</element>


<element name="pbr" required="0">
<description>Physically Based Rendering (PBR) material. There are two PBR workflows: metal and specular. While both workflows and their parameters can be specified at the same time, typically only one of them will be used (depending on the underlying renderer capability). It is also recommended to use the same workflow for all materials in the world.</description>

Expand Down
22 changes: 22 additions & 0 deletions src/Material.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class sdf::MaterialPrivate
/// \brief Lighting enabled?
public: bool lighting = true;

/// \brief Double sided material
public: bool doubleSided = false;

/// \brief Ambient color
public: ignition::math::Color ambient {0, 0, 0, 1};

Expand Down Expand Up @@ -86,6 +89,7 @@ Material::Material(const Material &_material)
this->dataPtr->shader = _material.dataPtr->shader;
this->dataPtr->normalMap = _material.dataPtr->normalMap;
this->dataPtr->lighting = _material.dataPtr->lighting;
this->dataPtr->doubleSided = _material.dataPtr->doubleSided;
this->dataPtr->ambient = _material.dataPtr->ambient;
this->dataPtr->diffuse = _material.dataPtr->diffuse;
this->dataPtr->specular = _material.dataPtr->specular;
Expand Down Expand Up @@ -215,6 +219,12 @@ Errors Material::Load(sdf::ElementPtr _sdf)
this->dataPtr->emissive = _sdf->Get<ignition::math::Color>("emissive",
this->dataPtr->emissive).first;

this->dataPtr->lighting = _sdf->Get<bool>("lighting",
this->dataPtr->lighting).first;

this->dataPtr->doubleSided = _sdf->Get<bool>("double_sided",
this->dataPtr->doubleSided).first;

// load pbr param
if (_sdf->HasElement("pbr"))
{
Expand Down Expand Up @@ -286,6 +296,18 @@ void Material::SetLighting(const bool _lighting)
this->dataPtr->lighting = _lighting;
}

//////////////////////////////////////////////////
bool Material::DoubleSided() const
{
return this->dataPtr->doubleSided;
}

//////////////////////////////////////////////////
void Material::SetDoubleSided(const bool _doubleSided)
{
this->dataPtr->doubleSided = _doubleSided;
}

//////////////////////////////////////////////////
sdf::ElementPtr Material::Element() const
{
Expand Down
14 changes: 14 additions & 0 deletions src/Material_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ TEST(DOMMaterial, Construction)
EXPECT_EQ(ignition::math::Color(0, 0, 0, 1), material.Specular());
EXPECT_EQ(ignition::math::Color(0, 0, 0, 1), material.Emissive());
EXPECT_TRUE(material.Lighting());
EXPECT_FALSE(material.DoubleSided());
EXPECT_EQ(nullptr, material.Element());
EXPECT_EQ("", material.ScriptUri());
EXPECT_EQ("", material.ScriptName());
Expand All @@ -48,6 +49,7 @@ TEST(DOMMaterial, MoveConstructor)
material.SetSpecular(ignition::math::Color(0.3f, 0.4f, 0.5f, 0.7f));
material.SetEmissive(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f));
material.SetLighting(false);
material.SetDoubleSided(true);
material.SetScriptUri("banana");
material.SetScriptName("orange");
material.SetShader(sdf::ShaderType::VERTEX);
Expand All @@ -62,6 +64,7 @@ TEST(DOMMaterial, MoveConstructor)
EXPECT_EQ(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f),
material2.Emissive());
EXPECT_FALSE(material2.Lighting());
EXPECT_TRUE(material2.DoubleSided());
EXPECT_EQ("banana", material2.ScriptUri());
EXPECT_EQ("orange", material2.ScriptName());
EXPECT_EQ(sdf::ShaderType::VERTEX, material2.Shader());
Expand All @@ -79,6 +82,7 @@ TEST(DOMMaterial, CopyConstructor)
material.SetSpecular(ignition::math::Color(0.3f, 0.4f, 0.5f, 0.7f));
material.SetEmissive(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f));
material.SetLighting(false);
material.SetDoubleSided(true);
material.SetScriptUri("banana");
material.SetScriptName("orange");
material.SetShader(sdf::ShaderType::VERTEX);
Expand All @@ -93,6 +97,7 @@ TEST(DOMMaterial, CopyConstructor)
EXPECT_EQ(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f),
material2.Emissive());
EXPECT_FALSE(material2.Lighting());
EXPECT_TRUE(material2.DoubleSided());
EXPECT_EQ("banana", material2.ScriptUri());
EXPECT_EQ("orange", material2.ScriptName());
EXPECT_EQ(sdf::ShaderType::VERTEX, material2.Shader());
Expand All @@ -110,6 +115,7 @@ TEST(DOMMaterial, AssignmentOperator)
material.SetSpecular(ignition::math::Color(0.3f, 0.4f, 0.5f, 0.7f));
material.SetEmissive(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f));
material.SetLighting(false);
material.SetDoubleSided(true);
material.SetScriptUri("banana");
material.SetScriptName("orange");
material.SetShader(sdf::ShaderType::VERTEX);
Expand All @@ -125,6 +131,7 @@ TEST(DOMMaterial, AssignmentOperator)
EXPECT_EQ(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f),
material2.Emissive());
EXPECT_FALSE(material2.Lighting());
EXPECT_TRUE(material2.DoubleSided());
EXPECT_EQ("banana", material2.ScriptUri());
EXPECT_EQ("orange", material2.ScriptName());
EXPECT_EQ(sdf::ShaderType::VERTEX, material2.Shader());
Expand All @@ -142,6 +149,7 @@ TEST(DOMMaterial, MoveAssignmentOperator)
material.SetSpecular(ignition::math::Color(0.3f, 0.4f, 0.5f, 0.7f));
material.SetEmissive(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f));
material.SetLighting(false);
material.SetDoubleSided(true);
material.SetScriptUri("banana");
material.SetScriptName("orange");
material.SetShader(sdf::ShaderType::VERTEX);
Expand All @@ -156,6 +164,7 @@ TEST(DOMMaterial, MoveAssignmentOperator)
EXPECT_EQ(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f),
material2.Emissive());
EXPECT_FALSE(material2.Lighting());
EXPECT_TRUE(material2.DoubleSided());
EXPECT_EQ("banana", material2.ScriptUri());
EXPECT_EQ("orange", material2.ScriptName());
EXPECT_EQ(sdf::ShaderType::VERTEX, material2.Shader());
Expand Down Expand Up @@ -206,6 +215,10 @@ TEST(DOMMaterial, Set)
material.SetLighting(false);
EXPECT_FALSE(material.Lighting());

EXPECT_FALSE(material.DoubleSided());
material.SetDoubleSided(true);
EXPECT_TRUE(material.DoubleSided());

EXPECT_EQ("", material.ScriptUri());
material.SetScriptUri("uri");
EXPECT_EQ("uri", material.ScriptUri());
Expand Down Expand Up @@ -243,6 +256,7 @@ TEST(DOMMaterial, Set)
EXPECT_EQ(ignition::math::Color(0.3f, 0.4f, 0.5f, 0.7f), moved.Specular());
EXPECT_EQ(ignition::math::Color(0.4f, 0.5f, 0.6f, 0.8f), moved.Emissive());
EXPECT_FALSE(moved.Lighting());
EXPECT_TRUE(moved.DoubleSided());
EXPECT_EQ("uri", moved.ScriptUri());
EXPECT_EQ("name", moved.ScriptName());
EXPECT_EQ(sdf::ShaderType::VERTEX, moved.Shader());
Expand Down
2 changes: 2 additions & 0 deletions test/integration/visual_dom.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ TEST(DOMVisual, Material)
EXPECT_EQ(ignition::math::Color(0.2f, 0.5f, 0.1f, 1.0f), mat->Diffuse());
EXPECT_EQ(ignition::math::Color(0.7f, 0.3f, 0.5f, 0.9f), mat->Specular());
EXPECT_EQ(ignition::math::Color(1.0f, 0.0f, 0.2f, 1.0f), mat->Emissive());
EXPECT_FALSE(mat->Lighting());
EXPECT_TRUE(mat->DoubleSided());
EXPECT_EQ(sdf::ShaderType::VERTEX, mat->Shader());
EXPECT_EQ("myuri", mat->ScriptUri());
EXPECT_EQ("myname", mat->ScriptName());
Expand Down
2 changes: 2 additions & 0 deletions test/sdf/material.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<diffuse>0.2 0.5 0.1 1.0</diffuse>
<specular>0.7 0.3 0.5 0.9</specular>
<emissive>1.0 0.0 0.2 1.0</emissive>
<lighting>false</lighting>
<double_sided>true</double_sided>
<shader type="vertex">
</shader>
<script>
Expand Down