magnum

Commit Graph

Author	SHA1	Message	Date
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š	8c2eaea406	Shaders: more shader code cleanup. Fixed random potential GLSL ES issues, reduced preprocessor madness.	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š	f52a086f8e	Shaders: clean up Flat, set default color only for textured one. Also probably fixed a few issues when compiling the shader on older GLSL and GLSL ES (floating point literal suffixed, 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š	bab8ce0a4a	Shaders: make VertexColor generic attribute.	11 years ago
Vladimír Vondruš	36ab0827c4	Shaders: one more try.	11 years ago
Vladimír Vondruš	5e95c7f08a	Shaders: fix WebGL 2 compilation. This is starting to be a little annoying.	11 years ago
Vladimír Vondruš	7041ff95c9	Shaders: fix MeshVisualizer test compilation on desktop GL.	11 years ago
Vladimír Vondruš	ba3935d4fc	Shaders: fix MeshVisualizer compilation on WebGL.	11 years ago
Vladimír Vondruš	c8dfb6789b	Shaders: fix assertion in MeshVisualizer. It would break on GL 2.1 or when instantiating the shader on ES < 3.1 without wireframe enabled.	11 years ago
Vladimír Vondruš	0ccd9aa26e	Shaders: ported MeshVisualizer to use geometry shaders also on ES3+AEP. Please note that in ES3 there is a behavioral change -- geometry shader is no longer explicitly disabled, but it is enabled by default and you have to disable it if you don't have the required extension or don't want to use it.	11 years ago
Vladimír Vondruš	9d61c57855	Shaders: assert that the shader compiled fine.	11 years ago
Vladimír Vondruš	5dd0c40421	Shaders: gl_VertexID is supported in GLES 3.0.	11 years ago
Vladimír Vondruš	2a83b447ad	Shaders: this statement has no side-effect.	11 years ago
Vladimír Vondruš	88f0415290	Support OpenGL tests also on Windows and OS X. I wanted to preserve the parameter-less constructor of tests, but WINAPI requires fairly ugly entagled set of functions, passing HWND around, which required storing it in a global var and hoping it is properly initialized when querying it for it to be passed to application constructor. When this was done, it was now fairly easy to support passing also argv/argc to application constructor, which in the future will enable selective disabling of extensions for even better test coverage. This however needed slightly different main() function and thus we now have MAGNUM_GL_TEST_MAIN() instead of CORRADE_TEST_MAIN(). Using the latter will result in an assert inside std::optional.	11 years ago
Vladimír Vondruš	ddcd679f85	Shaders: removed deprecated texture unit enums. Use dedicated texture setters instead.	11 years ago
Vladimír Vondruš	226974bf2c	TextureTools: work around compiler warning.	11 years ago
Vladimír Vondruš	3e2a91d27a	Cleaned up old Doxygen workarounds.	11 years ago
Vladimír Vondruš	9d326d4ff1	Better handling of compiled-in resources in static build. Each class/function that needs to access the resources first checks whether the group exists and the group is registered if not. Thus there is now no difference and annoying special cases when using static build.	11 years ago
Vladimír Vondruš	7a43d85d9f	Fix linkage conflict warning/error on MinGW and MSVC.	11 years ago
Vladimír Vondruš	d10f4ce593	Shaders: removed deprecated magnumShadersResourceImport.hpp file.	11 years ago
Vladimír Vondruš	74b9670650	Shaders: don't exceed limits for no reason. Shader::maxTextureImageUnits(Shader::Type::Fragment) is 16 on Ivy Bridge and Mesa.	11 years ago
Vladimír Vondruš	c71dc12503	Making test declarations more compact. Yet again I experienced how insanely large this thing got over the years.	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š	d90a5e27e8	Hide forward declarations from Doxygen. Forward declarations of templated types don't have named template parameters and thus Doxygen (sometimes) used these for documentation. It then looked like this: Magnum::Math::RectangularMatrix<std::size_t, std::size_t, class> which isn't helpful at all. After the change it looks like this (much better): Magnum::Math::RectangularMatrix<cols, rows, T>	12 years ago
Vladimír Vondruš	1cfb5b0eaf	Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };	12 years ago
Vladimír Vondruš	659bf2e44b	Use POSITION_INDEPENDENT_CODE CMake property. New in 2.8.9, much cleaner than the previous "solution". Also cleaned up the surroundings a bit. Fixed cases where PIC was forced independently of the settings, for plugins the PIC is now also set only when needed/requested.	12 years ago
Vladimír Vondruš	f0793d6aea	Fixed access to nonexistent MagnumShaders resources in utilities.	12 years ago
Vladimír Vondruš	adccc04c9a	Revert "Shaders: somehow I need to enable the extension also on ES3." Apparently not needed anymore with recent drivers. This reverts commit `331433effa`.	12 years ago
Vladimír Vondruš	c637002532	Shaders: fix MeshVisualizer on ES. The extension line must appear before any other non-preprocessor token.	12 years ago
Vladimír Vondruš	217b53ceb2	Display all headers in project view of IDEs. Finally makes development with QtCreator usable.	12 years ago
Vladimír Vondruš	5303979315	Shaders: make the helper function inline. Will be used outside of the library and I don't want to create another inter-library dependency.	12 years ago
Vladimír Vondruš	3be4422ded	Shaders: using attachShaders() everywhere.	12 years ago
Vladimír Vondruš	ee21b75b15	Shaders: fix build on ES3. I'm starting to hate these rushed prerelease fixes.	12 years ago
Vladimír Vondruš	c3df68aa28	doc: make section headers in class/function docs have sane size. Similar reasoning as in mosra/corrade@93b8308bc6a4def9d4564a6cea236cabe54fe063.	12 years ago
Vladimír Vondruš	4a44d3b875	Shaders: fix compilation of MeshVisualizer on WebGL and ANGLE. WebGL mandates that array subscription is done with constant expression, ANGLE too (but I think that has also something to do with D3D9 limitations). This is however allowed by OpenGL ES 2.0 specification, so enabling the workaround only for WebGL and ANGLE (i.e., this won't apply to Native Client using native GL drivers).	12 years ago
Vladimír Vondruš	757ca6d1ad	Use VectorTypeFor and MatrixTypeFor instead of DimensionTraits. Much shorter lines. I like that.	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š	069bdbd011	Fixed deprecated header.	12 years ago
Vladimír Vondruš	1e6e4c3f73	Install and find debug libraries with "-d" suffix. Makes it possible to have both debug and release libraries installed. If both libraries are present when finding the package, proper version is used based on what configuration is used in depending project.	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š	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š	5ffe761bad	Shaders: doc++	12 years ago
Vladimír Vondruš	df06a82430	Android: define GL_ES in GLSL if not defined. My emulator doesn't define that, causing all stock shaders to fail on compilation.	12 years ago

1 2

64 Commits (3a4eb8bfadc65ff41a6912a9f72dfbdfa72add7f)