ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5178 Commits
21 Branches
19 Tags
70 MiB
Tree: a7c7323673
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a7c7323673'
${ noResults }
magnum/src/Magnum/MeshTools/Test/InterleaveTest.cpp

164 lines
6.9 KiB
Raw Normal View History Unescape

MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
/*
This file is part of Magnum.
Hell, this project is big.
10 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
Happy new year too.
12 years ago
Vladimír Vondruš <mosra@centrum.cz>
Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.
13 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
*/
#include <sstream>
Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.
12 years ago
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/Endianness.h>
#include <Corrade/Utility/Debug.h>
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/)
12 years ago
#include "Magnum/MeshTools/Interleave.h"
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
namespace Magnum { namespace MeshTools { namespace Test {
Making test declarations more compact. Yet again I experienced how insanely large this thing got over the years.
11 years ago
struct InterleaveTest: Corrade::TestSuite::Tester {
explicit InterleaveTest();
void attributeCount();
void attributeCountGaps();
void stride();
void strideGaps();
void write();
void writeGaps();
void interleaveInto();
Got rid of header files in tests. They have no practical use and they only bloat codebase size and add maintenance burden.
14 years ago
};
Got rid of Qt's QtTest in favor of Corrade's TestSuite. Now we can use CORRADE_COMPARE() almost exclusively for comparing Vector, Matrix instances and all containers from STL. Tests running time for all 31 tests is now around 0.1 sec instead of two seconds like before. Disabled compilation of all benchmarks, because TestSuite cannot handle them yet. PKGBUILD from AUR now can shamelessly use check() function without unnecessary dependencies.
14 years ago
InterleaveTest::InterleaveTest() {
Adapted to Corrade changes. Allowing to instantiate Trade::AbstractImporter subclasses directly without plugin manager.
13 years ago
addTests({&InterleaveTest::attributeCount,
&InterleaveTest::attributeCountGaps,
&InterleaveTest::stride,
&InterleaveTest::strideGaps,
&InterleaveTest::write,
MeshTools: added interleaveInto(). Basically a version of interleave() which takes existing buffer instead of creating new zero-initialized one. The last bit needed for real runtime usage.
12 years ago
&InterleaveTest::writeGaps,
&InterleaveTest::interleaveInto});
Got rid of Qt's QtTest in favor of Corrade's TestSuite. Now we can use CORRADE_COMPARE() almost exclusively for comparing Vector, Matrix instances and all containers from STL. Tests running time for all 31 tests is now around 0.1 sec instead of two seconds like before. Disabled compilation of all benchmarks, because TestSuite cannot handle them yet. PKGBUILD from AUR now can shamelessly use check() function without unnecessary dependencies.
14 years ago
}
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
void InterleaveTest::attributeCount() {
No `using namespace std` anywhere. Also added missing std:: prefix to remaining cases of std::size_t, std::[u]int[0-9]+_t, std::sin() etc., std::exit().
14 years ago
std::stringstream ss;
Adapted to Corrade changes.
10 years ago
Error redirectError{&ss};
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE((Implementation::AttributeCount{}(std::vector<Byte>{0, 1, 2},
MeshTools: using new type aliases in whole MeshTools namespace.
13 years ago
std::vector<Byte>{0, 1, 2, 3, 4, 5})), std::size_t(0));
MeshTools: better assertion message for interleave(). Print expected and actual count to simplify debugging. Also the phrase "nothing done." is useless, as nothing is _ever_ done after assertion failure. Probably remains from the times where that wasn't assertion but merely harmless warning.
13 years ago
CORRADE_COMPARE(ss.str(), "MeshTools::interleave(): attribute arrays don't have the same length, expected 3 but got 6\n");
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE((Implementation::AttributeCount{}(std::vector<Byte>{0, 1, 2},
MeshTools: using new type aliases in whole MeshTools namespace.
13 years ago
std::vector<Byte>{3, 4, 5})), std::size_t(3));
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
}
Support for gaps in MeshTools::interleave().
14 years ago
void InterleaveTest::attributeCountGaps() {
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE((Implementation::AttributeCount{}(std::vector<Byte>{0, 1, 2}, 3,
MeshTools: using new type aliases in whole MeshTools namespace.
13 years ago
std::vector<Byte>{3, 4, 5}, 5)), std::size_t(3));
Support for gaps in MeshTools::interleave().
14 years ago
/* No arrays from which to get size */
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE(Implementation::AttributeCount{}(3, 5), ~std::size_t(0));
Support for gaps in MeshTools::interleave().
14 years ago
}
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
void InterleaveTest::stride() {
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE(Implementation::Stride{}(std::vector<Byte>()), std::size_t(1));
CORRADE_COMPARE(Implementation::Stride{}(std::vector<Int>()), std::size_t(4));
CORRADE_COMPARE((Implementation::Stride{}(std::vector<Byte>(), std::vector<Int>())), std::size_t(5));
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
}
Support for gaps in MeshTools::interleave().
14 years ago
void InterleaveTest::strideGaps() {
MeshTools: refactored implementation of interleave(). Everything are now pure functions, no shared state, no useless functor class wrapping. Still needed to wrap attribute count and stride computation functions in struct to make proper overload resolution working without the need to deinline the functions (they have cyclic dependencies).
12 years ago
CORRADE_COMPARE((Implementation::Stride{}(2, std::vector<Byte>(), 1, std::vector<Int>(), 12)), std::size_t(20));
Support for gaps in MeshTools::interleave().
14 years ago
}
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
void InterleaveTest::write() {
MeshTools: deprecate mesh/buffer-modifying vertex/index tools. The point of this change is to allow greater flexibility and reduce confusion. When instanced meshes are implemented, MeshTools::interleave() can be used for creating interleaved buffers with per-instance data and then the call to Mesh::setCount() will be harmful and/or confusing, becuase the user would in fact want to call Mesh::setInstanceCount() instead. Similarly, MeshTools::compressIndices() can be used to create index buffer for more than one mesh. GL 4.4 has ARB_buffer_storage, which (in relatively distant future) will mean that the current way of Buffer::setData() will be deprecated in favor of Buffer::setStorage(), similarly as Texture::setStorage() replaced Texture::setImage(). Thus any function which calls Buffer::setData() internally is not future-proof. The old MeshTools::compressIndices() and MeshTools::interleave() overloads are marked as deprecated and will be removed in future release.
12 years ago
const Containers::Array<char> data = MeshTools::interleave(
MeshTools: using new type aliases in whole MeshTools namespace.
13 years ago
std::vector<Byte>{0, 1, 2},
std::vector<Int>{3, 4, 5},
std::vector<Short>{6, 7, 8});
No `using namespace std` anywhere. Also added missing std:: prefix to remaining cases of std::size_t, std::[u]int[0-9]+_t, std::sin() etc., std::exit().
14 years ago
Bring whole Corrade namespace into Magnum namespace. These projects are tightly interconnected anyway, this means a lot less typing (yay!).
13 years ago
if(!Utility::Endianness::isBigEndian()) {
MeshTools: return Containers::Array also from interleave().
13 years ago
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00,
0x01, 0x04, 0x00, 0x00, 0x00, 0x07, 0x00,
0x02, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00
}));
} else {
MeshTools: return Containers::Array also from interleave().
13 years ago
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06,
0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x07,
0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08
}));
}
}
Support for gaps in MeshTools::interleave().
14 years ago
void InterleaveTest::writeGaps() {
MeshTools: deprecate mesh/buffer-modifying vertex/index tools. The point of this change is to allow greater flexibility and reduce confusion. When instanced meshes are implemented, MeshTools::interleave() can be used for creating interleaved buffers with per-instance data and then the call to Mesh::setCount() will be harmful and/or confusing, becuase the user would in fact want to call Mesh::setInstanceCount() instead. Similarly, MeshTools::compressIndices() can be used to create index buffer for more than one mesh. GL 4.4 has ARB_buffer_storage, which (in relatively distant future) will mean that the current way of Buffer::setData() will be deprecated in favor of Buffer::setStorage(), similarly as Texture::setStorage() replaced Texture::setImage(). Thus any function which calls Buffer::setData() internally is not future-proof. The old MeshTools::compressIndices() and MeshTools::interleave() overloads are marked as deprecated and will be removed in future release.
12 years ago
const Containers::Array<char> data = MeshTools::interleave(
MeshTools: using new type aliases in whole MeshTools namespace.
13 years ago
std::vector<Byte>{0, 1, 2}, 3,
std::vector<Int>{3, 4, 5},
std::vector<Short>{6, 7, 8}, 2);
Support for gaps in MeshTools::interleave().
14 years ago
Bring whole Corrade namespace into Magnum namespace. These projects are tightly interconnected anyway, this means a lot less typing (yay!).
13 years ago
if(!Utility::Endianness::isBigEndian()) {
MeshTools: don't allocate and memcpy zeros in interleave(). We have std::memset for that. What the hell I was thinking back then. Found when trying to get rid of as many naked allocations and deletions as possible. Also improved the test with some ASCII-art documentation.
13 years ago
/* byte, _____________gap, int___________________, short_____, _______gap */
MeshTools: return Containers::Array also from interleave().
13 years ago
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
Support for gaps in MeshTools::interleave().
14 years ago
0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
}));
} else {
MeshTools: don't allocate and memcpy zeros in interleave(). We have std::memset for that. What the hell I was thinking back then. Found when trying to get rid of as many naked allocations and deletions as possible. Also improved the test with some ASCII-art documentation.
13 years ago
/* byte, _____________gap, ___________________int, _____short, _______gap */
MeshTools: return Containers::Array also from interleave().
13 years ago
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
Support for gaps in MeshTools::interleave().
14 years ago
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00
}));
}
}
MeshTools: added interleaveInto(). Basically a version of interleave() which takes existing buffer instead of creating new zero-initialized one. The last bit needed for real runtime usage.
12 years ago
void InterleaveTest::interleaveInto() {
auto data = Containers::Array<char>::from(
0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77,
0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77,
0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77,
0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77, 0x11, 0x33, 0x55, 0x77
);
MeshTools: deprecate mesh/buffer-modifying vertex/index tools. The point of this change is to allow greater flexibility and reduce confusion. When instanced meshes are implemented, MeshTools::interleave() can be used for creating interleaved buffers with per-instance data and then the call to Mesh::setCount() will be harmful and/or confusing, becuase the user would in fact want to call Mesh::setInstanceCount() instead. Similarly, MeshTools::compressIndices() can be used to create index buffer for more than one mesh. GL 4.4 has ARB_buffer_storage, which (in relatively distant future) will mean that the current way of Buffer::setData() will be deprecated in favor of Buffer::setStorage(), similarly as Texture::setStorage() replaced Texture::setImage(). Thus any function which calls Buffer::setData() internally is not future-proof. The old MeshTools::compressIndices() and MeshTools::interleave() overloads are marked as deprecated and will be removed in future release.
12 years ago
MeshTools::interleaveInto(data, 2, std::vector<Int>{4, 5, 6, 7}, 1, std::vector<Short>{0, 1, 2, 3}, 3);
MeshTools: added interleaveInto(). Basically a version of interleave() which takes existing buffer instead of creating new zero-initialized one. The last bit needed for real runtime usage.
12 years ago
if(!Utility::Endianness::isBigEndian()) {
/* _______gap, int___________________, _gap, short_____, _____________gap */
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
0x11, 0x33, 0x04, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x33, 0x55, 0x77,
0x11, 0x33, 0x05, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x33, 0x55, 0x77,
0x11, 0x33, 0x06, 0x00, 0x00, 0x00, 0x55, 0x02, 0x00, 0x33, 0x55, 0x77,
0x11, 0x33, 0x07, 0x00, 0x00, 0x00, 0x55, 0x03, 0x00, 0x33, 0x55, 0x77
}));
} else {
/* _______gap, ___________________int, _gap, _____short, _____________gap */
CORRADE_COMPARE(std::vector<char>(data.begin(), data.end()), (std::vector<char>{
0x11, 0x33, 0x00, 0x00, 0x00, 0x04, 0x55, 0x00, 0x00, 0x33, 0x55, 0x77,
0x11, 0x33, 0x00, 0x00, 0x00, 0x05, 0x55, 0x00, 0x01, 0x33, 0x55, 0x77,
0x11, 0x33, 0x00, 0x00, 0x00, 0x06, 0x55, 0x00, 0x02, 0x33, 0x55, 0x77,
0x11, 0x33, 0x00, 0x00, 0x00, 0x07, 0x55, 0x00, 0x03, 0x33, 0x55, 0x77
}));
}
}
MeshTools: tool for interleaving attribute arrays. All passed attribute arrays must have the same length, otherwise zero length array is generated.
14 years ago
}}}
Got rid of header files in tests. They have no practical use and they only bloat codebase size and add maintenance burden.
14 years ago
CORRADE_TEST_MAIN(Magnum::MeshTools::Test::InterleaveTest)