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
56443c91e4
Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
...
Former-commit-id: 392c7c33ff64d19e0fe3c7bdc8b22fe17c150887 [formerly d12a3c5f664fccebe0ee40a73bb0310e2d02287e]
Former-commit-id: 22743f015567a8471f97cb90a06175f600ef0f8f
2016-07-21 23:00:09 +02:00
18cb5f9da3
Graphics/Material: Add SaveToParameters
...
Former-commit-id: 706770cc1eaf00e0849d9a6f6878b0ab9b69d3aa [formerly be281a7eaaa21f25c80ff65bf7b79c93c03e1e1d]
Former-commit-id: b54f61ec5be56a9ae51decaf625ff96b2ab5c62d
2016-07-07 08:56:18 +02:00
c83b9d0491
Graphics/Material: Add SaveToParameters
...
Former-commit-id: 87b9ca6e0f5f391f45edf6106efbd550dd52ac53 [formerly 91ba614d69d3a2e9762da0e059ee96985c891749]
Former-commit-id: e049a9db776f407e2cd7635bfb1825d809223c77
2016-07-07 08:56:18 +02:00
e0071b196a
Sdk/GraphicsComponent: Add Detach method
...
Former-commit-id: b80b7e52f4736f61c439a4242531adaefbdb75a2 [formerly 2c336b6480ae9a11ca1104ee1140e8f449bb2a02]
Former-commit-id: 54f77c634ce1f9bfc93a00d9a14567bd25a06b26
2016-06-20 13:11:31 +02:00
04e52caa88
Sdk/GraphicsComponent: Add Detach method
...
Former-commit-id: 16bcd7d8a3b50235cdd50443d8a1ed55e4b939f2 [formerly 93e838eebb955d5bbe17113ced86a247122bf522]
Former-commit-id: be3d0d2e8fb9a887eb903c6b17f16a56e5eee1c7
2016-06-20 13:11:31 +02:00
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
51533fabe9
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: 3878bde4d067ef921783f256b582af8f6463c19b [formerly 029a8e9081b66daf20a78ba7331a496d89145f44]
Former-commit-id: 47009b49149da0186169afc538618f2ab2973f89
2016-06-09 08:49:14 +02:00
f80dc7cf45
Graphics/Material: Add errors when failed to query texture
...
Former-commit-id: b848a6552b442edf87260bbbb6b3703bf155a4b7 [formerly b4720a11771bd5f2e61f54afc69c361b7c412555]
Former-commit-id: b3aa1119d7ca9efe3030f40f1f5d1f0c79b416fd
2016-06-09 08:49:01 +02:00
2ace255d17
Graphics/Material: Add errors when failed to query texture
...
Former-commit-id: a28cd9537b7155f461a0e0dc761225c5e8758c77 [formerly e9c6cf2e48766eb3ef99c4711567d4da2e4e30ce]
Former-commit-id: d00448a69f391c0e9b17fcce85e48f968b0de143
2016-06-09 08:49:01 +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
37ee034702
Graphics/DepthRenderTechnique: Fix typo in include name
...
Former-commit-id: f304f7bf1f0ecc2d58ce68d3b3a64802958bf2c7
2016-05-30 07:41:32 +02:00
18868082fc
Graphics/DepthRenderTechnique: Fix typo in include name
...
Former-commit-id: 8ac7a886fbb406d1c03ceae5ea8ac71bb48364b7
2016-05-30 07:41:32 +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
9036eb4804
Graphics/Light: Fix compilation
...
Former-commit-id: 39de337102ae862b74d5fe8fae9fdb7e19e32e06
2016-05-17 20:14:06 +02:00
a386a8bd2d
Graphics/Light: Fix compilation
...
Former-commit-id: 0ae92c86e52bb18aa9587fbb82c932b71b44484c
2016-05-17 20:14:06 +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
0bd8904878
Utility/*TextDrawer: Fix bounds starting at a negative position
...
Former-commit-id: 4954d0f3d1b10d4b7512c7b57936bc73c7ea69ae
2016-05-11 12:27:18 +02:00
2b04a4722f
Utility/*TextDrawer: Fix bounds starting at a negative position
...
Former-commit-id: 06ac76189b5c36e108b5fc80b3c54d01068deadd
2016-05-11 12:27:18 +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
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
0697fe1079
Revert "Graphics/RenderTechnique: Remove Clear method"
...
This reverts commit 8aa3764660d5c98995135f736ecd710677fa240c [formerly 9b4ec3ae32492e383c19a06bd1c3e461b3fcf46d].
It seems I was wrong about the Clear method, my revert broke the Deferred Rendering
Former-commit-id: b8d2db34ffd9d24798670f19aba0de88f5b77a1c
2016-04-06 12:39:29 +02:00
265e1c0fbd
Fix compilation for gcc/clang + tests for serialization
...
Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
2016-04-04 10:17:05 +02: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
c94c525446
Graphics/TextSprite: Add convenience constructor
...
Former-commit-id: f6ca6499baf20e561616251950e7749350516b14
2016-01-19 12:15:44 +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
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
7f4a7c1012
Add override where missing
...
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
2015-12-30 15:15:20 +01:00
1926b28d63
Graphics/Light: Add missing GetInnerAngleCosine() and GetInvRadius() implementation
...
Former-commit-id: 7deb6b2dd76139ccc98801cdb36a27e1f5979722
2015-12-18 13:46:15 +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
5d6e6b2d45
Fix errors and warnings
...
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01:00
7db9be3cfb
Disable memory manager for every module
...
Former-commit-id: 4c6e0a87de57bf55780cc9dfee280cc198d06704
2015-09-28 00:41:24 +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
c214251ecf
Update copy/move constructors/operators
...
Former-commit-id: b1faeeae9211a6c0ca29261d46929dc8c66ea0c4
2015-09-24 12:51:52 +02:00
dea3fb4e39
Convert spaces to tabs
...
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
2fd3872099
Core: Remove NonCopyable
...
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
2015-09-24 00:37:21 +02:00
025d873228
Merge branch 'NDK' into NDK-ShadowMapping
...
Conflicts:
SDK/include/NDK/Systems/RenderSystem.hpp
SDK/src/NDK/Systems/RenderSystem.cpp
Former-commit-id: 2772ff703c9d68d536667c469aca85084be4b861
2015-09-19 14:47:02 +02:00
859544eaa7
Ndk: Add support for 2D rendering
...
Former-commit-id: bdf9257816c8f48b8c0679647978480785720053
2015-09-18 12:34:05 +02:00
03ee0a12ed
Make signals arguments clearer
...
Former-commit-id: c329f1fc5b8d8ffcf8e38ec4e4804454b31f685f
2015-09-14 22:40:38 +02:00
2b48917176
Merge branch 'NDK' into NDK-ShadowMapping
...
Former-commit-id: b07de3853987ffc91946b307208c0ec26eda280a
2015-08-17 14:26:42 +02:00
ba1073828f
Graphics: Improve code
...
Former-commit-id: d548b513aef5190e20bc065653178981c5d18f68
2015-08-16 01:44:17 +02:00
95ae8ed82c
Graphics: Add billboard class
...
Former-commit-id: bc898f00aa78dd42f61d34ce743ed9a73dce55f6
2015-08-16 01:43:17 +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
9a7c356f75
Graphics/Material: Fix texture getters
...
Former-commit-id: 00799529501c489498c4afd7e42195157b74ba22
2015-07-02 12:24:04 +02:00
529673ebc1
Graphics/Light: Make shadow map format/size parametrable
...
Former-commit-id: 8151d71d58ab760584c0ace1e0686c44bab9d3b2
2015-06-30 20:48:46 +02:00
2c4a35b2d1
Graphics/Light: Add move constructor/operator
...
Former-commit-id: d2823b5bae913fc0d218f6aaf067ee29812a6cbf
2015-06-30 20:47:39 +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
eddac5c0b6
Graphics/SkyboxBackground: Fixes
...
Former-commit-id: ab45a2efa957e33015e4d8dd57ebc8a5d028798c
2015-06-24 00:18:38 +02:00
4cd4055c3f
Graphics/Model: Fix includes
...
Former-commit-id: 27f0e51429ce1ddb9e35d849a296186d79b1cde6
2015-06-23 23:35:30 +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
06b5e09935
Graphics/Renderable: Make Cull simply virtual (not pure anymore)
...
Former-commit-id: 34042cae998af21c04cbd393864f6984da5b1ef1
2015-06-23 13:59:15 +02:00
ea3fdaba26
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: 0a72e838de272bff91f0b8c8a3637db94fdd7820
2015-06-22 13:31:23 +02:00
109af2a581
Graphics/Light: Fix missing getters
...
Former-commit-id: 3e7c21d8f3d2a47b3a19f9eec4fcf44e2412a0ed
2015-06-22 13:27:45 +02:00
17f9d26387
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Former-commit-id: d6b7e05adf8586c40b79de8dc0880ae1a501403c
2015-06-22 11:19:34 +02:00
4b5c08e739
Graphics/Sprite: Fix debug build
...
Former-commit-id: 751eea18f8ca4c68243dbc363eb4b7de2618784d
2015-06-22 00:54:00 +02:00
8472578e42
Graphics/Material: Fix compilation error
...
Former-commit-id: 1cb87781afd8de0f6aaf4f6cbac861d5a1f8f717
2015-06-18 12:09:51 +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
b7c5283c4e
Graphics/Sprite: Fix compilation in debug
...
Former-commit-id: 233f8ebe775e268b72808ecd0770956651e717f6
2015-06-17 14:32:18 +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
c879bd1656
Graphics/Renderable: Fix warning
...
Former-commit-id: 8732717db7a067ccb286daf5771520c30017acc6
2015-06-16 12:25:32 +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
4cc8b53041
Graphics/DeferredRenderPass: Delete copy
...
This fixes compilation under VS
Former-commit-id: ccc7e647d0d06567953abb04b3fed73ca026bd0a
2015-06-13 22:32:22 +02:00
1fc17c8b53
Separate NAZARA_API into multiple defines (one per module)
...
To fix inter-module dependency
Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
2015-06-13 22:31:29 +02:00
251e21f006
More VS fixes
...
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
d9c31636b9
Graphics/RenderTechnique: Move viewer to SceneData
...
Former-commit-id: 6c8b5a00b65649c7a3877a186b51f7240361e801
2015-06-13 16:27:12 +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
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
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
8c6806eacb
Graphics: Update Light and Model to new interface
...
Former-commit-id: 5643f20261524f93a5d080404de5ab0b29151acb
2015-06-04 00:18:43 +02:00
349b322834
Graphics/RenderQueue: Default argument for Clear method
...
Former-commit-id: b45e5b8819670e3d88a7d737e957e2207fc3200e
2015-06-03 22:39:13 +02:00
11e7748d85
Ndk/GraphicsComponent: Update
...
Former-commit-id: 4f4ca46fb58582abb0c61b7f081b77e9cd95ee0f
2015-06-02 17:21:23 +02:00
844062cfd0
Graphics/Renderable: Fix warning
...
Former-commit-id: 6370969c051e7612b59e303806a6dc650988afc9
2015-06-02 17:19:47 +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
eba7cfc538
Graphics/Renderable: Fix linking
...
Former-commit-id: f41d5c79cf48e2f0fc9dd9f04b8a9229eea6cf7c
2015-05-31 22:12:59 +02:00
8f8eca1d70
Graphics/SkeletalModel: Update to new code
...
Former-commit-id: 74b17bf06b3c7c22477ee3a098301e70b093f890
2015-05-31 22:12:46 +02:00
962c1f2362
Graphics/SkeletalModel: Begin update to Renderable
...
Former-commit-id: c05e8a85bf3f0227fe2e75480df12045c8384124
2015-05-28 14:37:40 +02:00
e332193cd1
Graphics/Model: Default move constructor/operator
...
Former-commit-id: 0bf6787057d807dfaf4e27c965ea0d654c369b85
2015-05-28 13:49:25 +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
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
be335c3e81
Graphics/Renderable: Fix copy constructor/operator
...
Former-commit-id: eb376d49285cefa1f0317719a47e41f62a11aae5
2015-05-26 14:13:24 +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
36b39ec868
Alphabetical commit
...
Former-commit-id: 4f1e73bd1228fefefd7f788adcd3ccb396d0b141
2015-03-19 18:17:52 +01:00
e873d40ccc
(View) Added Map[Pixel|World]To[World|Pixel] method
...
Former-commit-id: 39295c71d040d472117cb30c266169476f563e9d
2015-03-18 20:31:39 +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
4c659a6442
Fixed potential name conflict with user's code
...
Former-commit-id: ca4e2ec3973d45832fc6a6535750b2639f65fe23
2015-02-04 21:59:45 +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
9195e162a8
(Material) Removed outdated Move declaration
...
Former-commit-id: 7bfacdc630203af6b231184dbde4af31bd46fab5
2015-01-28 13:53:39 +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
a185f03abc
Merge remote-tracking branch 'origin/Scene-Update'
...
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
2015-01-25 16:35:18 +01:00
4a2f386c80
(Drawable) Made destructor virtual
...
Former-commit-id: ab35592cf015a3056de5d533b29d3c469cb29d29
2015-01-25 16:34:34 +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
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
e46cb43ef5
Removed useless code
...
Former-commit-id: 8e65848eed8c3ceb829a7c556f4686676ea946f4
2015-01-24 12:03:24 +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
f6df10dacf
Removed unused file
...
Former-commit-id: 374fc27dca13c38dfa94928841cefb031e7b32ed
2015-01-23 20:07:24 +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
a39988ac46
Removed unused file
...
Former-commit-id: 42b523c8da74800166935602755e554f26d7fa40
2015-01-22 23:46:55 +01:00
ea8d683624
Updated copyright year
...
(532 files, wow)
Former-commit-id: cbb31f1124a86720bd3a54fe589a0f849a87b434
2015-01-21 20:53:01 +01:00
3933b07094
Suppression of warnings
...
OffsetOf: use of static_cast
Updatable: API and virtual destructor
Drawable: virtual destructor
Vector: std::abs should be "the" abs.
AbstractClass: API
+Updatable: Like for others abstracts
Buffer: nullptr for pointer to function.
Image: wasn't returning a vector.
Former-commit-id: 57e0009286a02b9e3b0b81945e500d7d9e466ae2
2015-01-21 13:51:49 +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
e2d4ba030c
Alphabetical commit
...
Former-commit-id: bacf8ab447d3022b48aac5f5ca2d337bc1283f8c
2015-01-19 11:57:19 +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
9662f4167d
Fixed crash on Utility uninitialisation
...
Former-commit-id: ef9f53674fe21c4d7780e68c62f7981554663a85
2015-01-17 22:55:50 +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
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
5eec0d2abe
Improved (Fixed ?) Material Copy/Move
...
Former-commit-id: 8eb9b716e2b028c6d2e249f9706ad6f5567c95dc
2015-01-16 14:03:06 +01:00
b6c5668232
Separated atlases from Font class
...
First use of shared_ptr, yay!
Former-commit-id: 4c22341fba5674746d5299cf0e8dbf6dc31d5362
2015-01-07 23:46:26 +01:00
9293022e71
Added sprite overlay rendering
...
Former-commit-id: 1e25a7d85f06f4a4bc3ed0ead76df01db440671d
2015-01-07 19:27:15 +01:00
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
ed1cc7a092
Added viewer-relative directions
...
Former-commit-id: 9d80744bd227689426b76df7e3c273de13424041
2015-01-03 22:39:51 +01:00
e55c521e96
Added support for skeletal models (WIP)
...
Former-commit-id: 6a6c2d9f2c68267df79dc48fa56450d2a563e323
2014-12-17 13:56:33 +01:00
a51cbc1e49
Added Sprite::SetSize(float, float) overload
...
Former-commit-id: 672a2e4f5c2a2d40b4af42c7ee4b7b37d3774117
2014-12-07 03:05:27 +01:00
df6fdf6784
Added a Size parameter to View class
...
Allowing independent from rendertarget size
Former-commit-id: c131b6dd95692c72a969bf0cc6edd997911bbe58
2014-12-07 02:57:30 +01:00
a008439cde
Added depth sorting attribute to Material class
...
Only works for billboards for now
Former-commit-id: 50a46d3266a2e7fc6d75629103ad8b7193b13bf3
2014-09-11 00:10:24 +02:00
04be41082c
Added A LOT of oveloads to AbstractRenderQueue::AddBillboards
...
Former-commit-id: 51b73a110e61cee7ad8fca42b10afd59363de809
2014-09-06 11:59:57 +02:00
659eb31757
Added support for billboads
...
Improved ForwardRenderTechnique code
Former-commit-id: 2386de85c26839565f087885ffcb098ef263bdfa
2014-09-03 13:16:56 +02:00
aeec8ee0f4
Enabled new shader flags
...
Former-commit-id: df06f4faf4c7275c702338eee1ed14a2445662a1
2014-09-01 16:00:54 +02:00
67ecefd380
Added sprite color attribute
...
Former-commit-id: 1db061b862315495cb40ff308348a0ac8d41e304
2014-09-01 15:42:51 +02:00
ea43edbaf3
Separated ParticleEmitter
...
Renamed ParticleEmitter to ParticleSystem
Added class ParticleEmitter
(First implementation, this will probably change)
Former-commit-id: a1f80db340983da5e85cedc974dd6b24a98e25b0
2014-08-31 14:09:43 +02:00
54382afc37
Merge remote-tracking branch 'origin/master' into Particle-Update
...
Former-commit-id: 7ec9fba80c2b47a1fb811c7912df67262986c9f0
2014-08-25 23:09:36 +02:00
9b1f63ce11
Fixed possible bug
...
Former-commit-id: 3ce9541e99d91140547ed8b60297d3d3785a0630
2014-08-25 20:23:00 +02:00
a15e3abd0c
Added Mass particle component
...
Former-commit-id: 491f488b7eab8aeb06a441701ca004f1738571e6
2014-08-09 00:31:01 +02:00
f395cb7579
Added ParticleEmitter::GetFixedStepSize()
...
Fixed missing implementation of ParticleEmitter::SetFixedStepSize
Former-commit-id: 255fcca4afe40cccf38a561f09f29a0a4ceccd71
2014-08-09 00:30:24 +02:00
0976607eb9
Added fixed step update
...
Switched back to defaulted operator=(ParticleEmitter&&) since it can't
throw exception anyway
Former-commit-id: 178b040a735ef01dcda21b45a317b6c534b5782e
2014-08-08 21:21:04 +02:00
202f675301
Changed particle callbacks arguments (offset, count) => (startId, endId)
...
Former-commit-id: 24550dad44e55aa9dfabaf916cbfb8e25df0451a
2014-08-08 20:59:49 +02:00
e9267d7f43
Added particles first implementation
...
Former-commit-id: 2b98ce2f007927690bdecd4092e211013bf568cb
2014-08-08 17:17:58 +02:00
149ef145a3
Fixed DebugOff
...
Former-commit-id: ba77eb95c3b5b3d4d88730c0fa029fd4f40e9c91
2014-08-05 09:42:37 +02:00
221e2583ac
Removed useless file
...
Former-commit-id: 162cc21adea7dbdf6604ed8d8b25485ec1442d90
2014-07-23 10:21:49 +02:00
9e04e8a0e4
Separated reference counting from Resources
...
Former-commit-id: 7380818cfee9e249c11fd15da9ff7883a6e76565
2014-07-15 00:59:02 +02:00
c4b10dddda
Big config/debug update
...
Added config checkers
Macro no longer use suffixes
Moved MemoryManager to upper directory
Renamed *_MEMORYMANAGER to *_MANAGE_MEMORY
Renamed AUDIO_STREAMEDBUFFERCOUNT to AUDIO_STREAMED_BUFFER_COUNT
Renamed CORE_REAL_PRECISION to CORE_DECIMAL_DIGITS
Renamed DEBUG_MEMORYMANAGER_DISABLE_REDEFINITION to
DEBUG_NEWREDEFINITION_DISABLE_REDEFINITION
Renamed GRAPHICS_MAX_LIGHTPERPASS to GRAPHICS_MAX_LIGHT_PER_PASS
Renamed UTILITY_FORCE_DECLARATION_STRIDE_MULTIPLE_OF_32 to
UTILITY_VERTEX_DECLARATION_FORCE_STRIDE_MULTIPLE_OF_32
Former-commit-id: 81ef836ac9f092ac471f60e544bb7c7c6370593c
2014-07-08 10:56:37 +02:00
b70f693b8c
Merge remote-tracking branch 'origin/RenderTechnique-Update'
...
Former-commit-id: 85e5af81ed3381af19e87c6ca0ee14e79955e563
2014-06-24 12:56:10 +02:00
6c1852299d
Added SkinningManager
...
Former-commit-id: ca3648dc16f5b1654cb8e3f5480d04f7fd22a3bc
2014-06-21 16:23:38 +02:00
a31ced1d76
Modified SceneNode::FrustumCull
...
Now provides an implementation which will test the bounding volume
against the frustum (Basic frustum culling)
Is now const
Disabled face culling on sprites
Former-commit-id: 5cb7a94b38ef8b0ffa5a78f16f5ef65a59ab375d
2014-06-05 21:28:17 +02:00
fa5b1ab000
Model can no longer be animated (SkeletalModel will)
...
Former-commit-id: e203a3dddf74bb171d8abe961e8a2f28df13bcad
2014-05-28 01:03:59 +02:00
c901b5808e
Added new abstract renderqueue rendering
...
Former-commit-id: 35e66174ccc3de3b43571f12a149e6d3c59cc2c9
2014-05-28 01:00:18 +02:00
012c120bf1
Added Scene::EnableBackground
...
Former-commit-id: 57a3c3e41799703bb72b4980433d7faadc3b1b86
2014-05-28 00:35:28 +02:00
c606599e19
Updated MemoryManager
...
Renamed MemoryLeakTracker[.hpp|.cpp] to MemoryManager[.hpp|.cpp]
Added MemoryManager::GetAllocatedBlockCount()
Added MemoryManager::GetAllocatedSize()
Optimized MemoryManager (no longer allocates a time buffer)
Former-commit-id: 0e9c720cbb48fbed7006db3bd1000ebbc22c9583
2014-04-21 22:13:31 +02:00
7d99550925
Made Initialize/Uninitialize static methods from non-submodules private
...
Former-commit-id: 78dac32c8650dc9eb4fd2c7f0bece030012497cf
2014-04-21 00:08:34 +02:00
ae316394f9
Fixed instancing rendering
...
(Finally fixed that bug)
Lowered required instance count to ten
Former-commit-id: 6aeb69eb8ca08727a029e07080aed558e1d1f089
2014-04-20 21:27:53 +02:00
0ca2c9ccb2
Removed [*]RenderQueue::AddModel
...
Former-commit-id: 74b3e2b59b7a2ced16edca8dd7027dd8ae1db861
2014-03-14 23:48:10 +01:00
4cd0ece11e
ModelParameters no longer contains shaderName field
...
Instead it will now set the shaderName field of the material field to
PhongLighting
Former-commit-id: 55b7f5500c7dc2c147f32a7c214a8e75ea434ff1
2014-03-01 12:25:11 +01:00
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
4df6c30a26
Fixed ParameterList placement new conflicting with MLT
...
Former-commit-id: 97ca15d16e20e42427fceeea4f96a2e6b857dc83
2014-02-18 00:52:23 +01:00
Lynix
Gawaboumga
Gawaboumga