Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history 
Signed-off-by: Squareys <[email protected]>
  • Loading branch information
@Squareys
Squareys committed May 7, 2020
1 parent 04ef2f5 commit e85941c
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 21 deletions.
18 changes: 3 additions & 15 deletions src/Magnum/Trade/MeshData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,26 +791,13 @@ void MeshData::weightsInto(const Containers::StridedArrayView1D<Vector4> destina
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> out{_vertexCount};
weightsInto(out, id);
Expand All @@ -825,13 +812,14 @@ void MeshData::jointIdsInto(const Containers::StridedArrayView1D<Vector4ui> dest
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);
const Containers::StridedArrayView2D<UnsignedInt> destination4ui = Containers::arrayCast<2, UnsignedInt>(destination);

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);
Math::castInto(Containers::arrayCast<2, const UnsignedByte>(attributeData, 4), destination4ui);
else if(attribute._format == VertexFormat::Vector4us)
Utility::copy(Containers::arrayCast<const Vector4us>(attributeData), destination);
Math::castInto(Containers::arrayCast<2, const UnsignedShort>(attributeData, 4), destination4ui);
else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
}

Expand Down
18 changes: 12 additions & 6 deletions src/Magnum/Trade/MeshData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,9 @@ enum class MeshAttribute: UnsignedShort {

/**
* Weights. Type is usually @ref VertexFormat::Vector4, but can be also
* @ref VertexFormat::Vector4h, @ref VertexFormat::Vector4ub,
* @ref VertexFormat::Vector4b, @ref VertexFormat::Vector4us,
* @ref VertexFormat::Vector4s, @ref VertexFormat::Vector4ubNormalized,
* @ref VertexFormat::Vector4bNormalized, @ref VertexFormat::Vector4usNormalized
* or @ref VertexFormat::Vector4sNormalized.
* Corresponds to * @ref Shaders::Generic::Weights.
* @ref VertexFormat::Vector4h, @ref VertexFormat::Vector4ubNormalized
* or @ref VertexFormat::Vector4usNormalized.
* Corresponds to @ref Shaders::Generic::Weights.
* @see @ref MeshData::weightsAsArray()
*/
Weights,
Expand Down Expand Up @@ -2132,6 +2129,15 @@ namespace Implementation {
(format == VertexFormat::UnsignedInt ||
format == VertexFormat::UnsignedShort ||
format == VertexFormat::UnsignedByte)) ||
(name == MeshAttribute::Weights &&
(format == VertexFormat::Vector4 ||
format == VertexFormat::Vector4h ||
format == VertexFormat::Vector4ubNormalized ||
format == VertexFormat::Vector4usNormalized)) ||
(name == MeshAttribute::JointIds &&
(format == VertexFormat::Vector4ui ||
format == VertexFormat::Vector4ub ||
format == VertexFormat::Vector4us)) ||
/* Custom attributes can be anything */
isMeshAttributeCustom(name);
}
Expand Down
124 changes: 124 additions & 0 deletions src/Magnum/Trade/Test/MeshDataTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ struct MeshDataTest: TestSuite::Tester {
template<class T> void objectIdsAsArray();
void objectIdsIntoArrayInvalidSize();

template<class T> void weightsAsArray();
template<class T> void weightsAsArrayPackedUnsignedNormalized();
template<class T> void weightsAsArrayPackedSignedNormalized();
void weightsIntoArrayInvalidSize();

template<class T> void jointIdsAsArray();
void jointIdsIntoArrayInvalidSize();

void implementationSpecificVertexFormat();
void implementationSpecificVertexFormatWrongAccess();
void implementationSpecificVertexFormatNotContained();
Expand Down Expand Up @@ -364,6 +372,17 @@ MeshDataTest::MeshDataTest() {
&MeshDataTest::objectIdsAsArray<UnsignedInt>,
&MeshDataTest::objectIdsIntoArrayInvalidSize,

&MeshDataTest::weightsAsArray<Vector4>,
&MeshDataTest::weightsAsArray<Vector4h>,
&MeshDataTest::weightsAsArrayPackedUnsignedNormalized<Vector4ub>,
&MeshDataTest::weightsAsArrayPackedUnsignedNormalized<Vector4us>,
&MeshDataTest::weightsIntoArrayInvalidSize,

&MeshDataTest::jointIdsAsArray<Vector4ui>,
&MeshDataTest::jointIdsAsArray<Vector4us>,
&MeshDataTest::jointIdsAsArray<Vector4ub>,
&MeshDataTest::jointIdsIntoArrayInvalidSize,

&MeshDataTest::implementationSpecificVertexFormat,
&MeshDataTest::implementationSpecificVertexFormatWrongAccess,
&MeshDataTest::implementationSpecificVertexFormatNotContained,
Expand Down Expand Up @@ -1856,8 +1875,11 @@ _c(Vector3b)
_c(Vector3us)
_c(Vector3s)
_c(Vector4)
_c(Vector4ui)
_c(Vector4h)
_c(Vector4ub)
_c(Vector4b)
_c(Vector4us)
_c(Vector4s)
_c(Color3)
_c(Color3h)
Expand Down Expand Up @@ -2500,6 +2522,108 @@ void MeshDataTest::objectIdsIntoArrayInvalidSize() {
"Trade::MeshData::objectIdsInto(): expected a view with 3 elements but got 2\n");
}

template<class T> void MeshDataTest::weightsAsArray() {
setTestCaseTemplateName(NameTraits<T>::name());
typedef typename T::Type U;

Containers::Array<char> vertexData{3*sizeof(T)};
auto weightsView = Containers::arrayCast<T>(vertexData);
/* Needs to be sufficiently representable to have the test work also for
half floats */
weightsView[0] = T::pad(Math::Vector4<U>{U(2.0f), U(1.0f), U(0.75f), U(3.0f)});
weightsView[1] = T::pad(Math::Vector4<U>{U(0.0f), U(-1.0f), U(1.25f), U(1.0f)});
weightsView[2] = T::pad(Math::Vector4<U>{U(-2.0f), U(3.0f), U(2.5f), U(2.5f)});

MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Weights, weightsView}}};
CORRADE_COMPARE_AS(data.weightsAsArray(), Containers::arrayView<Vector4>({
{2.0f, 1.0f, 0.75f, 3.0f}, {0.0f, -1.0f, 1.25f, 1.0f}, {-2.0f, 3.0f, 2.5f, 2.5f},
}), TestSuite::Compare::Container);
}

template<class T> void MeshDataTest::weightsAsArrayPackedUnsignedNormalized() {
setTestCaseTemplateName(NameTraits<T>::name());

Containers::Array<char> vertexData{2*sizeof(T)};
auto weightsView = Containers::arrayCast<T>(vertexData);
weightsView[0] = T::pad(Math::Vector4<typename T::Type>{Math::pack<typename T::Type>(1.0f), 0, Math::pack<typename T::Type>(1.0f), Math::pack<typename T::Type>(0.25f)});
weightsView[1] = T::pad(Math::Vector4<typename T::Type>{0, Math::pack<typename T::Type>(1.0f), 0, Math::pack<typename T::Type>(0.5f)});

MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Weights,
/* Assuming the normalized enum is always after the non-normalized */
VertexFormat(UnsignedInt(Implementation::vertexFormatFor<T>()) + 1),
weightsView}}};
CORRADE_COMPARE_AS(data.weightsAsArray(), Containers::arrayView<Vector4>({
Vector4::pad(Math::Vector<T::Size, Float>::pad(Vector4{1.0f, 0.0f, 1.0f, 0.25f})),
Vector4::pad(Math::Vector<T::Size, Float>::pad(Vector4{0.0f, 1.0f, 0.0f, 0.5f}))
}), TestSuite::Compare::Container);
}

template<class T> void MeshDataTest::weightsAsArrayPackedSignedNormalized() {
setTestCaseTemplateName(NameTraits<T>::name());

Containers::Array<char> vertexData{2*sizeof(T)};
auto weightsView = Containers::arrayCast<T>(vertexData);
weightsView[0] = T::pad(Math::Vector4<typename T::Type>{Math::pack<typename T::Type>(1.0f), 0, Math::pack<typename T::Type>(1.0f), Math::pack<typename T::Type>(0.25f)});
weightsView[1] = T::pad(Math::Vector4<typename T::Type>{0, Math::pack<typename T::Type>(-1.0f), 0, Math::pack<typename T::Type>(0.5f)});

MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Weights,
/* Assuming the normalized enum is always after the non-normalized */
VertexFormat(UnsignedInt(Implementation::vertexFormatFor<T>()) + 1),
weightsView}}};
CORRADE_COMPARE_AS(data.weightsAsArray(), Containers::arrayView<Vector4>({
Vector4::pad(Math::Vector<T::Size, Float>::pad(Vector4{1.0f, 0.0f, 1.0f, 0.25f})),
Vector4::pad(Math::Vector<T::Size, Float>::pad(Vector4{0.0f, -1.0f, 0.0f, 0.5f}))
}), TestSuite::Compare::Container);
}

void MeshDataTest::weightsIntoArrayInvalidSize() {
#ifdef CORRADE_NO_ASSERT
CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions");
#endif

Containers::Array<char> vertexData{3*sizeof(Vector4)};
MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Weights, Containers::arrayCast<Vector4>(vertexData)}}};

std::ostringstream out;
Error redirectError{&out};
Vector4 destination[2];
data.weightsInto(destination);
CORRADE_COMPARE(out.str(),
"Trade::MeshData::weightsInto(): expected a view with 3 elements but got 2\n");
}

template<class T> void MeshDataTest::jointIdsAsArray() {
setTestCaseTemplateName(NameTraits<T>::name());
typedef typename T::Type U;

Containers::Array<char> vertexData{3*sizeof(T)};
auto joinIdsView = Containers::arrayCast<T>(vertexData);
joinIdsView[0] = {U(0), U(1), U(2), U(3)};
joinIdsView[1] = {U(4), U(5), U(6), U(7)};
joinIdsView[2] = {U(8), U(9), U(10), U(11)};

MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::JointIds, joinIdsView}}};
CORRADE_COMPARE_AS(data.jointIdsAsArray(), Containers::arrayView<Vector4ui>({
{0, 1, 2, 3}, {4, 5, 6, 7}, {8, 9, 10, 11},
}), TestSuite::Compare::Container);
}

void MeshDataTest::jointIdsIntoArrayInvalidSize() {
#ifdef CORRADE_NO_ASSERT
CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions");
#endif

Containers::Array<char> vertexData{3*sizeof(Vector4ui)};
MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::JointIds, Containers::arrayCast<Vector4ui>(vertexData)}}};

std::ostringstream out;
Error redirectError{&out};
Vector4ui destination[2];
data.jointIdsInto(destination);
CORRADE_COMPARE(out.str(),
"Trade::MeshData::jointIdsInto(): expected a view with 3 elements but got 2\n");
}

/* MSVC 2015 doesn't like anonymous bitfields in inline structs, so putting the
declaration outside */
struct VertexWithImplementationSpecificData {
Expand Down

0 comments on commit e85941c

Please sign in to comment.