magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	295843189d	doc: convert shader images to proper sRGB and HiDPI.	8 years ago
Vladimír Vondruš	799d9b80db	Doc++	8 years ago
Vladimír Vondruš	b615e1ae28	Shaders: support multiple lights in Phong.	8 years ago
Vladimír Vondruš	7d0757ca4d	Shaders: debug output for all Flag / Flags enums / enum sets.	8 years ago
Vladimír Vondruš	fd1572a3a3	Shaders: default ambient color in Phong to transparent black. Makes it possible to support alpha-masked drawing out of the box, shouldn't have any negative effect on anything else.	8 years ago
Vladimír Vondruš	0e9cb6945e	Shaders: define reasonable uniform defaults for all shaders. Plus a bit of cleanup / fixing broken English.	8 years ago
Vladimír Vondruš	daf287d2a6	Shaders: classical alpha masking support in Phong and Flat. Slow and ugly, is here only for making quick'n'dirty alpha masked drawing without a need for blending or depth sorting. Oh and also to support the glTF alpha mask feature. Again, beware: slow.	8 years ago
Vladimír Vondruš	f0a868da9c	Shaders: assert on Phong::bindTexture*() if no texture was enabled.	8 years ago
Vladimír Vondruš	460df2b97c	Shaders: doc++	8 years ago
Vladimír Vondruš	c26075427b	Doxygen. Doxygen IS BROKEN BEYOND REPAIR. I introduced strong enum with values, in a subnamespace, that have the same name as completely unrelated typedefs. Guess what?! It breaks ALL LINKS TO THOSE TYPEDEFS! EVERYWHERE!!!	8 years ago
Vladimír Vondruš	f7122d3ce6	Shaders: explicitly list deleted/defaulted copy/move constructor. Two reasons: * documentation * making it actually work because the rules are so complex and ever changing that a thing I thought "just worked" in fact did not work at all The Vector tests now compile again.	8 years ago
Vladimír Vondruš	adb4547ba0	Split the OpenGL layer out, pt 20: adapted Shaders.	8 years ago
Vladimír Vondruš	55d4d344cf	Avoid linking to APIs that are not named like this anymore.	8 years ago
Vladimír Vondruš	b1c60c1b78	Shaders: hint how to have a fully diffuse material with Phong.	8 years ago
Vladimír Vondruš	7917741346	Shaders: rename texture binding functions from set() to bind(). This better reflects that the functions modify a global state instead of a shader-local state and so rebinding may be necessary (unlike with uniforms, which get preserved). The old set() functions are now inline aliases to the bind() functions, are marked as deprecated and will be removed in some future release.	8 years ago
Vladimír Vondruš	bc8b8f159a	doc: there's no latex output anyway.	8 years ago
Vladimír Vondruš	3906f533bb	doc: compiled code snippets for the Shaders namespace. Also not really without errors.	8 years ago
Vladimír Vondruš	6dffc0a91e	Shaders: documentation update for the new theme. Also made the shader image background transparent to better fit in the docs and updated the images to match site colors.	8 years ago
Vladimír Vondruš	623fa97970	Updated copyright year.	8 years ago
Vladimír Vondruš	7a16273e5d	Updated copyright year.	9 years ago
Vladimír Vondruš	d6f5f43d60	Shaders: modernize coding style. * Always prefix private members with an underscore * Use in-class initialization of the uniform locations * Use {} for default flag value	9 years ago
Vladimír Vondruš	1e8a5c927b	Shaders: added NoCreate constructors to all classes. Makes it possible to have instance of them even before any context is active.	9 years ago
Vladimír Vondruš	5ddd28dc19	Shader: include cleanup.	9 years ago
Vladimír Vondruš	23646e6690	Hell, this project is big.	10 years ago
Vladimír Vondruš	da2ac00478	Shaders: ability to do alpha-masking with Phong. All Color3 parameters are now Color4, but the API should be backwards compatible as Color4 is implicitly convertible from Color3.	11 years ago
Vladimír Vondruš	fc5ddeebbf	Shaders: ability to have both color and texture in Phong. Also probably fixed a few issues when compiling the shader on older GLSL (missing precision qualifiers). And less crazy preprocessor.	11 years ago
Vladimír Vondruš	e934a1d1d8	Moved Color to Math namespace. Apart from different include (<Magnum/Math/Color.h> instead of <Magnum/Color.h>) there shouldn't be any visible change to the user. The BasicColor3 and BasicColor4 classes are now Math::Color3 and Math::Color4. The Color3, Color4, Color3ub and Color4ub typedefs in Magnum namespace stayed the same. BasicColor3 and BasicColor4 is now an alias to Math::Color3 and Math::Color4, is marked as deprecated and will be removed in future release. The same goes for the <Magnum/Color.h> include, which now just includes the <Magnum/Math/Color.h> header.	11 years ago
Vladimír Vondruš	ddcd679f85	Shaders: removed deprecated texture unit enums. Use dedicated texture setters instead.	11 years ago
Vladimír Vondruš	3e2a91d27a	Cleaned up old Doxygen workarounds.	11 years ago
Vladimír Vondruš	6488fe6e75	Oh, it's 2015 already.	11 years ago
Vladimír Vondruš	4caeb30f7b	Shaders: there's never enough documentation. Each shader now has sample image, example mesh configuration and example rendering setup. Also properly documented all attribute types and made introductory chapter for whole Shaders namespace.	11 years ago
Vladimír Vondruš	a8a378316f	Shaders: removed autolink-preventing % noise.	12 years ago
Vladimír Vondruš	cbe63c7a04	Removed superfluous template parameter from EnumSet typedefs. Because with GCC 4.7 we can.	12 years ago
Vladimír Vondruš	0d7dd09ae8	Shaders: completed documentation review.	12 years ago
Vladimír Vondruš	e3b0d1d4ce	Shaders: use texture multi-bind functionality in Phong shader.	12 years ago
Vladimír Vondruš	67f4a2ff65	Doc++	12 years ago
Vladimír Vondruš	0955390ca8	Follow OpenGL terminology for texture binding units. Until now the textures were bound to layers, which was rather confusing, especially when binding layered textures to layers (gaah). Also the wording might have implied that each texture must be in some layer in order to make it usable in shader. This is no longer the case with (yet unimplemented) bindless texture, so another reason to remove the confusion. All occurences of texture layers were replaced texture binding units to follow OpenGL naming. It was mostly in the docs, except for already-deprecated *Layer enums in shaders, but they will be removed soon anyway.	12 years ago
Vladimír Vondruš	ae9462b4c8	Shaders: documentation improvements.	12 years ago
Vladimír Vondruš	7376e8f36d	Use functions to bind textures to shader rather than Texture::bind(). Why did I do this: It is more clean, shorter and nice looking with method chaining, i.e. instead of: shader.setColor(...) .setOtherParam(5); texture1.bind(MyShader::Texture1Layer); texture2.bind(MyShader::Texture2Layer); We now have this: shader.setColor(...) .setOtherParam(5) .setTexture1(texture1) .setTexture2(texture2); * It is now also clear which texture type is expected, the layer constant did not say anything about type. * Also it is possible to use new features (multi bind, bindless textures etc.) while preserving the same public API. The only potential disadvantage is that the textures don't stay bound like uniform values do, but this become a non-issue with bindless textures. As usual, the old way is now deprecated and will be removed in some future release.	12 years ago
Vladimír Vondruš	6f0ba96cb6	Happy new year too.	12 years ago
Vladimír Vondruš	7a68362170	Making includes absolute, part 6: better filenames for internal files. As we are now using absolute includes, there is no need to prefix everything with "magnum<Namespace>" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions.	13 years ago
Vladimír Vondruš	0616f24f34	Making includes absolute, part 5: absolute includes everywhere. The only places where they aren't absolute are: - when header is included from corresponding source file - when including headers which are not part of final installation (e.g. test-specific configuration, headers from Implementation/)	13 years ago
Vladimír Vondruš	45a10cefdf	Making includes absolute, part 1: moving files around. Everything what was in src/ is now in src/Corrade, everything from src/Plugins is now in src/MagnumPlugins, everything from external/ is in src/MagnumExternal. Added new CMakeLists.txt file and updated the other ones for the moves, no other change was made. If MAGNUM_BUILD_DEPRECATED is set, everything compiles and installs like previously except for the plugins, which are now in MagnumPlugins and not in Magnum/Plugins.	13 years ago
Vladimír Vondruš	3eb7f6f2b8	Shaders: added generic shader definition. Defines common attributes which are shared by majority of the shaders, allowing mesh to be configured for the generic shader to be used with any of them.	13 years ago
Vladimír Vondruš	ef42287cf9	Shaders: use location 1 for texture coordinates and location 2 for normals.	13 years ago
Vladimír Vondruš	a125964273	Doc++	13 years ago
Vladimír Vondruš	f130ce5891	Added convenience Matrix2x2, Matrix3x3 and Matrix4x4 aliases. Unlike Matrix3/Matrix4 these don't have any transformation-related functions. Deprecated the old Matrix2 typedef, which is now replaced with Matrix2x2 and will be removed in future release.	13 years ago
Vladimír Vondruš	593864be5c	Shaders: doc++	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š	d04b308aa3	Reducing pointer chasings, part 1: method chaining via references. Makes some cases less consistent (and some convenience shortcuts impossible), but goes well with the attitude "don't use pointer when it can't be null".	13 years ago

43 Commits (6d7558672d644769daa3b9d8ab1a94fca4e95d18)