sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,153 Commits 1 Branch 0 Tags 28 MiB
Commit Graph

56 Commits

Author SHA1 Message Date
Lynix 786a11fc78 Graphics/Material: Fix missing reflection initialization 2017-10-31 00:14:50 +01:00
Gawaboumga bbac0838dd Include-What-You-Use (#137) 
* IWYU Core

* IWYU Noise

* IWYU Utility

* IWYU Audio

* IWYU Platform

* IWYU Lua

* IWYU Network

* IWYU Physics2D

* IWYU Physics3D

* IWYU Renderer

* IWYU Graphics

* IWYU NDKServer

* IWYU Fix

* Try to fix compilation

* Other fixes
 2017-10-01 11:17:09 +02:00
Jérôme Leclercq 308f6d7448 #Oops 2017-05-29 20:00:39 +02:00
DrLynix f383eca19a Update copyright year 2017-01-20 12:58:35 +01:00
Lynix 682dab32b3 Graphics/Shader: Make texture units statics 
Provides better performances and prevents the sampler type bug to happen
 2016-12-18 01:13:46 +01: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 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 0b0dfda89d Utility/MaterialData: Fix FaceCulling being used for FaceSide 
Former-commit-id: b82f598a9c94700bea58d651b5f29dcf47251af1 [formerly 5790a8397870a66dfaeb9e56862e5fb2ae850cfc]
Former-commit-id: 93372a3b733d3c84de11abacc6eaa3804b98079a
 2016-07-07 08:57:11 +02:00
Lynix c83b9d0491 Graphics/Material: Add SaveToParameters 
Former-commit-id: 87b9ca6e0f5f391f45edf6106efbd550dd52ac53 [formerly 91ba614d69d3a2e9762da0e059ee96985c891749]
Former-commit-id: e049a9db776f407e2cd7635bfb1825d809223c77
 2016-07-07 08:56:18 +02:00
Lynix 51533fabe9 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 
Former-commit-id: 3878bde4d067ef921783f256b582af8f6463c19b [formerly 029a8e9081b66daf20a78ba7331a496d89145f44]
Former-commit-id: 47009b49149da0186169afc538618f2ab2973f89
 2016-06-09 08:49:14 +02:00
Lynix 296be70a5c Graphics/Material: Ugly spaces to tabs 
Former-commit-id: fe691ce50ec143681c8a916bab2f85270cedec06 [formerly c45aba3d7b6d8b47a90e5f8120c278785d68773b]
Former-commit-id: 04596ea0ca1bb7f1575a4db6a5ef309328922938
 2016-06-09 08:48:04 +02:00
Gawaboumga 2c941827ed Documentation for module: Graphics 
Former-commit-id: 1757c33318443aade1dc38e16d053240d7dc885c
 2016-05-30 14:21:36 +02:00
Lynix 6c8d2ed03a Merge branch 'NDK-ShadowMapping' 
Former-commit-id: 0fcd92b113069d2ee1edc74cf9be471cd6d97267
 2016-05-13 13:06:23 +02:00
Lynix a15b31c646 Graphics/Material: Add Basic2D and Translucent2D materials 
Former-commit-id: fd07cb7c039d0e30b6fe74378efb3208808f9d9b
 2016-05-13 12:47:43 +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 37aa00b2e7 Merge branch 'master' into NDK-ShadowMapping 
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
 2016-04-17 19:57:15 +02:00
Lynix ffb6a47435 Graphics/Material: Standardize flag testing 
Former-commit-id: f2207fa4f1ad600aa09d8b484559bd9155a11f47
 2016-01-19 12:22:43 +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 5d6e6b2d45 Fix errors and warnings 
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
 2015-11-12 00:29:10 +01: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 c0ee9d04b5 Graphics/Material: Add depth material parameter 
Former-commit-id: 980888e12e5d8c8cf280c6a62592068cfab49d2e
 2015-07-05 23:23:17 +02:00
Lynix 1593b7969f Graphics/Material: Fix shadow states initialize/copy/parameter 
Former-commit-id: efe926baa3a5f00e04e7443b3463730e0d16edf7
 2015-06-21 13:11:03 +02:00
Lynix 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
Lynix 763701df7f Graphics/Material: Inline class 
Former-commit-id: 7cd8b7a00c87adf087dae7d0fb8d955747cf82d1
 2015-06-17 23:36:53 +02:00
Lynix a069b105e6 Fully replace listener system by signals 
Former-commit-id: 032dfddd12cc3a792c71426148c758ffac3621f9
 2015-06-07 20:42:41 +02:00
Lynix c0c6179acc Graphics/ForwardRenderQueue: Replace listeners by signals 
Former-commit-id: 3429e69cc4334ba602d8ccfb1fc725af85d42f7f
 2015-06-07 17:59:09 +02:00
Lynix 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
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
Lynix ea8d683624 Updated copyright year 
(532 files, wow)


Former-commit-id: cbb31f1124a86720bd3a54fe589a0f849a87b434
 2015-01-21 20:53:01 +01:00
Lynix 47fa5dc731 Moved resources includes to the top of the implementations 
Former-commit-id: 788a62f66aa47fe76e32ef0b76e9e962b1c5f2e6
 2015-01-19 20:34:09 +01:00
Lynix 5d16d7ab7e (Material) Fixed depth sorting not being copied 
Former-commit-id: ecd4e3c8e44c6027c0e662f7d9d235a69ca9dc3d
 2015-01-19 11:56:27 +01:00
Lynix 304b46b17d Merge remote-tracking branch 'origin/Particle-Update' 
Former-commit-id: 272203af1d740dc32e9714e00e4f889db6b13350
 2015-01-19 02:23:07 +01:00
Lynix 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
Lynix cd5399459d Made Resource copying/moving impossible 
It is still possible to copy some Resource-based classes though


Former-commit-id: bbb6066f736c210015ff9fdfded7d95eb9695359
 2015-01-16 16:28:38 +01:00
Lynix 5eec0d2abe Improved (Fixed ?) Material Copy/Move 
Former-commit-id: 8eb9b716e2b028c6d2e249f9706ad6f5567c95dc
 2015-01-16 14:03:06 +01:00
Lynix 9293022e71 Added sprite overlay rendering 
Former-commit-id: 1e25a7d85f06f4a4bc3ed0ead76df01db440671d
 2015-01-07 19:27:15 +01:00
Lynix 4de17fdffb Remade sprite rendering 
Added VertexColor shader flag
Added color sprite attribute
Added VertexStruct_XY_Color(_UV) struct & declaration


Former-commit-id: b664f4520aa55f4502f85f9dedab9b92040a8c16
 2015-01-04 13:19:07 +01:00
Lynix aa37c632cb Fixed possible warning 
Former-commit-id: 4d14bf2cee4756db0720fda0d904d5bc7b2bafd9
 2014-12-07 03:00:35 +01:00
Lynix a008439cde Added depth sorting attribute to Material class 
Only works for billboards for now


Former-commit-id: 50a46d3266a2e7fc6d75629103ad8b7193b13bf3
 2014-09-11 00:10:24 +02:00
Lynix aeec8ee0f4 Enabled new shader flags 
Former-commit-id: df06f4faf4c7275c702338eee1ed14a2445662a1
 2014-09-01 16:00:54 +02:00
Lynix 9e04e8a0e4 Separated reference counting from Resources 
Former-commit-id: 7380818cfee9e249c11fd15da9ff7883a6e76565
 2014-07-15 00:59:02 +02:00
Lynix 7d99550925 Made Initialize/Uninitialize static methods from non-submodules private 
Former-commit-id: 78dac32c8650dc9eb4fd2c7f0bece030012497cf
 2014-04-21 00:08:34 +02:00