sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,473 Commits 1 Branch 0 Tags
31f052d405f09c837cf24eb43a21f8bc347cd970
Commit Graph

26 Commits

Author SHA1 Message Date
Lynix
0ee76b30a9 Graphics: Prevent shadow-mapping code to compile without shadow-mapping 
Temporary fix for OpenGL 3.3


Former-commit-id: 52d8ae54ee861f85e0cd2c66848c933227d02041 [formerly 3a43b5badc40d76aeca49795ad36d6475510ae68]
Former-commit-id: 39bf34c0ae386859a5bc74106ffccca5adf78475
 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