0ec0e02a5f
Graphics/ParticleSystem: Turn it to Renderable interface
...
Former-commit-id: c083f32a4bf2baed93126c30a6d05cf8ed0ba493
2015-06-23 14:01:44 +02:00
06b5e09935
Graphics/Renderable: Make Cull simply virtual (not pure anymore)
...
Former-commit-id: 34042cae998af21c04cbd393864f6984da5b1ef1
2015-06-23 13:59:15 +02:00
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
109af2a581
Graphics/Light: Fix missing getters
...
Former-commit-id: 3e7c21d8f3d2a47b3a19f9eec4fcf44e2412a0ed
2015-06-22 13:27:45 +02:00
17f9d26387
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Former-commit-id: d6b7e05adf8586c40b79de8dc0880ae1a501403c
2015-06-22 11:19:34 +02:00
4b5c08e739
Graphics/Sprite: Fix debug build
...
Former-commit-id: 751eea18f8ca4c68243dbc363eb4b7de2618784d
2015-06-22 00:54:00 +02:00
8472578e42
Graphics/Material: Fix compilation error
...
Former-commit-id: 1cb87781afd8de0f6aaf4f6cbac861d5a1f8f717
2015-06-18 12:09:51 +02:00
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
763701df7f
Graphics/Material: Inline class
...
Former-commit-id: 7cd8b7a00c87adf087dae7d0fb8d955747cf82d1
2015-06-17 23:36:53 +02:00
b7c5283c4e
Graphics/Sprite: Fix compilation in debug
...
Former-commit-id: 233f8ebe775e268b72808ecd0770956651e717f6
2015-06-17 14:32:18 +02:00
ebbaaf7ff2
Graphics: Add depth render technique/queue
...
Former-commit-id: 711306ee5f84a9579068ce23240dc105cec15cde
2015-06-17 14:32:05 +02:00
52972b0514
Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping
...
Former-commit-id: d58c9f21d0de14e06321ed38b237b9fffcc0b2b8
2015-06-16 23:04:20 +02:00
54b0339025
Graphics/TextSprite: Inlined some methods
...
Former-commit-id: 8c6633867e25b86b5b641662c804c446478fe56c
2015-06-16 22:54:29 +02:00
8ade9fa65e
Graphics/Sprite: Update to InstancedRenderable
...
Former-commit-id: 8153acbca05bf6afb4a4ed6cd0a323f641919b6d
2015-06-16 22:54:01 +02:00
974df4288f
First shadow mapping commit
...
Former-commit-id: 7465a7c3297626f8db8c1ff48a20c0e0d9feb765
2015-06-16 14:21:20 +02:00
c879bd1656
Graphics/Renderable: Fix warning
...
Former-commit-id: 8732717db7a067ccb286daf5771520c30017acc6
2015-06-16 12:25:32 +02:00
6d953d9e93
Graphics: Separate Renderable and make Light a Renderable (LightComponent)
...
Former-commit-id: 6177d473f27ef493ba77417fc14461cb08b6f9e1
2015-06-16 00:31:04 +02:00
f4c3ec51ed
Final VS fixes
...
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +02:00
4cc8b53041
Graphics/DeferredRenderPass: Delete copy
...
This fixes compilation under VS
Former-commit-id: ccc7e647d0d06567953abb04b3fed73ca026bd0a
2015-06-13 22:32:22 +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
d9c31636b9
Graphics/RenderTechnique: Move viewer to SceneData
...
Former-commit-id: 6c8b5a00b65649c7a3877a186b51f7240361e801
2015-06-13 16:27:12 +02:00
8c345964ef
Graphics/TextSprite: Add scale
...
Former-commit-id: 54bb42e83060730e8bd4784b1e24b479d21157f7
2015-06-12 00:45:52 +02:00
2391d76332
Graphics/ForwardRenderTechnique: Fix light uniforms
...
Former-commit-id: b3f0ae5cab39ea5a698800985843a818280d18be
2015-06-12 00:23:46 +02:00
3b5551ed7a
Graphics/TextSprite: Update to Renderable
...
Still WIP as it appears to randomly crash
Former-commit-id: 2397ba7e556f7ed72b5fc8752704c3b212fa9fc1
2015-06-11 14:14:57 +02:00
48a54dfa5c
Graphics/Renderable: Add InstanceData
...
Former-commit-id: f30f011ae91a445d5b22f33150a88bbda218950c
2015-06-11 14:14:11 +02:00
6f2f8d6390
Graphics: Make Background/RenderTechnique independent from Scene
...
Former-commit-id: d588a3bb74b08d79990a278ad2e399e9797755b4
2015-06-09 00:26:13 +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
65c4409f9c
Graphics/DeferredRenderQueue: Replace listener by signals
...
Former-commit-id: b874409b523a1bfd6d9dd0d74c0f28189411bcca
2015-06-07 18:09:37 +02:00
c0c6179acc
Graphics/ForwardRenderQueue: Replace listeners by signals
...
Former-commit-id: 3429e69cc4334ba602d8ccfb1fc725af85d42f7f
2015-06-07 17:59:09 +02:00
fe25249136
Replace Listenable system by signals
...
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
b9ced78772
Graphics/RenderTechnique: Remove Clear method
...
Let's face it, this method was useless from the beginning.
Former-commit-id: c38f57785c900acf66560ad07aa29498312c6063
2015-06-05 13:38:22 +02:00
8c6806eacb
Graphics: Update Light and Model to new interface
...
Former-commit-id: 5643f20261524f93a5d080404de5ab0b29151acb
2015-06-04 00:18:43 +02:00
349b322834
Graphics/RenderQueue: Default argument for Clear method
...
Former-commit-id: b45e5b8819670e3d88a7d737e957e2207fc3200e
2015-06-03 22:39:13 +02:00
11e7748d85
Ndk/GraphicsComponent: Update
...
Former-commit-id: 4f4ca46fb58582abb0c61b7f081b77e9cd95ee0f
2015-06-02 17:21:23 +02:00
844062cfd0
Graphics/Renderable: Fix warning
...
Former-commit-id: 6370969c051e7612b59e303806a6dc650988afc9
2015-06-02 17:19:47 +02:00
0f7948ea4c
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Conflicts:
include/Nazara/Graphics/SkeletalModel.hpp
src/Nazara/Graphics/SkeletalModel.cpp
Former-commit-id: 7dba08bc594d501adbc5a81c4ec1a70021eaa5b6
2015-05-31 22:18:09 +02:00
4a87481311
Graphics/ForwardShading: Remake light selection
...
Former-commit-id: f7e761411e88513d1772b55f09ac4bd3a1d065a7
2015-05-31 22:13:49 +02:00
eba7cfc538
Graphics/Renderable: Fix linking
...
Former-commit-id: f41d5c79cf48e2f0fc9dd9f04b8a9229eea6cf7c
2015-05-31 22:12:59 +02:00
8f8eca1d70
Graphics/SkeletalModel: Update to new code
...
Former-commit-id: 74b17bf06b3c7c22477ee3a098301e70b093f890
2015-05-31 22:12:46 +02:00
962c1f2362
Graphics/SkeletalModel: Begin update to Renderable
...
Former-commit-id: c05e8a85bf3f0227fe2e75480df12045c8384124
2015-05-28 14:37:40 +02:00
e332193cd1
Graphics/Model: Default move constructor/operator
...
Former-commit-id: 0bf6787057d807dfaf4e27c965ea0d654c369b85
2015-05-28 13:49:25 +02:00
367ec18217
Graphics/Light: Change the way lights are queued
...
Former-commit-id: 18cf919c3b221425624a4db15c59699abfba6fc7
2015-05-27 00:15:12 +02:00
a92a58301a
Graphics/Light: Add cache infos (cosines, tangent) + inline
...
Former-commit-id: 36e6fb9c2d09597480302da30d3097ec54582fe8
2015-05-26 23:45:40 +02:00
68d6f62cd4
Graphics/AbstractRenderQueue: Made members public
...
Former-commit-id: 61f69dda42b5d091a94d65b9f7f04ff1ce1ce59e
2015-05-26 23:39:42 +02:00
6f06383ab0
Graphics/Light: Update to Renderable
...
Former-commit-id: 6766d036eb4c79fd0d5cdb718b06d6e4812ac660
2015-05-26 14:16:15 +02:00
e1a25a8885
Graphics/Model: Update to Renderable
...
(Note: this branch doesn't compile right now, this is normal)
Former-commit-id: 8c7e823122744394dda31db9acbfe2823c6f29e2
2015-05-26 14:16:05 +02:00
f181d0f2df
Graphics/Renderable: Provide Cull default implementation
...
Former-commit-id: 7584b42b8737a426818af836628f8e7e1e34eb46
2015-05-26 14:13:57 +02:00
be335c3e81
Graphics/Renderable: Fix copy constructor/operator
...
Former-commit-id: eb376d49285cefa1f0317719a47e41f62a11aae5
2015-05-26 14:13:24 +02:00
b075d05d82
Graphics/RenderQueue: Replace AddLight method by variations
...
Former-commit-id: 79ad49d60bd8d397aa606cded7c0dd2d20a078dc
2015-05-26 14:12:41 +02:00
3ee981867e
Graphics: Add Renderable class
...
WIP
Former-commit-id: b9ea2a443cf2e5f8b90360e1f47466b0c3ce69fa
2015-05-26 00:08:24 +02:00
36b39ec868
Alphabetical commit
...
Former-commit-id: 4f1e73bd1228fefefd7f788adcd3ccb396d0b141
2015-03-19 18:17:52 +01:00
e873d40ccc
(View) Added Map[Pixel|World]To[World|Pixel] method
...
Former-commit-id: 39295c71d040d472117cb30c266169476f563e9d
2015-03-18 20:31:39 +01:00
ee6ca790a5
Fixed missing includes and warnings under VS
...
Former-commit-id: c06756b62b616e7322aced01062966247bb7654f
2015-02-21 15:04:07 +01:00
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
4c659a6442
Fixed potential name conflict with user's code
...
Former-commit-id: ca4e2ec3973d45832fc6a6535750b2639f65fe23
2015-02-04 21:59:45 +01:00
7a73314ef5
Added resource managers
...
Former-commit-id: 9c071230c1e325ec672c9dfe30ee7e498baa1d08
2015-01-28 20:53:40 +01:00
53162c1722
Added a Library to most reference-counted classes
...
Former-commit-id: 3ed409a71dcd5ce4eec7672ac26f8fff00e3b136
2015-01-28 18:06:05 +01:00
9195e162a8
(Material) Removed outdated Move declaration
...
Former-commit-id: 7bfacdc630203af6b231184dbde4af31bd46fab5
2015-01-28 13:53:39 +01:00
eed90cb683
(SceneNode) Added Remove() method
...
Former-commit-id: 191834826b1c6651dab62c77aabb072ba59a301b
2015-01-25 23:53:00 +01:00
0db92e671d
Added a static New method to RefCounted-derived classes
...
Former-commit-id: efd9e68e050fb6cc7e0df7a7c222ca759c502dc5
2015-01-25 23:41:09 +01:00
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
a185f03abc
Merge remote-tracking branch 'origin/Scene-Update'
...
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
2015-01-25 16:35:18 +01:00
4a2f386c80
(Drawable) Made destructor virtual
...
Former-commit-id: ab35592cf015a3056de5d533b29d3c469cb29d29
2015-01-25 16:34:34 +01:00
bc6dd44009
Made SceneNode name change reflect on the Scene
...
Former-commit-id: b924b0b9d103e4fce6ab2faf952b9153d49cce06
2015-01-25 16:34:19 +01:00
6d8b266b4c
(Scene) Added FindNode(As) and RemoveNode methods
...
Former-commit-id: 35b0d6a61e99383fffa8048b3c0f6a48b8f0f66c
2015-01-24 22:00:55 +01:00
9ebd023848
(SkeletalModel) Added virtual constructor implementation
...
Former-commit-id: 4a7f356e14f629a728a77f94db7e26c6c4af3b72
2015-01-24 16:42:49 +01:00
090263d847
Moved name attribute from Node to SceneNode
...
Former-commit-id: 6f920af67cd6c339d132a67b364742fdf172d5e9
2015-01-24 14:13:11 +01:00
e46cb43ef5
Removed useless code
...
Former-commit-id: 8e65848eed8c3ceb829a7c556f4686676ea946f4
2015-01-24 12:03:24 +01:00
0a7711d85b
(Scene) Added CreateNode and Clear methods
...
Former-commit-id: de92f4a4be45e5cbd1d2d83191300e0b46764f0e
2015-01-23 22:35:41 +01:00
cf12552358
(SceneNode) Added virtual constructor idiom
...
(Light) Added default constructor
Former-commit-id: 591e6a8435d2cea6238e70c0058d381b8d547f3e
2015-01-23 21:04:29 +01:00
f6df10dacf
Removed unused file
...
Former-commit-id: 374fc27dca13c38dfa94928841cefb031e7b32ed
2015-01-23 20:07:24 +01:00
1f043b61df
(Scene) Removed useless Pimpl idiom
...
Former-commit-id: ffbca2a6b6e16792f58e77195a08911368f64f57
2015-01-23 14:35:26 +01:00
c5ec2af361
(Scene) Added RenderFrame method
...
Former-commit-id: ba02b2f0d65858fdabdedf5f0a9f7f9b1baa7268
2015-01-23 00:02:33 +01:00
a39988ac46
Removed unused file
...
Former-commit-id: 42b523c8da74800166935602755e554f26d7fa40
2015-01-22 23:46:55 +01:00
ea8d683624
Updated copyright year
...
(532 files, wow)
Former-commit-id: cbb31f1124a86720bd3a54fe589a0f849a87b434
2015-01-21 20:53:01 +01:00
3933b07094
Suppression of warnings
...
OffsetOf: use of static_cast
Updatable: API and virtual destructor
Drawable: virtual destructor
Vector: std::abs should be "the" abs.
AbstractClass: API
+Updatable: Like for others abstracts
Buffer: nullptr for pointer to function.
Image: wasn't returning a vector.
Former-commit-id: 57e0009286a02b9e3b0b81945e500d7d9e466ae2
2015-01-21 13:51:49 +01:00
8a3c410d60
Made bounding volume handing part of SceneNodes
...
Former-commit-id: d09d06ac4515ce09aa16fd92dd045c2a06730a99
2015-01-20 20:35:16 +01:00
bce3cadfd5
(ParticleEmitter) Added lag compensation
...
Former-commit-id: 914a976ba52b2629190ded068cc23e1cf7dee4d4
2015-01-20 17:48:11 +01:00
bbfbec1aa3
(ParticleSystem) Moved controllers update to a function
...
Former-commit-id: 47586e675c202d871e3ea3561dc19781bdb264f3
2015-01-20 16:59:50 +01:00
ac25c4a041
(TextSprite) Renamed SetText method to Update
...
Former-commit-id: 798baecaaf919c20d43f036f361d10d459270d0b
2015-01-20 15:12:41 +01:00
e2d4ba030c
Alphabetical commit
...
Former-commit-id: bacf8ab447d3022b48aac5f5ca2d337bc1283f8c
2015-01-19 11:57:19 +01:00
304b46b17d
Merge remote-tracking branch 'origin/Particle-Update'
...
Former-commit-id: 272203af1d740dc32e9714e00e4f889db6b13350
2015-01-19 02:23:07 +01:00
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
c18fc4cb14
Removed ShaderUniform_[EyePosition|SceneAmbient]
...
Former-commit-id: 89dedaf78d86def598531f472a1a6ecd56fe8371
2015-01-19 00:15:01 +01:00
8f9ea9db17
Added ResourceListenerWrapper
...
This class wraps the call to
Resource::AddResourceListener/RemoveResourceListener using RAII and help
a lot with some of the dependencies.
Thanks to this, the render queues now handle their resources listening
properly.
Former-commit-id: 7f215ffa4ccadcc4f44f777656970e92ce01087a
2015-01-18 23:59:01 +01:00
9662f4167d
Fixed crash on Utility uninitialisation
...
Former-commit-id: ef9f53674fe21c4d7780e68c62f7981554663a85
2015-01-17 22:55:50 +01:00
18367d26da
Added View::SetSize(width, height)
...
Former-commit-id: 9afd04b62e99702720cb10feae2462eaad33a90b
2015-01-17 00:34:59 +01:00
3ed18e70da
Added default material to sprites
...
Former-commit-id: 8a68d3d9b251ff93a793d4e001aed721558a8eef
2015-01-17 00:34:09 +01:00
a0054def7b
Added TextSprites
...
Former-commit-id: 85bef5ec14336710b2fdc782d3d0d77787ab65dd
2015-01-17 00:16:52 +01:00
fdb722ef14
Made SceneNodes non-movable
...
Fixed SceneNodes copy constructor not parenting the right object
Former-commit-id: 21a08e3bb0931af426d97399dab86dda9acdf172
2015-01-17 00:15:01 +01:00
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
ff7cfa226e
Improved Atlas class
...
It now handles layer resize failure and will notify listeners of a
pointer change
Former-commit-id: df5e2a129897128a4e41e0b3205f6a1dbeb2069c
2015-01-16 16:26:15 +01:00
5eec0d2abe
Improved (Fixed ?) Material Copy/Move
...
Former-commit-id: 8eb9b716e2b028c6d2e249f9706ad6f5567c95dc
2015-01-16 14:03:06 +01:00
b6c5668232
Separated atlases from Font class
...
First use of shared_ptr, yay!
Former-commit-id: 4c22341fba5674746d5299cf0e8dbf6dc31d5362
2015-01-07 23:46:26 +01:00
9293022e71
Added sprite overlay rendering
...
Former-commit-id: 1e25a7d85f06f4a4bc3ed0ead76df01db440671d
2015-01-07 19:27:15 +01:00
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
ed1cc7a092
Added viewer-relative directions
...
Former-commit-id: 9d80744bd227689426b76df7e3c273de13424041
2015-01-03 22:39:51 +01:00
e55c521e96
Added support for skeletal models (WIP)
...
Former-commit-id: 6a6c2d9f2c68267df79dc48fa56450d2a563e323
2014-12-17 13:56:33 +01:00
Lynix
Gawaboumga