304b46b17d
Merge remote-tracking branch 'origin/Particle-Update'
...
Former-commit-id: 272203af1d740dc32e9714e00e4f889db6b13350
2015-01-19 02:23:07 +01:00
ead44173ba
Merge remote-tracking branch 'origin/Particle-Update'
...
Conflicts:
include/Nazara/Graphics/Enums.hpp
include/Nazara/Graphics/ForwardRenderQueue.hpp
include/Nazara/Graphics/ForwardRenderTechnique.hpp
include/Nazara/Graphics/Sprite.hpp
src/Nazara/Graphics/DeferredRenderQueue.cpp
src/Nazara/Graphics/ForwardRenderQueue.cpp
src/Nazara/Graphics/ForwardRenderTechnique.cpp
src/Nazara/Graphics/Material.cpp
src/Nazara/Graphics/Resources/Shaders/Basic/core.frag.h
src/Nazara/Graphics/Resources/Shaders/Basic/core.vert
src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
src/Nazara/Graphics/Sprite.cpp
Former-commit-id: 73139ce47d7721635d87c74b2ca1183c2f67c090
2015-01-19 02:20:28 +01:00
61188d0b3e
Added Cabin license (Oops)
...
Former-commit-id: 0e53b826308c76063c5d463ab22ca82bb2ef3b8b
2015-01-19 00:17:03 +01:00
c18fc4cb14
Removed ShaderUniform_[EyePosition|SceneAmbient]
...
Former-commit-id: 89dedaf78d86def598531f472a1a6ecd56fe8371
2015-01-19 00:15:01 +01:00
f518311223
Fixed FreeType being freed before the destruction of all fonts
...
Former-commit-id: a7b2653c94698671d7912675ee810be3b7ac10df
2015-01-19 00:02:06 +01:00
ffe101ff02
Fixed crash
...
Former-commit-id: 61b945a634b3de01c964e197175994896c7a5d01
2015-01-19 00:01:06 +01:00
911babc283
Changed meaning of return value from resource events
...
Returning false from a resource event will remove the listener from the
resource, instead of decrementing it's counter
Former-commit-id: ba47da0e8de5c0adb3d31f29af0ef7835beefd5a
2015-01-19 00:00:54 +01:00
8f9ea9db17
Added ResourceListenerWrapper
...
This class wraps the call to
Resource::AddResourceListener/RemoveResourceListener using RAII and help
a lot with some of the dependencies.
Thanks to this, the render queues now handle their resources listening
properly.
Former-commit-id: 7f215ffa4ccadcc4f44f777656970e92ce01087a
2015-01-18 23:59:01 +01:00
a6183fae69
Added missing SkeletonRef typedef
...
Former-commit-id: 7c6671664dcc28e2fc8f2a0beeacb76b80828f4f
2015-01-18 14:30:30 +01:00
0b1f10bf72
Alphabetical commit
...
Former-commit-id: a62b1812e59371e4ca7f1d77bf438859514e0ac7
2015-01-18 12:20:32 +01:00
81e38d1431
Fixed comment
...
Former-commit-id: 02e09bb9eac10da9693c07db00c837784a6edf4e
2015-01-18 12:19:05 +01:00
c2ac3281bf
Fixed text bounds
...
Former-commit-id: 9339ed907125ecf5186a86e8c943bf3197e11571
2015-01-18 12:12:32 +01:00
e30c447bd5
Added default font
...
Former-commit-id: 84fc15f2c6d46bcfb55236863611f2fb96961a6d
2015-01-18 10:38:50 +01:00
c02fe6c8ff
Fixed streaming loaders when used with memory streams
...
Former-commit-id: ce39ee03f40682c00c78b08ac285b9ea36240fa5
2015-01-17 23:42:49 +01:00
9f40fe12b1
(SimpleTextDrawer) swapped str and characterCount arguments
...
Former-commit-id: f009a36533158c37bcf4c996f62967df068a18af
2015-01-17 23:07:21 +01:00
e495c1094a
Fixed first atlas layer being resized to zero
...
Former-commit-id: f38c09255df40d62ddfa943cbd89353ff9a18cd0
2015-01-17 23:03:50 +01:00
f9345dc5fe
(TextSprite) Added atlas storage check
...
Former-commit-id: f9d222e196a0ef1aebcfd2baf8b425f55f852a9a
2015-01-17 23:00:56 +01:00
9662f4167d
Fixed crash on Utility uninitialisation
...
Former-commit-id: ef9f53674fe21c4d7780e68c62f7981554663a85
2015-01-17 22:55:50 +01:00
cfe1bcf107
Fixed Font::[Get|Set]Atlas interface
...
Former-commit-id: 7670317dc2684fc0f9240a1f188e4ba92592a263
2015-01-17 22:48:27 +01:00
722fba5d0c
Fixed compilation error
...
Former-commit-id: a88d418a78a1fed1606064898f4f191a3ac9ca53
2015-01-17 22:47:03 +01:00
c688b3f363
Fixed missing include
...
Former-commit-id: 9bc1621e951ff5d9cb4bd15bffff3fd477104fd4
2015-01-17 22:45:36 +01:00
b699d06805
Fixed typo
...
Former-commit-id: 1482a9580b19f657cccaadbbf4eacc9724d0a1e3
2015-01-17 22:45:25 +01:00
7fee649b49
(Font) Added default atlas
...
Former-commit-id: 876f42110d4053b09abf86c6158b3ba79fdea201
2015-01-17 22:42:33 +01:00
77db6f5dd3
Added Font initializer
...
Former-commit-id: 9d64e5f28508ebfafe7504a9ba47f57a970e77ce
2015-01-17 22:11:29 +01:00
c0995d1739
Fixed typo
...
Former-commit-id: d1aafe31020733e027a63c9e59dad13b40cd9c29
2015-01-17 22:08:14 +01:00
8b1660a121
(Font) Added Atlas safe check
...
Former-commit-id: daf33e34880e6142f2617e8afa84f8d9df12c4f2
2015-01-17 22:07:28 +01:00
f1694fd6e9
(Font) Added mutable default values for glyph border and minimum step size
...
Former-commit-id: 9b69b591afb95fdea9d686ef9b775f965de40d9f
2015-01-17 22:03:04 +01:00
b787ce94cf
(Font) Removed default move-constructor
...
Former-commit-id: 15ccd22b9333327e761500f7b07f0ef7db8ad857
2015-01-17 21:53:47 +01:00
829e82fdd9
Removed outdated comment
...
Former-commit-id: b2667fe3877022b61b5fbd6ae1ececc403fe5c1f
2015-01-17 21:42:35 +01:00
91912463fa
Fixed crash when loading "small" images into atlas
...
Former-commit-id: e34c26159a663a5680658d6312993147a6d804ee
2015-01-17 21:42:23 +01:00
a89adfe551
Fixed Freetype not being linked to Utility
...
Former-commit-id: 4bbfced926430defe35d6ef800954cdb0f2f6c2a
2015-01-17 19:41:38 +01:00
4a4b4e0fda
Regenerated global headers
...
Former-commit-id: 01c6359d8fae9309dfd1003c3c786de57a93692c
2015-01-17 00:39:40 +01:00
2fed71cc3a
Fixed mesh centering
...
Former-commit-id: d27dc7f0734d6a5bf0ecd6d36ede2f11cbff7c9c
2015-01-17 00:37:47 +01:00
22791ecaf4
Fixed some comments
...
Former-commit-id: cbf931edb8cd9d8ba41b4d1f082d0bff7a3b02ba
2015-01-17 00:37:05 +01:00
86502df849
Merge branch 'Font-Update'
...
Former-commit-id: d293f78c891a74554c6b990afafdc1eb1cc0a584
2015-01-17 00:36:28 +01:00
a244029e11
Fixed RenderTarget destructor not being virtual
...
Even though it's pretty useless
Former-commit-id: 9140fc3bc8aeabf041c5cf90ea3efcabc4ed4940
2015-01-17 00:35:20 +01:00
18367d26da
Added View::SetSize(width, height)
...
Former-commit-id: 9afd04b62e99702720cb10feae2462eaad33a90b
2015-01-17 00:34:59 +01:00
03b91575fb
Fixed Node::Move taking local scale into account
...
Former-commit-id: ce7b2c086e141c8cfa9981838c9d695f997b3941
2015-01-17 00:34:37 +01:00
3ed18e70da
Added default material to sprites
...
Former-commit-id: 8a68d3d9b251ff93a793d4e001aed721558a8eef
2015-01-17 00:34:09 +01:00
71c1d5f527
Fixed reordered warning
...
Former-commit-id: e825c3f282e1b1c3f65d32be8512210c92a3a1d9
2015-01-17 00:29:26 +01:00
a0054def7b
Added TextSprites
...
Former-commit-id: 85bef5ec14336710b2fdc782d3d0d77787ab65dd
2015-01-17 00:16:52 +01:00
fdb722ef14
Made SceneNodes non-movable
...
Fixed SceneNodes copy constructor not parenting the right object
Former-commit-id: 21a08e3bb0931af426d97399dab86dda9acdf172
2015-01-17 00:15:01 +01:00
6d3228477f
Added TextDrawer classes
...
Former-commit-id: 4c5ace385f1a9b9ceebb774022bbc001b69a3bb4
2015-01-16 23:36:20 +01:00
48ecb058f0
(Font) Added notification on atlas layer change
...
Fixed irrelevant error message when a font destroy an atlas
Former-commit-id: ddbd04e9172f2d35a8e0cf8a37fe48724aeb5c64
2015-01-16 23:34:56 +01:00
77347c8582
(Font) Added notification on atlas change
...
Will only clear glyphes when setting differents parameters
Former-commit-id: b16a289742c0f23fa5066d3c52ce35b4abc626c6
2015-01-16 18:57:09 +01:00
cd5399459d
Made Resource copying/moving impossible
...
It is still possible to copy some Resource-based classes though
Former-commit-id: bbb6066f736c210015ff9fdfded7d95eb9695359
2015-01-16 16:28:38 +01:00
ff7cfa226e
Improved Atlas class
...
It now handles layer resize failure and will notify listeners of a
pointer change
Former-commit-id: df5e2a129897128a4e41e0b3205f6a1dbeb2069c
2015-01-16 16:26:15 +01:00
5eec0d2abe
Improved (Fixed ?) Material Copy/Move
...
Former-commit-id: 8eb9b716e2b028c6d2e249f9706ad6f5567c95dc
2015-01-16 14:03:06 +01:00
96743375d9
Fixed debug build
...
Former-commit-id: 5a7ebd258d4b453412d0d74e7be8590905b26a78
2015-01-16 13:25:51 +01:00
c2f3ba00f2
Revert "Added ResourceConstListener"
...
This reverts commit 2492f87ba89bafa180308c60d2470b07e3aac27d [formerly 793b9a8884fb6153d5da152e2cf22659fc7e511b].
Former-commit-id: 05a9dff26921db1e7c1c5b90c0cd50073a839f3c
2015-01-16 13:02:53 +01:00
Lynix