Commit Graph

518 Commits

Author SHA1 Message Date
Lynix
24e23be7ea Graphics/Material: Add Basic2D and Translucent2D materials
Former-commit-id: 4c5d24d76d22894985e591036589ebba95f320d9
2016-05-13 12:47:43 +02:00
Lynix
a15b31c646 Graphics/Material: Add Basic2D and Translucent2D materials
Former-commit-id: fd07cb7c039d0e30b6fe74378efb3208808f9d9b
2016-05-13 12:47:43 +02:00
Lynix
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
Lynix
3b5d6e9cde Make mesh able to carry material informations
- Move OBJ Loader to Utility module, where it belongs
- Change Mesh material informations from a path to a parameterlist
- Improve Mesh code


Former-commit-id: f16f48f8b6399188a09797cec3707ab6726bdbca
2016-04-30 18:44:33 +02:00
Lynix
43c1243b75 Fix merge problems
Former-commit-id: 899b541adea1719f558c52abfab51458249b6aaf
2016-04-17 20:22:29 +02:00
Lynix
b3455e88ca Graphics/DepthRenderTechnique: Add Clear method
Former-commit-id: 70e7cb5b59f0407c73766687b6a95e09b7eca589
2016-04-17 19:58:15 +02:00
Lynix
37aa00b2e7 Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
Lynix
c8dd28f75c Sdk/RenderSystem: Allow to change render technique
Former-commit-id: ec61a2ebff138300344e6068917f0863c3d11859
2016-04-16 18:40:58 +02:00
Lynix
a31a969409 Replace useless reinterpret_cast by static_cast
Former-commit-id: f61d644d968d4fe9523a5cd122e11525a9c2765d
2016-04-07 04:20:18 +02:00
Lynix
b4e98dc7fc Formats: Change skip string format
Former-commit-id: 75952d298efb69bd9b77df31ee8dc1548442d071
2016-03-09 12:41:39 +01:00
Lynix
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
Lynix
dce587bd63 Add support for custom resource parameters
And allow users to skip a precise loader using them


Former-commit-id: 297af2e4a24ad67c343aae5d89352abf4ea05f63
2016-03-08 13:37:17 +01:00
Lynix
dff6e855e4 Fixes compilation on GCC
Former-commit-id: 1829fa37830618bd9b14e7bfa5d935c886213589
2016-02-24 14:12:45 +01:00
Lynix
ffb6a47435 Graphics/Material: Standardize flag testing
Former-commit-id: f2207fa4f1ad600aa09d8b484559bd9155a11f47
2016-01-19 12:22:43 +01:00
Lynix
c359c6925e Graphics/SpriteLibrary: Fix missing initialization/uninitialization (fixes crash at exit)
Former-commit-id: c7bbd781d163a8456f1fadd0f71451adc5a1bd1a
2016-01-19 12:14:07 +01:00
Lynix
2b908d0c2b Graphics/TextSprite: Fix unused memory not being released by Update
Former-commit-id: 2a1349b1346d6dd11a004654a65d43e91626b76a
2016-01-06 13:16:11 +01:00
Lynix
c6f491ca21 Graphics/TextSprite: Optimize Update method
Make it keep established connections instead of clearing everything and connecting again


Former-commit-id: abe315a03ba19059a9a867c23780c2f8cd34345b
2016-01-06 12:01:35 +01:00
Lynix
bff0e2df21 Graphics/ForwardRenderQueue: Fix error
Former-commit-id: a396c373b51128c57f5d8f98291f821b0bfc0c76
2015-12-11 13:08:32 +01:00
Lynix
91f778dd89 Graphics/SkyboxBackground: Add movement scaler
Former-commit-id: 02682210b2b3d4b0cf27c6dd8cf171a025a92701
2015-12-10 14:08:09 +01:00
Lynix
9e7452ab68 Graphics/DepthRender: Fix compilation
Former-commit-id: 749e3b67038cba20c46bd5570e616608200733f5
2015-12-09 01:11:27 +01:00
Lynix
9cf5e4b68c Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
Lynix
93fae53ea5 Graphics: Qt-friendly change
Former-commit-id: b4b278897d681ea5361ce9f751a0ecba7acd34ee
2015-12-07 22:45:07 +01:00
Lynix
0a0e6d00f7 Graphics: Add render order
Former-commit-id: 881ae69c214e024846dc0165f3476f76f5bcc0b5
2015-11-27 23:38:54 +01:00
Lynix
ed961f5ba8 Core: Merge InputStream and OutputStream to Stream
Remove serialization support from Stream


Former-commit-id: 7a761e4fcd07cab561f13e4709c4492ed18da88a
2015-11-20 13:52:49 +01:00
Lynix
682b8811f5 Graphics/TextSprite: Fix crash
Former-commit-id: c659044edff45afc7eec91065619bdfb402bc32d
2015-11-14 11:43:24 +01:00
Lynix
5d6e6b2d45 Fix errors and warnings
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01:00
Youri Hubaut
37586e7283 Switch from Nz prefix to namespace Nz for linux
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +02:00
Lynix
eaf1bb3601 Merge branch 'NDK-Refactor' into NDK
Conflicts:
	examples/HardwareInfo/main.cpp
	include/Nazara/Renderer/Enums.hpp
	include/Nazara/Renderer/GpuQuery.hpp
	include/Nazara/Renderer/OpenGL.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/RenderTexture.hpp
	include/Nazara/Renderer/Texture.hpp
	src/Nazara/Graphics/AbstractRenderTechnique.cpp
	src/Nazara/Graphics/DeferredRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/GpuQuery.cpp
	src/Nazara/Renderer/OpenGL.cpp
	src/Nazara/Renderer/RenderBuffer.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Renderer/Shader.cpp
	src/Nazara/Renderer/ShaderStage.cpp
	src/Nazara/Renderer/Texture.cpp

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


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
Lynix
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
dea3fb4e39 Convert spaces to tabs
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
Lynix
1ffd2b724f Merge branch 'NDK' into NDK-ShadowMapping
Former-commit-id: 150a4149d50af6971fd5798c080f0c55e009a55b
2015-09-20 23:42:12 +02:00
Lynix
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
Youri Hubaut
a4032abe63 Fix compilation on linux
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +02:00
Lynix
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
Lynix
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
Gawaboumga
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
Gawaboumga
3dbcb25384 Transfert enumeration from file to enums
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +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
391d248e59 Graphics/Sprite: Fix linker error
Former-commit-id: 1867897b6d67ccd7ed1779c66f086e3dc962e693
2015-08-16 01:45:31 +02:00
Lynix
29ffd44683 Graphics/ForwardRenderTechnique: Fix crash when rendering billboards without instancing
Former-commit-id: af5595a2eb0ddf7c9bb53250af3a5e2d78ea2cda
2015-08-16 01:45:12 +02:00
Lynix
ff9d233e7c Graphics/Billboard: Fix billboard texcoords
Former-commit-id: 4c3182736ded66d0d03ed5d0abc54a51d6f6eca6
2015-08-16 01:43:59 +02:00
Lynix
95ae8ed82c Graphics: Add billboard class
Former-commit-id: bc898f00aa78dd42f61d34ce743ed9a73dce55f6
2015-08-16 01:43:17 +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
1f2e810927 Graphics: Remake DepthRender[Queue|Technique]
Former-commit-id: c4d8d4d28d02822273ebe7dca3e468ea156af674
2015-07-05 23:43:35 +02:00
Lynix
c0ee9d04b5 Graphics/Material: Add depth material parameter
Former-commit-id: 980888e12e5d8c8cf280c6a62592068cfab49d2e
2015-07-05 23:23:17 +02:00
Lynix
529673ebc1 Graphics/Light: Make shadow map format/size parametrable
Former-commit-id: 8151d71d58ab760584c0ace1e0686c44bab9d3b2
2015-06-30 20:48:46 +02:00