67a9dc692a
Physics/Geom: Fix NullGeom InertialMatrix
...
Former-commit-id: ac5e0c6cd9f775c29e37a4bb5a072eee2b224d0f
2015-09-19 14:44:41 +02:00
466720abec
Core/String: Fix IsNull() method (thanks to Unit tests)
...
Former-commit-id: dd4828c3c0e2d3423094cf018e70fd74deac0740
2015-09-18 14:10:15 +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
9f1c190985
Core/String: Replace manual memory management/COW by smart pointers
...
Former-commit-id: 27cab7f0642619ab47d53ed59c737992534f2979
2015-09-13 12:07:31 +02:00
44e99bce3d
Core/HashDigest: Cleanup code
...
Former-commit-id: 869c880df6822e7cccf4b847bbba9a5390100a5d
2015-09-13 12:06:38 +02:00
73e03073eb
Lua: Add automatic function binding
...
Former-commit-id: dcb1d3ca474c9e10f9a40428095a5ff752f5c4a9
2015-09-10 18:03:52 +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
dea48a289d
Merge branch 'master' into NDK
...
Conflicts:
include/Nazara/Core/ConditionVariable.hpp
Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
853ff0e701
Consistency
...
Former-commit-id: 379ae9d0f63c08a2de6f573bdb52068ed84c19ef
2015-08-21 12:16:09 +02:00
8716daf73c
Debug axes
...
Former-commit-id: e7d93df67679d1e29014120aef5cc0c3421fd9c2
2015-08-21 12:14:35 +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
376df6a3b7
Indentations
...
Former-commit-id: 0d82a4464cb9369bc4ca5cf2d7780c921eff953d
2015-08-21 11:32:29 +02:00
0b390e45a1
ByteArray rewritten
...
Now works internally with std::vector
Former-commit-id: 643f1d88b2959aed324743dbf91f831130a9198e
2015-08-21 11:28:04 +02:00
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
40d35fbe5f
Utility/SimpleTextDrawer: Fix movement
...
Former-commit-id: ac62391a2e28f50a0a61e984692a7a1e3444b28e
2015-08-20 00:00:16 +02:00
0bdfa995b0
Merge branch 'NDK-ShadowMapping' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK-ShadowMapping
...
Former-commit-id: 77ef760d6343058bfdd33e391c0743d5008c8c49
2015-08-19 23:23:24 +02:00
831b9358ef
Utility/SimpleTextDrawer: Fix movement
...
Former-commit-id: f5086d1ca281f31a3b89d5cd535f9aeaa9b2a929
2015-08-19 23:23:19 +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
21ad09d626
Core/Utility: Fix font crash
...
Happened when the atlas was resizing while updating the text drawer, the
old invalid pointer was kept (now a dangling pointer).
Former-commit-id: d50153f81f1f2bdd80cfdac9dcee85eb7c28c35e
2015-08-17 13:54:07 +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
fabe42dc3a
Renderer/Texture: Set up compare mode
...
Former-commit-id: 6f85b6956530ea27b5bb96eb9b51a3ddc702f71b
2015-08-13 13:55:14 +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
6870148314
Renderer: Add shader validation
...
Former-commit-id: fa9225b87e6ec2217c3838535531075dfcaaf433
2015-07-05 23:26:09 +02:00
5556c38901
Renderer/RenderTexture: Fix Detach() not removing color targets
...
Former-commit-id: 058d95e1952f2316333be380cb6418c121db4a32
2015-07-05 23:25:12 +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
9c1441cc82
Core/MemoryManager: Implement allocation filling
...
Former-commit-id: 12e6c293e6d51663971e3da4c160b12a6710430e
2015-06-28 16:03:31 +02:00
318da0d960
Fixed some warnings
...
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
8bdb1c5206
Core/TaskSchedulerImpl: Fix compilation under POSIX
...
Former-commit-id: a5cedcad78a02283984bcb56be2d5a58e11cd504
2015-06-26 11:46:21 +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
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
80d4acfe32
Core/MemoryManager: Add delete checks
...
Now able to detect double-delete and dangling pointer delete
Former-commit-id: 7ac9ab7034b8b790333d5655aa0c82a49bb9309e
2015-06-21 13:20:10 +02:00
9318d269e2
Renderer/RenderTexture: Fix and inline
...
Former-commit-id: 4bf8ad8acd3b978c4665df9547328333b9f9ad42
2015-06-21 13:18:37 +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
39779c059d
Renderer/OpenGL: Apply swizzle on depth formats
...
Too much red when debugging shadow maps
Former-commit-id: 4445429fcae3208912fd509097403f3293a2ec7e
2015-06-16 23:35:52 +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
836e4af221
Utility/OBJParser: Fix material indexes being unstables
...
Former-commit-id: 10a3e37d9223359d45e3754ba69e6439be97852a
2015-06-14 22:44:21 +02:00
f4c3ec51ed
Final VS fixes
...
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +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
b1081c63e5
More VS fixes
...
Former-commit-id: 7b613049d581c62ccefd3b63938e51571a04fa8f
2015-06-13 17:23:45 +02:00
504eb96b93
Fix compilation under VS2015
...
Former-commit-id: fb7b3f377e34ea0c44a7fc65efbdb059581d772b
2015-06-13 17:14:19 +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
8f797737c6
Utility/Font: Fix crash
...
Former-commit-id: 6da45eeb68cba7d7588b7092cb3e88d00a91d307
2015-06-13 00:46:01 +02:00
310dcf40b1
Utility/Image: Clean memory managing
...
Former-commit-id: 15312493a66ea26266029a45cc3aa22cc83386eb
2015-06-13 00:45:21 +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
35f6e0d376
Fix debug errors
...
Former-commit-id: 59e7db4085fc05a366af6cfb9ba99c19f058a21b
2015-06-11 14:14:25 +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
022f082363
Utility/Font: Replace Listener system by Signals
...
Former-commit-id: 0391c506c039c7aeb7acf4a01faa8a979be16749
2015-06-07 16:08:14 +02:00
fe25249136
Replace Listenable system by signals
...
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
d43126eae5
Core/Signal: Fix incorrect forwarding
...
Former-commit-id: 4d437e98e89dcc52f44259371e18589a72fdbd27
2015-06-07 01:31:37 +02:00
f8682d227b
More Cppcheck fixes
...
Former-commit-id: 62ab1caa04543da1a169812bb92a450d44f3aec1
2015-06-07 00:21:53 +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
847aa234c6
Physics/Geom: Fix compilation
...
Former-commit-id: 4085b052dd8ed936a38867a06b3626f3c54c6c78
2015-05-31 22:14:00 +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
90e4a1ca52
Core/HardwareInfo: Added GetTotalMemory
...
Former-commit-id: 71289723115161dd253ccb65c1c91af65344c678
2015-05-19 14:13:48 +02:00
c3e5a7defc
Core/HardwareInfo: Improve accuracy under Windows
...
(I don't think this will change a thing but let's follow the spec
anyway)
Former-commit-id: 882225b4caf46cc0a34643d6a55d5f818f7f36b5
2015-05-19 13:52:44 +02:00
f82446dda3
Merge remote-tracking branch 'origin/master' into NDK
...
Former-commit-id: 9298de8cee7d3d204c80d974dafb315e3049fd10
2015-05-19 01:06:56 +02:00
2cb6fca127
Seems more correct
...
Former-commit-id: fa83f37d65c97bd5bfb7840865fab0e838804c30
2015-05-16 13:28:28 +02:00
2cb669a558
TaskSchedulerImpl for POSIX and compilation fixes
...
Former-commit-id: a402d40ac90cacf444b5832c49cfbdaf61f7f747
2015-05-16 13:10:54 +02:00
602dd561d2
Renderer/RenderTexture: Fix size miscalculation
...
Former-commit-id: e1f3b7b72a3c9de192bab34021aa4e7fbf04a1ff
2015-05-13 14:03:26 +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
53ae616d49
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: 7a27990f0e32319566a2c999b37ad0ab0ba3c611
2015-05-06 23:30:42 +02:00
d7f48dfa7f
Graphics/DeferredShading: Fixed phong lighting unifoms
...
Former-commit-id: 09adf80261d29cb2518adddfb90b3173ab34b068
2015-05-06 23:29:56 +02:00
96bbabe334
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Former-commit-id: 425b5941925c15c999e2e0d09e685ce603b29e11
2015-05-06 20:20:33 +02:00
045aa86c9c
Core/Node: Improved SetParent check
...
Former-commit-id: f9863603ee5f4b2d31b66716fa58f9749f5271ae
2015-05-06 20:20:27 +02:00
44ff678002
Core: Added Listenable class (Made class Listener system generic)
...
Former-commit-id: 3baed32d6720c6455f50af51f262292ece9943fa
2015-05-06 18:17:18 +02:00
fa2a269e5a
Utility/Node: Added listeners
...
Former-commit-id: aeddcbc5c61b7b51333ed704065fe6a18f17b2dc
2015-05-06 13:48:42 +02:00
bb74a9a6cb
Merge pull request #35 from Gawaboumga/POSIX
...
Fixed POSIX mutexes being not recursive + minor fixes
Former-commit-id: ecd3fb06ec6e53f1cfd237b3d0a860cf88978c03
2015-05-03 18:28:45 +02:00
4b43cc2d59
Core/MemoryManager: Made NextFree thread-safe
...
Former-commit-id: e87a05254538b265761f836a35b1f00474fbf3c7
2015-05-03 18:07:57 +02:00
7b2e6bb3f2
NzMutex is now a recursive mutex
...
Former-commit-id: c36c5543dfb8f79a6b961ef6c97aa9f647c93e57
2015-05-03 16:15:48 +02:00
4bbb02eadc
Revert
...
Former-commit-id: cb73baf4bb2a95b65e8439ee552f7ad85ede1008
2015-05-03 16:15:29 +02:00
100952d0b1
Core/ParameterList: Fixed typo
...
Former-commit-id: b4e43b8072eebb74df1cc145968e80c1f449b3e0
2015-05-02 20:40:43 +02:00
b29d1ffcd8
Little fixes and recursive mutex in NzFile
...
Former-commit-id: 7b5f3a6b14d027dc664e5d220257a22caca25c95
2015-05-02 16:19:46 +02:00
3b8449ebc4
Physics/PhysObject: Improved code
...
Former-commit-id: 48770967fb5e84931e5518fad21b0cf636e327d4
2015-05-02 10:01:10 +02:00
301bb56efc
Core/ParameterList: Fixed compilation
...
Thanks to Bl4ckb0ne
Former-commit-id: eca68dafb00ffcefc00a5c2e3177f26ca14d10dd
2015-05-02 09:14:45 +02:00
8c5101efda
Physics/PhysObject: Fixed static bodies collisions
...
Former-commit-id: 19304460685ca9e3d8afd9757060ec6094d9526a
2015-04-23 14:24:31 +02:00
b5efe4d907
Physics/PhysObject: Fixed compilation error
...
Former-commit-id: 75c2ea8ff79f985cbd0d88cc395f8ad061793153
2015-04-23 14:23:13 +02:00
22f8c1b0a3
Physics/PhysObject: Added Set(Angular)Velocity methods
...
Former-commit-id: cd506b93ad3be1f2c5972b784bef53e02a9211ef
2015-04-23 14:22:58 +02:00
a71c86c0ca
Physics/PhysObject: PhysObject now always have a valid geom
...
Former-commit-id: 3b93b318545a7f0b28a9afd82868c7460f63a80f
2015-04-20 13:39:40 +02:00
1a403eb79c
Physics/PhysObject: Fixed SetGeom
...
Former-commit-id: e7a343d90b1ec6ced031c5a0816e00e9c5c3b61c
2015-04-20 13:39:10 +02:00
a7be4c6346
Physics/PhysObject: Fixed class
...
Former-commit-id: bb5b3995e6cd8f349ad0a09258976bf163e65201
2015-04-20 01:44:31 +02:00
06b2651264
Physics/Geom: Geoms no longer need a pointer to PhysWorld
...
Former-commit-id: 7f9372e3ec13525208b49bc3fd07787657f64acb
2015-04-20 01:34:17 +02:00
1c7c1de3e7
Physics/PhysObject: Fixed Copy/Move operator
...
Former-commit-id: 58377ee8d41ef39ade38fcbf03355af5e7d7db58
2015-04-20 01:28:18 +02:00
61c6baeabe
Physics/PhysObject: Added Copy/Move constructor/operator
...
Former-commit-id: 3cec9759476de4eb1adb470d436aa40698357c50
2015-04-19 23:20:13 +02:00
f7d6107ec7
Physics/Geom: CompoundGeom can now include other CompounedGeom pieces
...
Former-commit-id: 8e421be85985bfb86ee7f6fd24569e36afdb34b4
2015-04-19 18:11:04 +02:00
1642536a0e
Physics/Geom: Improved Geom class
...
Renamed BaseGeom to PhysGeom, made it a reference-counted class
Former-commit-id: 5b3a2921addb537c2744346edc9c74eafb3260b0
2015-04-19 18:01:45 +02:00
0404927663
Fixed some files encoding
...
Former-commit-id: 78d0389774a67043d5e59e66b77ff4a1760dd1f4
2015-04-07 17:42:36 +02:00
fca2dad9d3
(SimpleTextDrawer) Fixed some methods visibility
...
Former-commit-id: 39bad2d5e64f7132f5cd4d4a949d6d3fbb5b98e1
2015-04-01 20:14:03 +02:00
40321cf9b1
(RenderTexture) Fixed size computation
...
Former-commit-id: 67f6408f0fe88af5066f9eb2c29f2426673db7cd
2015-03-28 14:54:52 +01:00
23cefe1fbe
(LuaInstance) Fixed Call() not resetting time limiter clock
...
Former-commit-id: 0d397fc21682f85114dc892eaea98a8f54969cde
2015-03-28 14:45:21 +01:00
3e16369d09
(Camera) Fixed SetTarget not invalidating viewport and stuff
...
Former-commit-id: ecce5389ffc3497828a9864a5ee46f597bdbfb76
2015-03-28 14:42:11 +01:00
bcefe9462d
(LuaInstance) Added Lua 5.3 operators
...
Former-commit-id: 17d1c8e325a1ee5441dac1f8d86d0a01dc5d8270
2015-03-24 13:12:35 +01:00
88c3b9d482
Added LuaInstance::Call
...
Former-commit-id: 3bbf04804868ab46dfcf1f9c30ad4de621c880b8
2015-03-24 12:50:04 +01:00
36b39ec868
Alphabetical commit
...
Former-commit-id: 4f1e73bd1228fefefd7f788adcd3ccb396d0b141
2015-03-19 18:17:52 +01:00
5345e615a1
(SimpleTextDrawer) Added GetText method
...
Former-commit-id: e4a6b7d915f05fdaef840e3a8320c2180415631f
2015-03-19 18:17:44 +01:00
3fd217b8a3
Merge branch 'master' into NDK
...
Former-commit-id: 7f2646da9f2e2c29157e645afbcfcf974f0e0709
2015-03-19 13:13:20 +01:00
5ecddb20c6
Remade RenderWindow::CopyToImage
...
Former-commit-id: a903cc8ea67d13ff7cf231d075235c3c17593a60
2015-03-18 22:24:07 +01:00
cbf3b2cf4e
(View) Fixed missing implementation of GetSize
...
Former-commit-id: 0953fb5079448035fc395ad2fd38535d27f08fb6
2015-03-18 21:57:02 +01:00
5c3720feb1
Merge branch 'master' into NDK
...
Former-commit-id: f118c029ca94296495957816f910d412ae8a56f2
2015-03-18 20:44:52 +01:00
4b09757f63
(Node) Fixed "Child not found" warnings
...
Former-commit-id: e9f60071ef0b12155bc26d339e06ccc160fac1fd
2015-03-18 20:40:32 +01:00
e873d40ccc
(View) Added Map[Pixel|World]To[World|Pixel] method
...
Former-commit-id: 39295c71d040d472117cb30c266169476f563e9d
2015-03-18 20:31:39 +01:00
5ab5e54242
(Windows) Improved window implementation
...
It no longer leaks if it fails to create a threaded window
Former-commit-id: 6df9bf1f62af8835d0824ab48fec0f4d80596da1
2015-03-18 13:24:59 +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
371f899776
(Windows) Improved error message on window creation failure
...
Former-commit-id: b00a5bc1511505bce2f1c34f32be662bee47cbf9
2015-03-18 13:03:35 +01:00
6cc81cdc05
(Image) Optimized GetMaxLevel
...
Former-commit-id: cdddd29020a6f82e6095ad30447eb0b6e9f2d8cf
2015-03-16 13:54:19 +01:00
74c4e93884
Fixed MD2 loader crash
...
Stupid alphabetical order
Former-commit-id: 2510dc6414d9042a5267cd2c2657f0011f2ee0f8
2015-02-26 01:26:38 +01:00
fd80228a1c
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: b0b57610baf6885bd5c6e8111e17e8ab64eb8354
2015-02-24 20:00:52 +01:00
122e4a013c
(OBJLoader) Improved code
...
Former-commit-id: 78252bd96d1d8eeba596892a9599136f26312618
2015-02-24 20:00:40 +01:00
fb68bf3a79
Fixed assertions handling
...
An assertion will now either abort the program or throw an exception
Former-commit-id: ee221e0934aeb7fbf625d0c891f828ce497ac720
2015-02-24 19:20:38 +01:00
a67d66bbd8
(HardwareInfo) Added Cpuid to the public interface
...
Also improved the code
Former-commit-id: 07025657e01ff21a3581204ce74e180c3a5e7737
2015-02-24 17:28:02 +01:00
60b6b2f4de
Refactored code
...
Former-commit-id: b4f0723b03152a657acd41758c297ac4a9bf1a50
2015-02-24 16:16:56 +01:00
23ed7d254f
Updated copyright year
...
Former-commit-id: 184ea65e52ffc4bb4849fd1306b1381f48d1470d
2015-02-24 15:19: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
0a9bf851fd
(sndfile loader) Removed useless allocation when mixing to mono
...
Former-commit-id: 22a4032bd2edffe51b9d9d823d7a2155a7b9fef5
2015-02-08 14:35:27 +01:00
28bbc28125
(sndfile Loader) Added comments
...
Former-commit-id: 8dad96dc06669e73a2b08f59c6de57092f7372f7
2015-02-08 14:33:01 +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
68b0acea65
Replaced header ostream include by iosfwd
...
Former-commit-id: 305b1b5bfed4c97fad7517ef379e6c0e57f88927
2015-02-05 23:34:12 +01:00
774e44333a
Upgraded Lua to 5.3.0
...
Former-commit-id: 1f5ac994e0bc7ec6467dff7ce02c199cf192b2e2
2015-02-04 22:53:20 +01:00
25dc252666
(String) Remade GetXBuffer, now called GetXString
...
And returns a standard string
Former-commit-id: 516735324a62cb6296e19d3be1960322073e5f3a
2015-02-03 21:16:17 +01:00
1c180ca9f2
(MemoryManager) changed log file name
...
Also killed a cow
Former-commit-id: 39eed924f7c6c7d724c9726a387eb232d22c8d26
2015-02-03 14:46:46 +01:00
29b61ec958
(MemoryManager) Added allocation logging
...
Former-commit-id: 6f7d5ae28b8a4bfecfc2dca5010524a3f2c88aaf
2015-02-03 14:43:58 +01:00
0a324d9323
Added some comments (as requested)
...
Former-commit-id: 4a6c7a025625ab49e59aaffa818cb50374e778d7
2015-02-01 21:39:47 +01:00
854efefda1
Removed useless casts
...
Former-commit-id: e4181b74a5444f0b695036a5f925f1444092ef09
2015-01-31 18:51:19 +01:00
53e2dfc6c9
Added some comments (as requested)
...
Former-commit-id: c6c25caf017124c492efc54d5ba8499028896112
2015-01-30 22:33:56 +01:00
622fce6f9c
Regenerated global headers (and updated copyright year, again)
...
Former-commit-id: b5b24f4a3610e1dead2883afaded48bf3554669d
2015-01-30 22:33:41 +01:00
2462a6f4bf
Removed conditional support of PBOs
...
Altough the Renderer doesn't support them yet
Former-commit-id: 8417f465c913bea1226fa7d742fe1dc614ecf72b
2015-01-30 15:44:34 +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
84e43046e0
Updated comment
...
Former-commit-id: b5635f35fc16fddaf4f9a0f9a4c9ac8c4aad755f
2015-01-27 19:16:17 +01:00
35a37f8507
Updated ComputeAAB and TransformVertices functions
...
They now take sparse pointers instead of template type
Former-commit-id: 92a3de59b6a321136b8bad324048239f83381534
2015-01-26 17:44:32 +01:00
025fdf6846
Renamed ComputeVerticesAABB function to ComputeAABB
...
Former-commit-id: 5e8381f8d09f583f6ef9b2919b082f3418644bce
2015-01-26 17:20:27 +01:00
8f101812c3
Updated Generate* functions
...
They take now multiples SparsePtr (as VertexPointers struct) instead of
a MeshVertex pointer
Former-commit-id: c9393015dfd426ee4a28d71bfdd9851c92d072b7
2015-01-26 17:17:16 +01:00
5e3fdbca89
(VertexMapper) Updated interface
...
Added access parameter
Removed useless GetVertexCount method
Former-commit-id: 670d16ed9668eb5df476a592929ed9c364b1f11a
2015-01-26 17:11:00 +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
d0bd62705b
Fixed FaceFilling bug introduced with 38a3c1455187e72e8fced0b92debc87288c8c770 [formerly f16751c0d98bcc87ad6f976c7b7052cdb4b16a05]
...
Former-commit-id: 8cb2b02c3f960a74827ec81aa36f76c349cc5dda
2015-01-24 16:20:11 +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
93b04476d1
Fixed POSIX DynLibImpl.hpp
...
Former-commit-id: 6b1924e7f7631eb78743c57973443661f48776f1
2015-01-22 22:47:01 +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
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
7cf561f05e
Optimized SimpleTextSprite
...
Former-commit-id: 623ab358d0e1a1e24d64e676949adc3597890303
2015-01-19 22:56:47 +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
f518311223
Fixed FreeType being freed before the destruction of all fonts
...
Former-commit-id: a7b2653c94698671d7912675ee810be3b7ac10df
2015-01-19 00:02:06 +01:00
ffe101ff02
Fixed crash
...
Former-commit-id: 61b945a634b3de01c964e197175994896c7a5d01
2015-01-19 00:01:06 +01:00
911babc283
Changed meaning of return value from resource events
...
Returning false from a resource event will remove the listener from the
resource, instead of decrementing it's counter
Former-commit-id: ba47da0e8de5c0adb3d31f29af0ef7835beefd5a
2015-01-19 00:00:54 +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
c02fe6c8ff
Fixed streaming loaders when used with memory streams
...
Former-commit-id: ce39ee03f40682c00c78b08ac285b9ea36240fa5
2015-01-17 23:42:49 +01:00
9f40fe12b1
(SimpleTextDrawer) swapped str and characterCount arguments
...
Former-commit-id: f009a36533158c37bcf4c996f62967df068a18af
2015-01-17 23:07:21 +01:00
e495c1094a
Fixed first atlas layer being resized to zero
...
Former-commit-id: f38c09255df40d62ddfa943cbd89353ff9a18cd0
2015-01-17 23:03: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
b699d06805
Fixed typo
...
Former-commit-id: 1482a9580b19f657cccaadbbf4eacc9724d0a1e3
2015-01-17 22:45:25 +01:00
7fee649b49
(Font) Added default atlas
...
Former-commit-id: 876f42110d4053b09abf86c6158b3ba79fdea201
2015-01-17 22:42:33 +01:00
77db6f5dd3
Added Font initializer
...
Former-commit-id: 9d64e5f28508ebfafe7504a9ba47f57a970e77ce
2015-01-17 22:11:29 +01:00
c0995d1739
Fixed typo
...
Former-commit-id: d1aafe31020733e027a63c9e59dad13b40cd9c29
2015-01-17 22:08:14 +01:00
Lynix
Gawaboumga
Youri Hubaut