52a4a590e1
Graphics/Material: Fix depth sorting flag handling for meshes
2017-04-22 17:13:51 +02:00
06038a4d81
Cleanup pass
2017-04-22 15:08:05 +02:00
496cdfd32c
Merge branch 'master' into reflection-mapping
2017-02-23 00:08:57 +01:00
c2e4ccaf72
Various little fixes ( #118 )
...
* Add missing override qualifier
* Mostly shadowing, virtual destructor and other little things
2017-02-19 23:15:13 +01:00
ead54e1c30
Merge branch 'master' into reflection-mapping
2017-02-18 15:07:17 +01:00
dc158d06a8
Fix warnings reported by Clang
2017-02-17 00:21:28 +01:00
7d5d21f025
Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping
2017-01-21 15:56:37 +01:00
f383eca19a
Update copyright year
2017-01-20 12:58:35 +01:00
6b949afb9b
Graphics: Add support of skins to InstancedRenderable + big clean up
2017-01-09 01:52:00 +01:00
d2ee4744a9
Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping
2017-01-06 17:29:54 +01:00
a00dd39c51
Graphics/MaterialPipeline: Fix error when failing to override a shader
2016-12-21 18:25:22 +01:00
adf5cd32b8
Graphics/ForwardRenderTechnique: Remove useless uniform sending
2016-12-19 18:45:42 +01:00
69296daac0
Graphics/SkyboxBackground: Reverse Z axis to match reflections
...
There's something wrong about skyboxes at the moment.
2016-12-19 18:25:19 +01:00
37d36a89a6
Graphics: Add basic reflection mapping
2016-12-18 01:18:48 +01:00
459c5e7a09
Graphics/Shaders: Add possibility to override Über-shaders at runtime
2016-12-18 01:16:26 +01:00
682dab32b3
Graphics/Shader: Make texture units statics
...
Provides better performances and prevents the sampler type bug to happen
2016-12-18 01:13:46 +01:00
5aa0c362a6
Graphics/DepthRenderTechnique: Fix SceneAmbient uniform not being sent
2016-12-15 23:08:56 +01:00
ff5b72b469
Graphics/DepthRenderTechnique: No longer require a viewer
...
Fixes crash
2016-12-15 14:37:12 +01:00
d62720d610
Utility/Buffer: Refactor Buffer classes
2016-12-09 08:56:46 +01:00
fd196cf0ae
Graphics/TextSprite: Fix undefined behavior
2016-12-03 00:36:24 +01:00
e6e4a437bd
Merge remote-tracking branch 'refs/remotes/origin/master' into gui
2016-11-30 13:08:08 +01:00
3c5594c206
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
2016-11-28 17:27:12 +01:00
3ae5bfad63
Graphics/TextSprite: Fix scale not affecting bounding volume
2016-11-24 09:40:04 +01:00
8d86306933
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
2016-11-23 14:07:52 +01:00
cd0e9d97b8
Graphics/Sprite: Add SetMaterial and SetTexture overloads for searching a resource name
2016-11-17 18:24:36 +01:00
7f445def13
Fix some warnings from MSVC
2016-11-10 16:44:29 +01:00
9e84c397ba
Merge branch 'master' into culling
2016-11-07 11:26:48 +01:00
e087129d4a
Fix many errors and warnings found out by MinGW
2016-11-04 18:14:52 +01:00
736b31af1b
Utility/SimpleTextDrawer: Whitespaces are now glyphs too
2016-10-28 17:44:59 +02:00
725dc6cdbc
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
2016-10-19 11:17:12 +02:00
4c6f049e0d
Fix another lot of warnings from Clang
...
Closes #90
Closes #91
Closes #92
Closes #93
2016-10-17 16:01:05 +02:00
7e594a861f
Graphics: Fix EnableInstancing(bool) having no impact
2016-10-17 14:47:15 +02:00
5a07bbd001
Fix a lot of warnings from Clang/GCC
2016-10-17 14:46:53 +02:00
4ba744c1bc
Fix merge fails
2016-10-12 17:29:08 +02:00
561c0cf51f
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
2016-10-12 16:51:18 +02:00
e9deac3802
Graphics/ParticleStruct: Add size member to ParticleStruct_Billboard
...
Former-commit-id: c8578baad436d18d609d4cc7cf1d773ba01b8616 [formerly fff8b8fce1a6b0a5330dc983e46676d9de6bc810] [formerly 9d584febdb50e4680d4beb24c5fb65371b838ffa [formerly cdbfc358e3c66ade396353c5d996c6d5c7fba313]]
Former-commit-id: 54ab0d22f7e947a2ee01fa9f36bd0e81af40e91d [formerly fc75d5fcd8351f4c9bccfd4c3a57131365d52ea4]
Former-commit-id: 79f3c8b08ad0089988e59139baaf87bf2aa5460b
2016-09-26 13:19:30 +02:00
e5218301b5
Graphics/TileMap: Add support for isometric tilemaps
...
Former-commit-id: f89318c22ae2dcdab159f46dcfcbdb778af00ae6 [formerly 9912b85867bbb46cd785af9f3fe3a1dc72180149] [formerly a82344e574762f14805ea6c831a0a314cfe36a20 [formerly c234ec3cebd016381a38cd13f7d411511ae98164]]
Former-commit-id: d170f0897b77bf29f984a8ddf9e5b193d63a5e60 [formerly 54a8819656b3c626c1485dbf5ccc8f015ad005f4]
Former-commit-id: 0b0bf65c250219c29b27067b315a3735d8fbbd70
2016-09-19 13:07:55 +02:00
8ec377e72f
Culling: Fix some issues
...
Former-commit-id: cc91c0e8a7f0651743439ce8ac19efacae1aed69 [formerly d7463103fce8210ea8e495a627e5d84e3e4d430b] [formerly 274c2b2c16df1784823027f3f50c6d7024640eee [formerly d5baf025e09e3ef48f5c1db64a07775c75594a8a]]
Former-commit-id: 15230bf754acd065e6db4ba8dd79d37f43ba8a02 [formerly 81b85f2234f378de5eed976d4924ce8ccb08296f]
Former-commit-id: 3cdd9b2416ada3c6ae9bc8bdc527da83c46e0459
2016-09-16 00:40:01 +02:00
7c3d9c563c
Graphics/Sprite: Allows to set sprite corner color
...
Former-commit-id: 0b892e363a4fbb18c729d289f543403d897b03c0 [formerly 28fcd5a7269c63b1f8c4c8c80c82e5dce9e17d1b] [formerly f8022fe7d864a6c1773c4e19843d7fc46590d328 [formerly 33fbfb6cd1700a3e05bc82875546cd57cfe6f6aa]]
Former-commit-id: 3ef8f144f07c0cf7666b59cdcc135fc74348caf9 [formerly 8bae7631b9aaf2565ec52d68f9c0c1a7a81dc69f]
Former-commit-id: 6eba237772ab4773180e3a86e9fe4f9b6b8e348d
2016-09-07 13:04:58 +02:00
614c1556ef
Graphics/Sprite: Allows to set sprite corner color
...
Former-commit-id: 66ca16acbb25da23a8a85b77d1bd4c4ca412e82f [formerly d4f67e512d1e7edd31c049045cc9069a8926d794] [formerly 7b9ca802280f114492d4e1aaa068c241802f3c25 [formerly 068f737047936c99b79057674bd453a54fe44960]]
Former-commit-id: e92d6bb1bd4668a2f94f0311f887f38c00544277 [formerly da0e5d605a0b9197a767e48d8a5dbd94dd83872b]
Former-commit-id: a4ce87c4974513dbe3890ac3f316ed14b74919eb
2016-09-07 13:04:58 +02:00
560825fa8e
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: 81dfaea9fd265b8a2610fda2a155cef4a73695b3 [formerly 4ca561497c773dd88058e448f1e1901ce558eb0b] [formerly 5ae1e8f8d0bd13c6ee275b655ec82e66435ae5b1 [formerly 2ea9e9744d6877a1192e6cb844e3172ae8db7218]]
Former-commit-id: d8944c28fa76195f7fdbd682b0d6113d0ae3c487 [formerly a81b6d5a73db2fbe5b0428cb7a8bc3388432c06c]
Former-commit-id: 50f7995003fd968d85a0f3f020313c7d6d9f5d68
2016-09-04 20:02:34 +02:00
82f39221f7
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: d40335a1d84793068db6d9ea7291e4053d00b349 [formerly 60aa10a46378c238c40f700bfd6c6e5585558da2] [formerly 0133433740741edc53e2070b8c2fdf5a4b831361 [formerly deb7b7432d4e327e8f9438814eafaa25dd3d9a51]]
Former-commit-id: f1eea3bf4fe3d0024217f5e9b38046cf2517b0cc [formerly 6a21f03e56a7d5c8d4aa9855f2aa50e9e7b30ae3]
Former-commit-id: 124f40eb3bbd24740ca15338a99153bab98846a4
2016-09-04 20:02:34 +02:00
ba6c562367
Sdk/GraphicsComponent: Allows to setup an offset to renderables
...
Former-commit-id: a5e9ceb3f30e79a0d3b96b6866a06441cbc0b463 [formerly 8af071cedec0a6aca00ff9c12d66e8a0817049c6] [formerly cd7e7040fd68dd5a74a0b458a3a305c251257b51 [formerly 0f9382c169a260d5fa34fe9b1ab64c3d19dbd385]]
Former-commit-id: 774af2326cb64824f85835c83464bc19884005e1 [formerly 4b676844f6dd56940b4f503c6a943905ea8a54c3]
Former-commit-id: 0673e4d4cd88c99d24e0e153a61d2726e2e2c039
2016-09-04 20:02:23 +02:00
f2aa4e0e19
Sdk/GraphicsComponent: Allows to setup an offset to renderables
...
Former-commit-id: fd1f70010f950dd4a4194e049ddff317c0d8b4b9 [formerly 8fee96f11b7bef08351110bef74643fa0be8b17d] [formerly ec5d6ad819cf325dac0ae61d983003cf99c78aac [formerly 2610a17ba67d61080254ce4bc3e9176e315dfbe5]]
Former-commit-id: 7683be7fa9a565dc3fb59be401ecff5580a6de15 [formerly 80ac7628f5119f58cf4518b5b1a44aff5b6d6b20]
Former-commit-id: d1604af612715688e7b1fc451d8561f79e100541
2016-09-04 20:02:23 +02:00
a311ff4cf1
Graphics/DeferredRenderQueue: Fix crash on layer removal
...
Former-commit-id: 87fdfb051158d241754eb6f1f811d12e88811a47 [formerly c5ae03d7168851330dd2c087c515c7d30ad863c7] [formerly 0f5debff94e6a37dde830975fd219daf82382d9d [formerly 42297b9b5af5b42e4c12146d930b6641425de8f4]]
Former-commit-id: b93ecd34f72724806ea06c6d335a41c7dd1afacb [formerly ad14d199f3ee381221df118b4af2cd647ab8fc24]
Former-commit-id: 805f20df11668bf73d35065e23c4912800850427
2016-09-03 21:13:00 +02:00
88615eae85
Graphics/DeferredRenderQueue: Fix crash on layer removal
...
Former-commit-id: 42859917e1603acb297e0dec88d91ea673698bc7 [formerly 416ca6e56e3d19c57bbd22df7c0ee760bdc85449] [formerly b405620cd6b4ebe4413d13abd1082d68eb9d7203 [formerly 38b249271c7366e767111de1bb98bb63e0b86e93]]
Former-commit-id: fb61d2d9bb16752c0e2ea9fbba3d8e61a138039d [formerly 5ef5905f3c64859d87425b76342acd6cc562ce5d]
Former-commit-id: 36ab2a4d8a66737af06634dc2f79da1f9d6b5662
2016-09-03 21:13:00 +02:00
7781a27641
Graphics: Clear instances in Clear method
...
Former-commit-id: 66b0db92e353312b6cf3d68526417b5fb77c0bef [formerly 897579017072102b658dc637b91bc52d80a061cd] [formerly 7685fb2c3c18c030ce5a3ac6a29129bd39de88c8 [formerly 7ba2bc156951247f5f7ba7ebfb3d65bced1731e7]]
Former-commit-id: a1eb128bba2d28589a7988f6f98a860839c07cfe [formerly 1fed3d7b8cbc84c528ce27db61123ce8fc562e97]
Former-commit-id: cc56728a6e0a6b84c4969850287109c8e92281cd
2016-09-01 13:02:46 +02:00
32aeb96378
Graphics: Clear instances in Clear method
...
Former-commit-id: 8f116c954577de1e231efe5d0c6c34458e7c195c [formerly 0b07a41900b0cad6305956370a045dd1539e5634] [formerly 4eb1b81cf3b3e2badcf61032988f61ffe511a001 [formerly f016c785f246cead41c81130d04ffb2dfe61e42d]]
Former-commit-id: 4f7fd53326b8b60c91d4e4edf53451561c7da7ad [formerly c80c94219ed09321ff35472cc9209e383f14cb59]
Former-commit-id: 8e2ec06ccf7bee67a47ad73dce1132c33cc91a5e
2016-09-01 13:02:46 +02:00
3755fc2487
Graphics/Sprite: Add Origin parameter
...
Allows you to change center of translation/rotation/scale
Former-commit-id: c5e8b3cf4b67e8a2765a4f0984d08bda3d1dc0ec [formerly 20f58bfa832c85f4837f325c3d74b0eef264b2bf] [formerly 830cae0d17c4cef7b538734d6cfe83539689dab3 [formerly 4dc889bfa34a04c59844969bb0d6b08599c1189a]]
Former-commit-id: 949b6b78762b7b804e357ee5b3afe35456fd7f2d [formerly 92beb7207e1271941f4053255091d32806a19e9b]
Former-commit-id: 5b1d9b37251f0bc3be87aef0ef0c3252ff82b4d0
2016-08-31 20:53:27 +02:00
5d13fa664b
Graphics/Sprite: Add Origin parameter
...
Allows you to change center of translation/rotation/scale
Former-commit-id: 6045c6f78ec81db54629883927a203e8c50bb561 [formerly 8ab1e1e5785a9be67b76364f62fe4b767dca341f] [formerly f17a5c8c4d5e5cef8dd4ee76734609a6651384e7 [formerly 4a932134b130d64deb88f018332f5414b1370435]]
Former-commit-id: 8311f12a2e6a28bec5e22f5ca5ce7d3f551d52ba [formerly 412800a9b5afb15fb21f2428e2e9b3b9eb34c0ab]
Former-commit-id: 80d03c5581adbe47ccbe33649787a5698774cdd3
2016-08-31 20:53:27 +02:00
1f2719fd17
Revert "Core/HardwareInfo: Fix indentation (Windows)"
...
This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]].
Former-commit-id: 153fd6ac243aee3971fda0a4a2ec9bed51a4ecbf [formerly 83b196ee86d8689cd331b8ac1e9256fc4158f4bb] [formerly 76dceaeb34c1e3156537ebaa3ba0a73950b03805 [formerly 10f813a3f75ef706c37c3e312ccc58a556b5e1f5]]
Former-commit-id: 9e2e56623d1f2b95f013ee0f565a5ffdf0f450b9 [formerly 1e58bd22e6b1070954227f669d92794ce56581a6]
Former-commit-id: c5ccf208507c40c8939ce9a92c8f4def6e231b79
2016-08-31 19:16:03 +02:00
486d4fc015
Revert "Core/HardwareInfo: Fix indentation (Windows)"
...
This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]].
Former-commit-id: 8c12c9823e95088e92a5fbcb77b7b4feb175d3d9 [formerly 137a3a93c7be0cbcc8b82939c0ba5f3844fa1e24] [formerly a76f30044d61a5e815ed2b1d0ebbcd05feaad994 [formerly 71b63053a8db0e880844044f849f1029c70a6b25]]
Former-commit-id: 596d78e1e8fd79e5dc8aa3fbb514c1d6444ce978 [formerly e5089919c76e32c64bda7a1186550a65a6b6d8b3]
Former-commit-id: bca999978415a972625367d087320cc016f4774b
2016-08-31 19:16:03 +02:00
85b2f41667
Core/HardwareInfo: Fix indentation (Windows)
...
Former-commit-id: 7ba2d1623489a77445c5f687b329fffd8f85bfc0 [formerly 670207d53279fa6ff6a63ee0c701ac5691b3073c] [formerly 214e08cdb6fa4abe6289c139b62211a806f7545b [formerly 1774090b940bb9046ed51fcb70e7fc89e490cc67]]
Former-commit-id: a6ebc85ef52dece75daf2dbd95b73cfad48e957c [formerly 00b7ddd2874d348d452ae8fd0bd668b90b7c4bcd]
Former-commit-id: e9dd53029407209f3210cd47b16e1e0070e1ccfd
2016-08-31 18:20:23 +02:00
4637547834
Core/HardwareInfo: Fix indentation (Windows)
...
Former-commit-id: 8e81ffeabb15ea32897b9326c64f3eb0509f3a4d [formerly 5f825a1f5e572a323ccde72c02092eef3fe63288] [formerly ee52f05420bcce124f38df04a993981f55319da3 [formerly d158e494b1e518dc1f472439cd96a9005e959697]]
Former-commit-id: 2bcd5f3ef3195e1ddb172010a3322551101490d3 [formerly c1ad1017301b3c17c8fab3981bb43fcbd3ca6dfc]
Former-commit-id: 7782b8a6e2ef27e2ca97201d490c5782a9a83899
2016-08-31 18:20:23 +02:00
24d7861380
Fix documentation
...
Former-commit-id: bdaff1e4efaaad685df60baa0d11af3e7951dc4d [formerly 409b51215b894006fbcae285c8dfd67c97c9ae11] [formerly 58a176f2944bc3d347ccba58360cbdee3bb1b8d3 [formerly e6bd6b34212946c04eeec6896954c3969d1baf5f]]
Former-commit-id: 944b2ddd24acdcb0b6a5db07cfc75c13f407737a [formerly 7ed2f044fe8e50bf99a1c432e6079f7a445af573]
Former-commit-id: a1bfe55ac944ea530578a0cc813dd253cc708b69
2016-08-21 13:49:24 +02:00
27d1fb048f
Fix documentation
...
Former-commit-id: d43e254a2b72c53f09058ececd3bb449a9db9b37 [formerly 6351dd5b08b135d781a4ef646801ecf264cd3158] [formerly d43cdee4a57da3c91eb04f07e8b6cd8ab6311bb1 [formerly d22dfb0c17d68a4b4d4f21cd4c302b01d2340c92]]
Former-commit-id: 09aca89659ff3eaf9a62d81458e055af07db19f7 [formerly d76a23b823cd559549b3e71a67b5fe18f9130869]
Former-commit-id: a4180f4dabc413916bef4c102d414a03aa9c3d97
2016-08-21 13:49:24 +02:00
705faa8d95
Graphics/DeferredRenderTechnique: Optimize Deferred Shading
...
No longer copies depth twice
Former-commit-id: fa946456f8196d2955efa278f2c47cdc9f6c0dac [formerly df5a55b487b02ebe7df1c31dc640ca60042ed49b] [formerly 5ebfb7cd0df4c998292a7f0b661438f4f2fc3b6d [formerly bd64449e3ecaa7443a4db86d6ef787fd42fbc314]]
Former-commit-id: 7bd35cd3c2bd845f9ee8b3d2d2a48793f63047e7 [formerly 267393d8cb349d6f77bf9e707c6ce2d5344ed7d7]
Former-commit-id: b9e45d39c4ec5a0ea4dd0cc37f478af0cf3e0caa
2016-08-15 01:27:33 +02:00
f3c57a5417
Graphics/DeferredRenderTechnique: Optimize Deferred Shading
...
No longer copies depth twice
Former-commit-id: aa2096ade409861b773bc7302ced27ae84fab858 [formerly 80fd00bd4a75506b128b70a545eb43ff6a3a7071] [formerly d8576a8858caca9314ea67661af0ce7d9077ba9d [formerly e626f2fd62d19ca5f952485478bfe46f4a803227]]
Former-commit-id: 363c93e397887e66b25446927bc5ef89e761c488 [formerly a8bee284456d7f46d182ae7df2d565fa29e55b61]
Former-commit-id: 168792d853247ada5add8f97057c213af7c801b3
2016-08-15 01:27:33 +02:00
e501a93ae2
Graphics/DeferredBloomPass: *bloom intensifies*
...
Former-commit-id: fef9aca40577c522d6125f7d352b318e7556e103 [formerly ab11d22150f2e4010fe7a1ca4c1bf574a5d9cd41] [formerly cb388b47dd6c2438fde651ca51c6cab67b92520d [formerly af484ac159cdaf43a162b407f3679bfa905e7314]]
Former-commit-id: 75e3fe6f35aa7b692e5135aa47f288dd655c96cd [formerly 0d44d17781c914790ab30431b0613a198092e180]
Former-commit-id: 9ef45a44ce6177a90f31db8b7aaf3366cd9c74dd
2016-08-14 18:02:30 +02:00
c196037cb7
Graphics/DeferredBloomPass: *bloom intensifies*
...
Former-commit-id: 7c373dfa8579858334fe08e6a4e4bcba51930019 [formerly 2fb489abdf59b7a424b1db83ecec95c6e5e2b1aa] [formerly 5140918ad3e3ae5a8d834fa33d8f703c85dd674d [formerly a1b3f613332071879be668c792cb8a8b327cc020]]
Former-commit-id: ff5f59007fe79f4b15b013ffa39648a9cc0935e2 [formerly 9246b1e9ae1f1e1b94f96ecb9870ab1002f81453]
Former-commit-id: dcf3afeac9e3ee890d1107bf6de9a4238a62b4bc
2016-08-14 18:02:30 +02:00
e3989b8656
Graphics/MaterialPipeline: Add Translucent3D pipeline
...
Former-commit-id: e947711e6be029a86c8a83b5ae2e48a0093caae2 [formerly 26782eac4659502817def9d7f008ac160bf6a339] [formerly 7dd4e62f7d12341237172777a84e3decf1fe6063 [formerly c362785d9aaa8693f6a753b1bf8127ec67bbf511]]
Former-commit-id: 749bd125c56425fccd3cb290362138d534f3582e [formerly 7ffbdcaea4592d2ec6cf8b5260de834c6e724ff0]
Former-commit-id: 3f37254ae01e54441226b9a873cc37fc278d4315
2016-08-14 18:00:38 +02:00
6749bde3fc
Graphics/MaterialPipeline: Add Translucent3D pipeline
...
Former-commit-id: 022e9e4eb922cc4aa5c9b973614e37fba77379b1 [formerly 26fe778c20258a71515be156a6818b4e37b8cd2e] [formerly dd5cda750e0a5ecbec9bdd0079233c13d4537b95 [formerly 27617b283f8c0d809f59cc76c05b3df75cd4c268]]
Former-commit-id: b50ce9e7fa9a7cdc13b372a1aebe257f3df80a65 [formerly c264fd6dab96b279e74d90b8884dc2ffd3c26f9a]
Former-commit-id: 4f8a31cb583b21a12df57bd990170b384522e5ea
2016-08-14 18:00:38 +02:00
1d5e071334
Graphics/MaterialPipeline: Fix Translucent2D material not having blending enabled
...
Former-commit-id: e8a2fd043c1abdbb9ef727bca1e31575175a2dd6 [formerly a3bb0930322858029a3fb1f5e8d67ec02536c329] [formerly 444ef3fbd363cab6453057d3cc6687a1d7663f67 [formerly d54f03800504a0f1674844f6fc13716ea0860511]]
Former-commit-id: 29e0c1232ad6a8bf29797a39dabbb7f0ade8d922 [formerly 3d93398d3ea500bc6758c800823e7a15b92901c1]
Former-commit-id: def6c8b2c5ec67da18f2fe913e8c3dce427b97d3
2016-08-14 17:58:54 +02:00
2f007efbfe
Graphics/MaterialPipeline: Fix Translucent2D material not having blending enabled
...
Former-commit-id: 98893c36d727a47c802c6aa190c9950e623325a7 [formerly 445ebf13e8ada3852afd0076508fc7fc9ef0cc2a] [formerly d050d8e58c2e4b7a25e450b7487d15986ec5f116 [formerly ca2c8cb540fe5dfc57ec766df017a1a6c03ebab9]]
Former-commit-id: cea769b7017ab98074f009cdf49749132d606248 [formerly f7492974f1ad6c2698de4357cd1d6bac354888de]
Former-commit-id: 22369659913859e780aa9db111bcc24823b68936
2016-08-14 17:58:54 +02:00
5e305a18fe
Graphics/MaterialPipeline: Fix default pipeline not having an ubershader
...
Former-commit-id: bcb9a8ff8490cbb067a577f5ec02c1fcbe161726 [formerly 7fbbad94a914bd6af32c88d4008a22fea064db0b] [formerly 4ccea598f463ebecf1f9bc48e9d85601974a9a0f [formerly 642ffb31b8578085001cd1bfaa59bf0f59a2fffe]]
Former-commit-id: d33e25edd9114a56a74064b492e266cc160f91dd [formerly c2075c3d1d2582d0d213574ac034bca530138679]
Former-commit-id: 8617c4a1edc70a96b9c34a386deb44b778f82f40
2016-08-14 17:58:38 +02:00
30380d2979
Graphics/MaterialPipeline: Fix default pipeline not having an ubershader
...
Former-commit-id: 740af3fb62dff7b07f184e8d13d00937b5e36f7d [formerly aedb01d9208c9e6579cae5d03e5a0c90424383f7] [formerly eb67802a9d6a3d67590f5c61e4b75c518da792ef [formerly d83b7c4c0241d43fa7d85741f67866303c1e86b6]]
Former-commit-id: c89e8612ad25f22a4bc471e916221c7338765b4d [formerly 1a72ceeeb9fa47b40fabfa2c6b98231e918bd18d]
Former-commit-id: 105238d08f0f41832751e0768324066c853b84b8
2016-08-14 17:58:38 +02:00
c231d73f9e
Graphics/Particles: Add wrappers on functions controller/generator/renderer
...
Former-commit-id: b4bc65fd61d304ab9c54f5eb960ee3ee111e4199 [formerly 6dc8ec4c126ec92253fcd1488f3d450a87cd2b0b] [formerly 72c62a62a1f34b633531c8e011e697a773ba574a [formerly d2aff554d20246c1fc5b47013e3e7c136c0b51a2]]
Former-commit-id: 54227b0f67e85ff186ec4ee7a3df0f3aa70193d1 [formerly 49065827d43b04e836901c05fee0542667c50683]
Former-commit-id: 013776ab4b91064bb48b18822317935376062a09
2016-08-14 17:54:37 +02:00
262f4c2a87
Graphics/Particles: Add wrappers on functions controller/generator/renderer
...
Former-commit-id: 8a0eab88a918f901e918a81cc8a81906167eccb8 [formerly 1fea24282314656473187fd5320f36eb6d06c004] [formerly ec24ee686b68f7e684853d49772105bc5a92b5a0 [formerly e9d6783dd6dff1de2468bd0fd979b28037b1cb44]]
Former-commit-id: fc6ad0e1dbf563f3b3b485fe9c7f93b35c0712bc [formerly 9cfcb29a154a3461183695df3daccbb8965eaee9]
Former-commit-id: b91d72a005fdb104711fb8892b14a5f98fc29ab3
2016-08-14 17:54:37 +02:00
b096096e83
Graphics: Allow OpenGL 3.3 to use the engine (with shadow disabled)
...
I still have a figure a better solution
Former-commit-id: 9a3dcc73288ef2d094f87b7d89fb964be3bcd7c0 [formerly c231ae17e7603200529c31b750f7679af8b03931] [formerly 2fa92f5bf7d2aa2d0161e1c8522100b4912f0d1b [formerly 3efc46381638ed065edcb4a3cf16a9d10f5b8cc3]]
Former-commit-id: b46272bfc3d671a876eafff1fd31643bc37bb49c [formerly 219ff5ec8d057e5d6efe3c73d3e59156da1e7575]
Former-commit-id: 18b860c45d7176848b832b62a57dff00dbeb7ffe
2016-08-11 00:04:10 +02:00
3f899d24aa
Graphics: Allow OpenGL 3.3 to use the engine (with shadow disabled)
...
I still have a figure a better solution
Former-commit-id: b183688bb05e98ba75f046b21aa10de3e7d8c329 [formerly 455fea0feb41b47325d0ca67b37edc4bbdf72251] [formerly 51570bc5776af09f35ffeec175361d5a68c6b3f6 [formerly 0361f22475e3064ed871cc13058b15098f45570d]]
Former-commit-id: 28efac6ddbe03f3d53e48072f20ea2353b45035f [formerly d68e985e7016c3e307cf55e882ff70507363985f]
Former-commit-id: ac4958f4df3df5f9c3847b14524cc275027c1ace
2016-08-11 00:04:10 +02:00
e0fa458f40
Fix compilation with GCC/Clang
...
Thanks to @Gawaboumga
Former-commit-id: b8cc59cab55fd7d3b286dda28e70ee0ddb753230 [formerly c734175c33bf84226eedb76953e773f5bb91f631] [formerly 01b6b7b89bffccf217e38ed8431e2b2921facc51 [formerly 03c3cd902be4a0a104db22a2831adeb675998929]]
Former-commit-id: 89ce26d806f8b750854af1704aa6af899b7779b3 [formerly 782dbee06d75ba2f555632713b44f1c25666e3ab]
Former-commit-id: 30ba1aff3bc8a8de9510fb6e4f417526fb31e125
2016-08-10 22:17:55 +02:00
5ebff77ef0
Fix compilation with GCC/Clang
...
Thanks to @Gawaboumga
Former-commit-id: c2ecad3d8c0bad06cb47b906829585c8d0b910c0 [formerly 7790b792e730ed65c3e8b8dddbd91b1527631e2e] [formerly ae62fe532d14dd33bfc88cf7bca1d19e63487a3f [formerly 41b273ee595cc56c6145651fb4caa1ceca0b2bf6]]
Former-commit-id: 7d4c3b3d0b48235a6c3534154c5787738440b2ae [formerly 96dcb709ba81c5696ba633b06e887007d5d9caf5]
Former-commit-id: 2a2013af6d26bb64362d1edd2e6aacaac000708f
2016-08-10 22:17:55 +02:00
021ddffdea
Graphics: Deferred Shading is back!
...
Former-commit-id: b231aa4a5c13be870e334ab7b780317b3fb5e94e [formerly f155bbf9fab223b7f6a931f70361ddde63ef5d46] [formerly 002dcb36444c752d9cdbaf70b255008073a8670f [formerly b37e872dcca19c3607e318f2032f7842a7698d6d]]
Former-commit-id: eee04dd3b14e7b1049e1662156de19683e5c2b14 [formerly ccd0956ed19b806581237aef58416e8338544875]
Former-commit-id: 09c603760da3c4edc512e3fd311f2702a2ebe180
2016-08-10 14:08:20 +02:00
3438d0105a
Graphics: Deferred Shading is back!
...
Former-commit-id: 72a1a2d31d0d0b54b596e2ed0e007acc0e206a37 [formerly 87ebaf36f4df323e992833e94ec9628cd5ebc1ad] [formerly 6be175c77c11ffa090106fdc20cf0eaf6dd33159 [formerly d721d20ae53ba078e856c6b968205ebaf71e0151]]
Former-commit-id: ab55c5ced8dec7cdc65da9a706bcae1c01a7d0d4 [formerly fd71d68a674972c542387d3342f4c3d61fc4e4da]
Former-commit-id: dc7cfadb8b7df4c78919af939380289a6b167354
2016-08-10 14:08:20 +02:00
55d14a8b88
Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release
...
Former-commit-id: ade351eb66716c1870de6450e6e499a927cd40b5 [formerly 0fa763b512136b5eea96269b7d60dffd350ec990] [formerly 8d17f072fb762cc7ff17752ed63d87613d69584e [formerly f5df4cfe375057859d62096fd01c20b5f3cdefba]]
Former-commit-id: 1e248d44ea1aaf65711c033e0a716220d22ee3f8 [formerly db200dbdbd6c8a12c0445476477061ad6bd26323]
Former-commit-id: c3d6857dac1325bc9b62bbc1503987253c3cad68
2016-08-06 01:07:09 +02:00
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
465801836d
Graphics: Fix build
...
Former-commit-id: f90f824361033d6accd56e6f11262c7f7bbc72d0 [formerly 7578444e26141f23e5f501d2f0deb1e60fc9e0fa] [formerly 94496fe3569ab91a47b46b9c5190f8e713df1bcd [formerly b5229f1ec2d406c8c6dee27b49664ce06784f649]]
Former-commit-id: 1b1a32242c7b6db509cf0a042974ccd8f60e6b46 [formerly 4bc3be4a64b03d166c685164a80ca332dc52ae56]
Former-commit-id: 1089d9778bd3060c453eb1b64c0c1259bb290ca8
2016-08-05 22:58:14 +02:00
dda41dbd8a
Graphics: Fix build
...
Former-commit-id: f9ff831dc3b5f09e829a949ff213020998a4fd82 [formerly 64dd5b86643363bc6a07d36c666d7f8172e21535] [formerly 288bc4600c43227953960f0ad59633aaa01fa598 [formerly f6a908db55d46775566395b11f719a05a1e9e7e2]]
Former-commit-id: 6cf4ad619557497865bee10757bf41eeeddc73e0 [formerly 19c535c963d5240de50733b1593fb201171f0c93]
Former-commit-id: fb64e1f4f1dfdd34d6431ec99f7a78a2c33e53ed
2016-08-05 22:58:14 +02:00
87b5047b14
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: 4ed2f66567f7da6b6b6ee073e4d855b9a935000d [formerly b540f468fc700a16d5136d4dbb8632e23882fd3d] [formerly 37fff624ec65cc387130875410b6ea35c1a5bcfb [formerly ab9a88f514f46f6596499e285981fa6da588bb03]]
Former-commit-id: a2e8859196c0f72b7d7ffd8764a887e6c8173743 [formerly c886cdade14769db243ff993a1741f6052a2eb2a]
Former-commit-id: e1d02662fb1ac165c7e888380afee7601350060f
2016-08-05 22:11:13 +02:00
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
8fbe279a50
Graphics/AbstractRenderQueue: Remove AddBillboard method
...
Former-commit-id: 454c84a97accb0cddddadbe48a2e08225b9cc98b [formerly a4e5d1e4511e5c1f02b8fd4e129192f88adf315f] [formerly d10b981f4e27d0dc6afc76b2c8dc60ab860cebbd [formerly 0e8c9cea9e8f06e82597924e608d0881d6735433]]
Former-commit-id: 43f5b9d50bd672aa347f00ed2f87c54e9c9148ee [formerly 3ce48d5f0e61153fdf0cc957e06d6a5985e40577]
Former-commit-id: d6def9dd70839c5caa8cc8a7d84d714321e81b88
2016-08-05 21:55:26 +02:00
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
af01e7242c
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: 4c3c2012ae06bdc4679fed40ee6ad50027664a8f [formerly d0454f47bbecdbb2513d7afc629b00b53543f671] [formerly 07f50ad9e366215fc51280232c26cc8cdbf8236d [formerly 27fbbc6106dc22f72d3ddb382049672e82833cd8]]
Former-commit-id: e45fd2e87fcadbdf0a56c410d6c1ff36d9ea4b4a [formerly 0453e3ba57d326859fc78105b741cd7f1cb97bd6]
Former-commit-id: 9f7082ef9da8e8baefaef5c141e630ba99b32a83
2016-08-04 01:12:06 +02:00
00fb383f70
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: a3051df8a12d596901043b142ee1fa55a2481644 [formerly 97b1364fc5ba7f22bb28479f0edb351db8e7cfff] [formerly 49730b561eda3f1350e87b2c99c48c04f45c849a [formerly e20bc09b46ea5a6555ef887b1db3a6f7f2b7cb3a]]
Former-commit-id: 78f2eff516042ec38f0f61ab9b4263d968c0488a [formerly c6e7d6d63628402d8a58cf8e95dbb0509d07ff03]
Former-commit-id: b269a6e53c5205aa27ef921f348367f1affde02e
2016-08-04 01:12:06 +02:00
cf8224b9e1
Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
...
Former-commit-id: 3e608a9622d6c759ca0d9cc42d5f5460a6e4488a [formerly b31994657a126489c141ca6bbd4f7745876b0fb3] [formerly 833df21d1208e31b5141dca3d9777c4822556ddd [formerly 638d3aa5c15845fc49c97727aa00aca2d670bedf]]
Former-commit-id: bb2418f3523c525691ebedf044b47314fcdec6bb [formerly 43c4cae99f5b0a20431e6118f2b134e0a930633f]
Former-commit-id: ffb8160b1574acd1063dab4ca151f420ff0940e8
2016-08-03 13:47:17 +02:00
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
ca1b9c1988
Improved declarations
...
Former-commit-id: 567f98b44eada10ffb797cc19cfcdbca584a2461 [formerly 01826c3bfd8385abd6a47f770c7eba7980ae9199] [formerly 6c54c8e8e6a8515387fc61f665bfa5d2cc2d8cdf [formerly f507b9604c2395a4d1eec0f12a07e3cd8b47e4f6]]
Former-commit-id: 1723f76155d68f5aac2006f5ebf5bd96b4ac81e7 [formerly 04f3ed2688c3519923edbb0693e259ee3653256b]
Former-commit-id: e37a8744e6756f5eb331881b422d491171adb362
2016-08-02 13:31:09 +02:00
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
fdfd078335
Build: Fix empty install commands
...
Former-commit-id: 42abd0d02836ee466821da11bc34bbe4acc30389 [formerly 0031006522b6c8910fae4c7b72eaf05cda23dcea]
Former-commit-id: 11ed91151aa8db729bea196ca9705a6e60f260bb
2016-07-31 12:59:04 +02:00
554c17702b
Build: Fix empty install commands
...
Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
2016-07-31 12:59:04 +02:00
2468fd63a4
Graphics/ParticleGroup: Remove fixed step parameter (wasn't used)
...
Former-commit-id: 9e0d603d8bf47cb971bdacbaa662f3068d035515 [formerly afc7e78d0e517d87ea1239fea4105f6a07ab3aea]
Former-commit-id: 3c972ba5345592c2f35e1caf886ce6aa87560d4a
2016-07-29 13:55:59 +02:00
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
b273a08571
Graphics: Rename ParticleSystem to ParticleGroup
...
Preparing for integration into the ECS
Former-commit-id: 9ca871117d0be3d4c655225d3f3dad6b0277cdd8 [formerly 9343fd818957da74e0bb7a5715a2172eefc325e5]
Former-commit-id: 93cf58c80f0cd396211df0c95063f0ad05449e75
2016-07-29 13:24:19 +02:00
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
4d307c07f9
Graphics: Add TileMap class
...
Former-commit-id: ecc9f3f1e786da4017ef24322a2f2510eab33a6c [formerly 2d18b57f6ef6c8480f83226082cfcceff3779093]
Former-commit-id: 531e4724efe7fa76f64c1e252665be31d1754e7b
2016-07-23 18:06:17 +02:00
25d7112054
Graphics: Add TileMap class
...
Former-commit-id: 0a45b956501998a40a6406f7fff6e6cc85b4b4db [formerly ab84ea10c52b128b17241844e6a4b3887c6618ab]
Former-commit-id: d62bbb11f5205daa6af3f7b9152be3fb213ca564
2016-07-23 18:06:17 +02:00
ceaac9be13
Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
...
Former-commit-id: 8839ceda70dfa0384e8da43205a208c89f1eb7bf [formerly f5434c9c44a52e02fdc6970e443cd7d3e9e99e6b]
Former-commit-id: 6a4846a2e2c8b60160598812ebd02da17a2f6947
2016-07-21 23:00:09 +02:00
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
884c8528f4
Utility/MaterialData: Fix FaceCulling being used for FaceSide
...
Former-commit-id: c6dea66694fbcce15d266e280e8048048e2523fa [formerly be83776dfb6acd33b6e86bf4e8aa74eaf253826a]
Former-commit-id: 018a5d60be15d1e476ccd739a9b171cc997ee355
2016-07-07 08:57:11 +02:00
0b0dfda89d
Utility/MaterialData: Fix FaceCulling being used for FaceSide
...
Former-commit-id: b82f598a9c94700bea58d651b5f29dcf47251af1 [formerly 5790a8397870a66dfaeb9e56862e5fb2ae850cfc]
Former-commit-id: 93372a3b733d3c84de11abacc6eaa3804b98079a
2016-07-07 08:57:11 +02:00
18cb5f9da3
Graphics/Material: Add SaveToParameters
...
Former-commit-id: 706770cc1eaf00e0849d9a6f6878b0ab9b69d3aa [formerly be281a7eaaa21f25c80ff65bf7b79c93c03e1e1d]
Former-commit-id: b54f61ec5be56a9ae51decaf625ff96b2ab5c62d
2016-07-07 08:56:18 +02:00
c83b9d0491
Graphics/Material: Add SaveToParameters
...
Former-commit-id: 87b9ca6e0f5f391f45edf6106efbd550dd52ac53 [formerly 91ba614d69d3a2e9762da0e059ee96985c891749]
Former-commit-id: e049a9db776f407e2cd7635bfb1825d809223c77
2016-07-07 08:56:18 +02:00
e0071b196a
Sdk/GraphicsComponent: Add Detach method
...
Former-commit-id: b80b7e52f4736f61c439a4242531adaefbdb75a2 [formerly 2c336b6480ae9a11ca1104ee1140e8f449bb2a02]
Former-commit-id: 54f77c634ce1f9bfc93a00d9a14567bd25a06b26
2016-06-20 13:11:31 +02:00
04e52caa88
Sdk/GraphicsComponent: Add Detach method
...
Former-commit-id: 16bcd7d8a3b50235cdd50443d8a1ed55e4b939f2 [formerly 93e838eebb955d5bbe17113ced86a247122bf522]
Former-commit-id: be3d0d2e8fb9a887eb903c6b17f16a56e5eee1c7
2016-06-20 13:11:31 +02:00
819b46f5fc
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
2016-06-13 21:09:55 +02:00
c528640d80
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: 5bc0c622c20eae45df51bb1ee62e5ed566e58a1b [formerly a8befbed30cb897ce876fd3b46a3585e1b70613e]
Former-commit-id: 999225e414c0d6a3e9c6868f040b68045b2ba724
2016-06-13 21:09:55 +02:00
c2d0ebd15e
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: f8a87ba041804b41dbc35db1fb2f99ec51702b8e [formerly 0adbfb8a3baf6330953b0247f4ad5a72af051633]
Former-commit-id: 54fbeafa8fb8034f945086ea06a20c34fb2bfb4d
2016-06-09 08:49:14 +02:00
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
0e01bdaa3e
Graphics/Material: Ugly spaces to tabs
...
Former-commit-id: 05162affc594bfa6e72bb32b4c49c3d322fd42ab [formerly 71fa5849249e9770184d693176c3e50393988f4d]
Former-commit-id: d0042378fa707d7e42303ffe3445a847596a482d
2016-06-09 08:48:04 +02:00
296be70a5c
Graphics/Material: Ugly spaces to tabs
...
Former-commit-id: fe691ce50ec143681c8a916bab2f85270cedec06 [formerly c45aba3d7b6d8b47a90e5f8120c278785d68773b]
Former-commit-id: 04596ea0ca1bb7f1575a4db6a5ef309328922938
2016-06-09 08:48:04 +02:00
4710da1f6c
Revert changes
...
Former-commit-id: 25a7ecad35f3fe38638f608f375ed9c8c5df873e [formerly fa3383a06a186551d427aee0e3def1e543b73a1b]
Former-commit-id: 5923cbbb60c4464741449c997c39212d2bc075f8
2016-06-08 14:13:19 +02:00
61c6cde4c0
Revert changes
...
Former-commit-id: 0034c2038ece25081a9975d29f50165e8545eacc [formerly c6e83866ba222715b7f08095494c9f2749fafa8b]
Former-commit-id: 66ad8e4a0df7eda465601c1695db5fbd39b792a4
2016-06-08 14:13:19 +02:00
363299f4de
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine into Documentation-Update
...
Former-commit-id: 601bee6e41fcb3951f3ae9070a277896aeb52d80 [formerly ea8c1543b3df294643130613a6df14ad17bc1dd5]
Former-commit-id: 08bda7de77c7615d6ba76eed38075a0c667ff72d
2016-06-06 19:33:33 +02:00
05e4eaabbc
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine into Documentation-Update
...
Former-commit-id: 866c0778a3dcdc259618e577649a1116ae3a57e8 [formerly 4905c256960813c8f7b9c5e15b70ba906baa0b90]
Former-commit-id: b880a6fe12f937c5cd766a8cf37fd6794d146e84
2016-06-06 19:33:33 +02:00
e94dc90f06
Graphics: Prevent shadow-mapping code to compile without shadow-mapping
...
Temporary fix for OpenGL 3.3
Former-commit-id: 38067e4e19ce5e7e0a804fdeb4c1ad9fcc9f415e [formerly c9878c521ccb78ff86ba5ce823acb009717b9bb8]
Former-commit-id: 22915443375dd97584f9e5408dcf308d5801f7b0
2016-06-02 13:49:30 +02:00
ce90bd43d6
Graphics: Prevent shadow-mapping code to compile without shadow-mapping
...
Temporary fix for OpenGL 3.3
Former-commit-id: 50b368b62fc0eba5507e4bf3c4f825eedf35cc8b [formerly 6a5258a1ecd4991937a4446684043f52bc60215c]
Former-commit-id: 70f890125f05d0c4e16f38535a3ca9c6848bf35b
2016-06-02 13:49:30 +02:00
db8a222f62
Fix for problems signaled by clang static analyzer
...
Former-commit-id: 835f639c45509b0d55fe716e51e3285ea2a89da4
2016-05-31 21:50:31 +02:00
abb5ab3596
Fix for problems signaled by clang static analyzer
...
Former-commit-id: 2ad296acdc783054198a7b2f2f34c36d9cc22958
2016-05-31 21:50:31 +02:00
a81cc4a295
Default behaviour without precision on name
...
Former-commit-id: 28959f509e5baee43109a66e17a8703a480288e4
2016-05-30 14:27:31 +02:00
a2c0963fe4
Default behaviour without precision on name
...
Former-commit-id: 984e99a8ce5380eb54aa48e206a62186a08cce23
2016-05-30 14:27:31 +02:00
96b958d655
Documentation for module: Graphics
...
Former-commit-id: 5e3ee3c61779fbdd1a083117f537a45e1bad820b
2016-05-30 14:21:36 +02:00
2c941827ed
Documentation for module: Graphics
...
Former-commit-id: 1757c33318443aade1dc38e16d053240d7dc885c
2016-05-30 14:21:36 +02:00
3e78dd40ad
Fix some GCC warnings
...
Former-commit-id: b3292fcfd4d029793cb70f97ab608aeb7d0579ef
2016-05-25 13:52:10 +02:00
8a3339badf
Fix some GCC warnings
...
Former-commit-id: 31c8460b4656c29ac165d7aa28f335851f2565df
2016-05-25 13:52:10 +02:00
a1644edf45
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: e77949168073f06d52d10785afb41bad2f7f86c0
2016-05-13 13:06:23 +02:00
6c8d2ed03a
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
2016-05-13 13:06:23 +02:00
24e23be7ea
Graphics/Material: Add Basic2D and Translucent2D materials
...
Former-commit-id: 4c5d24d76d22894985e591036589ebba95f320d9
2016-05-13 12:47:43 +02:00
a15b31c646
Graphics/Material: Add Basic2D and Translucent2D materials
...
Former-commit-id: fd07cb7c039d0e30b6fe74378efb3208808f9d9b
2016-05-13 12:47:43 +02:00
9e3b99bb5a
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: 3c18901133fa5ac8281269822f6e2650ddcefd2d
2016-04-30 18:44:33 +02:00
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
43c1243b75
Fix merge problems
...
Former-commit-id: 899b541adea1719f558c52abfab51458249b6aaf
2016-04-17 20:22:29 +02:00
b3455e88ca
Graphics/DepthRenderTechnique: Add Clear method
...
Former-commit-id: 70e7cb5b59f0407c73766687b6a95e09b7eca589
2016-04-17 19:58:15 +02:00
37aa00b2e7
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
c8dd28f75c
Sdk/RenderSystem: Allow to change render technique
...
Former-commit-id: ec61a2ebff138300344e6068917f0863c3d11859
2016-04-16 18:40:58 +02:00
a31a969409
Replace useless reinterpret_cast by static_cast
...
Former-commit-id: f61d644d968d4fe9523a5cd122e11525a9c2765d
2016-04-07 04:20:18 +02:00
b4e98dc7fc
Formats: Change skip string format
...
Former-commit-id: 75952d298efb69bd9b77df31ee8dc1548442d071
2016-03-09 12:41:39 +01:00
c935c1a293
Graphics/OBJLoader: Allow users to specifiy a vertex count cache when loading
...
Former-commit-id: 87ebc2aefe2c2091fd483793f880724e1ed6ac3d
2016-03-08 13:39:08 +01:00
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
dff6e855e4
Fixes compilation on GCC
...
Former-commit-id: 1829fa37830618bd9b14e7bfa5d935c886213589
2016-02-24 14:12:45 +01:00
ffb6a47435
Graphics/Material: Standardize flag testing
...
Former-commit-id: f2207fa4f1ad600aa09d8b484559bd9155a11f47
2016-01-19 12:22:43 +01:00
c359c6925e
Graphics/SpriteLibrary: Fix missing initialization/uninitialization (fixes crash at exit)
...
Former-commit-id: c7bbd781d163a8456f1fadd0f71451adc5a1bd1a
2016-01-19 12:14:07 +01:00
2b908d0c2b
Graphics/TextSprite: Fix unused memory not being released by Update
...
Former-commit-id: 2a1349b1346d6dd11a004654a65d43e91626b76a
2016-01-06 13:16:11 +01:00
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
bff0e2df21
Graphics/ForwardRenderQueue: Fix error
...
Former-commit-id: a396c373b51128c57f5d8f98291f821b0bfc0c76
2015-12-11 13:08:32 +01:00
91f778dd89
Graphics/SkyboxBackground: Add movement scaler
...
Former-commit-id: 02682210b2b3d4b0cf27c6dd8cf171a025a92701
2015-12-10 14:08:09 +01:00
9e7452ab68
Graphics/DepthRender: Fix compilation
...
Former-commit-id: 749e3b67038cba20c46bd5570e616608200733f5
2015-12-09 01:11:27 +01:00
9cf5e4b68c
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
93fae53ea5
Graphics: Qt-friendly change
...
Former-commit-id: b4b278897d681ea5361ce9f751a0ecba7acd34ee
2015-12-07 22:45:07 +01:00
0a0e6d00f7
Graphics: Add render order
...
Former-commit-id: 881ae69c214e024846dc0165f3476f76f5bcc0b5
2015-11-27 23:38:54 +01:00
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
682b8811f5
Graphics/TextSprite: Fix crash
...
Former-commit-id: c659044edff45afc7eec91065619bdfb402bc32d
2015-11-14 11:43:24 +01:00
5d6e6b2d45
Fix errors and warnings
...
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01:00
37586e7283
Switch from Nz prefix to namespace Nz for linux
...
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +02:00
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
df8da275c4
Switch from Nz prefix to namespace Nz
...
What a huge commit
Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
70ea6912e1
Merge branch 'OpenGL3-upgrade' into NDK
...
Conflicts:
src/Nazara/Graphics/SkyboxBackground.cpp
src/Nazara/Renderer/RenderTexture.cpp
src/Nazara/Renderer/Renderer.cpp
Former-commit-id: e8914d4e32a689b7df365dca15a438f10722530c
2015-09-24 21:35:43 +02:00
dea3fb4e39
Convert spaces to tabs
...
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
1ffd2b724f
Merge branch 'NDK' into NDK-ShadowMapping
...
Former-commit-id: 150a4149d50af6971fd5798c080f0c55e009a55b
2015-09-20 23:42:12 +02:00
b16abf0d09
Merge branch 'master' into NDK
...
Conflicts:
build/scripts/module/renderer.lua
build/scripts/module/utility.lua
include/Nazara/Renderer/OpenGL.hpp
src/Nazara/Core/String.cpp
Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
a4032abe63
Fix compilation on linux
...
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +02:00
aa303f9028
Merge branch 'NDK' into NDK-ShadowMapping
...
Conflicts:
include/Nazara/Math/Matrix4.inl
Former-commit-id: e4b7d178a7acba17c03de2b585af86324b8d75a6
2015-09-13 12:10:30 +02:00
505f1dbb03
Merge branch 'master' into NDK
...
Conflicts:
include/Nazara/Core/Algorithm.inl
include/Nazara/Core/ByteArray.hpp
include/Nazara/Math/Algorithm.inl
src/Nazara/Graphics/SkyboxBackground.cpp
Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566
2015-08-21 18:55:58 +02:00
282bdf9864
Consequences of the plane change + change perspective
...
The perspective matrix now as in glm (because the near frustum plane was
wrong). So there is a factor "2" on the component w and the skybox must
be changed in consequence.
Former-commit-id: 09dd049c177532b9ace34a5a60b1b96014652297
2015-08-21 12:01:52 +02:00
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
cd3b19ca79
Graphics/Shader: Fix shadowing
...
Former-commit-id: 54fc9a019217eef85281c33a8a7becb6fec4f851
2015-08-19 13:46:11 +02:00
2b48917176
Merge branch 'NDK' into NDK-ShadowMapping
...
Former-commit-id: b07de3853987ffc91946b307208c0ec26eda280a
2015-08-17 14:26:42 +02:00
391d248e59
Graphics/Sprite: Fix linker error
...
Former-commit-id: 1867897b6d67ccd7ed1779c66f086e3dc962e693
2015-08-16 01:45:31 +02:00
29ffd44683
Graphics/ForwardRenderTechnique: Fix crash when rendering billboards without instancing
...
Former-commit-id: af5595a2eb0ddf7c9bb53250af3a5e2d78ea2cda
2015-08-16 01:45:12 +02:00
ff9d233e7c
Graphics/Billboard: Fix billboard texcoords
...
Former-commit-id: 4c3182736ded66d0d03ed5d0abc54a51d6f6eca6
2015-08-16 01:43:59 +02:00
95ae8ed82c
Graphics: Add billboard class
...
Former-commit-id: bc898f00aa78dd42f61d34ce743ed9a73dce55f6
2015-08-16 01:43:17 +02:00
5cad63c21b
Graphics/Shadow: Implement PCF for spot lights
...
Former-commit-id: 0045af26b612a5c41268fcf3e3d03893e01c0448
2015-08-14 14:13:53 +02:00
835da411c7
Graphics/Shadows: Add directional shadow mapping (WIP)
...
It still needs some debug
Former-commit-id: 029872debc1a784712a33802ddd70a2b61e55623
2015-08-13 13:54:34 +02:00
75972fec36
Graphics: Add shadow mapping
...
Former-commit-id: ca404bee246991eab98df35396e3010ec5165c43
2015-07-05 23:57:54 +02:00
1f2e810927
Graphics: Remake DepthRender[Queue|Technique]
...
Former-commit-id: c4d8d4d28d02822273ebe7dca3e468ea156af674
2015-07-05 23:43:35 +02:00
c0ee9d04b5
Graphics/Material: Add depth material parameter
...
Former-commit-id: 980888e12e5d8c8cf280c6a62592068cfab49d2e
2015-07-05 23:23:17 +02:00
529673ebc1
Graphics/Light: Make shadow map format/size parametrable
...
Former-commit-id: 8151d71d58ab760584c0ace1e0686c44bab9d3b2
2015-06-30 20:48:46 +02:00
bdb6554bc8
Graphics/DepthRenderQueue: Make use of shadow casting parameter
...
Former-commit-id: cf15775c67a5d4245d344d001847b9fb1ffe7432
2015-06-30 20:47:08 +02:00
34e8271d24
Fix warnings
...
Former-commit-id: 42f2d38f7bf5143d91da6a0fa7dc7d3b88ce56ea
2015-06-30 20:44:37 +02:00
d93229a9ac
Fix compilation error
...
Former-commit-id: 5f264fc941898921da408b836c385d4073ebe3ae
2015-06-30 20:44:01 +02:00
0cb4726bf5
Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping
...
Conflicts:
SDK/include/NDK/Systems/RenderSystem.hpp
SDK/src/NDK/Systems/RenderSystem.cpp
Former-commit-id: f62e9a27427d96893acd2381bb06ae928a1d3741
2015-06-29 21:05:09 +02:00
318da0d960
Fixed some warnings
...
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
a4bd84a6e3
Graphics: Remove deprecated scene interface
...
Former-commit-id: 6b5d3c22827912d664c4f8c9c4051c824180bb51
2015-06-24 13:55:35 +02:00
58f91d6e39
Graphics/ParticleSystem: Update interface
...
Former-commit-id: b58c3f194a32411eba2e321b00987d3c76e03cb0
2015-06-24 12:41:54 +02:00
c4783ac38f
Graphics/ParticleSystem: Fix debug build
...
Former-commit-id: 52f1ea20af27d98a6e6c366f5a9f87e73bf529b0
2015-06-24 00:20:47 +02:00
eddac5c0b6
Graphics/SkyboxBackground: Fixes
...
Former-commit-id: ab45a2efa957e33015e4d8dd57ebc8a5d028798c
2015-06-24 00:18:38 +02:00
bfa2246ca2
Graphics: Fix missing initialisation of skyboxes
...
Former-commit-id: cf9989b52ca3d80fd1e789178dc77b67b98c2cdf
2015-06-24 00:10:54 +02:00
6092b0692b
Graphics/Backgrounds: Update backgrounds to new coding-style
...
Former-commit-id: 9f96b93706fd8417d6262392f0ce9ab9ca1985c3
2015-06-23 23:35:11 +02:00
0ec0e02a5f
Graphics/ParticleSystem: Turn it to Renderable interface
...
Former-commit-id: c083f32a4bf2baed93126c30a6d05cf8ed0ba493
2015-06-23 14:01:44 +02:00
1593b7969f
Graphics/Material: Fix shadow states initialize/copy/parameter
...
Former-commit-id: efe926baa3a5f00e04e7443b3463730e0d16edf7
2015-06-21 13:11:03 +02:00
ac8578c510
Graphics/Material: Add shadow support
...
The real fun will be in the shader
Former-commit-id: e29e98cbf3c35e4cf14c68852e03dc9da1df0ff1
2015-06-18 00:03:38 +02:00
763701df7f
Graphics/Material: Inline class
...
Former-commit-id: 7cd8b7a00c87adf087dae7d0fb8d955747cf82d1
2015-06-17 23:36:53 +02:00
80208b0dc5
Core/OffsetOf: Remove constexpr (cannot be used because of reinterpret_cast)
...
Former-commit-id: 78142eb9033a1969f20055b2cecf1bc78152e896
2015-06-17 23:32:48 +02:00
e89b87044d
Graphics: Fix some comments
...
Former-commit-id: df6d080b1ce251b7fe5707ddbb4e31773ba9035d
2015-06-17 14:32:32 +02:00
ebbaaf7ff2
Graphics: Add depth render technique/queue
...
Former-commit-id: 711306ee5f84a9579068ce23240dc105cec15cde
2015-06-17 14:32:05 +02:00
52972b0514
Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping
...
Former-commit-id: d58c9f21d0de14e06321ed38b237b9fffcc0b2b8
2015-06-16 23:04:20 +02:00
54b0339025
Graphics/TextSprite: Inlined some methods
...
Former-commit-id: 8c6633867e25b86b5b641662c804c446478fe56c
2015-06-16 22:54:29 +02:00
8ade9fa65e
Graphics/Sprite: Update to InstancedRenderable
...
Former-commit-id: 8153acbca05bf6afb4a4ed6cd0a323f641919b6d
2015-06-16 22:54:01 +02:00
974df4288f
First shadow mapping commit
...
Former-commit-id: 7465a7c3297626f8db8c1ff48a20c0e0d9feb765
2015-06-16 14:21:20 +02:00
6d953d9e93
Graphics: Separate Renderable and make Light a Renderable (LightComponent)
...
Former-commit-id: 6177d473f27ef493ba77417fc14461cb08b6f9e1
2015-06-16 00:31:04 +02:00
f4c3ec51ed
Final VS fixes
...
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +02:00
251e21f006
More VS fixes
...
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
1a92fe331c
Rename and move loaders, expose parsers
...
Former-commit-id: 932ae2aab020f956d3fdb91107f6842ff292aa08
2015-06-13 17:13:55 +02:00
d9c31636b9
Graphics/RenderTechnique: Move viewer to SceneData
...
Former-commit-id: 6c8b5a00b65649c7a3877a186b51f7240361e801
2015-06-13 16:27:12 +02:00
096b420d2c
Graphics/TextSprite: Fix Update not invalidating instance data
...
Former-commit-id: 5081c4dfc534671e0a157c0f0d279940eec9b091
2015-06-12 14:02:15 +02:00
8c345964ef
Graphics/TextSprite: Add scale
...
Former-commit-id: 54bb42e83060730e8bd4784b1e24b479d21157f7
2015-06-12 00:45:52 +02:00
2391d76332
Graphics/ForwardRenderTechnique: Fix light uniforms
...
Former-commit-id: b3f0ae5cab39ea5a698800985843a818280d18be
2015-06-12 00:23:46 +02:00
a38d988507
Graphics/TextSprite: Fix memory corruption
...
Former-commit-id: 2fc1fdcec29d58164b46ccd837bab56602418ce0
2015-06-12 00:18:35 +02:00
3b5551ed7a
Graphics/TextSprite: Update to Renderable
...
Still WIP as it appears to randomly crash
Former-commit-id: 2397ba7e556f7ed72b5fc8752704c3b212fa9fc1
2015-06-11 14:14:57 +02:00
48a54dfa5c
Graphics/Renderable: Add InstanceData
...
Former-commit-id: f30f011ae91a445d5b22f33150a88bbda218950c
2015-06-11 14:14:11 +02:00
6f2f8d6390
Graphics: Make Background/RenderTechnique independent from Scene
...
Former-commit-id: d588a3bb74b08d79990a278ad2e399e9797755b4
2015-06-09 00:26:13 +02:00
a069b105e6
Fully replace listener system by signals
...
Former-commit-id: 032dfddd12cc3a792c71426148c758ffac3621f9
2015-06-07 20:42:41 +02:00
0f4cf3c910
Graphics/RenderTechnique: Add uniform invalidation
...
Former-commit-id: 8f03073408a03854533d9911eb1a0605ebbb8767
2015-06-07 18:25:35 +02:00
65c4409f9c
Graphics/DeferredRenderQueue: Replace listener by signals
...
Former-commit-id: b874409b523a1bfd6d9dd0d74c0f28189411bcca
2015-06-07 18:09:37 +02:00
c0c6179acc
Graphics/ForwardRenderQueue: Replace listeners by signals
...
Former-commit-id: 3429e69cc4334ba602d8ccfb1fc725af85d42f7f
2015-06-07 17:59:09 +02:00
4e5cdea454
Core/Signals: Remove Connect/Disconnect macros
...
And make interface easier to use
Former-commit-id: 5b789c9acb694839cb173ae96392650d80d383b7
2015-06-07 17:28:19 +02:00
004b53c590
Renderer/Renderer: Replace listeners by signals
...
Former-commit-id: c1293f7f7cc31c4122ba866fc44d93188917ad93
2015-06-07 16:52:19 +02:00
fe25249136
Replace Listenable system by signals
...
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
b9ced78772
Graphics/RenderTechnique: Remove Clear method
...
Let's face it, this method was useless from the beginning.
Former-commit-id: c38f57785c900acf66560ad07aa29498312c6063
2015-06-05 13:38:22 +02:00
fc65b30f84
Improved code based on CppCheck results
...
None of this should change the engine's behavior, but the code is better
this way.
Former-commit-id: 0127769848fc1f7fc8006ee607985cfc0ead2965
2015-06-05 13:25:17 +02:00
8c6806eacb
Graphics: Update Light and Model to new interface
...
Former-commit-id: 5643f20261524f93a5d080404de5ab0b29151acb
2015-06-04 00:18:43 +02:00
806955dac7
Graphics/Scene: Temporary fix compile
...
Former-commit-id: 604961adc2b1400966491d22d5d1eb2d05ee9a6a
2015-06-03 17:59:31 +02:00
436f5002b2
Graphics/SkeletalModel: Fix crash
...
Former-commit-id: 75114644bb37796860854102fbd547aa1c50f51a
2015-05-31 22:19:30 +02:00
0f7948ea4c
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Conflicts:
include/Nazara/Graphics/SkeletalModel.hpp
src/Nazara/Graphics/SkeletalModel.cpp
Former-commit-id: 7dba08bc594d501adbc5a81c4ec1a70021eaa5b6
2015-05-31 22:18:09 +02:00
4a87481311
Graphics/ForwardShading: Remake light selection
...
Former-commit-id: f7e761411e88513d1772b55f09ac4bd3a1d065a7
2015-05-31 22:13:49 +02:00
8f8eca1d70
Graphics/SkeletalModel: Update to new code
...
Former-commit-id: 74b17bf06b3c7c22477ee3a098301e70b093f890
2015-05-31 22:12:46 +02:00
d7e640fd1e
Graphics/DeferredLighting: Fix target shader
...
Former-commit-id: 241cca9f659c67fed34c20fb022ff89889630556
2015-05-31 22:12:04 +02:00
962c1f2362
Graphics/SkeletalModel: Begin update to Renderable
...
Former-commit-id: c05e8a85bf3f0227fe2e75480df12045c8384124
2015-05-28 14:37:40 +02:00
122ae57968
Graphics/DeferredLighting: Update to new code
...
Former-commit-id: 6b16678bb477a8e2a95d799d144be09d688f2f16
2015-05-27 00:15:49 +02:00
367ec18217
Graphics/Light: Change the way lights are queued
...
Former-commit-id: 18cf919c3b221425624a4db15c59699abfba6fc7
2015-05-27 00:15:12 +02:00
a92a58301a
Graphics/Light: Add cache infos (cosines, tangent) + inline
...
Former-commit-id: 36e6fb9c2d09597480302da30d3097ec54582fe8
2015-05-26 23:45:40 +02:00
68d6f62cd4
Graphics/AbstractRenderQueue: Made members public
...
Former-commit-id: 61f69dda42b5d091a94d65b9f7f04ff1ce1ce59e
2015-05-26 23:39:42 +02:00
2bba1be938
Math: Add M_SQRT3 constant, fix sphere radius calculations
...
Former-commit-id: 71ac4d3522f427fda60a0e71d76eca7558539187
2015-05-26 23:39:01 +02:00
6f06383ab0
Graphics/Light: Update to Renderable
...
Former-commit-id: 6766d036eb4c79fd0d5cdb718b06d6e4812ac660
2015-05-26 14:16:15 +02:00
e1a25a8885
Graphics/Model: Update to Renderable
...
(Note: this branch doesn't compile right now, this is normal)
Former-commit-id: 8c7e823122744394dda31db9acbfe2823c6f29e2
2015-05-26 14:16:05 +02:00
f181d0f2df
Graphics/Renderable: Provide Cull default implementation
...
Former-commit-id: 7584b42b8737a426818af836628f8e7e1e34eb46
2015-05-26 14:13:57 +02:00
b075d05d82
Graphics/RenderQueue: Replace AddLight method by variations
...
Former-commit-id: 79ad49d60bd8d397aa606cded7c0dd2d20a078dc
2015-05-26 14:12:41 +02:00
3ee981867e
Graphics: Add Renderable class
...
WIP
Former-commit-id: b9ea2a443cf2e5f8b90360e1f47466b0c3ce69fa
2015-05-26 00:08:24 +02:00
446f537e3f
Merge branch 'master' into NDK
...
Conflicts:
src/Nazara/Physics/Geom.cpp
Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +02:00
1fff550c06
Graphics/ForwardShading: Fixed non-lit translucide rendering
...
Former-commit-id: dea27941badf51be183e9912c82be6f719015490
2015-05-06 23:31:42 +02:00
d7f48dfa7f
Graphics/DeferredShading: Fixed phong lighting unifoms
...
Former-commit-id: 09adf80261d29cb2518adddfb90b3173ab34b068
2015-05-06 23:29:56 +02:00
fa2a269e5a
Utility/Node: Added listeners
...
Former-commit-id: aeddcbc5c61b7b51333ed704065fe6a18f17b2dc
2015-05-06 13:48:42 +02:00
3e16369d09
(Camera) Fixed SetTarget not invalidating viewport and stuff
...
Former-commit-id: ecce5389ffc3497828a9864a5ee46f597bdbfb76
2015-03-28 14:42:11 +01:00
36b39ec868
Alphabetical commit
...
Former-commit-id: 4f1e73bd1228fefefd7f788adcd3ccb396d0b141
2015-03-19 18:17:52 +01:00
cbf3b2cf4e
(View) Fixed missing implementation of GetSize
...
Former-commit-id: 0953fb5079448035fc395ad2fd38535d27f08fb6
2015-03-18 21:57:02 +01:00
e873d40ccc
(View) Added Map[Pixel|World]To[World|Pixel] method
...
Former-commit-id: 39295c71d040d472117cb30c266169476f563e9d
2015-03-18 20:31:39 +01:00
fca8dc49e9
(TextSprite) Changed error message
...
Former-commit-id: f32804aca320bbfc3c6ecb5e0e3747b7b9d09369
2015-03-18 13:04:12 +01:00
d28154ab76
Added comments
...
Former-commit-id: e9297b7c0a4b85b2369abcba444d4cf89e04b95d
2015-03-18 13:03:53 +01:00
122e4a013c
(OBJLoader) Improved code
...
Former-commit-id: 78252bd96d1d8eeba596892a9599136f26312618
2015-02-24 20:00:40 +01:00
ee6ca790a5
Fixed missing includes and warnings under VS
...
Former-commit-id: c06756b62b616e7322aced01062966247bb7654f
2015-02-21 15:04:07 +01:00
2b6dcb4e2b
(Material) Set*Map methods now take an object reference...
...
...instead of a naked pointer.
Also renamed some parameters to make them more explicit.
Former-commit-id: 3b962ba178ffc94d630fb11e005e9992cf93005d
2015-02-18 21:03:17 +01:00
d3caf8bb1b
Fixed potential crash (1500th commit, yay)
...
Also cleaned up one line of code.
Former-commit-id: 841dde3eb2ce8b1e3b4607931aa31d94fefedec2
2015-02-07 19:15:22 +01:00
fa7b72fd49
Fixed outdated comment
...
Former-commit-id: 8825493d82bfc66ac84090ac4f9f051c35b2d61c
2015-02-06 13:57:58 +01:00
0a324d9323
Added some comments (as requested)
...
Former-commit-id: 4a6c7a025625ab49e59aaffa818cb50374e778d7
2015-02-01 21:39:47 +01:00
622fce6f9c
Regenerated global headers (and updated copyright year, again)
...
Former-commit-id: b5b24f4a3610e1dead2883afaded48bf3554669d
2015-01-30 22:33:41 +01:00
db4a499151
Removed support for OpenGL 2
...
Former-commit-id: e796c333d6c2ef0550ff4427d36dcfbaf00ef924
2015-01-30 15:39:25 +01:00
7a73314ef5
Added resource managers
...
Former-commit-id: 9c071230c1e325ec672c9dfe30ee7e498baa1d08
2015-01-28 20:53:40 +01:00
53162c1722
Added a Library to most reference-counted classes
...
Former-commit-id: 3ed409a71dcd5ce4eec7672ac26f8fff00e3b136
2015-01-28 18:06:05 +01:00
e18e490c59
Replaced (Uber)ShaderLibrary by template class ObjectLibrary
...
Former-commit-id: d488cfd4e5e3ff31112fffebce2b7cdb86cc2e55
2015-01-28 15:49:04 +01:00
cabc4e40bc
Fixed mesh centering in a better way
...
Former-commit-id: 859dfdad322da045fecf32ea7c551f7fb436f135
2015-01-25 23:57:28 +01:00
1219a8053c
Revert "Fixed mesh centering"
...
This reverts commit 504042119962c2ab55fe8ef9bb16bcc878fa1b38 [formerly fae2cf41a63c7ce599c227344478567b1f12f130].
Conflicts:
src/Nazara/Utility/Loaders/MD5Mesh/Loader.cpp
Former-commit-id: 6bd25fd7216121cce6879d74c6c98fbba545f2cf
2015-01-25 23:55:36 +01:00
eed90cb683
(SceneNode) Added Remove() method
...
Former-commit-id: 191834826b1c6651dab62c77aabb072ba59a301b
2015-01-25 23:53:00 +01:00
0db92e671d
Added a static New method to RefCounted-derived classes
...
Former-commit-id: efd9e68e050fb6cc7e0df7a7c222ca759c502dc5
2015-01-25 23:41:09 +01:00
5f5be93992
Merge remote-tracking branch 'origin/master' into Resource-Update
...
Conflicts:
include/Nazara/Audio/Music.hpp
include/Nazara/Audio/SoundBuffer.hpp
include/Nazara/Core/Resource.hpp
include/Nazara/Core/ResourceListener.hpp
include/Nazara/Graphics/Material.hpp
include/Nazara/Renderer/Context.hpp
include/Nazara/Renderer/RenderBuffer.hpp
include/Nazara/Renderer/Shader.hpp
include/Nazara/Renderer/Texture.hpp
include/Nazara/Renderer/UberShader.hpp
include/Nazara/Utility/Animation.hpp
include/Nazara/Utility/Buffer.hpp
include/Nazara/Utility/Image.hpp
include/Nazara/Utility/IndexBuffer.hpp
include/Nazara/Utility/Mesh.hpp
include/Nazara/Utility/SkeletalMesh.hpp
include/Nazara/Utility/Skeleton.hpp
include/Nazara/Utility/StaticMesh.hpp
include/Nazara/Utility/SubMesh.hpp
include/Nazara/Utility/VertexBuffer.hpp
include/Nazara/Utility/VertexDeclaration.hpp
src/Nazara/Core/Resource.cpp
src/Nazara/Core/ResourceListener.cpp
src/Nazara/Graphics/DeferredRenderQueue.cpp
src/Nazara/Graphics/ForwardRenderQueue.cpp
src/Nazara/Graphics/SkinningManager.cpp
src/Nazara/Renderer/RenderTexture.cpp
src/Nazara/Renderer/Renderer.cpp
src/Nazara/Utility/Mesh.cpp
Former-commit-id: 99b5ad26a19fe9c9f8118da7b5920bffe89f60f8
2015-01-25 19:29:55 +01:00
9e96a2061f
Fixed compile errors introducted in 228ecfe7e5f59d8c4091c3ebfee8190f66cf62ed [formerly 837c414856dbb7b5be20fd745359b3f1e7791c20]
...
Former-commit-id: efe88a0a209916b0aeea2813ec074182ab3a7adf
2015-01-25 17:19:35 +01:00
a185f03abc
Merge remote-tracking branch 'origin/Scene-Update'
...
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
2015-01-25 16:35:18 +01:00
bc6dd44009
Made SceneNode name change reflect on the Scene
...
Former-commit-id: b924b0b9d103e4fce6ab2faf952b9153d49cce06
2015-01-25 16:34:19 +01:00
6d8b266b4c
(Scene) Added FindNode(As) and RemoveNode methods
...
Former-commit-id: 35b0d6a61e99383fffa8048b3c0f6a48b8f0f66c
2015-01-24 22:00:55 +01:00
722622ded1
Fixed SkeletalModel registering itself for update multiple times
...
Former-commit-id: 9c7ff03a70b65c2ace3b7929b78f486621797dd4
2015-01-24 17:50:48 +01:00
9ebd023848
(SkeletalModel) Added virtual constructor implementation
...
Former-commit-id: 4a7f356e14f629a728a77f94db7e26c6c4af3b72
2015-01-24 16:42:49 +01:00
090263d847
Moved name attribute from Node to SceneNode
...
Former-commit-id: 6f920af67cd6c339d132a67b364742fdf172d5e9
2015-01-24 14:13:11 +01:00
0a7711d85b
(Scene) Added CreateNode and Clear methods
...
Former-commit-id: de92f4a4be45e5cbd1d2d83191300e0b46764f0e
2015-01-23 22:35:41 +01:00
cf12552358
(SceneNode) Added virtual constructor idiom
...
(Light) Added default constructor
Former-commit-id: 591e6a8435d2cea6238e70c0058d381b8d547f3e
2015-01-23 21:04:29 +01:00
01a1badac7
Removed useless std::function from rendering code
...
Former-commit-id: eaba729d5047d326fb2e746cec0621bfcf2eb1c5
2015-01-23 20:21:00 +01:00
1f043b61df
(Scene) Removed useless Pimpl idiom
...
Former-commit-id: ffbca2a6b6e16792f58e77195a08911368f64f57
2015-01-23 14:35:26 +01:00
c5ec2af361
(Scene) Added RenderFrame method
...
Former-commit-id: ba02b2f0d65858fdabdedf5f0a9f7f9b1baa7268
2015-01-23 00:02:33 +01:00
ea8d683624
Updated copyright year
...
(532 files, wow)
Former-commit-id: cbb31f1124a86720bd3a54fe589a0f849a87b434
2015-01-21 20:53:01 +01:00
8a3c410d60
Made bounding volume handing part of SceneNodes
...
Former-commit-id: d09d06ac4515ce09aa16fd92dd045c2a06730a99
2015-01-20 20:35:16 +01:00
bce3cadfd5
(ParticleEmitter) Added lag compensation
...
Former-commit-id: 914a976ba52b2629190ded068cc23e1cf7dee4d4
2015-01-20 17:48:11 +01:00
bbfbec1aa3
(ParticleSystem) Moved controllers update to a function
...
Former-commit-id: 47586e675c202d871e3ea3561dc19781bdb264f3
2015-01-20 16:59:50 +01:00
ac25c4a041
(TextSprite) Renamed SetText method to Update
...
Former-commit-id: 798baecaaf919c20d43f036f361d10d459270d0b
2015-01-20 15:12:41 +01:00
b7307c462a
Removed old unused code
...
Former-commit-id: 40985382a9f79620c4459f6997f1ce12b000a74f
2015-01-20 01:20:48 +01:00
f714a58993
Added TODO
...
Former-commit-id: 7695c390112ebaa2340779e32f417ae302905b09
2015-01-20 01:20:33 +01:00
c9d636c929
Fixed particle generation terrible performances
...
Former-commit-id: 484ab2a95a2848aecef0089dea458791c2b86735
2015-01-20 00:12:50 +01:00
47fa5dc731
Moved resources includes to the top of the implementations
...
Former-commit-id: 788a62f66aa47fe76e32ef0b76e9e962b1c5f2e6
2015-01-19 20:34:09 +01:00
e2d4ba030c
Alphabetical commit
...
Former-commit-id: bacf8ab447d3022b48aac5f5ca2d337bc1283f8c
2015-01-19 11:57:19 +01:00
5d16d7ab7e
(Material) Fixed depth sorting not being copied
...
Former-commit-id: ecd4e3c8e44c6027c0e662f7d9d235a69ca9dc3d
2015-01-19 11:56:27 +01:00
75ffa09792
Fixed errors from last merge
...
Former-commit-id: 850eadf5e233d0d6efad039b6bd943f05384df7d
2015-01-19 02:32:48 +01:00
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
c18fc4cb14
Removed ShaderUniform_[EyePosition|SceneAmbient]
...
Former-commit-id: 89dedaf78d86def598531f472a1a6ecd56fe8371
2015-01-19 00:15:01 +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
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
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
7fee649b49
(Font) Added default atlas
...
Former-commit-id: 876f42110d4053b09abf86c6158b3ba79fdea201
2015-01-17 22:42:33 +01:00
829e82fdd9
Removed outdated comment
...
Former-commit-id: b2667fe3877022b61b5fbd6ae1ececc403fe5c1f
2015-01-17 21:42:35 +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
18367d26da
Added View::SetSize(width, height)
...
Former-commit-id: 9afd04b62e99702720cb10feae2462eaad33a90b
2015-01-17 00:34:59 +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
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
3139e80902
Fixed do-while
...
Former-commit-id: 08f2520ddee6e6f006f04d60df4a3da52b2ec356
2015-01-16 12:46:42 +01:00
fbcdd6bb2b
Fixed potential crash
...
Former-commit-id: df8cde180c157f08031cd04d37bb735aa266ee53
2015-01-16 12:46:27 +01:00
703ea6e9c8
Removed useless call
...
Former-commit-id: 1c3d84596b5c6b61c6bb64e9067653b8d2279955
2015-01-08 14:20:00 +01:00
b6c5668232
Separated atlases from Font class
...
First use of shared_ptr, yay!
Former-commit-id: 4c22341fba5674746d5299cf0e8dbf6dc31d5362
2015-01-07 23:46:26 +01:00
9293022e71
Added sprite overlay rendering
...
Former-commit-id: 1e25a7d85f06f4a4bc3ed0ead76df01db440671d
2015-01-07 19:27:15 +01:00
fc1e75d379
Fixed compilation error (from 683866baee26a12cf63b20914fff338cc872a4c8 [formerly a885b69881c30dcad29f87c3ffee41808761b6c9])
...
Former-commit-id: 8d96d5dee5666bbce41f406bcbabe269e101fafb
2015-01-05 15:12:59 +01:00
b3d72ec094
Renamed BufferStorage enum to DataStorage
...
Former-commit-id: 97eede03eb6bb85e506c640d40c9d6e7acb2e099
2015-01-04 18:16:31 +01:00
4de17fdffb
Remade sprite rendering
...
Added VertexColor shader flag
Added color sprite attribute
Added VertexStruct_XY_Color(_UV) struct & declaration
Former-commit-id: b664f4520aa55f4502f85f9dedab9b92040a8c16
2015-01-04 13:19:07 +01:00
ed1cc7a092
Added viewer-relative directions
...
Former-commit-id: 9d80744bd227689426b76df7e3c273de13424041
2015-01-03 22:39:51 +01:00
e55c521e96
Added support for skeletal models (WIP)
...
Former-commit-id: 6a6c2d9f2c68267df79dc48fa56450d2a563e323
2014-12-17 13:56:33 +01:00
a51cbc1e49
Added Sprite::SetSize(float, float) overload
...
Former-commit-id: 672a2e4f5c2a2d40b4af42c7ee4b7b37d3774117
2014-12-07 03:05:27 +01:00
aa37c632cb
Fixed possible warning
...
Former-commit-id: 4d14bf2cee4756db0720fda0d904d5bc7b2bafd9
2014-12-07 03:00:35 +01:00
605bcc7038
Fixed possible warning
...
Former-commit-id: fac12a042d206976109ffde42865c561b021ed93
2014-12-07 03:00:19 +01:00
27e9996e7b
Improved error message
...
Former-commit-id: 0315fe27119a0da88334ee67575e144c488d655c
2014-12-07 03:00:10 +01:00
bb95e6862a
Fixed sprites being rendered upside-down in 2D
...
This is still waiting for a fix because it will be upside-down in 3D
Former-commit-id: ca4bef616f3496db22349eb907ec32a0b6c3deb8
2014-12-07 02:59:56 +01:00
df6fdf6784
Added a Size parameter to View class
...
Allowing independent from rendertarget size
Former-commit-id: c131b6dd95692c72a969bf0cc6edd997911bbe58
2014-12-07 02:57:30 +01:00
b79a4c503c
Fixed VBO being freed after OpenGL exit
...
Former-commit-id: ddd5fb16baa4371ceb917415bc138590cdc16e26
2014-09-14 19:35:12 +02:00
a008439cde
Added depth sorting attribute to Material class
...
Only works for billboards for now
Former-commit-id: 50a46d3266a2e7fc6d75629103ad8b7193b13bf3
2014-09-11 00:10:24 +02:00
04be41082c
Added A LOT of oveloads to AbstractRenderQueue::AddBillboards
...
Former-commit-id: 51b73a110e61cee7ad8fca42b10afd59363de809
2014-09-06 11:59:57 +02:00
c86de3ed7e
Merge pull request #31 from Gawaboumga/master
...
Some changes
Former-commit-id: f4ef15537da8edef3881def68dce39f6455f9b94
2014-09-03 13:47:39 +02:00
023e41512f
Merge remote-tracking branch 'origin/master' into Particle-Update
...
Former-commit-id: 8b2a22ff4546805cdbae394df3cdcdf4228198e5
2014-09-03 13:37:39 +02:00
bf2d39541c
Fixed cubemaps rendering (Skyboxes)
...
Former-commit-id: a8d065cbdf8bdbde55547739e53b4daa6ce2969d
2014-09-03 13:29:40 +02:00
659eb31757
Added support for billboads
...
Improved ForwardRenderTechnique code
Former-commit-id: 2386de85c26839565f087885ffcb098ef263bdfa
2014-09-03 13:16:56 +02:00
aeec8ee0f4
Enabled new shader flags
...
Former-commit-id: df06f4faf4c7275c702338eee1ed14a2445662a1
2014-09-01 16:00:54 +02:00
67ecefd380
Added sprite color attribute
...
Former-commit-id: 1db061b862315495cb40ff308348a0ac8d41e304
2014-09-01 15:42:51 +02:00
2753e3c4f1
Updated shaders
...
Added support for billboards (rendertechniques support is coming) -
Doesn't support lighting well for now
Added support for vertex coloring
Added AUTO_TEXCOORDS parameter support to PhongLighting UberShader
Removed unused flag FLAG_FLIP_UVS
More to come ...
Former-commit-id: b408c80e8805a8bfebe9fcdf3a3f954116fbfe96
2014-09-01 14:10:48 +02:00
ea43edbaf3
Separated ParticleEmitter
...
Renamed ParticleEmitter to ParticleSystem
Added class ParticleEmitter
(First implementation, this will probably change)
Former-commit-id: a1f80db340983da5e85cedc974dd6b24a98e25b0
2014-08-31 14:09:43 +02:00
fc4d84f206
Littles fixes
...
-Light Manager: I prefer iterators
-OpenGL: The UV problem is solved, but you forget to change the cubemaps
-Texture: GetSize() could return a int instead a NzVector2ui
-Algorithm: Simplification
-Utility: Couldn't compile
Former-commit-id: db890711b451d03427871fb997549a1b13c7d80a
2014-08-27 14:34:35 +02:00
54382afc37
Merge remote-tracking branch 'origin/master' into Particle-Update
...
Former-commit-id: 7ec9fba80c2b47a1fb811c7912df67262986c9f0
2014-08-25 23:09:36 +02:00
98aa804de5
Flipped texture coordinates
...
Nazara now use a top-left corner origin for UVs (DirectX-like)
Former-commit-id: 550dd76cf15bc731d1e23060d1af15c3cd5cb4fd
2014-08-25 22:37:36 +02:00
f3baf9f9df
Merge branch 'master' into Particle-Update
...
Former-commit-id: a015cefb77bfb41617e94368ac58f5cfe12266fe
2014-08-18 19:11:43 +02:00
b3351037c7
Changed some error messages
...
Former-commit-id: e578d813dd7a8691506af080b79bc1ec99b65e3c
2014-08-18 18:15:19 +02:00
f395cb7579
Added ParticleEmitter::GetFixedStepSize()
...
Fixed missing implementation of ParticleEmitter::SetFixedStepSize
Former-commit-id: 255fcca4afe40cccf38a561f09f29a0a4ceccd71
2014-08-09 00:30:24 +02:00
0976607eb9
Added fixed step update
...
Switched back to defaulted operator=(ParticleEmitter&&) since it can't
throw exception anyway
Former-commit-id: 178b040a735ef01dcda21b45a317b6c534b5782e
2014-08-08 21:21:04 +02:00
202f675301
Changed particle callbacks arguments (offset, count) => (startId, endId)
...
Former-commit-id: 24550dad44e55aa9dfabaf916cbfb8e25df0451a
2014-08-08 20:59:49 +02:00
e9267d7f43
Added particles first implementation
...
Former-commit-id: 2b98ce2f007927690bdecd4092e211013bf568cb
2014-08-08 17:17:58 +02:00
4d06ca3906
Fixed OBJ Loader sometimes creating empty mesh
...
Former-commit-id: 6b5624db279f3818edb6b4544ad0114b7c5e1e27
2014-08-02 21:30:19 +02:00
60d5c09c18
Renamed Basic.hpp to Algorithm.hpp
...
Former-commit-id: ba2858d26fb55069313fafc3e4464dc2e9224b7d
2014-07-28 15:18:39 +02:00
bd0f38092e
Updated PhongLighting shader
...
I can't remember why I commented these lines.
Former-commit-id: 3da37915073f94c9c44adfd84c968cb2d70982cf
2014-07-24 09:45:42 +02:00
fba2e5ae01
Moved MD5[Anim|Mesh]Parser loading code to Loader
...
Similary to OBJParser
Former-commit-id: 243b05f2fbc3899089ef05a29672979d3bbca695
2014-07-17 20:15:29 +02:00
9e04e8a0e4
Separated reference counting from Resources
...
Former-commit-id: 7380818cfee9e249c11fd15da9ff7883a6e76565
2014-07-15 00:59:02 +02:00
8ecae371ee
Improved error messages and moved safety check
...
Former-commit-id: 010051ae56a1d2c1ebfe8dca3ceae3488a4cef18
2014-07-13 17:08:13 +02:00
73ba06ac1c
Merge pull request #28 from Gawaboumga/master
...
Consistency update
Former-commit-id: 1c31be9c967cf2e7d9d5d89d46444bfaed11a142
2014-07-13 16:53:59 +02:00
4c63c53c44
Indentation
...
Former-commit-id: 17c357f50ffec9787e6c50dd638c85388fb344ca
2014-07-13 16:09:21 +02:00
e9554ad498
Coherence update
...
Audio: GetListenerDirection was using ALfloat and GetListenerRotation
not.
ByteArray: Two return *this, hazh is perturbing, is it intended ?
String: Same ?
Camera: Adds of security (don't think it's usefull)
Parser: size() = 0 -> empty()
Utility: update 13 to 14 was forgotten
VertexDeclaration: same
Former-commit-id: f6db5cd15e5a4dc5ac2af12366b18d1f6922b0e0
2014-07-13 16:03:15 +02:00
3714371403
Fixed error messages
...
Fixed Quaternion type not handled by VertexDeclaration::IsTypeSupported
Former-commit-id: 4668810c2acbee3127ba52aed9782255ef92013e
2014-07-13 09:42:21 +02:00
a0c2d81114
Replaced struct by lambda
...
Former-commit-id: 4bb344e15c5f83480c30cb89fc3c213b33c2bbd4
2014-07-08 11:55:40 +02:00
f19b89f947
Updated Skinning code
...
Former-commit-id: ae608042061847b2f710abce8101eb008ef2a661
2014-07-08 11:31:14 +02:00
c4b10dddda
Big config/debug update
...
Added config checkers
Macro no longer use suffixes
Moved MemoryManager to upper directory
Renamed *_MEMORYMANAGER to *_MANAGE_MEMORY
Renamed AUDIO_STREAMEDBUFFERCOUNT to AUDIO_STREAMED_BUFFER_COUNT
Renamed CORE_REAL_PRECISION to CORE_DECIMAL_DIGITS
Renamed DEBUG_MEMORYMANAGER_DISABLE_REDEFINITION to
DEBUG_NEWREDEFINITION_DISABLE_REDEFINITION
Renamed GRAPHICS_MAX_LIGHTPERPASS to GRAPHICS_MAX_LIGHT_PER_PASS
Renamed UTILITY_FORCE_DECLARATION_STRIDE_MULTIPLE_OF_32 to
UTILITY_VERTEX_DECLARATION_FORCE_STRIDE_MULTIPLE_OF_32
Former-commit-id: 81ef836ac9f092ac471f60e544bb7c7c6370593c
2014-07-08 10:56:37 +02:00
b70f693b8c
Merge remote-tracking branch 'origin/RenderTechnique-Update'
...
Former-commit-id: 85e5af81ed3381af19e87c6ca0ee14e79955e563
2014-06-24 12:56:10 +02:00
6c1852299d
Added SkinningManager
...
Former-commit-id: ca3648dc16f5b1654cb8e3f5480d04f7fd22a3bc
2014-06-21 16:23:38 +02:00
f5833aa2d4
Improved rendertechnique fallback (will no longer loop)
...
Former-commit-id: 1aeb737432de1d2a8f205e547404b3f140967a16
2014-06-21 15:38:24 +02:00
a31ced1d76
Modified SceneNode::FrustumCull
...
Now provides an implementation which will test the bounding volume
against the frustum (Basic frustum culling)
Is now const
Disabled face culling on sprites
Former-commit-id: 5cb7a94b38ef8b0ffa5a78f16f5ef65a59ab375d
2014-06-05 21:28:17 +02:00
bc9c8c6bdb
Merge remote-tracking branch 'origin/RenderTechnique-Update'
...
Former-commit-id: db5a6503e43615a47e3be4aaaa033899639392b7
2014-05-29 19:59:09 +02:00
df803fd5f7
Fixed Graphics module build
...
Former-commit-id: 1dc70a30cd4ca68d2d7869d51eb01f81770b0e3b
2014-05-28 01:15:12 +02:00
c8ae34f20b
Updated mesh loader
...
Former-commit-id: 04c174544912a8c3c48e3fde7934cdc4edc19e07
2014-05-28 01:08:08 +02:00
fa5b1ab000
Model can no longer be animated (SkeletalModel will)
...
Former-commit-id: e203a3dddf74bb171d8abe961e8a2f28df13bcad
2014-05-28 01:03:59 +02:00
c901b5808e
Added new abstract renderqueue rendering
...
Former-commit-id: 35e66174ccc3de3b43571f12a149e6d3c59cc2c9
2014-05-28 01:00:18 +02:00
012c120bf1
Added Scene::EnableBackground
...
Former-commit-id: 57a3c3e41799703bb72b4980433d7faadc3b1b86
2014-05-28 00:35:28 +02:00
c606599e19
Updated MemoryManager
...
Renamed MemoryLeakTracker[.hpp|.cpp] to MemoryManager[.hpp|.cpp]
Added MemoryManager::GetAllocatedBlockCount()
Added MemoryManager::GetAllocatedSize()
Optimized MemoryManager (no longer allocates a time buffer)
Former-commit-id: 0e9c720cbb48fbed7006db3bd1000ebbc22c9583
2014-04-21 22:13:31 +02:00
7d99550925
Made Initialize/Uninitialize static methods from non-submodules private
...
Former-commit-id: 78dac32c8650dc9eb4fd2c7f0bece030012497cf
2014-04-21 00:08:34 +02:00
9b74459ea8
Updated comments
...
Former-commit-id: 77b83bdf6f52325efdc3e3b9a1d2743124426531
2014-04-20 22:34:10 +02:00
c7156494f3
Improved DeferredRenderTechnique initialization error messages
...
Former-commit-id: 99b1174257ae4e99600ad763ba2444d553957d18
2014-04-12 14:28:02 +02:00
f88c6cf0d7
Fixed debug shader not compiling on some configurations
...
Former-commit-id: 7e31eec475dc5e40491f480e9f45476acab5fdb6
2014-04-04 14:56:45 +02:00
044a00669d
Improved Scene implementation
...
Will provide a default background/technique when necessary
Former-commit-id: 547cca512aed4f90c53fff33e8c69245913d3a09
2014-03-18 19:54:35 +01:00
90ebf4940c
Fixed potential overflow in OBJ Loader
...
Former-commit-id: 8356daec0fc094c8316d9f0cfabfb6f4ccb8a1e7
2014-03-18 19:53:24 +01:00
37197a3840
Fixed sprite rendering in Deferred Shading
...
Temporary fix: In the future Deferred Shading shall work with some
sprites
Former-commit-id: 4c39ddf1b09511ee411713943d97cf807ee8f52d
2014-03-18 19:53:00 +01:00
268d3ae86d
RenderQueues now use std::map::insert only if necessary
...
It looks like my std::map::insert implementation allocates something,
even if the element is present (It's not a leak, just some useless
allocation)
Former-commit-id: 9490bfb7994c23f893a74d5710381ba5919bb38c
2014-03-14 23:55:14 +01:00
0ca2c9ccb2
Removed [*]RenderQueue::AddModel
...
Former-commit-id: 74b3e2b59b7a2ced16edca8dd7027dd8ae1db861
2014-03-14 23:48:10 +01:00
9a129ec733
Disabled face culling on default material
...
Former-commit-id: 112868ff6fe6b4fdd820bbe0839127c5c6b27824
2014-03-06 09:59:27 +01:00
cec6f29e1e
Fixed UberShader leak
...
Former-commit-id: 2d84fadee8ed55f068d30a28510500fe64df6365
2014-03-06 09:58:26 +01:00
24be314b86
Fixed spaces
...
Former-commit-id: 570c1fb8c0ffa6d140112a9cdaa14c05c752d916
2014-03-05 00:47:26 +01:00
5e9201cb22
Optimized Scenes configuration
...
The scene class no longer create a default background/default
rendertechnique at construction, instead it waits for Scene::Cull method
and create them if they are invalid
Former-commit-id: b5d031abc5d7df4be5ad4edd6036ad7d60cacbb4
2014-03-04 20:21:33 +01:00
2990843f31
Added warning
...
Former-commit-id: b6956df1ded62a23140f4c44f0fd8b677c63c981
2014-03-04 19:35:51 +01:00
0f2cab56ff
Forward RenderTechnique now handles non-lighting shaders
...
Former-commit-id: f243ba8aea76ada91510f6b36c292ae0e18e2add
2014-03-04 19:35:40 +01:00
05e7e11356
Made default material wireframe
...
Former-commit-id: c65d5b74dd430ecd5dd71a1b3167dc4afdf6dbf9
2014-03-04 19:34:07 +01:00
edaac1ded4
Fixed last commit
...
Thanks to Raakz for his patience
Former-commit-id: 4b423f3d271fcbdc3e33937e8170843681a3b096
2014-03-01 12:55:43 +01:00
4cd0ece11e
ModelParameters no longer contains shaderName field
...
Instead it will now set the shaderName field of the material field to
PhongLighting
Former-commit-id: 55b7f5500c7dc2c147f32a7c214a8e75ea434ff1
2014-03-01 12:25:11 +01:00
02275293ee
Fixed Texture loader not setting shader
...
Former-commit-id: 9a2e54c28f42a9390ab51d0909c92b7454aba476
2014-03-01 12:20:52 +01:00
0e4b1a8ffa
Fixed unused variable warning
...
Former-commit-id: 7a3752dfc8b68620162ef13fe40ac60c97611af9
2014-02-28 13:40:41 +01:00
4fb70f8b9f
Removed useless include and added TODO comment
...
Former-commit-id: 99c33e1725fac1a5e08038b7bb013a7d72bc61c2
2014-02-21 19:45:21 +01:00
86bdab9055
Big UberShader update
...
-Added GRAPHICS_MAX_LIGHTPERPASS macro
-Added glGetActiveUniform OpenGL function
-Added (Uber)ShaderLibrary
-Added (Uber)ShaderName parameter to models
-Changed uniform system
-Fixed Node copying
-Moved Material class to Graphics module
-Optimized lights
-Remade Shader class
-Renamed Node::Invalidate to Node::InvalidateNode
-Renamed ShaderProgram to Shader
Former-commit-id: 15f0cad52969e91a2442e7d750ba2dc412f3549d
2014-02-21 19:27:39 +01:00
fd958fd9ac
Updated the way module are initialized
...
It's safer and prevent a bug when initialisation fails
Former-commit-id: a04f18e18f2d9db11ec595a9b8096c2792b39641
2014-02-21 11:13:14 +01:00
4df6c30a26
Fixed ParameterList placement new conflicting with MLT
...
Former-commit-id: 97ca15d16e20e42427fceeea4f96a2e6b857dc83
2014-02-18 00:52:23 +01:00
9533f16e46
Fixed forward shading point lights for real
...
Thanks to Raakz
Former-commit-id: a6c2b282a18d2dfa94732afb401811c8dd5d4b93
2014-01-18 09:08:42 +01:00
c096756dab
Happy thousandth commit Nazara
...
Updated copyright year (Yay, 515 file updated)
Regenerated global headers
Fixed some typo
Improved some shaders
-Blah blah blah-
Thank you all for supporting my project !
-Lynix
Former-commit-id: e4e741b318ba4f203da5ffd265bd5e516e7ffd7d
2014-01-12 20:16:21 +01:00
b9dca8966d
Improved Deferred Shading performances
...
Former-commit-id: 7251e9f552230c31409f7780929fcc30f2b85bed
2014-01-11 19:16:36 +01:00
cbce6e6e64
Reunited Deferred Point Shader and Spot Shader
...
Former-commit-id: 0a77f57d8af98387690748102f6cdcea5d5514ed
2014-01-11 10:21:33 +01:00
16578e728f
Renamed RenderClearFlags to RendererBufferFlags
...
Former-commit-id: 7821709bc7310820e877db9bb26d1fb50d7ba217
2014-01-11 10:12:06 +01:00
351618f93b
Fixed instancing not enabling in some conditions
...
Former-commit-id: a6a29acd1896f44a7f82dd64fd53740b9021b422
2014-01-08 11:27:29 +01:00
Lynix
Gawaboumga
Gawaboumga