magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	06f0433250	Shaders: better preprocessor code formatting.	13 years ago
Vladimír Vondruš	2c0e7da5a0	Shaders: fix compilation of textured Phong shader on OpenGL ES.	13 years ago
Vladimír Vondruš	51ca4be9a9	Shaders: fix Phong shader compilation for more than one texture.	13 years ago
Vladimír Vondruš	9e2dc3cc2f	Shaders: test compilation of Phong shader. Currently fails for some combinations.	13 years ago
Vladimír Vondruš	55a557f419	Shaders: test compilation of MeshVisualizer shader.	13 years ago
Vladimír Vondruš	c2f69b20e8	Shaders: test compilation of Flat and VertexColor shaders.	13 years ago
Vladimír Vondruš	c13f8a77f5	Shaders: test compilation of *Vector shaders.	13 years ago
Vladimír Vondruš	f4de432ac4	Shaders: `const` for readonly vars is in ARB_shading_language_420pack. In the end it wasn't my NVidia shader compiler being too forgiving.	13 years ago
Vladimír Vondruš	fd1d067c36	Shaders: fix textured Phong for GLSL 1.20 and GLSL ES 1.0. I desperately need unit tests for shader compilation.	13 years ago
Vladimír Vondruš	f166d006c2	Shaders: `const` for readonly variables is since GLSL 4.20.	13 years ago
Vladimír Vondruš	ac3fe7cdf5	Removed Doxygen workarounds for forward declarations.	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š	3f53a7a1ca	Shaders: don't set uniform if not used.	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
Vladimír Vondruš	41f7784dc5	Shaders: ambient, diffuse and specular texture support in Phong.	13 years ago
Vladimír Vondruš	b349ca54ad	Shaders: explicitly setting normal matrix in Phong shader. Currently the most used scene graph transformation implementation are dual quaternions, which don't allow any scaling. The original code normalized the rotation matrix, involving three dot products and one sqrt, even if it wasn't needed in most cases -- even if using scene graph with matrices mostly you don't scale at all and thus the shader internally renormalized already normalized vectors for _each object_ in each frame. This _will_ break things, don't forget to update the code and call `setNormalMatrix()` along with `setTransformationMatrix()`.	13 years ago
Vladimír Vondruš	e5d0904417	Shaders: no need to have virtual destructor here. Protected constructor and destructor is sufficient, AbstractVector itself isn't meant to be deleted (via pointer).	13 years ago
Vladimír Vondruš	fc0bde4f47	Wrap CMAKE_SHARED_LIBRARY_CXX_FLAGS in quotes. The variable is empty on some platforms (Windows), would cause issues.	13 years ago
Vladimír Vondruš	771968c69a	Shaders: forgot this. Follow up to `2eb4e3c8ba`. Damn.	13 years ago
Vladimír Vondruš	2eb4e3c8ba	Removed default template argument from DimensionTraits. It's not obvious what should be the default and thus it is confusing. Sometimes Int, sometimes Float, no clear winner.	13 years ago
Vladimír Vondruš	a403a7f288	Shaders: make GLSL code for fullscreen triangle reusable. Now you can just add the file and call `fullScreenTriangle()`.	13 years ago
Vladimír Vondruš	ec467e4099	Shaders: `range` is reserved keyword in GLSL. Neither desktop GL nor GLES on my NVidia complained. Just Chrome didn't like it.	13 years ago
Vladimír Vondruš	a7f5bef038	Getting rid of <>, part 1: Color classes. Inspired in STL, base templated class is renamed to BasicColor{3,4} and typedef'd with Float type to Color{3, 4}. It is much nicer to write this: Color3(1.0f) Color3::fromHSV(25.0_degf, 0.5f, 0.9f); instead of this: Color3<>(1.0f); Color3<>::fromHSV(25.0_degf, 0.5f, 0.9f);	13 years ago
Vladimír Vondruš	5200771066	Added some TODOs.	13 years ago
Vladimír Vondruš	5c06009446	Reverted interval in distancefield-related things. 1.0 is taken as shape center (white), 0.0 as shape surroundings (black). It was unintuitive to have it reverted, updated documentation to make it right.	13 years ago
Vladimír Vondruš	261250f074	Shaders: fix port of *Vector shaders to old GLSL. Texture layer binding was never set and there were various GLSL compilation errors.	13 years ago
Vladimír Vondruš	8d70e3e3a9	Shaders: allow default construction of MeshVisualizer. While it doesn't make any sense, it is more convenient than writing {} when testing it.	13 years ago
Vladimír Vondruš	20fd1f7afc	Shaders: really ported MeshVisualizer to ES.	13 years ago
Vladimír Vondruš	abc8bfcfc5	Fixed resource import headers.	13 years ago
Vladimír Vondruš	79c0dc9550	Shaders: use Context::isVersionSupported() instead of ad-hoc solution. Also removed redundant branching for ES.	13 years ago
Vladimír Vondruš	b9a72bd3d1	Shaders: ported MeshVisualizer to not require geometry shader. Wireframe width and smoothness isn't ported yet, because I don't fully understand the behavior of standard derivatives in fragment shader.	13 years ago
Vladimír Vondruš	d969a9a162	Adapted to Corrade changes.	13 years ago
Vladimír Vondruš	4f82053058	Shaders: removed redundant `inline` keyword.	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š	173c2a8190	Shaders: added first version of MeshVisualizer shader. Rudely written to work only with fairly recent extensions and nothing less than GLSL 3.30. It requires geometry shaders for wireframe rendering, without it it behaves the same as Shaders::Flat.	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š	f2df328fe2	Using Corrade's visibility macros instead of copypasta all over again.	13 years ago
Vladimír Vondruš	40a69636bd	Shaders: support color alpha in FlatShader.	13 years ago
Vladimír Vondruš	2f4bcd1455	Added files for automatic resource importing from static libraries. Not documented yet, because I am ashamed of this way of doing things. With shared libraries the resources are imported automatically, with static ones the user must explicitly include these files in some non-static library or executable to have them imported.	13 years ago
Vladimír Vondruš	c79327ee43	Option to build Magnum as static library. And optionaly position-independent code. The tests now pass again, if both Corrade and Magnum is static.	13 years ago
Vladimír Vondruš	14c6790701	Shaders: set default values for VertexColorShader uniforms. Default value for matrix uniform would be zero uniform which would cause "black screen of death".	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š	a0b83edd2b	Relicensing to MIT/Expat license, part 4: CMake and documentation files. They didn't contain license header before, but I think adding it also there wouldn't do any harm. Documentation is also integral part of the codebase.	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š	6a5d75d1e4	Relicensing to MIT/Expat license, part 2: headers.	13 years ago
Vladimír Vondruš	90dbb28763	Thorough CMakeLists cleanup. * Calling enable_testing() only in root path. * Using CORRADE_CXX_FLAGS instead of our own set to make things easier to maintain. * Various cleanup and reorganization.	13 years ago
Vladimír Vondruš	2d98dadb0a	Shaders: first DistanceFieldVectorShader implementation. Currently only fill and outline can be specified. Also crosslinked from documentation of VectorShader and TextureTools::distanceField().	13 years ago
Vladimír Vondruš	549558b502	Shaders: doc++	13 years ago

1 2 3

129 Commits (06f04332506aa65912bf6a29fb4da754930fbff9)