magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	f7aa2c05a6	Deinlined heavy functions and removed redundant `inline` everywhere else.	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š	1fd8c7691a	Added AbstractShaderProgram::validate().	13 years ago
Vladimír Vondruš	468fb9995d	Public function for getting OpenGL program ID.	13 years ago
Vladimír Vondruš	d9c61e2a35	Moved AbstractShaderProgram::Attribute definition out of the class.	13 years ago
Vladimír Vondruš	6904b38b13	Reworked and cleaned up shader classes. Removed unneeded member variables, removed wrong assertions and wrong documentation (most of the state they were fobidding is actually valid). Retrieving shader log with full length, properly printing non-error messages to debug output. Each shader must now be compiled explicitly using compile(), which is slightly better for the user as it is possible to check compile status instead of having it weirdly hidden inside attachShader(). link() now also returns linking status.	13 years ago
Vladimír Vondruš	fd4ada4fc1	Method chaining in Shader. The methods return reference instead of pointer, as the class is commonly created on the stack. Removed static functions Shader::fromFile() and Shader::fromData(), as they are not needed now. Also asserting that the file exists and is readable in addFile().	13 years ago
Vladimír Vondruš	7ef8432fbe	Doxygen: ignore specific namespaces instead of whole directories. Less maintenance burden with `#ifndef DOXYGEN_GENERATING_OUTPUT`, removed the ones which are not needed anymore.	13 years ago
Vladimír Vondruš	71c7480299	Fixed one-value AbstractShaderProgram::setUniform(). The original workaround for enums didn't work (all enums were treated as UnsignedInt even though they had Int as underlying type), moreover the solution didn't scale for other possible types with implicit conversions. Now explicitly listing all scalar types and templated vectors/matrices, it should work for most cases.	13 years ago
Vladimír Vondruš	8923f2debb	Added support for uniform arrays. Also not including Math/Matrix.h in AbstractShaderProgram.cpp and using just RectangularMatrix everywhere.	13 years ago
Vladimír Vondruš	38ec076eda	Minor code cleanup (unused parameters).	13 years ago
Vladimír Vondruš	6a5d75d1e4	Relicensing to MIT/Expat license, part 2: headers.	13 years ago
Vladimír Vondruš	5eb98494b3	Doc++	13 years ago
Vladimír Vondruš	1693c772ad	Moved OpenGL includes out from Magnum.h. OpenGL includes are ~35k lines together and it is a waste of compilation time to include them even if they are not needed at all (e.g. whole SceneGraph and Physics libraries). Saves ~10s of compilation time (6:46 before, now 6:35).	13 years ago
Vladimír Vondruš	2d2d1c07f4	Using new type aliases in whole root Magnum namespace.	13 years ago
Vladimír Vondruš	6220f24f0b	Our own aliases for builtin types. It seems like a bad idea, but it will: * Improve portability, as `Int` will be always 32bit. * Improve readability, as `std::int32_t` is just plain ugly and too complicated to write. * Improve consistency and reduce confusion, as it's not good to mix `int`, `std::int32_t`, `GLint`, `khronos_int_t` and whatnot in one codebase. * Possibly reduce compilation time, because including all ~35k lines worth of GL headers just for one GLfloat typedef is even worse than now forbidden #include <iostream> in headers.	13 years ago
Vladimír Vondruš	faf94c74e2	Adapted to recent meshdata/shader changes.	13 years ago
Vladimír Vondruš	3379e6c794	Ability to send less than all attribute components to the shader. Remaining unspecified components are set to 0, 0, 1, according to spec. Also cleaned up and simplified the internals, added debug output operators for attribute component count and types and tested the whole thing.	13 years ago
Vladimír Vondruš	24bd924aa5	Consistent naming of attribute types in AbstractShaderProgram.	13 years ago
Vladimír Vondruš	77d9773d37	Removed linkage of AbstractShaderProgram::Attribute::Location. It now doesn't appear in symbol lists, avoiding nasty linker issues.	13 years ago
Vladimír Vondruš	dd9fcd83f0	Fixed name clash in internal implementation. Clang didn't like that.	13 years ago
Vladimír Vondruš	6e61354fde	OpenGL ES compilation fixes.	13 years ago
Vladimír Vondruš	976377f0a4	Moved code to check allowed attribute types to internal implementation. TypeTraits class is now not needed at all.	13 years ago
Vladimír Vondruš	a9d25c995f	Mesh: fixed attribute stride computation. The stride was computed always for resulting GLSL type (e.g. vec4) even if the data were of anoother type (e.g. std::uint8_t[4]). The code is exceptionally ugly now, time to wrap it with unit tests.	13 years ago
Vladimír Vondruš	f4146bea94	Forgot to rename this to match OpenGL name. It was named this way in the docs, but in the actual code not. Don't know why.	13 years ago
Vladimír Vondruš	fbeb7b02bc	Minor renaming in shader/mesh guts. Function size() will be used later for commputing size of the attribute, renaming the original to components().	13 years ago
Vladimír Vondruš	5ca096512e	Forward declaration header for Math namespace.	14 years ago
Vladimír Vondruš	7d04b7d511	Doc++ Basic framebuffer usage, mentioned framebuffer attachments in shader documentation.	14 years ago
Vladimír Vondruš	7e66a09461	Marking all constructors explicit, except for matrix and vector classes. It prevents unwanted implicit conversions from e.g. nullptr to Camera, Vector2 to Physics::Point etc. By making all the constructors explicit it is easier to routinely add the keyword to all new classes instead of thinking about cases when to add and when not to.	14 years ago
Vladimír Vondruš	dc1ab80cda	Doc++	14 years ago
Vladimír Vondruš	0f889369f4	No `using namespace std` anywhere. Also added missing std:: prefix to remaining cases of std::size_t, std::[u]int[0-9]+_t, std::sin() etc., std::exit().	14 years ago
Vladimír Vondruš	43f6dbc72d	Using integer vector aliases all over the place.	14 years ago
Vladimír Vondruš	3ac906db9e	Fixed AbstractShaderProgram documentation. Forgot to do it in `259a9f6666`.	14 years ago
Vladimír Vondruš	8f83485653	Forward declarations for Magnum namespace in Magnum.h header.	14 years ago
Vladimír Vondruš	a636792b19	AbstractShaderProgram: query for max supported attribute count.	14 years ago
Vladimír Vondruš	ae78b77b10	Added some @todos .	14 years ago
Vladimír Vondruš	93a5e7230f	Use OpenGL ES 2.0 specific definitions for extension-only functionality. If targetting explicitly OpenGL ES 2.0, only gl2.h is included (not gl3.h).	14 years ago
Vladimír Vondruš	9701c8dacb	If targetting exactly ES 2.0, hide everything not available there. Some target platforms supply their own OpenGL headers, thus we cannot use our own from ES 3.0 and compilation fails. On the other hand, this will be better for users as usage of unsupported features will be catched right during compilation and not at runtime.	14 years ago
Vladimír Vondruš	5e648b2701	Fixed Color3/Color4 support in shader attributes.	14 years ago
Vladimír Vondruš	29893ebe82	Updated OpenGL ES support in shaders.	14 years ago
Vladimír Vondruš	c460fdc059	Doc++	14 years ago
Vladimír Vondruš	259a9f6666	Type-checked vertex attributes with type conversion possibility. * Normalization of e.g. color components passed as unsigned byte to float values is possible. * BGRA vector component ordering is possible. * Proper type checking, allowing only GLSL-equivalent types to be used as attributes. * Reverted back to typedef'ing shader attributes, as type conversion can now be specified in constructor.	14 years ago
Vladimír Vondruš	cb1c3f0b2b	Preparation for type checked vertex attributes. Currently it was possible to pass e.g. five-component vector or 2x1 matrix to shader, we don't want that.	14 years ago
Vladimír Vondruš	84850b5bf9	Updated AbstractShaderProgram documentation. * #version directive doesn't belong to shader sources, since it is specified in Shader constructor. * It's not needed to call use() before setUniform() anymore.	14 years ago
Vladimír Vondruš	69421f9187	Provide default constructor for AbstractShaderProgram::Attribute. Fixes compilation with clang.	14 years ago
Vladimír Vondruš	4aa01e073e	Code cleanup, doc++	14 years ago
Vladimír Vondruš	21acb3edc6	Mesh rework, part 1: better vertex attribute management. * Instead of "binding attributes" the user now "adds vertex buffer". It corresponds better with what OpenGL itself does. * Vertex buffers now must be managed by the user. * Shader attributes are now static const members instead of typedefs to allow more convenient addVertexBuffer() calls.	14 years ago
Vladimír Vondruš	ddbfca2f95	Don't export private symbols.	14 years ago
Vladimír Vondruš	733e02b07b	Documented internal shader program state tracking.	14 years ago
Vladimír Vondruš	b97e6f8bce	Updated and simplified AbstractShaderProgram documentation.	14 years ago

1 2 3

107 Commits (77093a9b659d4d7c65484d49ada132d8cd94bd95)