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

fixup! MeshAttribute 

Signed-off-by: Squareys <squareys@googlemail.com>
pull/444/head
Squareys 6 years ago
parent
17931de06e
commit
9046215923
2 changed files with 76 additions and 20 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. 60
      src/Magnum/Trade/MeshData.cpp
  2. 36
      src/Magnum/Trade/MeshData.h

60
src/Magnum/Trade/MeshData.cpp
Unescape View File

@ -777,15 +777,67 @@ Containers::Array<UnsignedInt> MeshData::objectIdsAsArray(const UnsignedInt id)
return out; return out;
} }
void MeshData::weightsInto(const Containers::StridedArrayView1D<Vector4> destination, const UnsignedInt id) const {
const UnsignedInt attributeId = attributeFor(MeshAttribute::Weights, id);
CORRADE_ASSERT(attributeId != ~UnsignedInt{}, "Trade::MeshData::weightsInto(): index" << id << "out of range for" << attributeCount(MeshAttribute::Weights) << "weights attributes", );
CORRADE_ASSERT(destination.size() == _vertexCount, "Trade::MeshData::weightsInto(): expected a view with" << _vertexCount << "elements but got" << destination.size(), );
const MeshAttributeData& attribute = _attributes[attributeId];
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(attribute._format),
"Trade::MeshData::weightsInto(): can't extract data out of an implementation-specific vertex format" << reinterpret_cast<void*>(vertexFormatUnwrap(attribute._format)), );
const Containers::StridedArrayView1D<const void> attributeData = attributeDataViewInternal(attribute);
const Containers::StridedArrayView2D<Float> destination4f = Containers::arrayCast<2, Float>(destination);
if(attribute._format == VertexFormat::Vector4)
Utility::copy(Containers::arrayCast<const Vector4>(attributeData), destination);
else if(attribute._format == VertexFormat::Vector4h)
Math::unpackHalfInto(Containers::arrayCast<2, const UnsignedShort>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4ub)
Math::castInto(Containers::arrayCast<2, const UnsignedByte>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4b)
Math::castInto(Containers::arrayCast<2, const Byte>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4us)
Math::castInto(Containers::arrayCast<2, const UnsignedShort>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4s)
Math::castInto(Containers::arrayCast<2, const Short>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4ubNormalized)
Math::unpackInto(Containers::arrayCast<2, const UnsignedByte>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4bNormalized)
Math::unpackInto(Containers::arrayCast<2, const Byte>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4usNormalized)
Math::unpackInto(Containers::arrayCast<2, const UnsignedShort>(attributeData, 4), destination4f);
else if(attribute._format == VertexFormat::Vector4sNormalized)
Math::unpackInto(Containers::arrayCast<2, const Short>(attributeData, 4), destination4f);
else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
}
Containers::Array<Vector4> MeshData::weightsAsArray(const UnsignedInt id) const { Containers::Array<Vector4> MeshData::weightsAsArray(const UnsignedInt id) const {
Containers::Array<Vector4> out{_vertexCount}; Containers::Array<Vector4> out{_vertexCount};
weightsInto(out, id); weightsInto(out, id);
return out; return out;
} }
Containers::Array<Vector4us> MeshData::jointIndicesAsArray(const UnsignedInt id) const { void MeshData::jointIdsInto(const Containers::StridedArrayView1D<Vector4ui> destination, const UnsignedInt id) const {
Containers::Array<Vector4us> out{_vertexCount}; const UnsignedInt attributeId = attributeFor(MeshAttribute::JointIds, id);
jointIndicesInto(out, id); CORRADE_ASSERT(attributeId != ~UnsignedInt{}, "Trade::MeshData::jointIdsInto(): index" << id << "out of range for" << attributeCount(MeshAttribute::JointIds) << "joint IDs attributes", );
CORRADE_ASSERT(destination.size() == _vertexCount, "Trade::MeshData::jointIdsInto(): expected a view with" << _vertexCount << "elements but got" << destination.size(), );
const MeshAttributeData& attribute = _attributes[attributeId];
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(attribute._format),
"Trade::MeshData::jointIdsInto(): can't extract data out of an implementation-specific vertex format" << reinterpret_cast<void*>(vertexFormatUnwrap(attribute._format)), );
const Containers::StridedArrayView1D<const void> attributeData = attributeDataViewInternal(attribute);
if(attribute._format == VertexFormat::Vector4ui)
Utility::copy(Containers::arrayCast<const Vector4ui>(attributeData), destination);
else if(attribute._format == VertexFormat::Vector4ub)
Utility::copy(Containers::arrayCast<const Vector4ub>(attributeData), destination);
else if(attribute._format == VertexFormat::Vector4us)
Utility::copy(Containers::arrayCast<const Vector4us>(attributeData), destination);
else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
}
Containers::Array<Vector4ui> MeshData::jointIdsAsArray(const UnsignedInt id) const {
Containers::Array<Vector4ui> out{_vertexCount};
jointIdsInto(out, id);
return out; return out;
} }
@ -823,6 +875,8 @@ Debug& operator<<(Debug& debug, const MeshAttribute value) {
_c(TextureCoordinates) _c(TextureCoordinates)
_c(Color) _c(Color)
_c(ObjectId) _c(ObjectId)
_c(Weights)
_c(JointIds)
#undef _c #undef _c
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */

36
src/Magnum/Trade/MeshData.h
Unescape View File

@ -149,21 +149,23 @@ enum class MeshAttribute: UnsignedShort {
/** /**
* Weights. Type is usually @ref VertexFormat::Vector4, but can be also * Weights. Type is usually @ref VertexFormat::Vector4, but can be also
* @ref VertexFormat::Vector4h, @ref VertexFormat::Vector4bNormalized or * @ref VertexFormat::Vector4h, @ref VertexFormat::Vector4ub,
* @ref VertexFormat::Vector4sNormalized. Corresponds to * @ref VertexFormat::Vector4b, @ref VertexFormat::Vector4us,
* @ref Shaders::Generic::Weights. * @ref VertexFormat::Vector4s, @ref VertexFormat::Vector4ubNormalized,
* @ref VertexFormat::Vector4bNormalized, @ref VertexFormat::Vector4usNormalized
* or @ref VertexFormat::Vector4sNormalized.
* Corresponds to * @ref Shaders::Generic::Weights.
* @see @ref MeshData::weightsAsArray() * @see @ref MeshData::weightsAsArray()
*/ */
Weights, Weights,
/** /**
* JointIndices. Type is usually @ref VertexFormat::Vector4ui, but can be also * Joint IDs. Type is usually @ref VertexFormat::Vector4ui, but can be also
* @ref VertexFormat::Vector4i, @ref VertexFormat::Vector4s, @ref VertexFormat::Vector4us, * @ref VertexFormat::Vector4us or @ref VertexFormat::Vector4ub.
* @ref VertexFormat::Vector4ub or @ref VertexFormat::Vector4b. Corresponds to * @ref Shaders::Generic::JointIds.
* @ref Shaders::Generic::JointIndices. * @see @ref MeshData::jointIdsAsArray()
* @see @ref MeshData::jointIndicesAsArray()
*/ */
JointIndices, JointIds,
/** /**
* This and all higher values are for importer-specific attributes. Can be * This and all higher values are for importer-specific attributes. Can be
@ -632,7 +634,7 @@ The simplest usage is through the convenience functions @ref positions2DAsArray(
@ref positions3DAsArray(), @ref tangentsAsArray(), @ref bitangentsAsArray(), @ref positions3DAsArray(), @ref tangentsAsArray(), @ref bitangentsAsArray(),
@ref normalsAsArray(), @ref tangentsAsArray(), @ref textureCoordinates2DAsArray(), @ref normalsAsArray(), @ref tangentsAsArray(), @ref textureCoordinates2DAsArray(),
@ref colorsAsArray(), @ref objectIdsAsArray(), @ref weightsAsArray() and @ref colorsAsArray(), @ref objectIdsAsArray(), @ref weightsAsArray() and
@ref jointIndicesAsArray(). Each of these takes an index (as there can be multiple @ref jointIdsAsArray(). Each of these takes an index (as there can be multiple
sets of texture coordinates, for example) and you're expected to check for sets of texture coordinates, for example) and you're expected to check for
attribute presence first with either @ref hasAttribute() or attribute presence first with either @ref hasAttribute() or
@ref attributeCount(MeshAttribute) const: @ref attributeCount(MeshAttribute) const:
@ -1761,28 +1763,28 @@ class MAGNUM_TRADE_EXPORT MeshData {
void weightsInto(Containers::StridedArrayView1D<Vector4> destination, UnsignedInt id = 0) const; void weightsInto(Containers::StridedArrayView1D<Vector4> destination, UnsignedInt id = 0) const;
/** /**
* @brief Weights as 4D unsigned short vectors * @brief Joint IDs as 4D unsigned int vectors
* *
* Convenience alternative to @ref attribute(MeshAttribute, UnsignedInt) const * Convenience alternative to @ref attribute(MeshAttribute, UnsignedInt) const
* with @ref MeshAttribute::JointIndices as the first argument. Converts * with @ref MeshAttribute::JointIds as the first argument. Converts
* the joint indices array from an arbitrary underlying type and returns it * the joint indices array from an arbitrary underlying type and returns it
* in a newly-allocated array. Expects that the vertex format is *not* * in a newly-allocated array. Expects that the vertex format is *not*
* implementation-specific, in that case you can only access the * implementation-specific, in that case you can only access the
* attribute via the typeless @ref attribute(MeshAttribute, UnsignedInt) const. * attribute via the typeless @ref attribute(MeshAttribute, UnsignedInt) const.
* @see @ref jointIndicesInto(), @ref attributeFormat(), * @see @ref jointIdsInto(), @ref attributeFormat(),
* @ref isVertexFormatImplementationSpecific() * @ref isVertexFormatImplementationSpecific()
*/ */
Containers::Array<Vector4us> jointIndicesAsArray(UnsignedInt id = 0) const; Containers::Array<Vector4ui> jointIdsAsArray(UnsignedInt id = 0) const;
/** /**
* @brief Weights as 4D unsigned short vectors into a pre-allocated view * @brief Joint IDs as 4D unsigned int vectors into a pre-allocated view
* *
* Like @ref jointIndicesAsArray(), but puts the result into * Like @ref jointIdsAsArray(), but puts the result into
* @p destination instead of allocating a new array. Expects that * @p destination instead of allocating a new array. Expects that
* @p destination is sized to contain exactly all data. * @p destination is sized to contain exactly all data.
* @see @ref vertexCount() * @see @ref vertexCount()
*/ */
void jointIndicesInto(Containers::StridedArrayView1D<Vector4us> destination, UnsignedInt id = 0) const; void jointIdsInto(Containers::StridedArrayView1D<Vector4ui> destination, UnsignedInt id = 0) const;
/** /**
* @brief Release index data storage * @brief Release index data storage

Write Preview
Loading…
Cancel
Save