magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	76427f0d7b	Merge branch 'master' into compatibility	12 years ago
Vladimír Vondruš	08e77819e8	Fix build on GCC 4.5 and OpenGL ES. Thank you, Jenkins.	12 years ago
Vladimír Vondruš	6f42745250	Silence deprecated warnings in internals of deprecated build. Together with recent Corrade changes is Magnum compiling without any noise again (i.e. just one line of output from Ninja).	12 years ago
Vladimír Vondruš	ef7575a47f	Merge branch 'master' into compatibility Compiler compatibility is checked in UseCorrade.cmake, we thus won't duplicate that error here. Conflicts: CMakeLists.txt	12 years ago
Vladimír Vondruš	02be314e9c	Error out when compatibility branch is needed for particular compiler.	12 years ago
Vladimír Vondruš	c8e4a93317	GCC 4.4 compatibility: no lambda functions.	12 years ago
Vladimír Vondruš	4a5ee634b4	GCC 4.4 compatibility: explicit std::reference_wrapper constructor. Surely a way to make that utility class useful.	12 years ago
Vladimír Vondruš	bbe19ab788	GCC 4.5 compatibility: somehow can't use {} to construct from init-list.	12 years ago
Vladimír Vondruš	d2229917f8	GCC 4.5 compatibility: no range-based for.	12 years ago
Vladimír Vondruš	96e2c35da4	GCC 4.5 compatibility: no forward enum declarations.	12 years ago
Vladimír Vondruš	68ab85de7b	Merge branch 'master' into compatibility Conflicts: src/Magnum/AbstractTexture.cpp src/Magnum/BufferTexture.h src/Magnum/CubeMapTexture.h src/Magnum/CubeMapTextureArray.h src/Magnum/DebugMessage.cpp src/Magnum/Magnum.h src/Magnum/MeshTools/Duplicate.h src/Magnum/MeshTools/RemoveDuplicates.h src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp src/Magnum/SceneGraph/FeatureGroup.h src/Magnum/SceneGraph/Object.h src/Magnum/SceneGraph/Object.hpp src/Magnum/Shaders/AbstractVector.h src/Magnum/Texture.h	12 years ago
Vladimír Vondruš	e1105300cb	Fix Context initialization in WebGL. Broken since `41235c20eb` which was three weeks ago. I am SO thoroughly testing all the stuff, right?	12 years ago
Vladimír Vondruš	8a9fa4d999	Test also ResourceManager::set() with default values.	12 years ago
Vladimír Vondruš	6015896ceb	Doxygen I hate you.	12 years ago
Vladimír Vondruš	e8aa600a34	Polished docs of ResourceManager API.	12 years ago
Vladimír Vondruš	b64a50c821	SceneGraph: avoid unnecessary copies in deprecated functions. Optimizations of deprecated API? What the hell am I doing?	12 years ago
Vladimír Vondruš	388db5ae00	SceneGraph: no need to return void.	12 years ago
Vladimír Vondruš	ceb150f6d6	SceneGraph: workaround ambiguous overloads on deprecated GCC < 4.7 build. GCC 4.7 cannot detect proper overload based on arguments in initializer list constructor of some type, thus we need to provide explicit overload taking std::initializer_lists.	12 years ago
Vladimír Vondruš	70a4909ed0	SceneGraph: don't do infinite recursion on deprecated Object::setClean(). Found thanks to (probably otherwise useless) GCC warning about usage of deprecated function . Clang didn't emit such warning, because even deprecated function should be able to call itself recursively.	12 years ago
Vladimír Vondruš	12a2bb81ba	Doc++, added some TODOs.	12 years ago
Vladimír Vondruš	b9ca5f11a8	MeshTools: actually use the epsilon parameter. Thanks, Clang. Fortunately this affected only deprecated build.	12 years ago
Vladimír Vondruš	b6f8ad4fa1	SceneGraph: fix Object test on deprecated build.	12 years ago
Vladimír Vondruš	a16963276b	SceneGraph: fix deprecated build. Thank you, Jenkins.	12 years ago
Vladimír Vondruš	650fd6766b	SceneGraph: use std::reference_wrapper in FeatureGroup internals.	12 years ago
Vladimír Vondruš	aa49008358	SceneGraph: using std::reference_wrapper instead of pointers. Currently all the functions taking vectors of objects (e.g. setClean(), transformations() and transformationMatrices()) were taking pointers, which lead to additional (and often forgotten) nullptr checks. The internals are now much more clean, as the parts where we are dealing with pointers are reduced to bare minimum. Also renamed private Object::setClean() function to Object::setCleanInternal() to avoid overload clash with the public one. The old way is now an nullptr-checked alias to the new one, is marked as deprecated and will be removed in some future release.	12 years ago
Vladimír Vondruš	8acd03778e	SceneGraph: documentation updates and fixes.	12 years ago
Vladimír Vondruš	ae9462b4c8	Shaders: documentation improvements.	12 years ago
Vladimír Vondruš	e55ee11b6a	Deprecate AbstractTexture::maxLayers() altogether. *Texture::bind() is now meant to be used only internally from shaders, thus this function is not needed at all, as we should query directly the particular shader type for the limits. The name also somehow clashes with layered textures, which should be avoided.	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š	b1be448453	doc: hint that these function actually take some parameters. This looked like valid code, which is not.	12 years ago
Vladimír Vondruš	cef4fde398	DebugTools: fix obsolete reference in documentation.	12 years ago
Vladimír Vondruš	703ce0bd89	Explicitly passing shader to Mesh::draw(). Previously the API didn't encourage the user to set up and activate shader before drawing the meshes, leading to unintuitive behavior: // Can I just call draw() or do I have to fully understand the // meaning of the universe before? mesh.draw(); Now the draw() needs the shader passed explicitly as parameter, which should hint that the shader must be set up somehow: // Right, so this needs just a shader and that's all. Expecting this // I fortunately did* configure all the uniforms before this call. mesh.draw(shader); It is also possible to pass the shader as rvalue, in case the drawing is just a one-off thing and is already fully configured. mesh.draw(MyShader{}); As usual, the original API is kept, is marked as deprecated and will be removed in some future release.	12 years ago
Vladimír Vondruš	c70f037add	Deprecate implicit conversion of Resource<T, U> to U&. We are allowing implicit conversions only if they are harmless and this is not harmless, as it might fire an assertion. The user should use operator*() or operator->() instead, which will make these conversions stand out more in the code. Also reduced code duplication.	12 years ago
Vladimír Vondruš	5a79193227	Trade: allow objects without materials.	12 years ago
Vladimír Vondruš	3c64b371ac	Audio: remove useless deprecated function. The std::vector overload is enough. I removed it everywhere else but not here? Was I drunk or what.	12 years ago
Vladimír Vondruš	2713d0f725	Doc++	12 years ago
Vladimír Vondruš	a93774eeb2	doc: update Getting Started for MSVC too.	12 years ago
Vladimír Vondruš	3a3830098b	doc: mention that it might be easier to use SDL2 on newer systems.	12 years ago
Vladimír Vondruš	2ba69b2c2b	doc: added Visual Studio building instructions.	12 years ago
Vladimír Vondruš	4c21e10e57	Support both DSA and SSO variants of glProgramUniform(). Also added (currently disabled) ES implementation (provided by EXT_separate_shader_objects). Unfortunately it's not possible to reduce the function count, because ARB_separate_shader_objects and EXT_direct_state_access are completely independent. Also double uniforms are supported since GL 4.0 and SSO are since 4.1, so we can't omit old glUniform() calls for doubles either.	12 years ago
Vladimír Vondruš	4a289c9df5	package: Magnum doesn't have versioned libraries. Yet.	12 years ago
Vladimír Vondruš	e3248bf524	package: fix typo. Blind coding FTW!	12 years ago
Vladimír Vondruš	40c8548db7	package: no CMake files are installed by Magnum.	12 years ago
Vladimír Vondruš	e7159c52ae	package: added debian package. Thanks to Costas Hatzis for the help.	12 years ago
Vladimír Vondruš	6ce7466b21	Use UnsignedInt instead of std::size_t for attribute sizes/offsets.	12 years ago
Vladimír Vondruš	69225bf8c1	doc: clearly mention all possibly needed CMake module files. Also note that the files should be kept up-to-date.	12 years ago
Vladimír Vondruš	29deb70f23	doc: mention also OpenGL version for optionally used extensions.	12 years ago
Vladimír Vondruš	6fb04dcdfe	modules: work around GLUT_Xi_LIBRARY-related CMake errors on Ubuntu. These libraries are not needed for GlutApplication, thus we link only to GLUT_glut_LIBRARY now. Hopefully this won't break linking somewhere else.	12 years ago
Vladimír Vondruš	30aae1bd48	modules: actually detect the MAGNUM_PLUGINS_DIR. It now defaults to magnum/ subdirectory of dir where main Magnum library was found. It was annoying to change /usr/local/lib/magnum to /usr/lib/magnum _every time_.	12 years ago
Vladimír Vondruš	3a1c776557	Adapted to Corrade::PluginManager changes.	12 years ago

1 2 3 4 5 ...

3515 Commits (76427f0d7b806bf2bce1c4bdfb9639cc4cfd2227) All Branches Search

3515 Commits (76427f0d7b806bf2bce1c4bdfb9639cc4cfd2227)

All Branches