5d6e6b2d45
Fix errors and warnings
...
Former-commit-id: a3ba309633f198f82c1d0277d750d867cad4ba44
2015-11-12 00:29:10 +01:00
37586e7283
Switch from Nz prefix to namespace Nz for linux
...
Former-commit-id: 64eeaf3c633254b04910ebd4576fd9e910002be0
2015-09-27 15:58:49 +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
dea3fb4e39
Convert spaces to tabs
...
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +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
a4032abe63
Fix compilation on linux
...
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +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
282bdf9864
Consequences of the plane change + change perspective
...
The perspective matrix now as in glm (because the near frustum plane was
wrong). So there is a factor "2" on the component w and the skybox must
be changed in consequence.
Former-commit-id: 09dd049c177532b9ace34a5a60b1b96014652297
2015-08-21 12:01:52 +02:00
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
391d248e59
Graphics/Sprite: Fix linker error
...
Former-commit-id: 1867897b6d67ccd7ed1779c66f086e3dc962e693
2015-08-16 01:45:31 +02:00
29ffd44683
Graphics/ForwardRenderTechnique: Fix crash when rendering billboards without instancing
...
Former-commit-id: af5595a2eb0ddf7c9bb53250af3a5e2d78ea2cda
2015-08-16 01:45:12 +02:00
ff9d233e7c
Graphics/Billboard: Fix billboard texcoords
...
Former-commit-id: 4c3182736ded66d0d03ed5d0abc54a51d6f6eca6
2015-08-16 01:43:59 +02:00
95ae8ed82c
Graphics: Add billboard class
...
Former-commit-id: bc898f00aa78dd42f61d34ce743ed9a73dce55f6
2015-08-16 01:43:17 +02:00
318da0d960
Fixed some warnings
...
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
a4bd84a6e3
Graphics: Remove deprecated scene interface
...
Former-commit-id: 6b5d3c22827912d664c4f8c9c4051c824180bb51
2015-06-24 13:55:35 +02:00
58f91d6e39
Graphics/ParticleSystem: Update interface
...
Former-commit-id: b58c3f194a32411eba2e321b00987d3c76e03cb0
2015-06-24 12:41:54 +02:00
c4783ac38f
Graphics/ParticleSystem: Fix debug build
...
Former-commit-id: 52f1ea20af27d98a6e6c366f5a9f87e73bf529b0
2015-06-24 00:20:47 +02:00
eddac5c0b6
Graphics/SkyboxBackground: Fixes
...
Former-commit-id: ab45a2efa957e33015e4d8dd57ebc8a5d028798c
2015-06-24 00:18:38 +02:00
bfa2246ca2
Graphics: Fix missing initialisation of skyboxes
...
Former-commit-id: cf9989b52ca3d80fd1e789178dc77b67b98c2cdf
2015-06-24 00:10:54 +02:00
6092b0692b
Graphics/Backgrounds: Update backgrounds to new coding-style
...
Former-commit-id: 9f96b93706fd8417d6262392f0ce9ab9ca1985c3
2015-06-23 23:35:11 +02:00
0ec0e02a5f
Graphics/ParticleSystem: Turn it to Renderable interface
...
Former-commit-id: c083f32a4bf2baed93126c30a6d05cf8ed0ba493
2015-06-23 14:01:44 +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
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
251e21f006
More VS fixes
...
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
1a92fe331c
Rename and move loaders, expose parsers
...
Former-commit-id: 932ae2aab020f956d3fdb91107f6842ff292aa08
2015-06-13 17:13:55 +02:00
d9c31636b9
Graphics/RenderTechnique: Move viewer to SceneData
...
Former-commit-id: 6c8b5a00b65649c7a3877a186b51f7240361e801
2015-06-13 16:27:12 +02:00
096b420d2c
Graphics/TextSprite: Fix Update not invalidating instance data
...
Former-commit-id: 5081c4dfc534671e0a157c0f0d279940eec9b091
2015-06-12 14:02:15 +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
a38d988507
Graphics/TextSprite: Fix memory corruption
...
Former-commit-id: 2fc1fdcec29d58164b46ccd837bab56602418ce0
2015-06-12 00:18:35 +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
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
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
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
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
8c6806eacb
Graphics: Update Light and Model to new interface
...
Former-commit-id: 5643f20261524f93a5d080404de5ab0b29151acb
2015-06-04 00:18:43 +02:00
806955dac7
Graphics/Scene: Temporary fix compile
...
Former-commit-id: 604961adc2b1400966491d22d5d1eb2d05ee9a6a
2015-06-03 17:59:31 +02:00
436f5002b2
Graphics/SkeletalModel: Fix crash
...
Former-commit-id: 75114644bb37796860854102fbd547aa1c50f51a
2015-05-31 22:19:30 +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
Lynix
Youri Hubaut
Gawaboumga