Skip to content
Snippets Groups Projects
Commit fc992bbe authored by aboensch's avatar aboensch
Browse files

FIX: trying to make clang happy

parent 4fd66922
Branches
Tags
1 merge request!135Feature/#458 custom materials
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "phx/resources/resource_utils.hpp" #include "phx/resources/resource_utils.hpp"
#include "phx/resources/types/material.hpp" #include "phx/resources/types/material.hpp"
#include "test_utilities/glm_vec3.hpp"
SCENARIO("The Generic Material Loader can create Generic materials.", SCENARIO("The Generic Material Loader can create Generic materials.",
"[phx][phx::GenericMaterialLoader]") { "[phx][phx::GenericMaterialLoader]") {
GIVEN("A plain Generic Material Loader") { GIVEN("A plain Generic Material Loader") {
...@@ -41,23 +43,17 @@ SCENARIO("The Generic Material Loader can create Generic materials.", ...@@ -41,23 +43,17 @@ SCENARIO("The Generic Material Loader can create Generic materials.",
"The material is red, and specular color, ambient color and " "The material is red, and specular color, ambient color and "
"shininess are set to default values.") { "shininess are set to default values.") {
auto diffuseColor = materialResource->GetDiffuseColor(); auto diffuseColor = materialResource->GetDiffuseColor();
REQUIRE(diffuseColor[0] == 1.0f); REQUIRE(diffuseColor == glm::vec3(1.0, 0.0, 0.0));
REQUIRE(diffuseColor[1] == 0.f);
REQUIRE(diffuseColor[2] == 0.f);
auto specularColor = materialResource->GetSpecularColor(); auto specularColor = materialResource->GetSpecularColor();
auto specularColorDefault = auto specularColorDefault =
phx::Material::GetDefault()->GetSpecularColor(); phx::Material::GetDefault()->GetSpecularColor();
REQUIRE(specularColor[0] == specularColorDefault[0]); REQUIRE(specularColor == specularColorDefault);
REQUIRE(specularColor[1] == specularColorDefault[1]);
REQUIRE(specularColor[2] == specularColorDefault[2]);
auto ambientColor = materialResource->GetAmbientColor(); auto ambientColor = materialResource->GetAmbientColor();
auto ambientColorDefault = auto ambientColorDefault =
phx::Material::GetDefault()->GetAmbientColor(); phx::Material::GetDefault()->GetAmbientColor();
REQUIRE(ambientColor[0] == ambientColorDefault[0]); REQUIRE(ambientColor == ambientColorDefault);
REQUIRE(ambientColor[1] == ambientColorDefault[1]);
REQUIRE(ambientColor[2] == ambientColorDefault[2]);
float shininess = materialResource->GetShininess(); float shininess = materialResource->GetShininess();
REQUIRE(shininess == phx::Material::GetDefault()->GetShininess()); REQUIRE(shininess == phx::Material::GetDefault()->GetShininess());
...@@ -78,19 +74,13 @@ SCENARIO("The Generic Material Loader can create Generic materials.", ...@@ -78,19 +74,13 @@ SCENARIO("The Generic Material Loader can create Generic materials.",
THEN("All the values in the material are set to the right value.") { THEN("All the values in the material are set to the right value.") {
auto diffuseColor = secondMaterial->GetDiffuseColor(); auto diffuseColor = secondMaterial->GetDiffuseColor();
REQUIRE(diffuseColor[0] == 0.4f); REQUIRE(diffuseColor == glm::vec3(0.4f, 0.3f, 0.55f));
REQUIRE(diffuseColor[1] == 0.3f);
REQUIRE(diffuseColor[2] == 0.55f);
auto specularColor = secondMaterial->GetSpecularColor(); auto specularColor = secondMaterial->GetSpecularColor();
REQUIRE(specularColor[0] == 0.48f); REQUIRE(specularColor == glm::vec3(0.48f, 0.42f, 0.88f));
REQUIRE(specularColor[1] == 0.42f);
REQUIRE(specularColor[2] == 0.88f);
auto ambientColor = secondMaterial->GetAmbientColor(); auto ambientColor = secondMaterial->GetAmbientColor();
REQUIRE(ambientColor[0] == 0.11f); REQUIRE(ambientColor == glm::vec3(0.11f, 0.94f, 0.73f));
REQUIRE(ambientColor[1] == 0.94f);
REQUIRE(ambientColor[2] == 0.73f);
float shininess = secondMaterial->GetShininess(); float shininess = secondMaterial->GetShininess();
REQUIRE(shininess == 40.f); REQUIRE(shininess == 40.f);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment