magnum

Commit Graph

Author	SHA1	Message	Date
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
Vladimír Vondruš	d6f5560262	Trade: got rid of opening input streams in AbstractImporter. Now it is possible to open either pure data arrays or arrays specified with filename. The function calls might be ambiguous now (i.e. open("image.tga") would open data array instead of handling it as filename), renamed them to avoid that. Default implementations now fire an assertion. Bumped plugin interface string version as this is pretty incompatible change.	13 years ago
Vladimír Vondruš	b1fcdf81af	Trade: improved Data constructors and destructors. They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.	13 years ago
Vladimír Vondruš	38ec076eda	Minor code cleanup (unused parameters).	13 years ago
Vladimír Vondruš	e76543703f	Trade: don't define MeshData constructor etc. in header. The class has heavy construction/destruction due to all the vectors.	13 years ago
Vladimír Vondruš	5db0861b82	Trade: don't define AbstractImporter constructors in header. They are heavier than it seems due to inheritance and virtual functions.	13 years ago
Vladimír Vondruš	a0b83edd2b	Relicensing to MIT/Expat license, part 4: CMake and documentation files. They didn't contain license header before, but I think adding it also there wouldn't do any harm. Documentation is also integral part of the codebase.	13 years ago
Vladimír Vondruš	c5ab86794b	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
Vladimír Vondruš	6a5d75d1e4	Relicensing to MIT/Expat license, part 2: headers.	13 years ago
Vladimír Vondruš	90dbb28763	Thorough CMakeLists cleanup. * Calling enable_testing() only in root path. * Using CORRADE_CXX_FLAGS instead of our own set to make things easier to maintain. * Various cleanup and reorganization.	13 years ago
Vladimír Vondruš	231f3277ab	Adapted to Corrade changes. Allowing to instantiate Trade::AbstractImporter subclasses directly without plugin manager.	13 years ago

1 2 3

132 Commits (13d5e2a50fe1bbfb01fbf63e5790d1feecd8ce26)