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

MeshTools: fix a typo in an assertion message.

pull/168/head
Vladimír Vondruš 3 years ago
parent
615eeacd9a
commit
6b9b0f5552
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Magnum/MeshTools/Compile.cpp
  2. 6
      src/Magnum/MeshTools/Test/CompileGLTest.cpp

2
src/Magnum/MeshTools/Compile.cpp
Unescape View File

@ -95,7 +95,7 @@ GL::Mesh compileInternal(const Trade::MeshData& meshData, GL::Buffer&& indices,
Similarly warn if an attribute has a location conflicting with Similarly warn if an attribute has a location conflicting with
another one (such as ObjectId and Bitangent). */ another one (such as ObjectId and Bitangent). */
if(boundAttributes[attribute.location()] != ~UnsignedInt{}) { if(boundAttributes[attribute.location()] != ~UnsignedInt{}) {
Warning{} << "MeshTools::compile(): ignoring" << meshData.attributeName(i) << meshData.attributeId(i) << "as its biding slot is already occupied by" << meshData.attributeName(boundAttributes[attribute.location()]) << meshData.attributeId(boundAttributes[attribute.location()]); Warning{} << "MeshTools::compile(): ignoring" << meshData.attributeName(i) << meshData.attributeId(i) << "as its binding slot is already occupied by" << meshData.attributeName(boundAttributes[attribute.location()]) << meshData.attributeId(boundAttributes[attribute.location()]);
return; return;
} }

6
src/Magnum/MeshTools/Test/CompileGLTest.cpp
Unescape View File

@ -364,7 +364,7 @@ const struct {
VertexFormat::Vector2, 2*sizeof(Vector2), VertexFormat::Vector2, 2*sizeof(Vector2),
9, ConflictingAttributesDataStride}, 9, ConflictingAttributesDataStride},
}}, Flag::TextureCoordinates2D, 0, "textured2D.tga", }}, Flag::TextureCoordinates2D, 0, "textured2D.tga",
"ignoring Trade::MeshAttribute::TextureCoordinates 1 as its biding slot is already occupied by Trade::MeshAttribute::TextureCoordinates 0"}, "ignoring Trade::MeshAttribute::TextureCoordinates 1 as its binding slot is already occupied by Trade::MeshAttribute::TextureCoordinates 0"},
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
{"bitangents + object ID", {InPlaceInit, { {"bitangents + object ID", {InPlaceInit, {
Trade::MeshAttributeData{Trade::MeshAttribute::Bitangent, Trade::MeshAttributeData{Trade::MeshAttribute::Bitangent,
@ -374,7 +374,7 @@ const struct {
VertexFormat::UnsignedInt, 3*sizeof(Vector2), VertexFormat::UnsignedInt, 3*sizeof(Vector2),
9, ConflictingAttributesDataStride}, 9, ConflictingAttributesDataStride},
}}, Flag::ObjectId, 0, "flat2D.tga", }}, Flag::ObjectId, 0, "flat2D.tga",
"ignoring Trade::MeshAttribute::ObjectId 0 as its biding slot is already occupied by Trade::MeshAttribute::Bitangent 0"}, "ignoring Trade::MeshAttribute::ObjectId 0 as its binding slot is already occupied by Trade::MeshAttribute::Bitangent 0"},
{"object ID + bitangents", {InPlaceInit, { {"object ID + bitangents", {InPlaceInit, {
Trade::MeshAttributeData{Trade::MeshAttribute::ObjectId, Trade::MeshAttributeData{Trade::MeshAttribute::ObjectId,
VertexFormat::UnsignedInt, 3*sizeof(Vector2), VertexFormat::UnsignedInt, 3*sizeof(Vector2),
@ -383,7 +383,7 @@ const struct {
VertexFormat::Vector3, 3*sizeof(Vector2) + sizeof(UnsignedInt), VertexFormat::Vector3, 3*sizeof(Vector2) + sizeof(UnsignedInt),
9, ConflictingAttributesDataStride}, 9, ConflictingAttributesDataStride},
}}, Flag::ObjectId, 26234, "flat2D.tga", }}, Flag::ObjectId, 26234, "flat2D.tga",
"ignoring Trade::MeshAttribute::Bitangent 0 as its biding slot is already occupied by Trade::MeshAttribute::ObjectId 0"}, "ignoring Trade::MeshAttribute::Bitangent 0 as its binding slot is already occupied by Trade::MeshAttribute::ObjectId 0"},
#endif #endif
/* Conflicting skinning attributes tested directly in skinning() */ /* Conflicting skinning attributes tested directly in skinning() */
/** @todo test also a conflict with instanced transformation + secondary /** @todo test also a conflict with instanced transformation + secondary

Write Preview
Loading…
Cancel
Save