magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	73cb557291	Added *Image::dataSize(). Will be used to compute size of data array needed to store image of given size.	13 years ago
Vladimír Vondruš	f31cbccbcc	Default template parameter for Buffer::data(), templated Image::data(). To have BufferImage::buffer().data() consistent with Image::data() (default is unsigned char data type, but it is possible to reinterpret the data). Saves some ugly code: Image2D image(ColorFormat::RGB, ColorType::UnsignedByte, ...); Color3ub a = reinterpret_cast<Color3ub*>(image.data())[0]; // before Color3ub b = image.data<Color3ub>()[0]; // after	13 years ago
Vladimír Vondruš	bdfa0b4abe	Proper syntax for deleted copy constructors. Another bug caused by copypasting, but caused issue only on GCC 4.5. Also removed unused parameter name.	13 years ago
Vladimír Vondruš	ce7102df46	GCC 4.6 compatibility: no std::is_assignable. Just disabling it, as it appears only in tests.	13 years ago
Vladimír Vondruš	576f9ef210	Improved tests for Image, ImageReference and Trade::ImageData classes. Properly testing copy and move constructors.	13 years ago
Vladimír Vondruš	5b56235084	Adapted to Corrade changes.	13 years ago
Vladimír Vondruš	5d9490c73b	Extracted Primitive enum from Mesh to MeshPrimitive. Because we can't forward-declare class members we would need to include whole Mesh (along with all OpenGL headers and other stuff) just to use Primitive enum. The old Mesh::Primitive is now alias to new one, is marked as deprecated and will be removed in future release.	13 years ago
Vladimír Vondruš	d945395800	Using Corrade::Utility::Directory::{read,write}() where possible. Much shorter code now with less redundancy.	13 years ago
Vladimír Vondruš	5ae723c8d1	Added release() function to Image and Trade::ImageData. Allows the image to release ownership of the data.	13 years ago
Vladimír Vondruš	1c928424ae	Documentation updates for Image classes.	13 years ago
Vladimír Vondruš	fb1a8490ea	Disallow conversion of const {Image,Trade::ImageData}&& to ImageReference. The conversion is done implicitly, thus this seemingly innocent code would be allowed: ImageReference2D reference = Image2D(...); foo(reference.data()); // crash on access, data already deleted	13 years ago
Vladimír Vondruš	ee045d261a	Make some type conversions explicit. Fixes a bunch of MSVC warnings.	13 years ago
Vladimír Vondruš	d00aa0c560	doc: thoroughly explained plugin usage.	13 years ago
Vladimír Vondruš	e49be200d4	Properly fix linking to libdl. Use CORRADE_PLUGINMANAGER_LIBRARIES instead of CORRADE_PLUGINMANAGER_LIBRARY when linking core Magnum library. This reverts commit `80263eb318` and `6dbe31f0f0`.	13 years ago
Vladimír Vondruš	80263eb318	Trade: explicitly link tests to CORRADE_PLUGINMANAGER_LIBRARIES. Compilation of tests in static build fails with missing reference to dlclose().	13 years ago
Vladimír Vondruš	8dfd6fd4fc	Trade: convenience MeshDataD::has() functions. Makes it more intuitive (and shorter) than calling `if(data.textureCoords2DArrayCount())`.	13 years ago
Vladimír Vondruš	bc3cbf1ad6	Renamed ImageType and ImageFormat to ColorType and ColorFormat. Makes more sense. Added aliases and header file for backwards compatibility, will be removed in future versions.	13 years ago
Vladimír Vondruš	a4f895a4df	Doc++	13 years ago
Vladimír Vondruš	97b51189ac	Trade: forgotten std::move().	13 years ago
Vladimír Vondruš	03235705a3	Trade: cut InstanceType enums out of ObjectDataD classes. Now named ObjectInstanceTypeD. Similar reasoning as in previous commit, now easier to type and not involving ambiguities due to subclassing.	13 years ago
Vladimír Vondruš	b1bfdbbc86	Trade: cut Type enum out of AbstractMaterialData class. Now named MaterialType. It's easier to type this: auto t = Trade::MaterialType::Phong; Than this overlong name, which is moreover ambiguous due to subclassing: auto t = Trade::AbstractMaterialData::Type::Phong; // or should I use rather Trade::PhongMaterialData::Type::Phong?	13 years ago
Vladimír Vondruš	bced4719ad	Trade: cleanup the dummy classes a bit. They need to be at least movable to be returnable inside `std::optional`.	13 years ago
Vladimír Vondruš	df91532ed6	Trade: using `std::unique_ptr` when returning polymorphic types. This requires inclusion of heavyweight <memory> header (~25k LOC), but data import isn't something the user would want to do in every file, so it hopefully won't hurt compilation times too much.	13 years ago
Vladimír Vondruš	6bbdfbc269	Trade: using `std::optional` instead of pointer in AbstractImporter. Saves unnecessary heap allocation and saves user from the burden of explicit deletion, otherwise the usage is the same. Polymorphic types can't be done using `std::optional`, will fix that later.	13 years ago
Vladimír Vondruš	a7522e54ec	Assert that the file is really closed after closing it in importer. Should harden plugin implementations a bit more.	13 years ago
Vladimír Vondruš	ac3fe7cdf5	Removed Doxygen workarounds for forward declarations.	13 years ago
Vladimír Vondruš	13d5e2a50f	Removed enum-referencing Doxygen workarounds. In 1.8.5 it is now possible to reference directly to enum member. Hooray! Also added explicit @ref here and there, fixing some referencing bugs along the way.	13 years ago
Vladimír Vondruš	e167b971c7	Trade: don't forget to initialize variable. It's just test, but it might fail when least expected.	13 years ago
Vladimír Vondruš	3b14a1816e	Trade: fixed wrong indentation.	13 years ago
Vladimír Vondruš	bcdd0920fd	Trade: no comma at the end of enumeration list. It visually punishes me.	13 years ago
Vladimír Vondruš	845b8982e5	Reducing pointer chasings, part 2: don't use `this->` so often. It clarifies some things (e.g. from what base given member is). Not changed where it would be too long to write.	13 years ago
Vladimír Vondruš	261e7cbdc5	Trade: improved documentation, removed redundancy.	13 years ago
Vladimír Vondruš	4937b51713	Trade: use instance() instead of instanceId() for consistency. Nowhere else is `Id` suffix.	13 years ago
Vladimír Vondruš	50ef1df213	Trade: debug output operator for TextureData::Type enum.	13 years ago
Vladimír Vondruš	b937c2bf4e	Trade: debug output operator for AbstractMaterialData::Type enum.	13 years ago
Vladimír Vondruš	105dbc90e9	Trade: move the data instead of copying.	13 years ago
Vladimír Vondruš	e62afc1b6c	Trade: ability to have either color or texture in PhongMaterialData.	13 years ago
Vladimír Vondruš	dcebf1a7b9	Trade: added TextureData parameters. Not adding border color (yet), as it is not supported in ES.	13 years ago
Vladimír Vondruš	5b842d11a3	Trade: de-inline virtual destructor. Less generated code.	13 years ago
Vladimír Vondruš	9875f49a99	Trade: properly specify underlying enum type.	13 years ago
Vladimír Vondruš	97b8d38e9e	Trade: document ability to copy and move.	13 years ago
Vladimír Vondruš	b57a8e9264	Trade: use strongly typed enum for AbstractMaterialData::Type.	13 years ago
Vladimír Vondruš	0a9b9b6270	Trade: hide unused parameter.	13 years ago
Vladimír Vondruš	aacb6b7041	Trade: return references, not pointers from MeshData. The access methods assert that the user is querying only available data. Also updated Primitives implementation to create MeshData when everything is done, not creating empty MeshData and then shooting the data through interface intended for end users.	13 years ago
Vladimír Vondruš	1d6015e95b	Trade: pass ImageReference2D to image converter. Also not through pointer, but throught const&, allows implicit conversion from Image2D and Trade::ImageData2D, which is good. Bumped plugin interface version a bit, as this is not so drastic change in behavior.	13 years ago
Vladimír Vondruš	bb6e08ef1c	Trade: properly return false instead of nullptr.	13 years ago
Vladimír Vondruš	d3d172daec	Trade: Doxygen fixes.	13 years ago
Vladimír Vondruš	eb3de49e75	Reordered *Image parameters. First format, then type, then size, then data. Seems more intuitive this way, also the data are laid out in the structure this way.	13 years ago
Vladimír Vondruš	fbdd132b71	Allow conversion of Image and Trade::ImageData to ImageReference.	13 years ago
Vladimír Vondruš	cecc1dc2bc	Renamed ImageWrapper to ImageReference. Better reflect what the class is actually about.	13 years ago

1 2 3 4

158 Commits (6f12e2c741af2a3e7c380175f68d273203fba8ba)