0aa9658dd4
Ditto
...
Former-commit-id: 5cb29c2fb4f8784b32ee827747d6a6c9817610cd [formerly b829d211af88b307682c2da13f1c90c809b3f7cb] [formerly f06859f02d279137edb3372b2b31932b702e380d [formerly 5395decad1eb27038bbecbd31569e91625f09123]]
Former-commit-id: 6c3355cf30e066eb3a76b9faf418f3f97efbaada [formerly 54aee068e98e897122f2b23a5bff7f4bb879db93]
Former-commit-id: 17b48986c81e954b632650594cfadbde5d64d23e
2016-08-10 23:17:25 +02:00
a87e5fb823
Renderer/RenderStates: Fix compilation with GCC/Clang
...
Former-commit-id: 94415ad48c519f7e243932d63213bc2769126773 [formerly 226fbf0a755fe6897361b25816fb819d1f6e761a] [formerly df91cbb488e40b5edc59408e860ec325ec01e746 [formerly b6284bcf325ae1b2d64ee1f225c41993ec3b8cd3]]
Former-commit-id: b938d3c4b782c95a9f024f23856e3207b1ae5813 [formerly 31544309ddd428a189898b6a72c169958519224a]
Former-commit-id: 36ad48f83668aacdbd60a5c830aa7b82a216ce9d
2016-08-10 23:12:22 +02:00
ac25df0126
Graphics: Separate pipeline state from Material into a new class, MaterialPipeline
...
This allows much more efficient batching, along with pipeline reusage and preparation for the Vulkan API
Former-commit-id: fd2de2f0e9612ea275ee69c5578c68e7169cd05b [formerly 53bd8a5ed5695311b7543ad717df63f93fad2da6] [formerly 171740929652ac9fe30e84983709388859cedd6b [formerly 25096a76678f1052e76f67d26b458077a0632cc3]]
Former-commit-id: 7978dbeb87af2eac9e5501a97afa83849648bf6e [formerly 81b6cce1ee81a2ca8873d3c70d468b2c71510c95]
Former-commit-id: 6663e2721c3f79d5f1e3f33c6183174378b502f4
2016-08-05 22:11:13 +02:00
6f265a1cb3
Revert "Core/RefCounted: Remove persistent boolean"
...
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].
Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]]
Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98]
Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
2016-08-02 13:20:34 +02:00
07725ceb03
Core/RefCounted: Remove persistent boolean
...
Former-commit-id: 99602e0fa1e54b6fc8e0087ef89d0e2c74bcfc15 [formerly 83374368c28b83e4916958e7a58d54ec663a9842]
Former-commit-id: 603d0c81eada7d1f25058163bbf97672cd96d08c
2016-08-02 12:52:49 +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
bd2b73bba7
Renderer/RenderWindow: Fix visibility of OnWindow*() events
...
Former-commit-id: 221602aecc845cf0b8c385d7ffd7bbf94fcc716f [formerly 43f42f18548e618a5af37d8b4a2e195694d925b8]
Former-commit-id: 30084dc77a88fc721f06b28755a44b7ffa32e2a3
2016-06-20 13:12:09 +02:00
c528640d80
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: 5bc0c622c20eae45df51bb1ee62e5ed566e58a1b [formerly a8befbed30cb897ce876fd3b46a3585e1b70613e]
Former-commit-id: 999225e414c0d6a3e9c6868f040b68045b2ba724
2016-06-13 21:09:55 +02:00
6c8d2ed03a
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
2016-05-13 13:06:23 +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
d6112c99f4
Renderer/OpenGL: Add loading of glCompressedTexSubImage*D
...
Former-commit-id: 34f19a2c8f640edace81a0f7cd211b06063fe8a3
2016-04-21 13:21:06 +02:00
37aa00b2e7
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
265e1c0fbd
Fix compilation for gcc/clang + tests for serialization
...
Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
2016-04-04 10:17:05 +02:00
d6ff7d065e
Utility/Image: Add saver (allowing to save images)
...
Former-commit-id: df78d657256f8a6b7dad5ab11877aae7402608b3
2016-03-08 13:11:09 +01:00
7f4a7c1012
Add override where missing
...
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
2015-12-30 15:15:20 +01:00
9cf5e4b68c
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +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
7db9be3cfb
Disable memory manager for every module
...
Former-commit-id: 4c6e0a87de57bf55780cc9dfee280cc198d06704
2015-09-28 00:41:24 +02:00
37586e7283
Switch from Nz prefix to namespace Nz for linux
...
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +02:00
fe2e47478e
Commit forgotten files
...
Former-commit-id: dd296ce0e7c4128c35b41cbe753ffb572858ba6c
2015-09-25 23:17:44 +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
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
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
829b356ae2
First GLX implementation
...
Former-commit-id: 0f41eb0bd949899fce740879604f14a44f532d8a
2015-09-19 17:22:25 +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
03ee0a12ed
Make signals arguments clearer
...
Former-commit-id: c329f1fc5b8d8ffcf8e38ec4e4804454b31f685f
2015-09-14 22:40:38 +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
8716daf73c
Debug axes
...
Former-commit-id: e7d93df67679d1e29014120aef5cc0c3421fd9c2
2015-08-21 12:14:35 +02:00
6870148314
Renderer: Add shader validation
...
Former-commit-id: fa9225b87e6ec2217c3838535531075dfcaaf433
2015-07-05 23:26:09 +02:00
9318d269e2
Renderer/RenderTexture: Fix and inline
...
Former-commit-id: 4bf8ad8acd3b978c4665df9547328333b9f9ad42
2015-06-21 13: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
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
c0c6179acc
Graphics/ForwardRenderQueue: Replace listeners by signals
...
Former-commit-id: 3429e69cc4334ba602d8ccfb1fc725af85d42f7f
2015-06-07 17:59:09 +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
446f537e3f
Merge branch 'master' into NDK
...
Conflicts:
src/Nazara/Physics/Geom.cpp
Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +02:00
44ff678002
Core: Added Listenable class (Made class Listener system generic)
...
Former-commit-id: 3baed32d6720c6455f50af51f262292ece9943fa
2015-05-06 18:17:18 +02:00
40321cf9b1
(RenderTexture) Fixed size computation
...
Former-commit-id: 67f6408f0fe88af5066f9eb2c29f2426673db7cd
2015-03-28 14:54:52 +01:00
5ecddb20c6
Remade RenderWindow::CopyToImage
...
Former-commit-id: a903cc8ea67d13ff7cf231d075235c3c17593a60
2015-03-18 22:24:07 +01:00
4c659a6442
Fixed potential name conflict with user's code
...
Former-commit-id: ca4e2ec3973d45832fc6a6535750b2639f65fe23
2015-02-04 21:59:45 +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
Lynix
Gawaboumga
Gawaboumga