Vladimír Vondruš
83f348256e
Merge branch 'master' into compatibility
...
Conflicts:
CMakeLists.txt
13 years ago
Vladimír Vondruš
d4162a4160
Platform: add dummy title setting function to NaClApplication.
...
So the user doesn't need to wrap it in #ifdefs when porting to NaCl.
13 years ago
Vladimír Vondruš
fc1a486f00
Platform: ignore Sdl2Application title in Emscripten.
13 years ago
Vladimír Vondruš
27a80cb76e
Shaders: doc++
13 years ago
Vladimír Vondruš
5b56235084
Adapted to Corrade changes.
13 years ago
Vladimír Vondruš
48ee52b14f
Remove misleading comment.
...
We need 2.8.8 for much more things.
13 years ago
Vladimír Vondruš
f796b5a781
Ignore CORRADE_DEPRECATED() macro in Doxygen.
13 years ago
Vladimír Vondruš
2157123de0
Updated toolchains submodule.
13 years ago
Vladimír Vondruš
2c9a982a16
Merge branch 'master' into compatibility
13 years ago
Vladimír Vondruš
8850f69f20
external: updated Optional with Native Client support.
13 years ago
Vladimír Vondruš
0204669735
Platform: add at least some support for wheel events to NaClApplication.
...
In NaCl the wheel event is something completely different than mouse
event and in my opinion overly complicated (the scrolled distance is
measured in pixel precision!).
To preserve at least some compatibility with other toolkits, the events
are shoved into normal MouseEvent. Sadly the event doesn't contain any
position information.
13 years ago
Vladimír Vondruš
4e8df64e93
Merge branch 'master' into compatibility
13 years ago
Vladimír Vondruš
282ee58c62
Math: work around missing std::round() in NaCl newlib.
...
Also test that our implementation behaves the same.
13 years ago
Vladimír Vondruš
744cc2f806
Text: fix error in fontconverter utility documentation.
13 years ago
Vladimír Vondruš
ae9c02d591
Text: actually have some sane default plugin dir.
13 years ago
Vladimír Vondruš
dfeeff779b
Shaders: oops.
13 years ago
Vladimír Vondruš
143440d074
GCC 4.4 compatibility: fix linker errors with =default.
13 years ago
Vladimír Vondruš
a9fdfb77cc
Merge branch 'master' into compatibility
13 years ago
Vladimír Vondruš
0e370efa0c
Work around missing types in NaCl's `gl2.h`.
13 years ago
Vladimír Vondruš
dbafac0ba3
Updated FindCorrade.cmake from Corrade repository.
13 years ago
Vladimír Vondruš
59d92dc4af
GCC 4.4 compatibility: no lambda functions.
13 years ago
Vladimír Vondruš
0086a815a0
GCC 4.4 compatibility: work around ambiguous constructor.
...
That thing added its own variant of copy constructor and then complains
that it is ambiguous with the other.
13 years ago
Vladimír Vondruš
d3dccd8720
GCC 4.4 compatibility: some explicit typing is needed.
13 years ago
Vladimír Vondruš
ac1337e9d8
Merge branch 'master' into compatibility
13 years ago
Vladimír Vondruš
1251d44aec
Use "" instead of <> for inter-project includes.
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š
28de7cb72d
Text: fix array index type in Renderer.
...
When we have 256 vertices and >256 indices, we need more than 8 bits to
index the index array. The tests are passing again.
13 years ago
Vladimír Vondruš
6dd40e744d
Text: it's totally fine to have 256 vertices indexed with UnsignedByte.
13 years ago
Vladimír Vondruš
8331696707
Text: test that proper index type is used in Renderer.
...
Something smells fishy here.
13 years ago
Vladimír Vondruš
e2d2d094b6
Text: harden and clean up Renderer test.
13 years ago
Vladimír Vondruš
768a8ccc1c
Text: minor cleanup.
13 years ago
Vladimír Vondruš
4396506e95
Text: fix rendering of scaled multi-line text.
...
Take text size into account when advancing lines. I would probably not
run into this issue if I would visually test this on anything else than
unscaled pixel art font.
13 years ago
Vladimír Vondruš
5e1e95bae6
Text: test line advance behavior when rendering scaled text.
...
Currently the test fails, because line advance doesn't take text size
into account.
13 years ago
Vladimír Vondruš
4285f75494
Text: improve AbstractFont documentation.
13 years ago
Vladimír Vondruš
5a84d4d572
GCC 4.5 compatibility: no forward declarations for enums.
13 years ago
Vladimír Vondruš
07619d9929
modules: updated FindCorrade.cmake from Corrade compatibility branch.
13 years ago
Vladimír Vondruš
e9827a6678
Merge branch 'master' into compatibility
...
Conflicts:
modules/FindCorrade.cmake
13 years ago
Vladimír Vondruš
2fa0e0a555
modules: updated FindCorrade.cmake from Corrade repository.
13 years ago
Vladimír Vondruš
9a4373abbb
Merge branch 'master' into compatibility
...
Conflicts:
src/Math/RectangularMatrix.h
src/Math/Vector.h
src/Platform/AbstractXApplication.cpp
src/Platform/GlutApplication.cpp
src/Platform/GlutApplication.h
src/Platform/GlxApplication.h
src/Platform/NaClApplication.cpp
src/Platform/NaClApplication.h
src/Platform/Sdl2Application.cpp
src/Platform/Sdl2Application.h
src/Platform/WindowlessGlxApplication.cpp
src/Platform/WindowlessGlxApplication.h
src/Platform/WindowlessNaClApplication.cpp
src/Platform/WindowlessNaClApplication.h
src/Platform/XEglApplication.h
src/Platform/magnum-info.cpp
src/Primitives/Capsule.cpp
src/Primitives/Circle.cpp
src/Primitives/Crosshair.cpp
src/Primitives/Cylinder.cpp
src/Primitives/Implementation/WireframeSpheroid.cpp
src/Primitives/Line.cpp
src/Primitives/Plane.cpp
src/Primitives/Square.cpp
src/Primitives/UVSphere.cpp
src/Shader.cpp
src/Text/AbstractFontConverter.cpp
src/Text/fontconverter.cpp
src/TextureTools/distancefieldconverter.cpp
13 years ago
Vladimír Vondruš
a9fe635867
Updated and improved ColorFormat, ColorType and TextureFormat enum docs.
...
Finishing promises made in #31 .
13 years ago
Vladimír Vondruš
4eaedf94eb
Platform: fixed SDL link in documentation.
...
Thx @biosek .
13 years ago
Vladimír Vondruš
1d789ef55e
MeshTools: added TODOs.
13 years ago
Vladimír Vondruš
5d9490c73b
Extracted Primitive enum from Mesh to MeshPrimitive.
...
Because we can't forward-declare class members we would need to include
whole Mesh (along with all OpenGL headers and other stuff) just to use
Primitive enum. The old Mesh::Primitive is now alias to new one, is
marked as deprecated and will be removed in future release.
13 years ago
Vladimír Vondruš
2dd61a4dcd
Platform: fixed assertions.
13 years ago
Vladimír Vondruš
d945395800
Using Corrade::Utility::Directory::{read,write}() where possible.
...
Much shorter code now with less redundancy.
13 years ago
Vladimír Vondruš
ef83211c46
Shaders: fix textured Flat on systems w/o ARB_explicit_attribute_location.
...
How could I possibly overlook this.
13 years ago
Vladimír Vondruš
686e215725
GCC 4.6 compatibility: can't use both constexpr and const.
13 years ago
Vladimír Vondruš
8d01723084
Fixed static build.
13 years ago
Vladimír Vondruš
79ff9e1ca4
Marking deprecated functions and types with CORRADE_DEPRECATED().
...
Sadly enum values can't be marked as such.
13 years ago
Vladimír Vondruš
09c2f7ffe2
Doc++
...
Finally I got it right.
13 years ago