Commit Graph

385 Commits

Author SHA1 Message Date
Lynix
fdfd078335 Build: Fix empty install commands
Former-commit-id: 42abd0d02836ee466821da11bc34bbe4acc30389 [formerly 0031006522b6c8910fae4c7b72eaf05cda23dcea]
Former-commit-id: 11ed91151aa8db729bea196ca9705a6e60f260bb
2016-07-31 12:59:04 +02:00
Lynix
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
Lynix
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
Lynix
4d307c07f9 Graphics: Add TileMap class
Former-commit-id: ecc9f3f1e786da4017ef24322a2f2510eab33a6c [formerly 2d18b57f6ef6c8480f83226082cfcceff3779093]
Former-commit-id: 531e4724efe7fa76f64c1e252665be31d1754e7b
2016-07-23 18:06:17 +02:00
Lynix
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
Lynix
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
Lynix
18cb5f9da3 Graphics/Material: Add SaveToParameters
Former-commit-id: 706770cc1eaf00e0849d9a6f6878b0ab9b69d3aa [formerly be281a7eaaa21f25c80ff65bf7b79c93c03e1e1d]
Former-commit-id: b54f61ec5be56a9ae51decaf625ff96b2ab5c62d
2016-07-07 08:56:18 +02:00
Lynix
e0071b196a Sdk/GraphicsComponent: Add Detach method
Former-commit-id: b80b7e52f4736f61c439a4242531adaefbdb75a2 [formerly 2c336b6480ae9a11ca1104ee1140e8f449bb2a02]
Former-commit-id: 54f77c634ce1f9bfc93a00d9a14567bd25a06b26
2016-06-20 13:11:31 +02:00
Lynix
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
Lynix
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
Lynix
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
Gawaboumga
4710da1f6c Revert changes
Former-commit-id: 25a7ecad35f3fe38638f608f375ed9c8c5df873e [formerly fa3383a06a186551d427aee0e3def1e543b73a1b]
Former-commit-id: 5923cbbb60c4464741449c997c39212d2bc075f8
2016-06-08 14:13:19 +02:00
Gawaboumga
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
Lynix
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
Gawaboumga
db8a222f62 Fix for problems signaled by clang static analyzer
Former-commit-id: 835f639c45509b0d55fe716e51e3285ea2a89da4
2016-05-31 21:50:31 +02:00
Gawaboumga
a81cc4a295 Default behaviour without precision on name
Former-commit-id: 28959f509e5baee43109a66e17a8703a480288e4
2016-05-30 14:27:31 +02:00
Gawaboumga
96b958d655 Documentation for module: Graphics
Former-commit-id: 5e3ee3c61779fbdd1a083117f537a45e1bad820b
2016-05-30 14:21:36 +02:00
Lynix
3e78dd40ad Fix some GCC warnings
Former-commit-id: b3292fcfd4d029793cb70f97ab608aeb7d0579ef
2016-05-25 13:52:10 +02:00
Lynix
a1644edf45 Merge branch 'NDK-ShadowMapping'
Former-commit-id: e77949168073f06d52d10785afb41bad2f7f86c0
2016-05-13 13:06:23 +02:00
Lynix
24e23be7ea Graphics/Material: Add Basic2D and Translucent2D materials
Former-commit-id: 4c5d24d76d22894985e591036589ebba95f320d9
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
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