3247435e08
Fix for Linux
...
Former-commit-id: 8cddb6d53f658144f8659adbd7ecab67eb5a41a2
2015-12-30 15:59:08 +01:00
840c591b6e
Fix linking problem in United mode
...
Former-commit-id: 6c78f8bb7fba17bda69a622a8028c59d2fadcca2
2015-11-28 13:53:26 +01:00
4619099a01
Core/SimpleTextDrawer: Fix assignment operator
...
Former-commit-id: 52aa69ef0712d142ab36eae6dedf084c32a08012
2015-11-25 18:20:02 +01:00
bbe8a776e8
Fix a shitloads of warnings on VS
...
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
2015-11-25 18:19:26 +01:00
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
ddc343a630
Core: Rename MemoryStream to MemoryView, add MemoryStream
...
Former-commit-id: c180d5f34fa7c477f35c4b70ebf7b64e3f35fe3d
2015-11-17 14:06:57 +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
dea3fb4e39
Convert spaces to tabs
...
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
2015-09-24 00:55:57 +02:00
2fd3872099
Core: Remove NonCopyable
...
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
2015-09-24 00:37:21 +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
e8cc3e357e
First xcb implementation
...
Former-commit-id: 483522109b8b63fa80b9152b04bca79a65809d4d
2015-09-19 17:20:01 +02:00
438e45c08e
Test fixes for linux
...
Former-commit-id: 9d58eba0f30eb968161b212541f2411263162293
2015-09-19 17:11:31 +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
376df6a3b7
Indentations
...
Former-commit-id: 0d82a4464cb9369bc4ca5cf2d7780c921eff953d
2015-08-21 11:32:29 +02:00
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
40d35fbe5f
Utility/SimpleTextDrawer: Fix movement
...
Former-commit-id: ac62391a2e28f50a0a61e984692a7a1e3444b28e
2015-08-20 00:00:16 +02:00
21ad09d626
Core/Utility: Fix font crash
...
Happened when the atlas was resizing while updating the text drawer, the
old invalid pointer was kept (now a dangling pointer).
Former-commit-id: d50153f81f1f2bdd80cfdac9dcee85eb7c28c35e
2015-08-17 13:54:07 +02:00
318da0d960
Fixed some warnings
...
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
836e4af221
Utility/OBJParser: Fix material indexes being unstables
...
Former-commit-id: 10a3e37d9223359d45e3754ba69e6439be97852a
2015-06-14 22:44:21 +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
1a92fe331c
Rename and move loaders, expose parsers
...
Former-commit-id: 932ae2aab020f956d3fdb91107f6842ff292aa08
2015-06-13 17:13:55 +02:00
8f797737c6
Utility/Font: Fix crash
...
Former-commit-id: 6da45eeb68cba7d7588b7092cb3e88d00a91d307
2015-06-13 00:46:01 +02:00
310dcf40b1
Utility/Image: Clean memory managing
...
Former-commit-id: 15312493a66ea26266029a45cc3aa22cc83386eb
2015-06-13 00:45:21 +02:00
35f6e0d376
Fix debug errors
...
Former-commit-id: 59e7db4085fc05a366af6cfb9ba99c19f058a21b
2015-06-11 14:14:25 +02:00
a069b105e6
Fully replace listener system by signals
...
Former-commit-id: 032dfddd12cc3a792c71426148c758ffac3621f9
2015-06-07 20:42:41 +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
022f082363
Utility/Font: Replace Listener system by Signals
...
Former-commit-id: 0391c506c039c7aeb7acf4a01faa8a979be16749
2015-06-07 16:08:14 +02:00
fe25249136
Replace Listenable system by signals
...
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
d43126eae5
Core/Signal: Fix incorrect forwarding
...
Former-commit-id: 4d437e98e89dcc52f44259371e18589a72fdbd27
2015-06-07 01:31:37 +02:00
f8682d227b
More Cppcheck fixes
...
Former-commit-id: 62ab1caa04543da1a169812bb92a450d44f3aec1
2015-06-07 00:21:53 +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
446f537e3f
Merge branch 'master' into NDK
...
Conflicts:
src/Nazara/Physics/Geom.cpp
Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +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
fca2dad9d3
(SimpleTextDrawer) Fixed some methods visibility
...
Former-commit-id: 39bad2d5e64f7132f5cd4d4a949d6d3fbb5b98e1
2015-04-01 20:14:03 +02:00
5345e615a1
(SimpleTextDrawer) Added GetText method
...
Former-commit-id: e4a6b7d915f05fdaef840e3a8320c2180415631f
2015-03-19 18:17:44 +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
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
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
ee6ca790a5
Fixed missing includes and warnings under VS
...
Former-commit-id: c06756b62b616e7322aced01062966247bb7654f
2015-02-21 15:04:07 +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
25dc252666
(String) Remade GetXBuffer, now called GetXString
...
And returns a standard string
Former-commit-id: 516735324a62cb6296e19d3be1960322073e5f3a
2015-02-03 21:16:17 +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
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
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
090263d847
Moved name attribute from Node to SceneNode
...
Former-commit-id: 6f920af67cd6c339d132a67b364742fdf172d5e9
2015-01-24 14:13:11 +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
7cf561f05e
Optimized SimpleTextSprite
...
Former-commit-id: 623ab358d0e1a1e24d64e676949adc3597890303
2015-01-19 22:56:47 +01:00
f518311223
Fixed FreeType being freed before the destruction of all fonts
...
Former-commit-id: a7b2653c94698671d7912675ee810be3b7ac10df
2015-01-19 00:02:06 +01:00
ffe101ff02
Fixed crash
...
Former-commit-id: 61b945a634b3de01c964e197175994896c7a5d01
2015-01-19 00:01:06 +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
c2ac3281bf
Fixed text bounds
...
Former-commit-id: 9339ed907125ecf5186a86e8c943bf3197e11571
2015-01-18 12:12:32 +01:00
e30c447bd5
Added default font
...
Former-commit-id: 84fc15f2c6d46bcfb55236863611f2fb96961a6d
2015-01-18 10:38:50 +01:00
c02fe6c8ff
Fixed streaming loaders when used with memory streams
...
Former-commit-id: ce39ee03f40682c00c78b08ac285b9ea36240fa5
2015-01-17 23:42:49 +01:00
9f40fe12b1
(SimpleTextDrawer) swapped str and characterCount arguments
...
Former-commit-id: f009a36533158c37bcf4c996f62967df068a18af
2015-01-17 23:07:21 +01:00
e495c1094a
Fixed first atlas layer being resized to zero
...
Former-commit-id: f38c09255df40d62ddfa943cbd89353ff9a18cd0
2015-01-17 23:03:50 +01:00
9662f4167d
Fixed crash on Utility uninitialisation
...
Former-commit-id: ef9f53674fe21c4d7780e68c62f7981554663a85
2015-01-17 22:55:50 +01:00
cfe1bcf107
Fixed Font::[Get|Set]Atlas interface
...
Former-commit-id: 7670317dc2684fc0f9240a1f188e4ba92592a263
2015-01-17 22:48:27 +01:00
b699d06805
Fixed typo
...
Former-commit-id: 1482a9580b19f657cccaadbbf4eacc9724d0a1e3
2015-01-17 22:45:25 +01:00
7fee649b49
(Font) Added default atlas
...
Former-commit-id: 876f42110d4053b09abf86c6158b3ba79fdea201
2015-01-17 22:42:33 +01:00
77db6f5dd3
Added Font initializer
...
Former-commit-id: 9d64e5f28508ebfafe7504a9ba47f57a970e77ce
2015-01-17 22:11:29 +01:00
c0995d1739
Fixed typo
...
Former-commit-id: d1aafe31020733e027a63c9e59dad13b40cd9c29
2015-01-17 22:08:14 +01:00
8b1660a121
(Font) Added Atlas safe check
...
Former-commit-id: daf33e34880e6142f2617e8afa84f8d9df12c4f2
2015-01-17 22:07:28 +01:00
f1694fd6e9
(Font) Added mutable default values for glyph border and minimum step size
...
Former-commit-id: 9b69b591afb95fdea9d686ef9b775f965de40d9f
2015-01-17 22:03:04 +01:00
91912463fa
Fixed crash when loading "small" images into atlas
...
Former-commit-id: e34c26159a663a5680658d6312993147a6d804ee
2015-01-17 21:42:23 +01:00
2fed71cc3a
Fixed mesh centering
...
Former-commit-id: d27dc7f0734d6a5bf0ecd6d36ede2f11cbff7c9c
2015-01-17 00:37:47 +01:00
86502df849
Merge branch 'Font-Update'
...
Former-commit-id: d293f78c891a74554c6b990afafdc1eb1cc0a584
2015-01-17 00:36:28 +01:00
03b91575fb
Fixed Node::Move taking local scale into account
...
Former-commit-id: ce7b2c086e141c8cfa9981838c9d695f997b3941
2015-01-17 00:34:37 +01:00
6d3228477f
Added TextDrawer classes
...
Former-commit-id: 4c5ace385f1a9b9ceebb774022bbc001b69a3bb4
2015-01-16 23:36:20 +01:00
48ecb058f0
(Font) Added notification on atlas layer change
...
Fixed irrelevant error message when a font destroy an atlas
Former-commit-id: ddbd04e9172f2d35a8e0cf8a37fe48724aeb5c64
2015-01-16 23:34:56 +01:00
77347c8582
(Font) Added notification on atlas change
...
Will only clear glyphes when setting differents parameters
Former-commit-id: b16a289742c0f23fa5066d3c52ce35b4abc626c6
2015-01-16 18:57:09 +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
96743375d9
Fixed debug build
...
Former-commit-id: 5a7ebd258d4b453412d0d74e7be8590905b26a78
2015-01-16 13:25:51 +01:00
e36e8a21e0
Fixed VertexLayout_XYZ_Color_UV declaration
...
Former-commit-id: e9aa4604e88467c23dd889da943d9e00b75ae637
2015-01-16 12:52:48 +01:00
b5dbe6f03f
Added XY_Color VertexLayout
...
Former-commit-id: 0f53126584b61738b25b1d86cec819d6166ad678
2015-01-16 12:52:10 +01:00
e85c6afa12
Added some formats (.fon, .otf and .ttc) support to FreeType loader
...
Former-commit-id: ff5d9f9522c920976929603f25d056ed68e6d971
2015-01-16 12:46:07 +01:00
bdaa4f2838
Renamed TextStyle_None to TextStyle_Regular
...
Former-commit-id: 3bd44c785f8c6f011bcade1242b051d8662287d2
2015-01-16 12:45:29 +01:00
9d83f3f474
(Font) Added spaceAdvance SizeInfo
...
Former-commit-id: 2767915c2554103615918347c6e742cb324092c5
2015-01-16 12:42:27 +01:00
1781e93462
Renamed AbstractFontAtlas to AbstractAtlas
...
Former-commit-id: 2908a05a7d2d6d44e2e29e96c52cafe962382b71
2015-01-16 12:40:23 +01:00
e3de7e6f3c
Added Atlas listeners
...
Former-commit-id: a487b6ed53d9b97bfee27b28ba5523e43c1e9e7e
2015-01-16 12:36:13 +01:00
Gawaboumga
Lynix
Gawaboumga