Commit Graph

265 Commits

Author SHA1 Message Date
Lynix c136f8eddc Commit WIP about RenderSurface 2016-11-10 12:54:10 +01:00
Lynix 8d06c57d0d Renderer: Add support for hardware buffers 2016-10-29 00:52:25 +02:00
Lynix 71aa4d53a3 Renderer: Allow to pass custom parameters 2016-10-28 22:31:04 +02:00
Lynix cf7465f7db Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan 2016-10-11 17:24:03 +02:00
Lynix f709ca4997 VulkanRenderer: Add RenderWindow wrapper
Former-commit-id: 8046b7ecb5a71ba64bb5d51faaa2d2946318e6f1 [formerly adbc30c0ed533b63c445125f013384412f9272bd] [formerly eaa0c2a91e13440ee9b869d5fd2faad08d682879 [formerly 67381c6dbe3b960b1ab23bbe18c0a6193286f330]]
Former-commit-id: f4716a44444383d107f44265b5720490e141e4d0 [formerly 49d667d30dda623e6192853573efe05aa589035c]
Former-commit-id: fd3718fac5bb6d896d7cfd350807bbc1c0af309f
2016-09-15 00:44:22 +02:00
Lynix bdedd05032 Add new Renderer architecture (far from complete)
Former-commit-id: 52226793d7a087dfe0523315d3303934daffee49 [formerly 9de1c04df6b371f861a2eee8bba38902ee5041cd] [formerly ecd3099df5498722f6390447f40bd3907b8e40c4 [formerly 3076df585565fc9759ab3e718270f2e5ef620840]]
Former-commit-id: 92d52f967d0b088d1271afef26069e08cacd6b0f [formerly 5fe27e2ead104278951c772c2121a7b677f88d4d]
Former-commit-id: fb6c2456d8edd3ec022d5d953f79fecdd4f2b8f4
2016-08-23 12:52:34 +02:00
Lynix 032ae7821b Ditto
Former-commit-id: de116d9f995865b3bf3687b0ec58dc06a2ed7f0a [formerly 20da754cca992573ffc4f34bc54f6df1c8197147] [formerly 6ad83121710e258d999671bdcc88eab49a026f6c [formerly 6e3f8edf77443a6b11c45562fb05c09369d19026]]
Former-commit-id: 30f51b03ded349aa9c1d4f17671ce9a061e113d4 [formerly 2c25e268591713c7eb898e6cffdaf1921189c087]
Former-commit-id: 29caff3ced232e9dc014427545158502ef623185
2016-08-10 23:17:25 +02:00
Lynix 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
Lynix e6fc3edeca Renderer/RenderStates: Fix compilation with GCC/Clang
Former-commit-id: 802d2d15fc5c1d7f5a350ce18e1c105cdb001b5f [formerly 76d7c26fba7510d64aadbac3b142a699afdfad16] [formerly a1ec278f7404f5bd1ecad4e0c3c511bdf638e67e [formerly 0f98c7716944aad42b0c5ac58af360526757dc2f]]
Former-commit-id: 118f5cf639bb5f7fc0330519a9e8e464203859b5 [formerly 96bcd9ce1d3e4f43dc4ffc0389de27e6bd66ca71]
Former-commit-id: 94a2d27a97be7040287bedee2c8c3695a021115e
2016-08-10 23:12:22 +02:00
Lynix 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
Lynix 87b5047b14 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: 4ed2f66567f7da6b6b6ee073e4d855b9a935000d [formerly b540f468fc700a16d5136d4dbb8632e23882fd3d] [formerly 37fff624ec65cc387130875410b6ea35c1a5bcfb [formerly ab9a88f514f46f6596499e285981fa6da588bb03]]
Former-commit-id: a2e8859196c0f72b7d7ffd8764a887e6c8173743 [formerly c886cdade14769db243ff993a1741f6052a2eb2a]
Former-commit-id: e1d02662fb1ac165c7e888380afee7601350060f
2016-08-05 22:11:13 +02:00
Lynix 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
Lynix 5fa5186480 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: 13a54266823fed88610753b1a90f4ef2c6fe932d [formerly 508d1a01cceee4a577063c684244fcf598ff6cb5] [formerly 2c99faae4d65dc222d05d2f98913a380b38d58ef [formerly 0117f7aec15e3db31cacdd0ef874064907c41ba8]]
Former-commit-id: 140d69126443b821a232a1a8b012712fc2e74b0f [formerly 501a63bd435f64d9da932279c90400ed95d0c1be]
Former-commit-id: d2d74a42d070eae9c1f158a59238c5f1ac40edb3
2016-08-02 13:20:34 +02:00
Lynix 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
Lynix 755bf0b04b Core/RefCounted: Remove persistent boolean
Former-commit-id: 6661b29e0e5e1dee8f4588688dc42865ce76e9ba [formerly 55e47c5ec3851e55243fb0e8e85d7fcc22f6cc1b]
Former-commit-id: 5442ab91a3a4b7da93c10bd06889785ac1faf034
2016-08-02 12:52:49 +02:00
Lynix 07725ceb03 Core/RefCounted: Remove persistent boolean
Former-commit-id: 99602e0fa1e54b6fc8e0087ef89d0e2c74bcfc15 [formerly 83374368c28b83e4916958e7a58d54ec663a9842]
Former-commit-id: 603d0c81eada7d1f25058163bbf97672cd96d08c
2016-08-02 12:52:49 +02:00
Lynix 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
Lynix 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
Lynix 77cf413f6a Renderer/RenderWindow: Fix visibility of OnWindow*() events
Former-commit-id: 9e756e4a50d8f14bbf9cded7b580bd6787515332 [formerly d8a7f7a52aec51b3480ddfe0e71ffb6568f35440]
Former-commit-id: 61e0ee78490dc00e64c8efd72953cfe5ceee195f
2016-06-20 13:12:09 +02:00
Lynix 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
Lynix 819b46f5fc Fix a shitload of warnings in 64 bits mode
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
2016-06-13 21:09:55 +02:00
Lynix 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
Lynix a1644edf45 Merge branch 'NDK-ShadowMapping'
Former-commit-id: e77949168073f06d52d10785afb41bad2f7f86c0
2016-05-13 13:06:23 +02:00
Lynix 6c8d2ed03a Merge branch 'NDK-ShadowMapping'
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
2016-05-13 13:06:23 +02:00
Lynix 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
Lynix 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
Lynix d6112c99f4 Renderer/OpenGL: Add loading of glCompressedTexSubImage*D
Former-commit-id: 34f19a2c8f640edace81a0f7cd211b06063fe8a3
2016-04-21 13:21:06 +02:00
Lynix 37aa00b2e7 Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
Gawaboumga 265e1c0fbd Fix compilation for gcc/clang + tests for serialization
Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
2016-04-04 10:17:05 +02:00
Lynix d6ff7d065e Utility/Image: Add saver (allowing to save images)
Former-commit-id: df78d657256f8a6b7dad5ab11877aae7402608b3
2016-03-08 13:11:09 +01:00
Gawaboumga 7f4a7c1012 Add override where missing
Former-commit-id: 2a876a280bc29f45ba81cedff5a3efeb5b70efab
2015-12-30 15:15:20 +01:00
Lynix 9cf5e4b68c Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
Lynix 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
Lynix 7db9be3cfb Disable memory manager for every module
Former-commit-id: 4c6e0a87de57bf55780cc9dfee280cc198d06704
2015-09-28 00:41:24 +02:00
Youri Hubaut 37586e7283 Switch from Nz prefix to namespace Nz for linux
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +02:00
Lynix fe2e47478e Commit forgotten files
Former-commit-id: dd296ce0e7c4128c35b41cbe753ffb572858ba6c
2015-09-25 23:17:44 +02:00
Lynix 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
Lynix df8da275c4 Switch from Nz prefix to namespace Nz
What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
Lynix 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
Lynix c214251ecf Update copy/move constructors/operators
Former-commit-id: b1faeeae9211a6c0ca29261d46929dc8c66ea0c4
2015-09-24 12:51:52 +02:00
Lynix dea3fb4e39 Convert spaces to tabs
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
Lynix 2fd3872099 Core: Remove NonCopyable
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
2015-09-24 00:37:21 +02:00
Lynix 1ffd2b724f Merge branch 'NDK' into NDK-ShadowMapping
Former-commit-id: 150a4149d50af6971fd5798c080f0c55e009a55b
2015-09-20 23:42:12 +02:00
Lynix 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
Youri Hubaut 829b356ae2 First GLX implementation
Former-commit-id: 0f41eb0bd949899fce740879604f14a44f532d8a
2015-09-19 17:22:25 +02:00
Lynix 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
Lynix 03ee0a12ed Make signals arguments clearer
Former-commit-id: c329f1fc5b8d8ffcf8e38ec4e4804454b31f685f
2015-09-14 22:40:38 +02:00
Lynix 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
Lynix 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
Gawaboumga 8716daf73c Debug axes
Former-commit-id: e7d93df67679d1e29014120aef5cc0c3421fd9c2
2015-08-21 12:14:35 +02:00