Commit Graph

34 Commits

Author SHA1 Message Date
Lynix
96f3104347 Fix Basic uber-shader compilation on some drivers 2018-03-10 13:02:30 +01:00
Lynix
e7eaea37d7 Reencode resources 2017-10-26 23:38:33 +02:00
Lynix
fce0db09e8 Add support for reflection in PhongLighting shader 2017-10-11 00:07:57 +02:00
Lynix
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
Lynix
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
Lynix
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
Lynix
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
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
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
Lynix
9cf5e4b68c Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
Lynix
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
Lynix
cd3b19ca79 Graphics/Shader: Fix shadowing
Former-commit-id: 54fc9a019217eef85281c33a8a7becb6fec4f851
2015-08-19 13:46:11 +02:00
Lynix
2b48917176 Merge branch 'NDK' into NDK-ShadowMapping
Former-commit-id: b07de3853987ffc91946b307208c0ec26eda280a
2015-08-17 14:26:42 +02:00
Lynix
ff9d233e7c Graphics/Billboard: Fix billboard texcoords
Former-commit-id: 4c3182736ded66d0d03ed5d0abc54a51d6f6eca6
2015-08-16 01:43:59 +02:00
Lynix
5cad63c21b Graphics/Shadow: Implement PCF for spot lights
Former-commit-id: 0045af26b612a5c41268fcf3e3d03893e01c0448
2015-08-14 14:13:53 +02:00
Lynix
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
Lynix
75972fec36 Graphics: Add shadow mapping
Former-commit-id: ca404bee246991eab98df35396e3010ec5165c43
2015-07-05 23:57:54 +02:00
Lynix
db4a499151 Removed support for OpenGL 2
Former-commit-id: e796c333d6c2ef0550ff4427d36dcfbaf00ef924
2015-01-30 15:39:25 +01:00
Lynix
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
Lynix
9293022e71 Added sprite overlay rendering
Former-commit-id: 1e25a7d85f06f4a4bc3ed0ead76df01db440671d
2015-01-07 19:27:15 +01:00
Lynix
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
Lynix
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
Lynix
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
Lynix
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
Lynix
9533f16e46 Fixed forward shading point lights for real
Thanks to Raakz


Former-commit-id: a6c2b282a18d2dfa94732afb401811c8dd5d4b93
2014-01-18 09:08:42 +01:00
Lynix
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
Lynix
b9dca8966d Improved Deferred Shading performances
Former-commit-id: 7251e9f552230c31409f7780929fcc30f2b85bed
2014-01-11 19:16:36 +01:00
Lynix
cbce6e6e64 Reunited Deferred Point Shader and Spot Shader
Former-commit-id: 0a77f57d8af98387690748102f6cdcea5d5514ed
2014-01-11 10:21:33 +01:00
Lynix
a332579c80 Deferred Shading update
-Deferred Shading now use a dynamics pass system
-Forward Shading is now capable of rendering more than three lights
(Multipass)


Former-commit-id: 74ed0b998d72aa9eb3bd2aab938a75985ebb2bf6
2013-12-28 10:22:03 +01:00
Lynix
efd3491b43 Fixed Bloom shader not compiling everywhere
Former-commit-id: ff47c90aefa7c54349dfe162c6d5b3e34957460a
2013-12-20 20:08:05 +01:00
Lynix
ac7f5008ca Improved FXAA
Former-commit-id: aa3b64de5be93b05fab0ad45039e5aac74c4d197
2013-12-20 20:06:00 +01:00
Lynix
f2bb457850 Updated Shaders for Deferred Shading
Former-commit-id: ab97c6e7b74bffad32d334a2d0e5bd4607047c03
2013-12-20 20:05:51 +01:00
Lynix
0e99205046 Fixed rendering
Resource encoder now store unsigned char instead of signed char


Former-commit-id: 648dd1d55facd40bc37075291782a54cbbc4811f
2013-11-26 15:25:43 +01:00
Lynix
b7b65d7119 Added Deferred Shading
Former-commit-id: 926022d6306144e2f87cd293291928bda44c7a87
2013-10-22 12:54:05 +02:00