43c1243b75
Fix merge problems
...
Former-commit-id: 899b541adea1719f558c52abfab51458249b6aaf
2016-04-17 20:22:29 +02:00
37aa00b2e7
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
91f2bee487
Bug fix -> String with one char + Directory and File on linux
...
Former-commit-id: 7f9b6c44197c3cc67145eb0a2d421a2e1de45a84
2016-04-04 10:36:13 +02:00
265e1c0fbd
Fix compilation for gcc/clang + tests for serialization
...
Former-commit-id: db9c93a1db3c57f268fc17e411402e071fc8675a
2016-04-04 10:17:05 +02:00
2b9dcb47c0
Math/BoundingVolume: Fix compilation
...
Former-commit-id: 6717a9d8d92f05ba3e4ae3b088aef79f0a637736
2016-03-26 01:38:03 +01:00
b28ab414c9
Math/BoundingVolume: Add ExtendTo method
...
Former-commit-id: 5cfd681d5cd7adcc2bcf16184a2da821bf4eb477
2016-03-25 23:07:59 +01:00
300dc82806
Math: Fix missing includes
...
Former-commit-id: 21ff7a6db4beb9fc7968e9bf1ba7478ca2f55e21
2016-03-06 14:54:56 +01:00
e9d126b3a4
Math: Add serialization specialization for all types
...
Former-commit-id: 7e45c50d3b4eabfc581736f290fc208592d3d46c
2016-03-06 01:54:13 +01:00
192fccc634
Fix compilation
...
Former-commit-id: d5ac6bb73615f7c9b068c1de2037dfeddc5c1b45
2016-03-02 16:53:20 +01:00
1c4135fc09
Improve documentation
...
Former-commit-id: 08d70f6a53a7f12d2748d145d1fe139595a1b39e
2016-03-01 15:37:05 +01:00
2cace84c90
Math/Matrix4: Fix computations.
...
Sometimes some values can be really small (and very close to zero) without being null.
Former-commit-id: 932160043e4eb4094c7234f8cf4eb7c212966678
2016-01-15 01:04:29 +01:00
856df11d5c
Math/Algorithm: Fix compilation (C++14 constexpr is not supported by all major compilers)
...
Former-commit-id: 83c2d98885763160cedcf03cfb08aa44571703f4
2016-01-01 16:34:49 +01:00
139c495966
Documentation for Vector4 + static DotProduct & Normalize
...
Former-commit-id: 4a190589292f299d266e20f7b9723594f2c32468
2015-12-30 15:36:38 +01:00
95400fdfab
Documentation for Vector3
...
Former-commit-id: 15f770065aa66e03928d7086403c697be334cb3a
2015-12-30 15:36:12 +01:00
844e31fb38
Documentation for Vector2 + static DotProduct & Normalize
...
Former-commit-id: 6f0aa15cd725f9dfaa7f6f99b10c6d2dde4e94a1
2015-12-30 15:35:37 +01:00
cec0567fdd
Documentation for Sphere + new Unit sphere
...
Former-commit-id: 8f7dd89c3669f0a791b76ef7cb89d998ce6b336a
2015-12-30 15:34:59 +01:00
d733a9c5d1
Documentation for Rect
...
Former-commit-id: 4cb6ff983f7f01611847d29699dab5ca06e17d4a
2015-12-30 15:34:36 +01:00
137bc33770
Documentation for Ray + New method intersection Ray-Triangle
...
Former-commit-id: 29989ec859e609582fdb60a67a7fb353a03091a0
2015-12-30 15:33:55 +01:00
9efce81eac
Documentation for Quaternion
...
Former-commit-id: b19bd792823e1f49ff088fc95be26f0db185a8a6
2015-12-30 15:33:26 +01:00
40d3d6b235
Documentation for OrientedBox
...
Former-commit-id: 77f7c82d7ca16348774ccdf1d4e98432710a585a
2015-12-30 15:32:59 +01:00
53f4bacab6
Documentation for Plane + add MakeXY methods
...
Former-commit-id: 688a65089e6e332e3a2ffbed7966e4f9185b79cc
2015-12-30 15:32:41 +01:00
f131fd2121
Documentation for Matrix4 + Check for affine
...
Former-commit-id: 9ddb4e85f860b12d06afaa2d32139bea4053eb66
2015-12-30 15:32:09 +01:00
fa48b750ae
Documentation for Frustum
...
Former-commit-id: 38c09bfa36e663a77ebeb19f5b2c16f60f99ea14
2015-12-30 15:31:27 +01:00
5d0624f03f
Documentation for EulerAngles + change Return of Set
...
Former-commit-id: 7e269b89e880156d66d92cff202095c4e30f344d
2015-12-30 15:30:13 +01:00
e2213cac61
Documentation for BoundingVolume & Box
...
Former-commit-id: 0fc14422dc32677f329f95dc7a554127f1b8ba0a
2015-12-30 15:29:07 +01:00
007b40b1b3
Documentation for Algorithm + constexpr
...
Former-commit-id: d77905d0ee9a2dde655f548bd175042aa3f5d22d
2015-12-30 15:28:13 +01:00
9cf5e4b68c
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1
2015-12-09 00:59:07 +01:00
6bc285cb00
Fix compilation for GCC
...
Former-commit-id: 7c51c59904fa86f952b704d175b09b32640d9395
2015-11-28 02:07:56 +01:00
bbe8a776e8
Fix a shitloads of warnings on VS
...
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
2015-11-25 18:19:26 +01: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
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
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
dea48a289d
Merge branch 'master' into NDK
...
Conflicts:
include/Nazara/Core/ConditionVariable.hpp
Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
89e0f631d6
No problems
...
No problems found in Rect, Sphere, Vector2, Vector3 and Vector4
Former-commit-id: 6688608a2beaa9cf5328daf7e5108b6cfebd843d
2015-08-21 12:05:46 +02:00
cb8ab90300
Quaternion bug fix: missing 'x'
...
And indentation
Former-commit-id: 87e7cc0f69604f3c4593395b15068b9ded59ba1a
2015-08-21 12:04:46 +02:00
19e1cb05bb
OrientedBox no problem
...
Former-commit-id: ad1256baf4bf6d832cb376fe62b1b52f25479e67
2015-08-21 12:03:37 +02:00
9d7dc63574
Wrong place
...
Former-commit-id: 909750e9bca284c2a0096a51c782c1083b258cef
2015-08-21 12:02:55 +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
077584ec49
EulerAngles simplification
...
Former-commit-id: 775b07a51077e6f17b9fe05773dc5c277c49919d
2015-08-21 11:53:16 +02:00
b4f926d3ca
Test box
...
No problem except indentation
Former-commit-id: 58d711b48164363fd672c51c005e16eb5ce55e9e
2015-08-21 11:52:44 +02:00
f0660d5da8
Fix operator== with infinite BoundingVolume
...
Former-commit-id: 47cee9fb8d8d2b8188d3918527aeebab56b03992
2015-08-21 11:52:05 +02:00
c2161f2a8b
Fix NumberEquals with unsigned
...
Former-commit-id: 30b573278e84991a9d76604a359bd3110f13d87c
2015-08-21 11:49:37 +02:00
2d07922478
Add Unit for vector2
...
Former-commit-id: 4a143363f24e08d0be12a5ef6bfb46c71b11be4a
2015-08-21 11:34:08 +02:00
376df6a3b7
Indentations
...
Former-commit-id: 0d82a4464cb9369bc4ca5cf2d7780c921eff953d
2015-08-21 11:32:29 +02:00
34e8271d24
Fix warnings
...
Former-commit-id: 42f2d38f7bf5143d91da6a0fa7dc7d3b88ce56ea
2015-06-30 20:44:37 +02:00
7dd4965f9a
Math/Matrix4: Fix cotangent in projection matrix
...
Former-commit-id: 57ccfc4fd2a1a8245272328204afa6590a5cb3fb
2015-06-26 14:05:50 +02:00
35066a3451
Math/Sphere: Fix (Squared)Distance
...
Former-commit-id: d91c0d6e8a193e47c3ed45babaf3b83bf1cbe7ee
2015-06-17 23:35:06 +02:00
f4c3ec51ed
Final VS fixes
...
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +02:00
009d860d6c
Math/Algorithm: Clean code
...
Former-commit-id: 5133320f4cf04e78d3cf7d66dbbe6f87f44b4bdc
2015-06-13 17:34:06 +02:00
Lynix
Gawaboumga
Gawaboumga