magnum

Commit Graph

Author	SHA1	Message	Date
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
Vladimír Vondruš	8e7156999e	Allow copying of ImageWrapper, movement of Image and Trade::ImageData.	13 years ago
Vladimír Vondruš	3994790879	Trade: reworked AbstractImageConverter plugin interface. Implementation is moved into private virtual `do*()` functions and public interface does additional sanity checks around them. Exporting to file is by default done in base implementation, which takes exported data and then saves them to the file. Added unit test for file export, bumped plugin interface version to 0.2.	13 years ago
Vladimír Vondruš	80fc4611de	Trade: reworked AbstractImporter plugin interface. Implementation is moved into private virtual `do*()` functions and the public interface does additional checks aroung them to simplify plugin development. Opening files is by default done by the base implementation, which then calls function for opening raw data with file contents. Added test for file opening, bumped plugin interface version to 0.3. Y# Please enter the commit message for your changes. Lines starting	13 years ago
Vladimír Vondruš	d53110c3ac	Trade: use Corrade::Containers::Array in AbstractImageConverter.	13 years ago
Vladimír Vondruš	d969a9a162	Adapted to Corrade changes.	13 years ago
Vladimír Vondruš	777b406840	Trade: removed redundant `inline` keyword.	13 years ago
Vladimír Vondruš	db71a23e3c	Bring whole Corrade namespace into Magnum namespace. These projects are tightly interconnected anyway, this means a lot less typing (yay!).	13 years ago
Vladimír Vondruš	12a985526d	Adapted to Corrade changes.	13 years ago
Vladimír Vondruš	7de45c98b1	Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.	13 years ago
Vladimír Vondruš	3bf9dbc3f7	Trade: properly implement move constructor and assignment in MeshData. Default implementation of move constructor won't set pointer to indices to `nullptr` in `other` object, thus implementing it explicitly. Not sure what will happen in move assignment, implementing it explicitly too.	13 years ago
Vladimír Vondruš	61e1ec0082	No need to have `const` also in function declarations.	13 years ago
Vladimír Vondruš	a56f7730b1	Trade: default-constructed pair is equivalent to that.	13 years ago
Vladimír Vondruš	bbb764eff5	Base for image converter plugins.	13 years ago
Vladimír Vondruš	872ef12ebd	Treat image data as array of unsigned chars. Arithmetic on void* is not defined, this helps a little with various conversions.	13 years ago
Vladimír Vondruš	dc10235a96	Trade: updated AbstractImporter documentation. Clearly state that deleting the data is user responsibility.	13 years ago
Vladimír Vondruš	2054cbf447	Trade: deinlined all AbstractImporter virtual functions.	13 years ago

1 2 3

142 Commits (c9e8d270a5c220db219bb849751c8dbb471d2a0f)