ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Trade: test that importerState is saved in material and object data.

pull/191/head
Vladimír Vondruš 8 years ago
parent
c20d50bf5f
commit
70e58bd990
3 changed files with 29 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/Magnum/Trade/Test/MaterialDataTest.cpp
  2. 9
      src/Magnum/Trade/Test/ObjectData2DTest.cpp
  3. 10
      src/Magnum/Trade/Test/ObjectData3DTest.cpp

10
src/Magnum/Trade/Test/MaterialDataTest.cpp
Unescape View File

@ -85,6 +85,7 @@ void MaterialDataTest::constructPhong() {
CORRADE_COMPARE(cdata.diffuseColor(), 0xeebbff_rgbf);
CORRADE_COMPARE(cdata.specularColor(), 0xacabad_rgbf);
CORRADE_COMPARE(cdata.shininess(), 80.0f);
CORRADE_COMPARE(cdata.importerState(), &a);
}
void MaterialDataTest::constructPhongAmbientTexture() {
@ -103,6 +104,7 @@ void MaterialDataTest::constructPhongAmbientTexture() {
CORRADE_COMPARE(cdata.diffuseColor(), 0xeebbff_rgbf);
CORRADE_COMPARE(cdata.specularColor(), 0xacabad_rgbf);
CORRADE_COMPARE(cdata.shininess(), 80.0f);
CORRADE_COMPARE(cdata.importerState(), &a);
}
void MaterialDataTest::constructPhongDiffuseTexture() {
@ -121,6 +123,7 @@ void MaterialDataTest::constructPhongDiffuseTexture() {
CORRADE_COMPARE(cdata.diffuseTexture(), 42);
CORRADE_COMPARE(cdata.specularColor(), 0xacabad_rgbf);
CORRADE_COMPARE(cdata.shininess(), 80.0f);
CORRADE_COMPARE(cdata.importerState(), &a);
}
void MaterialDataTest::constructPhongSpecularTexture() {
@ -139,6 +142,7 @@ void MaterialDataTest::constructPhongSpecularTexture() {
CORRADE_COMPARE(cdata.diffuseColor(), 0xeebbff_rgbf);
CORRADE_COMPARE(cdata.specularTexture(), 42);
CORRADE_COMPARE(cdata.shininess(), 30.0f);
CORRADE_COMPARE(cdata.importerState(), &a);
}
void MaterialDataTest::constructCopy() {
@ -164,6 +168,7 @@ void MaterialDataTest::constructMovePhongNoAmbientTexture() {
CORRADE_COMPARE(b.diffuseTexture(), 42);
CORRADE_COMPARE(b.specularTexture(), 13);
CORRADE_COMPARE(b.shininess(), 80.0f);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
PhongMaterialData d{PhongMaterialData::Flag::AmbientTexture, 100.0f, &c};
@ -177,6 +182,7 @@ void MaterialDataTest::constructMovePhongNoAmbientTexture() {
CORRADE_COMPARE(d.diffuseTexture(), 42);
CORRADE_COMPARE(d.specularTexture(), 13);
CORRADE_COMPARE(d.shininess(), 80.0f);
CORRADE_COMPARE(d.importerState(), &a);
}
void MaterialDataTest::constructMovePhongNoDiffuseTexture() {
@ -195,6 +201,7 @@ void MaterialDataTest::constructMovePhongNoDiffuseTexture() {
CORRADE_COMPARE(b.diffuseColor(), 0xeebbff_rgbf);
CORRADE_COMPARE(b.specularTexture(), 13);
CORRADE_COMPARE(b.shininess(), 80.0f);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
PhongMaterialData d{PhongMaterialData::Flag::DiffuseTexture, 100.0f, &c};
@ -208,6 +215,7 @@ void MaterialDataTest::constructMovePhongNoDiffuseTexture() {
CORRADE_COMPARE(d.diffuseColor(), 0xeebbff_rgbf);
CORRADE_COMPARE(d.specularTexture(), 13);
CORRADE_COMPARE(d.shininess(), 80.0f);
CORRADE_COMPARE(d.importerState(), &a);
}
void MaterialDataTest::constructMovePhongNoSpecularTexture() {
@ -226,6 +234,7 @@ void MaterialDataTest::constructMovePhongNoSpecularTexture() {
CORRADE_COMPARE(b.diffuseTexture(), 42);
CORRADE_COMPARE(b.specularColor(), 0xacabad_rgbf);
CORRADE_COMPARE(b.shininess(), 80.0f);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
PhongMaterialData d{PhongMaterialData::Flag::SpecularTexture, 30.0f, &c};
@ -239,6 +248,7 @@ void MaterialDataTest::constructMovePhongNoSpecularTexture() {
CORRADE_COMPARE(d.diffuseTexture(), 42);
CORRADE_COMPARE(d.specularColor(), 0xacabad_rgbf);
CORRADE_COMPARE(d.shininess(), 80.0f);
CORRADE_COMPARE(d.importerState(), &a);
}
void MaterialDataTest::accessInvalidColors() {

9
src/Magnum/Trade/Test/ObjectData2DTest.cpp
Unescape View File

@ -78,6 +78,7 @@ void ObjectData2DTest::constructEmpty() {
CORRADE_COMPARE(data.transformation(), Matrix3::translation(Vector2::xAxis(-4.0f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType2D::Empty);
CORRADE_COMPARE(data.instance(), -1);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData2DTest::constructEmptyTransformations() {
@ -95,6 +96,7 @@ void ObjectData2DTest::constructEmptyTransformations() {
Matrix3::scaling(Vector2::yScale(1.5f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType2D::Empty);
CORRADE_COMPARE(data.instance(), -1);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData2DTest::constructMesh() {
@ -107,6 +109,7 @@ void ObjectData2DTest::constructMesh() {
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType2D::Mesh);
CORRADE_COMPARE(data.instance(), 13);
CORRADE_COMPARE(data.material(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData2DTest::constructMeshTransformations() {
@ -125,6 +128,7 @@ void ObjectData2DTest::constructMeshTransformations() {
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType2D::Mesh);
CORRADE_COMPARE(data.instance(), 13);
CORRADE_COMPARE(data.material(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData2DTest::constructCamera() {
@ -136,6 +140,7 @@ void ObjectData2DTest::constructCamera() {
CORRADE_COMPARE(data.transformation(), Matrix3::translation(Vector2::yAxis(5.0f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType2D::Camera);
CORRADE_COMPARE(data.instance(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData2DTest::constructCopy() {
@ -162,6 +167,7 @@ void ObjectData2DTest::constructMoveTransformations() {
Matrix3::scaling(Vector2::yScale(1.5f)));
CORRADE_COMPARE(b.instanceType(), ObjectInstanceType2D::Camera);
CORRADE_COMPARE(b.instance(), 13);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
ObjectData2D d{{0, 1}, Matrix3{}, ObjectInstanceType2D::Empty, 27, &c};
@ -179,6 +185,7 @@ void ObjectData2DTest::constructMoveTransformations() {
Matrix3::scaling(Vector2::yScale(1.5f)));
CORRADE_COMPARE(d.instanceType(), ObjectInstanceType2D::Camera);
CORRADE_COMPARE(d.instance(), 13);
CORRADE_COMPARE(d.importerState(), &a);
}
void ObjectData2DTest::constructMoveMesh() {
@ -193,6 +200,7 @@ void ObjectData2DTest::constructMoveMesh() {
CORRADE_COMPARE(b.instanceType(), ObjectInstanceType2D::Mesh);
CORRADE_COMPARE(b.instance(), 13);
CORRADE_COMPARE(b.material(), 42);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
MeshObjectData2D d{{0, 1}, {}, 27, -1, &c};
@ -205,6 +213,7 @@ void ObjectData2DTest::constructMoveMesh() {
CORRADE_COMPARE(d.instanceType(), ObjectInstanceType2D::Mesh);
CORRADE_COMPARE(d.instance(), 13);
CORRADE_COMPARE(d.material(), 42);
CORRADE_COMPARE(d.importerState(), &a);
}
void ObjectData2DTest::accessInvalidTransformations() {

10
src/Magnum/Trade/Test/ObjectData3DTest.cpp
Unescape View File

@ -80,6 +80,7 @@ void ObjectData3DTest::constructEmpty() {
CORRADE_COMPARE(data.transformation(), Matrix4::translation(Vector3::xAxis(-4.0f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Empty);
CORRADE_COMPARE(data.instance(), -1);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructEmptyTransformations() {
@ -97,6 +98,7 @@ void ObjectData3DTest::constructEmptyTransformations() {
Matrix4::scaling(Vector3::yScale(1.5f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Empty);
CORRADE_COMPARE(data.instance(), -1);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructMesh() {
@ -109,6 +111,7 @@ void ObjectData3DTest::constructMesh() {
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Mesh);
CORRADE_COMPARE(data.instance(), 13);
CORRADE_COMPARE(data.material(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructMeshTransformations() {
@ -127,6 +130,7 @@ void ObjectData3DTest::constructMeshTransformations() {
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Mesh);
CORRADE_COMPARE(data.instance(), 13);
CORRADE_COMPARE(data.material(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructCamera() {
@ -138,6 +142,7 @@ void ObjectData3DTest::constructCamera() {
CORRADE_COMPARE(data.transformation(), Matrix4::translation(Vector3::yAxis(5.0f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Camera);
CORRADE_COMPARE(data.instance(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructLight() {
@ -149,6 +154,7 @@ void ObjectData3DTest::constructLight() {
CORRADE_COMPARE(data.transformation(), Matrix4::translation(Vector3::yAxis(5.0f)));
CORRADE_COMPARE(data.instanceType(), ObjectInstanceType3D::Light);
CORRADE_COMPARE(data.instance(), 42);
CORRADE_COMPARE(data.importerState(), &a);
}
void ObjectData3DTest::constructCopy() {
@ -175,6 +181,7 @@ void ObjectData3DTest::constructMoveTransformations() {
Matrix4::scaling(Vector3::yScale(1.5f)));
CORRADE_COMPARE(b.instanceType(), ObjectInstanceType3D::Light);
CORRADE_COMPARE(b.instance(), 13);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
ObjectData3D d{{0, 1}, Matrix4{}, ObjectInstanceType3D::Empty, 27, &c};
@ -192,6 +199,7 @@ void ObjectData3DTest::constructMoveTransformations() {
Matrix4::scaling(Vector3::yScale(1.5f)));
CORRADE_COMPARE(d.instanceType(), ObjectInstanceType3D::Light);
CORRADE_COMPARE(d.instance(), 13);
CORRADE_COMPARE(d.importerState(), &a);
}
void ObjectData3DTest::constructMoveMesh() {
@ -206,6 +214,7 @@ void ObjectData3DTest::constructMoveMesh() {
CORRADE_COMPARE(b.instanceType(), ObjectInstanceType3D::Mesh);
CORRADE_COMPARE(b.instance(), 13);
CORRADE_COMPARE(b.material(), 42);
CORRADE_COMPARE(b.importerState(), &a);
const int c{};
MeshObjectData3D d{{0, 1}, {}, 27, -1, &c};
@ -218,6 +227,7 @@ void ObjectData3DTest::constructMoveMesh() {
CORRADE_COMPARE(d.instanceType(), ObjectInstanceType3D::Mesh);
CORRADE_COMPARE(d.instance(), 13);
CORRADE_COMPARE(d.material(), 42);
CORRADE_COMPARE(d.importerState(), &a);
}
void ObjectData3DTest::accessInvalidTransformations() {

Write Preview
Loading…
Cancel
Save