Commit Graph

535 Commits

Author SHA1 Message Date
Lynix
bbe8a776e8 Fix a shitloads of warnings on VS
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
2015-11-25 18:19:26 +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
5d6e6b2d45 Fix errors and warnings
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01: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
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
dea3fb4e39 Convert spaces to tabs
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +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
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
853ff0e701 Consistency
Former-commit-id: 379ae9d0f63c08a2de6f573bdb52068ed84c19ef
2015-08-21 12:16:09 +02:00
Gawaboumga
8716daf73c Debug axes
Former-commit-id: e7d93df67679d1e29014120aef5cc0c3421fd9c2
2015-08-21 12:14:35 +02:00
Gawaboumga
0b390e45a1 ByteArray rewritten
Now works internally with std::vector


Former-commit-id: 643f1d88b2959aed324743dbf91f831130a9198e
2015-08-21 11:28:04 +02:00
Gawaboumga
3dbcb25384 Transfert enumeration from file to enums
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
Lynix
fabe42dc3a Renderer/Texture: Set up compare mode
Former-commit-id: 6f85b6956530ea27b5bb96eb9b51a3ddc702f71b
2015-08-13 13:55:14 +02:00
Lynix
6870148314 Renderer: Add shader validation
Former-commit-id: fa9225b87e6ec2217c3838535531075dfcaaf433
2015-07-05 23:26:09 +02:00
Lynix
5556c38901 Renderer/RenderTexture: Fix Detach() not removing color targets
Former-commit-id: 058d95e1952f2316333be380cb6418c121db4a32
2015-07-05 23:25:12 +02:00
Lynix
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
Lynix
318da0d960 Fixed some warnings
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
Lynix
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
Lynix
9318d269e2 Renderer/RenderTexture: Fix and inline
Former-commit-id: 4bf8ad8acd3b978c4665df9547328333b9f9ad42
2015-06-21 13:18:37 +02:00
Lynix
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
Lynix
974df4288f First shadow mapping commit
Former-commit-id: 7465a7c3297626f8db8c1ff48a20c0e0d9feb765
2015-06-16 14:21:20 +02:00
Lynix
251e21f006 More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
Lynix
35f6e0d376 Fix debug errors
Former-commit-id: 59e7db4085fc05a366af6cfb9ba99c19f058a21b
2015-06-11 14:14:25 +02:00
Lynix
a069b105e6 Fully replace listener system by signals
Former-commit-id: 032dfddd12cc3a792c71426148c758ffac3621f9
2015-06-07 20:42:41 +02:00
Lynix
0f4cf3c910 Graphics/RenderTechnique: Add uniform invalidation
Former-commit-id: 8f03073408a03854533d9911eb1a0605ebbb8767
2015-06-07 18:25:35 +02:00
Lynix
c0c6179acc Graphics/ForwardRenderQueue: Replace listeners by signals
Former-commit-id: 3429e69cc4334ba602d8ccfb1fc725af85d42f7f
2015-06-07 17:59:09 +02:00
Lynix
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
Lynix
004b53c590 Renderer/Renderer: Replace listeners by signals
Former-commit-id: c1293f7f7cc31c4122ba866fc44d93188917ad93
2015-06-07 16:52:19 +02:00
Lynix
fe25249136 Replace Listenable system by signals
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
Lynix
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
Lynix
f82446dda3 Merge remote-tracking branch 'origin/master' into NDK
Former-commit-id: 9298de8cee7d3d204c80d974dafb315e3049fd10
2015-05-19 01:06:56 +02:00
Lynix
602dd561d2 Renderer/RenderTexture: Fix size miscalculation
Former-commit-id: e1f3b7b72a3c9de192bab34021aa4e7fbf04a1ff
2015-05-13 14:03:26 +02:00
Lynix
446f537e3f Merge branch 'master' into NDK
Conflicts:
	src/Nazara/Physics/Geom.cpp

Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +02:00
Lynix
44ff678002 Core: Added Listenable class (Made class Listener system generic)
Former-commit-id: 3baed32d6720c6455f50af51f262292ece9943fa
2015-05-06 18:17:18 +02:00
Lynix
40321cf9b1 (RenderTexture) Fixed size computation
Former-commit-id: 67f6408f0fe88af5066f9eb2c29f2426673db7cd
2015-03-28 14:54:52 +01:00
Lynix
5ecddb20c6 Remade RenderWindow::CopyToImage
Former-commit-id: a903cc8ea67d13ff7cf231d075235c3c17593a60
2015-03-18 22:24:07 +01:00
Lynix
ee6ca790a5 Fixed missing includes and warnings under VS
Former-commit-id: c06756b62b616e7322aced01062966247bb7654f
2015-02-21 15:04:07 +01:00
Lynix
622fce6f9c Regenerated global headers (and updated copyright year, again)
Former-commit-id: b5b24f4a3610e1dead2883afaded48bf3554669d
2015-01-30 22:33:41 +01:00
Lynix
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
Lynix
db4a499151 Removed support for OpenGL 2
Former-commit-id: e796c333d6c2ef0550ff4427d36dcfbaf00ef924
2015-01-30 15:39:25 +01:00
Lynix
7a73314ef5 Added resource managers
Former-commit-id: 9c071230c1e325ec672c9dfe30ee7e498baa1d08
2015-01-28 20:53:40 +01:00
Lynix
53162c1722 Added a Library to most reference-counted classes
Former-commit-id: 3ed409a71dcd5ce4eec7672ac26f8fff00e3b136
2015-01-28 18:06:05 +01:00
Lynix
e18e490c59 Replaced (Uber)ShaderLibrary by template class ObjectLibrary
Former-commit-id: d488cfd4e5e3ff31112fffebce2b7cdb86cc2e55
2015-01-28 15:49:04 +01:00
Lynix
0db92e671d Added a static New method to RefCounted-derived classes
Former-commit-id: efd9e68e050fb6cc7e0df7a7c222ca759c502dc5
2015-01-25 23:41:09 +01:00
Lynix
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