Commit Graph

250 Commits

Author SHA1 Message Date
Lynix 218dfc9bb1 Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release
Former-commit-id: 2aeee76d912fe28845cf3654374a70f6035f115b [formerly e5bc7e35688b44ed78e6b76cd2a448ec0f1bb89e] [formerly e2924ddad7955a7b4aa0b11932a4019bddfdf19e [formerly 30651b18c45b8da9bcfda621a6b21d42520e85a1]]
Former-commit-id: 205e52c5da9e9da01a48285f71f9b9dc7603f29b [formerly a4040aaacf0c0eb7625ab739123116e18a4a07a8]
Former-commit-id: abb37a852646924793a2cfd00b74a05c00479cb3
2016-08-06 01:07:09 +02:00
Lynix ac25df0126 Graphics: Separate pipeline state from Material into a new class, MaterialPipeline
This allows much more efficient batching, along with pipeline reusage and preparation for the Vulkan API


Former-commit-id: fd2de2f0e9612ea275ee69c5578c68e7169cd05b [formerly 53bd8a5ed5695311b7543ad717df63f93fad2da6] [formerly 171740929652ac9fe30e84983709388859cedd6b [formerly 25096a76678f1052e76f67d26b458077a0632cc3]]
Former-commit-id: 7978dbeb87af2eac9e5501a97afa83849648bf6e [formerly 81b6cce1ee81a2ca8873d3c70d468b2c71510c95]
Former-commit-id: 6663e2721c3f79d5f1e3f33c6183174378b502f4
2016-08-05 22:11:13 +02:00
Lynix 3cf4cd3d53 Graphics/AbstractRenderQueue: Remove AddBillboard method
Former-commit-id: 9429c5e127d9c4d2172d5ae224b60338d62a58ce [formerly 8e723fad4893f182a3d7b7735e5a156973ca6e59] [formerly d961c2da7c6989cd861d4a703608466dede9ba40 [formerly 20783627678843cb2f1c414862193c079d81e168]]
Former-commit-id: b019c83ab483922120a9d37c16e8294694a16aa3 [formerly a651bc66c4cb96962a34ef3f2ade62d91ce1d6b7]
Former-commit-id: 820dcb4d787709600d9306025c34b9feb1ced7b2
2016-08-05 21:55:26 +02:00
Lynix 1d758d370c Graphics/InstancedRenderable: Take a const reference to the matrix instead of a non-const one
Former-commit-id: 148f4367351f79994f51699a656a938c6784af8f [formerly 27ef2f23da51c156f615bb33e6b3138b44f77498] [formerly 120334bc6e2bd3fcff30fde0febc901d83cdeb9b [formerly 9f4d16e134fb009ce021f4720ffc6d410cc5bd3c]]
Former-commit-id: 55595b1a006dfa313e7f088f76ff6880971530c4 [formerly 7e3a37de6c217d1b7734be14df74c174f6e0b4d6]
Former-commit-id: 0ebdab2df6d218a51c5ee425482bff7c660fddd8
2016-08-05 09:09:14 +02:00
Lynix 3a18c4bb98 Graphics/Model: Add AddToRenderQueue(renderQueue, matrix, order) overload
Former-commit-id: 51b2eb160cee64341f659cb9233f7323648196ff [formerly eed84804d642972f3952ed5ea5c3991afb6c9657] [formerly 9eb1f9d149bf3eb9beeea950d780e713acbd34b1 [formerly eec842ec8bcebc5e04f2b48c18ec608ae5a82014]]
Former-commit-id: 82dee95422af697ba8319c53a60f32bf98ff31da [formerly c797b9f8a5964390dcdd2a55271e7a18896a8d8f]
Former-commit-id: 8c5e34da6e3686be332a84613230a6734b58966a
2016-08-05 09:08:56 +02:00
Lynix 66bc8a5dde Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
Former-commit-id: 8697752459c0f8a99c545ae41eedf6e0382c366e [formerly a855bebde268850fba035f3981e3e907acf33232] [formerly 2894f133ef2b92b49a0642df95393939269ee50b [formerly 348a5a1f8745537e3fb20a0aeac5e89a6f831c19]]
Former-commit-id: 50a4cef7ee7ac3be85cc9ccc6a6b194c4beb79f2 [formerly 49fdda2e6a597ed6251d822ff4b189442c5a9296]
Former-commit-id: ee48615b811e902841ff29529c15a6910fc8e1c1
2016-08-03 13:47:17 +02:00
Lynix a2fbd9f2d0 Improved declarations
Former-commit-id: fae51c9344fd88a35b6c6ebb825ba71e6ca33f1a [formerly 75901e046e5bbe5732846eed7ba7cdc3ebcc7bb2] [formerly c14ba82b5e7849ff610789fc4dca09aa67907200 [formerly f9dd4fd281c9b68aff9affef037d5ce1a3802fd7]]
Former-commit-id: 88f4d343858f42b06420f593efa6a481018e05fb [formerly 09a6ba61ac09ded89c59612aec2ab7263eb75e36]
Former-commit-id: 6268a2a01d13a27f79f18f6282023cac1a8579d4
2016-08-02 13:31:09 +02:00
Lynix 6f265a1cb3 Revert "Core/RefCounted: Remove persistent boolean"
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].


Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]]
Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98]
Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
2016-08-02 13:20:34 +02:00
Lynix 07725ceb03 Core/RefCounted: Remove persistent boolean
Former-commit-id: 99602e0fa1e54b6fc8e0087ef89d0e2c74bcfc15 [formerly 83374368c28b83e4916958e7a58d54ec663a9842]
Former-commit-id: 603d0c81eada7d1f25058163bbf97672cd96d08c
2016-08-02 12:52:49 +02:00
Lynix 554c17702b Build: Fix empty install commands
Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
2016-07-31 12:59:04 +02:00
Lynix 4efb8f0354 Graphics/ParticleEmitter: No longer inherit from Node
Former-commit-id: d2d67fdfc9940cf09b6bf15560c4f8b2b8c3819d [formerly 6deadba03ab57675310b279ce401c1db8b02869b]
Former-commit-id: 115f0a7f6293703be1bd497a107419ec95683dc1
2016-07-30 15:50:41 +02:00
Lynix e68b962f4d Graphics/ParticleGroup: Remove fixed step parameter (wasn't used)
Former-commit-id: 28e6d1d11ac699d184e9f0ca90994c1ae6368962 [formerly 696269b6f34dd4f9f61fd1c1f4b93bd2a50fdcdf]
Former-commit-id: d3fbf42609596a03cde0cdaf1256dd014e87087e
2016-07-29 13:55:59 +02:00
Lynix 9fa7267523 Graphics: Rename ParticleSystem to ParticleGroup
Preparing for integration into the ECS


Former-commit-id: 201e28c9f00ee31f809d9de3d9a37f57a7fe740c [formerly 9b88616308f9801482fc8811a9a19a7231dce2a7]
Former-commit-id: 579f4e9597f94620f922fb145931202d8fc9cc96
2016-07-29 13:24:19 +02:00
Gawaboumga 4c1c8dd2a9 Various fixes
Former-commit-id: bc799bb6b028f94a57c30dad8563367ab8a89973 [formerly 6c3e07c34170a8df0a4465d80cdfe9e5b8e04087]
Former-commit-id: e685bae1b31f698856efaf66d7bab8d96cb047f8
2016-07-28 19:22:41 +02:00
Lynix b988c34622 Doc: Fix \see
Former-commit-id: 2d9bd386e63fc602f2a92ac083f3e252b9a9b797 [formerly 6fd2cb0e7bb10a68d83b3d44520413f679f8872a]
Former-commit-id: 70d70144834b1dea6055348f70960a5df5197309
2016-07-23 18:24:27 +02:00
Lynix 25d7112054 Graphics: Add TileMap class
Former-commit-id: 0a45b956501998a40a6406f7fff6e6cc85b4b4db [formerly ab84ea10c52b128b17241844e6a4b3887c6618ab]
Former-commit-id: d62bbb11f5205daa6af3f7b9152be3fb213ca564
2016-07-23 18:06:17 +02:00
Lynix 56443c91e4 Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
Former-commit-id: 392c7c33ff64d19e0fe3c7bdc8b22fe17c150887 [formerly d12a3c5f664fccebe0ee40a73bb0310e2d02287e]
Former-commit-id: 22743f015567a8471f97cb90a06175f600ef0f8f
2016-07-21 23:00:09 +02:00
Lynix c83b9d0491 Graphics/Material: Add SaveToParameters
Former-commit-id: 87b9ca6e0f5f391f45edf6106efbd550dd52ac53 [formerly 91ba614d69d3a2e9762da0e059ee96985c891749]
Former-commit-id: e049a9db776f407e2cd7635bfb1825d809223c77
2016-07-07 08:56:18 +02:00
Lynix 04e52caa88 Sdk/GraphicsComponent: Add Detach method
Former-commit-id: 16bcd7d8a3b50235cdd50443d8a1ed55e4b939f2 [formerly 93e838eebb955d5bbe17113ced86a247122bf522]
Former-commit-id: be3d0d2e8fb9a887eb903c6b17f16a56e5eee1c7
2016-06-20 13:11:31 +02:00
Lynix 51533fabe9 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 3878bde4d067ef921783f256b582af8f6463c19b [formerly 029a8e9081b66daf20a78ba7331a496d89145f44]
Former-commit-id: 47009b49149da0186169afc538618f2ab2973f89
2016-06-09 08:49:14 +02:00
Lynix 2ace255d17 Graphics/Material: Add errors when failed to query texture
Former-commit-id: a28cd9537b7155f461a0e0dc761225c5e8758c77 [formerly e9c6cf2e48766eb3ef99c4711567d4da2e4e30ce]
Former-commit-id: d00448a69f391c0e9b17fcce85e48f968b0de143
2016-06-09 08:49:01 +02:00
Gawaboumga 2c941827ed Documentation for module: Graphics
Former-commit-id: 1757c33318443aade1dc38e16d053240d7dc885c
2016-05-30 14:21:36 +02:00
Lynix 18868082fc Graphics/DepthRenderTechnique: Fix typo in include name
Former-commit-id: 8ac7a886fbb406d1c03ceae5ea8ac71bb48364b7
2016-05-30 07:41:32 +02:00
Lynix 8a3339badf Fix some GCC warnings
Former-commit-id: 31c8460b4656c29ac165d7aa28f335851f2565df
2016-05-25 13:52:10 +02:00
Lynix a386a8bd2d Graphics/Light: Fix compilation
Former-commit-id: 0ae92c86e52bb18aa9587fbb82c932b71b44484c
2016-05-17 20:14:06 +02:00
Lynix 6c8d2ed03a Merge branch 'NDK-ShadowMapping'
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
2016-05-13 13:06:23 +02:00
Lynix 2b04a4722f Utility/*TextDrawer: Fix bounds starting at a negative position
Former-commit-id: 06ac76189b5c36e108b5fc80b3c54d01068deadd
2016-05-11 12:27:18 +02:00
Lynix 3b5d6e9cde Make mesh able to carry material informations
- Move OBJ Loader to Utility module, where it belongs
- Change Mesh material informations from a path to a parameterlist
- Improve Mesh code


Former-commit-id: f16f48f8b6399188a09797cec3707ab6726bdbca
2016-04-30 18:44:33 +02:00
Lynix b3455e88ca Graphics/DepthRenderTechnique: Add Clear method
Former-commit-id: 70e7cb5b59f0407c73766687b6a95e09b7eca589
2016-04-17 19:58:15 +02:00
Lynix 37aa00b2e7 Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
Lynix c8dd28f75c Sdk/RenderSystem: Allow to change render technique
Former-commit-id: ec61a2ebff138300344e6068917f0863c3d11859
2016-04-16 18:40:58 +02:00
Lynix 0697fe1079 Revert "Graphics/RenderTechnique: Remove Clear method"
This reverts commit 8aa3764660d5c98995135f736ecd710677fa240c [formerly 9b4ec3ae32492e383c19a06bd1c3e461b3fcf46d].

It seems I was wrong about the Clear method, my revert broke the Deferred Rendering


Former-commit-id: b8d2db34ffd9d24798670f19aba0de88f5b77a1c
2016-04-06 12:39:29 +02:00
Gawaboumga 265e1c0fbd Fix compilation for gcc/clang + tests for serialization
Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
2016-04-04 10:17:05 +02:00
Lynix dce587bd63 Add support for custom resource parameters
And allow users to skip a precise loader using them


Former-commit-id: 297af2e4a24ad67c343aae5d89352abf4ea05f63
2016-03-08 13:37:17 +01:00
Lynix c94c525446 Graphics/TextSprite: Add convenience constructor
Former-commit-id: f6ca6499baf20e561616251950e7749350516b14
2016-01-19 12:15:44 +01:00
Lynix c359c6925e Graphics/SpriteLibrary: Fix missing initialization/uninitialization (fixes crash at exit)
Former-commit-id: c7bbd781d163a8456f1fadd0f71451adc5a1bd1a
2016-01-19 12:14:07 +01:00
Lynix c6f491ca21 Graphics/TextSprite: Optimize Update method
Make it keep established connections instead of clearing everything and connecting again


Former-commit-id: abe315a03ba19059a9a867c23780c2f8cd34345b
2016-01-06 12:01:35 +01:00
Gawaboumga 7f4a7c1012 Add override where missing
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
2015-12-30 15:15:20 +01:00
Lynix 1926b28d63 Graphics/Light: Add missing GetInnerAngleCosine() and GetInvRadius() implementation
Former-commit-id: 7deb6b2dd76139ccc98801cdb36a27e1f5979722
2015-12-18 13:46:15 +01:00
Lynix 91f778dd89 Graphics/SkyboxBackground: Add movement scaler
Former-commit-id: 02682210b2b3d4b0cf27c6dd8cf171a025a92701
2015-12-10 14:08:09 +01:00
Lynix 9e7452ab68 Graphics/DepthRender: Fix compilation
Former-commit-id: 749e3b67038cba20c46bd5570e616608200733f5
2015-12-09 01:11:27 +01:00
Lynix 9cf5e4b68c Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
Lynix 93fae53ea5 Graphics: Qt-friendly change
Former-commit-id: b4b278897d681ea5361ce9f751a0ecba7acd34ee
2015-12-07 22:45:07 +01:00
Lynix 0a0e6d00f7 Graphics: Add render order
Former-commit-id: 881ae69c214e024846dc0165f3476f76f5bcc0b5
2015-11-27 23:38:54 +01:00
Lynix ed961f5ba8 Core: Merge InputStream and OutputStream to Stream
Remove serialization support from Stream


Former-commit-id: 7a761e4fcd07cab561f13e4709c4492ed18da88a
2015-11-20 13:52:49 +01:00
Lynix 5d6e6b2d45 Fix errors and warnings
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01:00
Lynix 7db9be3cfb Disable memory manager for every module
Former-commit-id: 4c6e0a87de57bf55780cc9dfee280cc198d06704
2015-09-28 00:41:24 +02:00
Lynix eaf1bb3601 Merge branch 'NDK-Refactor' into NDK
Conflicts:
	examples/HardwareInfo/main.cpp
	include/Nazara/Renderer/Enums.hpp
	include/Nazara/Renderer/GpuQuery.hpp
	include/Nazara/Renderer/OpenGL.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/RenderTexture.hpp
	include/Nazara/Renderer/Texture.hpp
	src/Nazara/Graphics/AbstractRenderTechnique.cpp
	src/Nazara/Graphics/DeferredRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/GpuQuery.cpp
	src/Nazara/Renderer/OpenGL.cpp
	src/Nazara/Renderer/RenderBuffer.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Renderer/Shader.cpp
	src/Nazara/Renderer/ShaderStage.cpp
	src/Nazara/Renderer/Texture.cpp

Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
2015-09-25 23:16:58 +02:00
Lynix df8da275c4 Switch from Nz prefix to namespace Nz
What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
Lynix c214251ecf Update copy/move constructors/operators
Former-commit-id: b1faeeae9211a6c0ca29261d46929dc8c66ea0c4
2015-09-24 12:51:52 +02:00