Browse Source

Fix color literal bugs discovered by the new implementation.

Very nice.
pull/674/head
Vladimír Vondruš 1 year ago
parent
commit
602ed1687d
  1. 2
      doc/generated/primitives.cpp
  2. 2
      doc/generated/shaders.cpp
  3. 2
      src/Magnum/SceneTools/Test/SceneConverterImplementationTest.cpp
  4. 8
      src/Magnum/Shaders/Test/VectorTest.cpp

2
doc/generated/primitives.cpp

@ -179,7 +179,7 @@ int PrimitiveVisualizer::exec() {
GL::Renderer::enable(GL::Renderer::Feature::FaceCulling);
GL::Renderer::enable(GL::Renderer::Feature::Blending);
GL::Renderer::setBlendFunction(GL::Renderer::BlendFunction::One, GL::Renderer::BlendFunction::One);
GL::Renderer::setClearColor(0x000000_srgbaf);
GL::Renderer::setClearColor(0x00000000_srgbaf);
CORRADE_INTERNAL_ASSERT(GL::Renderer::lineWidthRange().contains(2.0f));
GL::Renderer::setLineWidth(2.0f);

2
doc/generated/shaders.cpp

@ -134,7 +134,7 @@ int ShaderVisualizer::exec() {
GL::Renderer::enable(GL::Renderer::Feature::DepthTest);
GL::Renderer::enable(GL::Renderer::Feature::FramebufferSrgb);
GL::Renderer::setClearColor(0x000000_srgbaf);
GL::Renderer::setClearColor(0x00000000_srgbaf);
for(auto fun: {&ShaderVisualizer::phong,
&ShaderVisualizer::line,

2
src/Magnum/SceneTools/Test/SceneConverterImplementationTest.cpp

@ -625,7 +625,7 @@ void SceneConverterImplementationTest::infoMaterials() {
if(id == 0) return Trade::MaterialData{Trade::MaterialType::PbrMetallicRoughness, {
{Trade::MaterialAttribute::BaseColor, 0x3bd26799_rgbaf},
{Trade::MaterialAttribute::DoubleSided, true},
{Trade::MaterialAttribute::EmissiveColor, 0xe9eca_rgbf},
{Trade::MaterialAttribute::EmissiveColor, 0x0e9eca_rgbf},
{Trade::MaterialAttribute::RoughnessTexture, 67u},
{Trade::MaterialAttribute::RoughnessTextureMatrix, Matrix3::translation({0.25f, 0.75f})},
{Trade::MaterialAttribute::RoughnessTextureSwizzle, Trade::MaterialTextureSwizzle::B},

8
src/Magnum/Shaders/Test/VectorTest.cpp

@ -164,7 +164,7 @@ void VectorTest::materialUniformConstructNoInit() {
/* Testing only some fields, should be enough */
VectorMaterialUniform a;
a.color = 0x354565fc_rgbaf;
a.backgroundColor = 0x98769facb_rgbaf;
a.backgroundColor = 0x98769fac_rgbaf;
new(&a) VectorMaterialUniform{NoInit};
{
@ -175,7 +175,7 @@ void VectorTest::materialUniformConstructNoInit() {
CORRADE_EXPECT_FAIL("GCC 6.1+ misoptimizes and overwrites the value.");
#endif
CORRADE_COMPARE(a.color, 0x354565fc_rgbaf);
CORRADE_COMPARE(a.backgroundColor, 0x98769facb_rgbaf);
CORRADE_COMPARE(a.backgroundColor, 0x98769fac_rgbaf);
}
CORRADE_VERIFY(std::is_nothrow_constructible<VectorMaterialUniform, NoInitT>::value);
@ -187,9 +187,9 @@ void VectorTest::materialUniformConstructNoInit() {
void VectorTest::materialUniformSetters() {
VectorMaterialUniform a;
a.setColor(0x354565fc_rgbaf)
.setBackgroundColor(0x98769facb_rgbaf);
.setBackgroundColor(0x98769fac_rgbaf);
CORRADE_COMPARE(a.color, 0x354565fc_rgbaf);
CORRADE_COMPARE(a.backgroundColor, 0x98769facb_rgbaf);
CORRADE_COMPARE(a.backgroundColor, 0x98769fac_rgbaf);
}
}}}}

Loading…
Cancel
Save