6e89d34c9d
Ditto
...
Former-commit-id: f365cc8672d2eab20f121cf9ab10da5caec8a970 [formerly 24946be5b1045755d9d9d0bee0496feb7c58ff27] [formerly 7a3e46294df8577d38074589aabdc1786a46ee07 [formerly 9f97ef85ec4e440da265b2501d1423a986f033ee]]
Former-commit-id: 69a61ef34ec687d786e6c5bbc40fb27b20960c21 [formerly fd94316370437cd7ed97778772b20e1cb1fa4249]
Former-commit-id: e0f6c22e3dfd0a3ff88c7fdf1f746db7f0fafbf5
2016-08-10 23:17:25 +02:00
c22fff6740
Renderer/RenderStates: Fix compilation with GCC/Clang
...
Former-commit-id: cb3e1bb2288fb54641b9c37aa834d86d16bfc6a7 [formerly d8cd853dd7e5aa4f3863dab42f3f68d65ef53ed7] [formerly 8f64028937689f0472e3febd94f189bc9e461c1e [formerly ac5f3bb11f52d985f1336a3a51d40fc9d24f3c59]]
Former-commit-id: 3bf5abc062b8d38241d829709d9867b40c140e84 [formerly e94c3d9f980d526b6a0dbf8dbe64e88eec0ba876]
Former-commit-id: c1dcb29cd3998e6eecd236bc86892fef240c4527
2016-08-10 23:12:22 +02:00
a7ce82c2c9
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: 0b7e82d78d15e8b5e128f1856df3b28e6d7aaa44 [formerly 828c211f472b1fd2c839a0436ce43b4189a9f50a] [formerly 2e56582c87a8e2b0949ee946319655792e925f4a [formerly e6626b101b2c29f10e0025325a29463807504b3c]]
Former-commit-id: 0cabdfb1e5e38c21e11407d19b8543578f0aa260 [formerly 91fbd0ab2fb10de6802962ec9e6e5819f0391b94]
Former-commit-id: dc3fff253a97c2e78ce9c3500c81f66788e3480f
2016-08-05 22:11:13 +02:00
76818335ff
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: fcbfc6cb2fac86f6f10ff5def148cc5635082c83 [formerly 6bcf746c9b6f35aff6786da950001da11cedfc48] [formerly 9d219f350ddebbfa60eaa9c382d8d811d963ac15 [formerly 75f534e850802526877b811e8f6ca510bb7f2c16]]
Former-commit-id: b5ca8fa1bde036ccb4f7be17a98ef8275ab5cf2a [formerly ee166858dad5c8cd00249894266b13e8ce1a153e]
Former-commit-id: 2a601076664aebc1107654dd80f3b53f7acbc044
2016-08-02 13:20:34 +02:00
b7a08a6aa7
Core/RefCounted: Remove persistent boolean
...
Former-commit-id: b5681c26fc30db38b94f9c1ecc9c12ee699af767 [formerly aeebf599245261644fd5fb54fe9f64067a63afc9]
Former-commit-id: f7bcc658c93cc3977ffa91a617b7ca4d463b4aca
2016-08-02 12:52:49 +02:00
887432b3ce
Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
...
Former-commit-id: 8a6545bd9d4145f092bc0d90650c75e79c5298c9 [formerly 82499bdba825dfc5fff8f15be285a1ae5c4a2c41]
Former-commit-id: d1c39e221b96a0e032e113691bcb1c0c68f5899e
2016-07-21 23:00:09 +02:00
8162c2f80f
Renderer/RenderWindow: Fix visibility of OnWindow*() events
...
Former-commit-id: 87e307e9d7872c9d4d1b8012813d9d9f59ae67d2 [formerly 3eb2b440d85ada54bd4a5e67cc05f1651e7c1e4d]
Former-commit-id: 227258c9b7ebdc06563909bd30e37ef10eeae51b
2016-06-20 13:12:09 +02:00
086de1f71c
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: d3d40b9f364a0a27a3411586e62a16443ee5de00 [formerly 71282c40087232985fa19b8dcbd0d75bd4fcd97b]
Former-commit-id: c11c69d4c1f40bdd33f721cb33c68c4144771510
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