magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	f0793d6aea	Fixed access to nonexistent MagnumShaders resources in utilities.	12 years ago
Vladimír Vondruš	4d538c9453	GCC 4.4 compatibility: std::reference_wrapper-related issues.	12 years ago
Vladimír Vondruš	3be4422ded	Shaders: using attachShaders() everywhere.	12 years ago
Vladimír Vondruš	b100f34f24	GCC 4.4 compatibility: explicit std::reference_wrapper cconstructor.	12 years ago
Vladimír Vondruš	9d0fc0d9d3	GCC 4.5 compatibility: cannot deduce init list in templated function.	12 years ago
Vladimír Vondruš	d7a13940b1	Shaders: making use of parallel compilation. Compiling fragment and vertex shader simultaenously, at least. Nothing more can be done for now. Also removed weird duplicate compile/link calls from MeshVisualizer, went unnoticed since `b9a72bd3d1`. Why did I do that?!	12 years ago
Vladimír Vondruš	0f8d22235d	Shader: more robust extension presence checking. Propagate the information about whether given extension is disabled to GLSL instead of doing the guesswork again from scratch.	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š	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/)	12 years ago
Vladimír Vondruš	8c2291aa49	Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.	12 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.	12 years ago
Vladimír Vondruš	ce52f7b62f	Moved Version enum to its own file. There will be many places (e.g. all Platform::*Application::Configuration classes) where Version will be used without Context (and all GL stuff brought with it).	13 years ago
Miguel Martin	0670f59c95	Added colour uniform to flat shader (event when texturing is enabled) This enables blending and transparency Default colour is white (and fully opaque)	13 years ago
Vladimír Vondruš	51db425bdb	Shaders: use generic definitions also in GLSL sources. So each sourcs doesn't need to be manually rewritten each time the generic definition changes.	13 years ago
Vladimír Vondruš	fd3f7febae	Shaders: what the hell.	13 years ago
Vladimír Vondruš	81f02a24c6	Shaders: compile shaders also for GLSL 1.50 (GL 3.2). It seems that ARB_explicit_attrib_location is not supported on GLSL 1.40 on OSX (even that the support is advertised).	13 years ago
Vladimír Vondruš	0f60325126	Shaders: minor cleanup.	13 years ago
Vladimír Vondruš	60d8d1af16	Shaders: textured version of Flat shader.	13 years ago
Vladimír Vondruš	0b4e6391a0	Shaders: extension support queries depend on selected GLSL version. Also added GLSL 1.30 (GL 3.0) into version list. Should fix issues where extension is supported but is not available in selected GLSL version.	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š	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š	623fda0dc7	Shaders: removed superfluous `*Shader` suffix from class names.	13 years ago
Vladimír Vondruš	127910d537	Shaders: minor tweaks. Non-matching number of opening and closing braces confused editors with code folding feature.	13 years ago
Vladimír Vondruš	777f67ab9f	GCC 4.5 compatibility: can't use initializer list here. Don't know why.	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š	003e524a26	Shaders: using new type aliases in whole Shaders namespace.	13 years ago
Vladimír Vondruš	dc798b7320	Shaders: added missing 3D version of FlatShader vertex shader. Fragment shader is common for both 2D and 3D.	13 years ago
Vladimír Vondruš	a22bf1bf4e	Shaders: don't use explicit attribute location on GL 2.1.	13 years ago
Vladimír Vondruš	29a07c7d62	GCC 4.6 compilation fixes.	14 years ago
Vladimír Vondruš	7a894e97a0	Using ARB_explicit_uniform_location in shaders. The backwards compatibility fully kills the purpose, but at least I can test the feature somewhere :-)	14 years ago
Vladimír Vondruš	231c002838	Explicitly use Matrix in names when appropriate. In shader uniforms (projectionMatrix makes more sense than projection alone) * For underlying types for SceneGraph transformation. It is already used in Drawable::clean() as transformationMatrix, so why not use it also in AbstractFeature::clean(). Moreover, clean() could be in future also done using something else, this helps to distinguish the type just from parameter name. * In Physics shapes - applyTransformationMatrix() (as it could be in future also done using something else).	14 years ago
Vladimír Vondruš	02158cd0f9	GCC 4.5 compatibility: fixed initializer-list issues.	14 years ago
Vladimír Vondruš	e4a6832eab	Accidentaly forgot commented-out code.	14 years ago
Vladimír Vondruš	2dd0a68329	Internal "traits" cleanup. Don't use constexpr class members, as their usage is not so convenient compared to classic inline functions.	14 years ago
Vladimír Vondruš	6f6d3d09b2	Blind port of FlatShader to OpenGL 2.1 and OpenGL ES 2.0.	14 years ago
Vladimír Vondruš	d46bc34390	Moved flat shader from internal physics implementation to Shaders. It is so general that it can be reused elsewhere.	14 years ago
Vladimír Vondruš	f85a7fc568	Physics: Minimal initial implementation of debug draw.	14 years ago

19 Commits (e4454ace8d8a6f331644f781d38eecfef811bbc6)