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
Lynix
Gawaboumga
Gawaboumga