602dd561d2
Renderer/RenderTexture: Fix size miscalculation
...
Former-commit-id: e1f3b7b72a3c9de192bab34021aa4e7fbf04a1ff
2015-05-13 14:03:26 +02:00
446f537e3f
Merge branch 'master' into NDK
...
Conflicts:
src/Nazara/Physics/Geom.cpp
Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +02:00
1fff550c06
Graphics/ForwardShading: Fixed non-lit translucide rendering
...
Former-commit-id: dea27941badf51be183e9912c82be6f719015490
2015-05-06 23:31:42 +02:00
53ae616d49
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: 7a27990f0e32319566a2c999b37ad0ab0ba3c611
2015-05-06 23:30:42 +02:00
d7f48dfa7f
Graphics/DeferredShading: Fixed phong lighting unifoms
...
Former-commit-id: 09adf80261d29cb2518adddfb90b3173ab34b068
2015-05-06 23:29:56 +02:00
96bbabe334
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Former-commit-id: 425b5941925c15c999e2e0d09e685ce603b29e11
2015-05-06 20:20:33 +02:00
045aa86c9c
Core/Node: Improved SetParent check
...
Former-commit-id: f9863603ee5f4b2d31b66716fa58f9749f5271ae
2015-05-06 20:20:27 +02:00
44ff678002
Core: Added Listenable class (Made class Listener system generic)
...
Former-commit-id: 3baed32d6720c6455f50af51f262292ece9943fa
2015-05-06 18:17:18 +02:00
fa2a269e5a
Utility/Node: Added listeners
...
Former-commit-id: aeddcbc5c61b7b51333ed704065fe6a18f17b2dc
2015-05-06 13:48:42 +02:00
bb74a9a6cb
Merge pull request #35 from Gawaboumga/POSIX
...
Fixed POSIX mutexes being not recursive + minor fixes
Former-commit-id: ecd3fb06ec6e53f1cfd237b3d0a860cf88978c03
2015-05-03 18:28:45 +02:00
4b43cc2d59
Core/MemoryManager: Made NextFree thread-safe
...
Former-commit-id: e87a05254538b265761f836a35b1f00474fbf3c7
2015-05-03 18:07:57 +02:00
7b2e6bb3f2
NzMutex is now a recursive mutex
...
Former-commit-id: c36c5543dfb8f79a6b961ef6c97aa9f647c93e57
2015-05-03 16:15:48 +02:00
4bbb02eadc
Revert
...
Former-commit-id: cb73baf4bb2a95b65e8439ee552f7ad85ede1008
2015-05-03 16:15:29 +02:00
100952d0b1
Core/ParameterList: Fixed typo
...
Former-commit-id: b4e43b8072eebb74df1cc145968e80c1f449b3e0
2015-05-02 20:40:43 +02:00
b29d1ffcd8
Little fixes and recursive mutex in NzFile
...
Former-commit-id: 7b5f3a6b14d027dc664e5d220257a22caca25c95
2015-05-02 16:19:46 +02:00
3b8449ebc4
Physics/PhysObject: Improved code
...
Former-commit-id: 48770967fb5e84931e5518fad21b0cf636e327d4
2015-05-02 10:01:10 +02:00
301bb56efc
Core/ParameterList: Fixed compilation
...
Thanks to Bl4ckb0ne
Former-commit-id: eca68dafb00ffcefc00a5c2e3177f26ca14d10dd
2015-05-02 09:14:45 +02:00
8c5101efda
Physics/PhysObject: Fixed static bodies collisions
...
Former-commit-id: 19304460685ca9e3d8afd9757060ec6094d9526a
2015-04-23 14:24:31 +02:00
b5efe4d907
Physics/PhysObject: Fixed compilation error
...
Former-commit-id: 75c2ea8ff79f985cbd0d88cc395f8ad061793153
2015-04-23 14:23:13 +02:00
22f8c1b0a3
Physics/PhysObject: Added Set(Angular)Velocity methods
...
Former-commit-id: cd506b93ad3be1f2c5972b784bef53e02a9211ef
2015-04-23 14:22:58 +02:00
a71c86c0ca
Physics/PhysObject: PhysObject now always have a valid geom
...
Former-commit-id: 3b93b318545a7f0b28a9afd82868c7460f63a80f
2015-04-20 13:39:40 +02:00
1a403eb79c
Physics/PhysObject: Fixed SetGeom
...
Former-commit-id: e7a343d90b1ec6ced031c5a0816e00e9c5c3b61c
2015-04-20 13:39:10 +02:00
a7be4c6346
Physics/PhysObject: Fixed class
...
Former-commit-id: bb5b3995e6cd8f349ad0a09258976bf163e65201
2015-04-20 01:44:31 +02:00
06b2651264
Physics/Geom: Geoms no longer need a pointer to PhysWorld
...
Former-commit-id: 7f9372e3ec13525208b49bc3fd07787657f64acb
2015-04-20 01:34:17 +02:00
1c7c1de3e7
Physics/PhysObject: Fixed Copy/Move operator
...
Former-commit-id: 58377ee8d41ef39ade38fcbf03355af5e7d7db58
2015-04-20 01:28:18 +02:00
61c6baeabe
Physics/PhysObject: Added Copy/Move constructor/operator
...
Former-commit-id: 3cec9759476de4eb1adb470d436aa40698357c50
2015-04-19 23:20:13 +02:00
f7d6107ec7
Physics/Geom: CompoundGeom can now include other CompounedGeom pieces
...
Former-commit-id: 8e421be85985bfb86ee7f6fd24569e36afdb34b4
2015-04-19 18:11:04 +02:00
1642536a0e
Physics/Geom: Improved Geom class
...
Renamed BaseGeom to PhysGeom, made it a reference-counted class
Former-commit-id: 5b3a2921addb537c2744346edc9c74eafb3260b0
2015-04-19 18:01:45 +02:00
0404927663
Fixed some files encoding
...
Former-commit-id: 78d0389774a67043d5e59e66b77ff4a1760dd1f4
2015-04-07 17:42:36 +02:00
fca2dad9d3
(SimpleTextDrawer) Fixed some methods visibility
...
Former-commit-id: 39bad2d5e64f7132f5cd4d4a949d6d3fbb5b98e1
2015-04-01 20:14:03 +02:00
40321cf9b1
(RenderTexture) Fixed size computation
...
Former-commit-id: 67f6408f0fe88af5066f9eb2c29f2426673db7cd
2015-03-28 14:54:52 +01:00
23cefe1fbe
(LuaInstance) Fixed Call() not resetting time limiter clock
...
Former-commit-id: 0d397fc21682f85114dc892eaea98a8f54969cde
2015-03-28 14:45:21 +01:00
3e16369d09
(Camera) Fixed SetTarget not invalidating viewport and stuff
...
Former-commit-id: ecce5389ffc3497828a9864a5ee46f597bdbfb76
2015-03-28 14:42:11 +01:00
bcefe9462d
(LuaInstance) Added Lua 5.3 operators
...
Former-commit-id: 17d1c8e325a1ee5441dac1f8d86d0a01dc5d8270
2015-03-24 13:12:35 +01:00
88c3b9d482
Added LuaInstance::Call
...
Former-commit-id: 3bbf04804868ab46dfcf1f9c30ad4de621c880b8
2015-03-24 12:50:04 +01:00
36b39ec868
Alphabetical commit
...
Former-commit-id: 4f1e73bd1228fefefd7f788adcd3ccb396d0b141
2015-03-19 18:17:52 +01:00
5345e615a1
(SimpleTextDrawer) Added GetText method
...
Former-commit-id: e4a6b7d915f05fdaef840e3a8320c2180415631f
2015-03-19 18:17:44 +01:00
3fd217b8a3
Merge branch 'master' into NDK
...
Former-commit-id: 7f2646da9f2e2c29157e645afbcfcf974f0e0709
2015-03-19 13:13:20 +01:00
5ecddb20c6
Remade RenderWindow::CopyToImage
...
Former-commit-id: a903cc8ea67d13ff7cf231d075235c3c17593a60
2015-03-18 22:24:07 +01:00
cbf3b2cf4e
(View) Fixed missing implementation of GetSize
...
Former-commit-id: 0953fb5079448035fc395ad2fd38535d27f08fb6
2015-03-18 21:57:02 +01:00
5c3720feb1
Merge branch 'master' into NDK
...
Former-commit-id: f118c029ca94296495957816f910d412ae8a56f2
2015-03-18 20:44:52 +01:00
4b09757f63
(Node) Fixed "Child not found" warnings
...
Former-commit-id: e9f60071ef0b12155bc26d339e06ccc160fac1fd
2015-03-18 20:40:32 +01:00
e873d40ccc
(View) Added Map[Pixel|World]To[World|Pixel] method
...
Former-commit-id: 39295c71d040d472117cb30c266169476f563e9d
2015-03-18 20:31:39 +01:00
5ab5e54242
(Windows) Improved window implementation
...
It no longer leaks if it fails to create a threaded window
Former-commit-id: 6df9bf1f62af8835d0824ab48fec0f4d80596da1
2015-03-18 13:24:59 +01:00
fca8dc49e9
(TextSprite) Changed error message
...
Former-commit-id: f32804aca320bbfc3c6ecb5e0e3747b7b9d09369
2015-03-18 13:04:12 +01:00
d28154ab76
Added comments
...
Former-commit-id: e9297b7c0a4b85b2369abcba444d4cf89e04b95d
2015-03-18 13:03:53 +01:00
371f899776
(Windows) Improved error message on window creation failure
...
Former-commit-id: b00a5bc1511505bce2f1c34f32be662bee47cbf9
2015-03-18 13:03:35 +01:00
6cc81cdc05
(Image) Optimized GetMaxLevel
...
Former-commit-id: cdddd29020a6f82e6095ad30447eb0b6e9f2d8cf
2015-03-16 13:54:19 +01:00
74c4e93884
Fixed MD2 loader crash
...
Stupid alphabetical order
Former-commit-id: 2510dc6414d9042a5267cd2c2657f0011f2ee0f8
2015-02-26 01:26:38 +01:00
fd80228a1c
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: b0b57610baf6885bd5c6e8111e17e8ab64eb8354
2015-02-24 20:00:52 +01:00
122e4a013c
(OBJLoader) Improved code
...
Former-commit-id: 78252bd96d1d8eeba596892a9599136f26312618
2015-02-24 20:00:40 +01:00
fb68bf3a79
Fixed assertions handling
...
An assertion will now either abort the program or throw an exception
Former-commit-id: ee221e0934aeb7fbf625d0c891f828ce497ac720
2015-02-24 19:20:38 +01:00
a67d66bbd8
(HardwareInfo) Added Cpuid to the public interface
...
Also improved the code
Former-commit-id: 07025657e01ff21a3581204ce74e180c3a5e7737
2015-02-24 17:28:02 +01:00
60b6b2f4de
Refactored code
...
Former-commit-id: b4f0723b03152a657acd41758c297ac4a9bf1a50
2015-02-24 16:16:56 +01:00
23ed7d254f
Updated copyright year
...
Former-commit-id: 184ea65e52ffc4bb4849fd1306b1381f48d1470d
2015-02-24 15:19:40 +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
0a9bf851fd
(sndfile loader) Removed useless allocation when mixing to mono
...
Former-commit-id: 22a4032bd2edffe51b9d9d823d7a2155a7b9fef5
2015-02-08 14:35:27 +01:00
28bbc28125
(sndfile Loader) Added comments
...
Former-commit-id: 8dad96dc06669e73a2b08f59c6de57092f7372f7
2015-02-08 14:33:01 +01:00
d3caf8bb1b
Fixed potential crash (1500th commit, yay)
...
Also cleaned up one line of code.
Former-commit-id: 841dde3eb2ce8b1e3b4607931aa31d94fefedec2
2015-02-07 19:15:22 +01:00
fa7b72fd49
Fixed outdated comment
...
Former-commit-id: 8825493d82bfc66ac84090ac4f9f051c35b2d61c
2015-02-06 13:57:58 +01:00
68b0acea65
Replaced header ostream include by iosfwd
...
Former-commit-id: 305b1b5bfed4c97fad7517ef379e6c0e57f88927
2015-02-05 23:34:12 +01:00
774e44333a
Upgraded Lua to 5.3.0
...
Former-commit-id: 1f5ac994e0bc7ec6467dff7ce02c199cf192b2e2
2015-02-04 22:53:20 +01:00
25dc252666
(String) Remade GetXBuffer, now called GetXString
...
And returns a standard string
Former-commit-id: 516735324a62cb6296e19d3be1960322073e5f3a
2015-02-03 21:16:17 +01:00
1c180ca9f2
(MemoryManager) changed log file name
...
Also killed a cow
Former-commit-id: 39eed924f7c6c7d724c9726a387eb232d22c8d26
2015-02-03 14:46:46 +01:00
29b61ec958
(MemoryManager) Added allocation logging
...
Former-commit-id: 6f7d5ae28b8a4bfecfc2dca5010524a3f2c88aaf
2015-02-03 14:43:58 +01:00
0a324d9323
Added some comments (as requested)
...
Former-commit-id: 4a6c7a025625ab49e59aaffa818cb50374e778d7
2015-02-01 21:39:47 +01:00
854efefda1
Removed useless casts
...
Former-commit-id: e4181b74a5444f0b695036a5f925f1444092ef09
2015-01-31 18:51:19 +01:00
53e2dfc6c9
Added some comments (as requested)
...
Former-commit-id: c6c25caf017124c492efc54d5ba8499028896112
2015-01-30 22:33:56 +01:00
622fce6f9c
Regenerated global headers (and updated copyright year, again)
...
Former-commit-id: b5b24f4a3610e1dead2883afaded48bf3554669d
2015-01-30 22:33:41 +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
e18e490c59
Replaced (Uber)ShaderLibrary by template class ObjectLibrary
...
Former-commit-id: d488cfd4e5e3ff31112fffebce2b7cdb86cc2e55
2015-01-28 15:49:04 +01:00
84e43046e0
Updated comment
...
Former-commit-id: b5635f35fc16fddaf4f9a0f9a4c9ac8c4aad755f
2015-01-27 19:16:17 +01:00
35a37f8507
Updated ComputeAAB and TransformVertices functions
...
They now take sparse pointers instead of template type
Former-commit-id: 92a3de59b6a321136b8bad324048239f83381534
2015-01-26 17:44:32 +01:00
025fdf6846
Renamed ComputeVerticesAABB function to ComputeAABB
...
Former-commit-id: 5e8381f8d09f583f6ef9b2919b082f3418644bce
2015-01-26 17:20:27 +01:00
8f101812c3
Updated Generate* functions
...
They take now multiples SparsePtr (as VertexPointers struct) instead of
a MeshVertex pointer
Former-commit-id: c9393015dfd426ee4a28d71bfdd9851c92d072b7
2015-01-26 17:17:16 +01:00
5e3fdbca89
(VertexMapper) Updated interface
...
Added access parameter
Removed useless GetVertexCount method
Former-commit-id: 670d16ed9668eb5df476a592929ed9c364b1f11a
2015-01-26 17:11:00 +01:00
cabc4e40bc
Fixed mesh centering in a better way
...
Former-commit-id: 859dfdad322da045fecf32ea7c551f7fb436f135
2015-01-25 23:57:28 +01:00
1219a8053c
Revert "Fixed mesh centering"
...
This reverts commit 504042119962c2ab55fe8ef9bb16bcc878fa1b38 [formerly fae2cf41a63c7ce599c227344478567b1f12f130].
Conflicts:
src/Nazara/Utility/Loaders/MD5Mesh/Loader.cpp
Former-commit-id: 6bd25fd7216121cce6879d74c6c98fbba545f2cf
2015-01-25 23:55:36 +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
9e96a2061f
Fixed compile errors introducted in 228ecfe7e5f59d8c4091c3ebfee8190f66cf62ed [formerly 837c414856dbb7b5be20fd745359b3f1e7791c20]
...
Former-commit-id: efe88a0a209916b0aeea2813ec074182ab3a7adf
2015-01-25 17:19:35 +01:00
a185f03abc
Merge remote-tracking branch 'origin/Scene-Update'
...
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
2015-01-25 16:35:18 +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
722622ded1
Fixed SkeletalModel registering itself for update multiple times
...
Former-commit-id: 9c7ff03a70b65c2ace3b7929b78f486621797dd4
2015-01-24 17:50:48 +01:00
9ebd023848
(SkeletalModel) Added virtual constructor implementation
...
Former-commit-id: 4a7f356e14f629a728a77f94db7e26c6c4af3b72
2015-01-24 16:42:49 +01:00
d0bd62705b
Fixed FaceFilling bug introduced with 38a3c1455187e72e8fced0b92debc87288c8c770 [formerly f16751c0d98bcc87ad6f976c7b7052cdb4b16a05]
...
Former-commit-id: 8cb2b02c3f960a74827ec81aa36f76c349cc5dda
2015-01-24 16:20:11 +01:00
090263d847
Moved name attribute from Node to SceneNode
...
Former-commit-id: 6f920af67cd6c339d132a67b364742fdf172d5e9
2015-01-24 14:13:11 +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
01a1badac7
Removed useless std::function from rendering code
...
Former-commit-id: eaba729d5047d326fb2e746cec0621bfcf2eb1c5
2015-01-23 20:21:00 +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
93b04476d1
Fixed POSIX DynLibImpl.hpp
...
Former-commit-id: 6b1924e7f7631eb78743c57973443661f48776f1
2015-01-22 22:47:01 +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
Lynix
Youri Hubaut
Gawaboumga