magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	67dbdd4b00	Fixed compiler warning when compiling with OpenGL ES support.	14 years ago
Vladimír Vondruš	b12792d15a	Updated OpenGL ES support in textures.	14 years ago
Vladimír Vondruš	9f7ae0b34f	Overloaded AbstractTexture methods in subclasses for better chaining. Allows to conveniently set the data after fully configuring the texture, so OpenGL can optimize the data to match the settings. Advice taken from http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/TechniquesForWorkingWithTextureData/TechniquesForWorkingWithTextureData.html#//apple_ref/doc/uid/TP40008793-CH104-SW1	14 years ago
Vladimír Vondruš	1f43839e04	Using EXT_direct_state_access in textures. Saves unnecessary calls to glActiveTexture() and glBindTexture().	14 years ago
Vladimír Vondruš	1f3c360cb2	Using bindInternal() directly in AbstractTexture::DataHelper.	14 years ago
Vladimír Vondruš	ddbfca2f95	Don't export private symbols.	14 years ago
Vladimír Vondruš	f9099a86bf	Tracking texture state - bindings and limits.	14 years ago
Vladimír Vondruš	2595974fae	Refactoring of internal OpenGL object names.	14 years ago
Vladimír Vondruš	1077370937	Using fixed-size 8bit integer for dimension count. There can be only one, two or three dimensions, so why to use eight times larger type than needed?	14 years ago
Vladimír Vondruš	64fae952dd	Follow-up fix for previous commit.	14 years ago
Vladimír Vondruš	00cc00311b	Workarounds for old GLEW versions (tested on 1.6). GLEW defines some extensions on its own and is making mistakes, which aren't later resolved by including the official header, because the extension is already defined in glew.h. Hopefully these are the first and last errors found.	14 years ago
Vladimír Vondruš	bd665cb280	More texture and renderbuffer internal formats supported in OpenGL ES 3.0.	14 years ago
Vladimír Vondruš	5310326e69	Enabled RGB565 and BPTC textures, as they are now in headers.	14 years ago
Vladimír Vondruš	035bd4d376	Links to documentation of related gl*() function. Each function touching OpenGL now has list of all related functions touching OpenGL.	14 years ago
Vladimír Vondruš	f3a07f82f4	Method chaining for textures.	14 years ago
Vladimír Vondruš	c451b22392	Revert "Documentation: organizing the classes into "modules"." It only caused another maintenance burden and was confusing to users. Now when scene graph is in SceneGraph namespace there is no need for another grouping. Namespaces are (and should be) sufficient. This reverts commit `79945ab6fc`. Conflicts: src/BufferedImage.h src/BufferedTexture.h src/Framebuffer.h src/Query.h src/SceneGraph/Scene.h	14 years ago
Vladimír Vondruš	cbdff68052	Clarified signed normalized texture types, formatting fixes. Signed normalization results in [-1.0, 1.0], NOT [0.0, 1.0].	14 years ago
Vladimír Vondruš	d9dff2c046	Clarified required version and extension for R/RG textures.	14 years ago
Vladimír Vondruš	d5ab207552	Fixed compilation on non-GLES targets (oops).	14 years ago
Vladimír Vondruš	9cb27a4dc3	Depth/stencil can be stored only in renderbuffer in OpenGL ES 2.0. Moreover only sized version is permitted.	14 years ago
Vladimír Vondruš	e7bb19b70b	Documented unsized internal depth/stencil format.	14 years ago
Vladimír Vondruš	a22bbc9e15	Removed @todo (deprecated in GLES 3.0).	14 years ago
Vladimír Vondruš	c8aa005e86	Added Color3 and Color4 classes with HSV conversion. They can be used for both floating-point (normalized) and integral (denormalized) representation and support conversion between them. HSV conversion is done always using floating-point types. Getters for RGB(A) were removed from Vector3 and Vector4, they are now part of Color3 and Color4. Because of this, Framebuffer now accepts Color instead of Vector.	14 years ago
Vladimír Vondruš	29723d0975	Fixed texture subdata setters. Functions for setting 2D subimage of 3D texture / 1D subimage of 2D texture introduced in `728ddb19a3` weren't probably tested at all, as they are ambiguous overloads. Now using std::enable_if, which works.	14 years ago
Vladimír Vondruš	b5699863f2	Doc: @todo++	14 years ago
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š	9170728c66	@todo++	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š	1aca6caf5f	AbstractTexture: documented relation between loose and exact types.	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š	83fd5df368	Disable instantiation of all Abstract* classes. For classes which already have pure virtual functions instantiation is not allowed, but for other there needs to be at least one pure virtual method: the destructor. Pure virtual functions actually can have implementations, but they must be called explicitly. Destructors are called explicitly, so for them it works.	14 years ago
Vladimír Vondruš	1be7b8b9c2	Workarounds for Clang parsing issues.	14 years ago
Vladimír Vondruš	ce09e50e05	Doc: Using @relates for texture internal format operator\|.	14 years ago
Vladimír Vondruš	453aa4de99	glGenerateMipmap() requires OpenGL 3.0 / EXT_framebuffer_object.	14 years ago
Vladimír Vondruš	95725cae94	Workaround Doxygen parsing bug. Probably caused by MAGNUM_EXPORT macro.	14 years ago
Vladimír Vondruš	97c516fd4c	Windows build fixes.	14 years ago
Vladimír Vondruš	172c60a900	Support for anisotropic filtering.	14 years ago
Vladimír Vondruš	a21e3ea02e	Improved documentation for texture completeness. (Almost) nobody will notice that in function documentation, so it's now only in class documentation.	14 years ago
Vladimír Vondruš	2976b30922	Reworded array textures to be consistent with CubeMapTextureArray.	14 years ago
Vladimír Vondruš	61bceb8462	Cube map texture array.	14 years ago
Vladimír Vondruš	728ddb19a3	Ability to set texture subdata from image with one less dimensions. It is now possible to call Texture2D::setSubData() with 1D image and Texture3D::setSubData() with 2D image.	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š	2ae1a884cb	Hiding AbstractTexture::DataHelper class from documentation.	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š	efb36b4e33	Removed cube map coordinates from AbstractTexture::Target. They are specified as CubeMapTexture::Coordinate anyway and this was just misleading.	14 years ago
Vladimír Vondruš	b26a4d0c3c	Fixed copypaste error.	14 years ago

1 2

83 Commits (dfccdf9b7ed46ef8bc3d0075f228c9f3e24a0aff)