magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	c7bb153d0a	Port to OpenGL ES 2. Desktop OpenGL and OpenGL ES 2 support can be switched using CMake TARGET_GLES option. All functionality not supported in ES is marked in documentation. If targetting OpenGL ES, GLES2/gl2.h is included instead of GLEW. Mesh class now uses VAOs only in desktop OpenGL, in ES the buffers are bound on each draw call.	14 years ago
Vladimír Vondruš	4dcb5df21c	Reworked binding of textures to shaders. According to OpenGL specification the sampler uniform takes only texture layer and not any particular texture. In OpenGL 4.2 it is possible to explicitly specify desired texture layer in the uniform, so I suppose it's desired to have shader with fixed texture layers and on the other hand be able to bind texture to any layer, not only one -- the exact opposite of how it was in Magnum before. The shader should now specify in its public API which texture is on which layer and explicitly set the layer uniforms upon construction. All setUniform() functions taking textures as argument were thus removed, as they confuse things a lot. The textures now have bind() function which takes layer as argument, so it's now sufficient to only bind the texture before drawing the mesh without messing with sampler uniform.	14 years ago
Vladimír Vondruš	79945ab6fc	Documentation: organizing the classes into "modules". While namespaces act for hierarchy, modules are something like "tags" - usable when you want to check related classes of e.g. CubeMapTexture. Not sure how to name module for Math and Physics namespaces and Contexts/Trade, though.	14 years ago
Vladimír Vondruš	f97a272fb6	Texture documentation reorganization. The part similar for all AbstractTexture subclasses should be in AbstractTexture itself, not anywhere else.	14 years ago
Vladimír Vondruš	5133861750	Links to required extensions in documentation. Fixed a few typos in extension names, fixed BPTC texture compression typos. Removed redundant EXT_framebuffer_object from functions as the Framebuffer class itself has it.	14 years ago
Vladimír Vondruš	61bceb8462	Cube map texture array.	14 years ago
Vladimír Vondruš	eca97de2fc	Added safety dummy parameter to AbstractTexture::DataHelper::set*Data(). Previously it was possible to pass e.g. one-dimensional image to 3D texture, now it will be reported by the compiler as error.	14 years ago
Vladimír Vondruš	cc1f9c60c9	Swapped size and type template parameters in Vector and Matrix. Long-standing TODO. It is better to have size first, because it is more significant than type (e.g. because there are Vector4<T> specializations and not VectorT<4> specializations). It is also IMHO easier for user to distinguish/read the type than before: Vector<float, 4> -> Vector4<float> // before Vector<4, float> -> Vector4<float> // now	14 years ago
Vladimír Vondruš	63f2e130b1	Fixed CubeMapTexture wrapping, simplified code of texture classes. Texture now doesn't have it's own redundant copy of target, but uses the one from AbstractTexture. Subsequently, all DataHelper functions now accept "untyped" GLenum as target for better flexibility. CubeMapTexture is not based on Texture2D anymore, all references to cube map textures were removed from Target enums, so it's now not possible to create cube map texture other way than using CubeMapTexture class, which is how it should be done in first place. The wrapping mode fix is thus now trivial.	14 years ago
Vladimír Vondruš	aa3c703c25	Added TODOs for easily implementable things.	14 years ago
Vladimír Vondruš	3f4e28cfca	Documented required OpenGL version for some functionality. The requirements are cross-referenced to dedicated page, similarly to TODO and bug lists. Also updated / improved documentation for some texture / image formats.	14 years ago
Vladimír Vondruš	d69253757a	Added CubeMapTexture::setSeamless().	14 years ago
Vladimír Vondruš	2b7aa09520	Added some TODOs.	14 years ago
Vladimír Vondruš	11f4f0a500	Removed support for setting texture data directly. Texture data can be now set only using image classes (Image, BufferedImage, Trade::ImageData).	14 years ago
Vladimír Vondruš	03f15c714b	Renamed template in Texture to prevent underscores in parameters.	14 years ago
Vladimír Vondruš	b641085b21	Doc++	14 years ago
Vladimír Vondruš	1cf69616a3	Documentation updates, "markdownization". All HTML code and Doxygen shortcuts such as @c, @b and @em are now rewritten using Markdown syntax, which makes it more readable. Also updated Doxyfile. Doxygen 1.8 at least is required to generate the documentation now.	14 years ago
Vladimír Vondruš	6504aecf0c	Added classes Image and BufferedImage. These classes are meant to be used in the same texture updating functions as Trade::ImageData due to static polymorphism. In addition to Trade::ImageData, which is read-only, these classes support updating the dimensions and data. Image2D and ImageBuffer2D can update the data also from framebuffer.	14 years ago
Vladimír Vondruš	10b8eda20a	Inlined functions.	14 years ago
Vladimír Vondruš	7bae1a3f8a	Renamed data access classes in Trade to avoid confusion.	14 years ago
Vladimír Vondruš	8cdf5e87c4	Strong typed texture targets. Only those targets which are meaningful for given dimension are available.	14 years ago
Vladimír Vondruš	52971935ab	Using strongly-typed enum for plain OpenGL types. Mesh and IndexedMesh is not completely ported, as it will need more work.	14 years ago
Vladimír Vondruš	476e8285cd	Simplified massive repeated code in CubeMapTexture.h.	14 years ago
Vladimír Vondruš	70fa53b949	Removed unbind() from buffers and textures. It doesn't help with any safety, but just complicates everything and makes unnecessary GL calls.	14 years ago
Vladimír Vondruš	dacd31fcc5	Moved AbstractImporter and Image to new Trade namespace. Start of AbstractImporter rework - Trade namespace will contain simple classes usable for exchanging data with other formats, importers will not depend on any OpenGL functionality, they will just provide access to plain data.	14 years ago
Vladimír Vondruš	b945f5f68b	Happy New Year.	15 years ago
Vladimír Vondruš	31c70f2c08	Doc++	15 years ago
Vladimír Vondruš	a0fc06bf94	Making Texture data setting functions public.	15 years ago
Vladimír Vondruš	ef80006737	Using GLint instead of GLsizei for offset.	15 years ago
Vladimír Vondruš	d6b4cbb466	Added convenience functions for feeding Textures with Images.	15 years ago
Vladimír Vondruš	40441b39e2	Removed unnecessary templating of AbstractTexture::DataHelper.	15 years ago
Vladimír Vondruš	e9a556cc10	Using strongly-typed enums in AbstractTexture and derived classes. Allows safer passing of values, more descriptive and shorter enum names and also using the same enum names/values in InternalFormat and ColorFormat.	15 years ago
Vladimír Vondruš	d0044b960e	Support for setting texture subdata.	15 years ago
Vladimír Vondruš	715d9910a8	Support for texture layers.	15 years ago
Vladimír Vondruš	0407e8152b	New class for Cube map textures.	15 years ago

35 Commits (26b6d40a8b5cfb59e02569eb859f97d1e00c8ea9)