0e44e0eb15
Revert "Fix compile"
...
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].
Former-commit-id: ac8998b1a9ee363bcacfc3c9163e805cb1cbd93e [formerly 00d103e705e266c89cc508f3c4b06bab2b20bd4f] [formerly ba1b3fa7a77eb7e258234d5c12e89f0e883870cd [formerly cc0071350fc26ac76a1a49b2705b59871ac6c6f2]]
Former-commit-id: 6f83e8ded662a4ba85ab379f41809f541f83a628 [formerly 1ecb471c3812b741f0edd43e27ab0a1e567d8c18]
Former-commit-id: 4b0bd20ee74057669cce771c7a66520698980aa0
2016-08-02 13:20:31 +02:00
f41bbfbf79
Fix compile
...
Former-commit-id: 7ae323d1a7816fdea1634325c5edf3a468089495 [formerly 51214a2f11742919093c73a60dc74910d2610be1]
Former-commit-id: 2b787569abc0dc73637dc5ecb43018b1766e2c28
2016-08-02 12:56:03 +02:00
f9d6f27e92
Utility/OBJParser: Abort parsing when there's more than one error per two line
...
Former-commit-id: 37075de6e7d10996af4c30ffcf74ead74b27905f [formerly 25597dd190b82dc40de1eaf7f4c75c9b058784ec]
Former-commit-id: 5383d58fd326b61cce4c415707dd06a0376e6dbe
2016-07-29 13:37:44 +02:00
96dc8c001e
Various fixes
...
Former-commit-id: 26dfbdb3388c845a6e3039f816f19ffbb462d7b8 [formerly a6437e0b6e48dbd630440f8d2629b32e4756b48e]
Former-commit-id: 8a1855fc1d4d7c343b7e1fdcd3c6a31f3134a59a
2016-07-28 19:22:41 +02:00
3b335ada9d
Utility/OBJSaver: Fix multiple materials saving
...
Former-commit-id: 003f1dee7556318bb0c42b84ce178b4ee687c9a1 [formerly 17eb0eab5b018ef6a127ade58d4db4b815378dd0]
Former-commit-id: 0e984242a33c40c8f1a1ee0c0754ac24ea96d79d
2016-07-17 21:10:20 +02:00
4555a52317
Utility/Formats: Add OBJSaver (WIP)
...
Former-commit-id: d45e18a1c36ace696f07277923368540cca84850 [formerly 916fe15a35f125c17a318038ef417e34be878510]
Former-commit-id: fd5b56061baae2ceebbaa968b15ad5a01455d90e
2016-07-12 08:14:05 +02:00
d641336654
Utility/Mesh: Add MeshSaver properly
...
Former-commit-id: 8f6c3db5e5cd208a6a7b0b330ef3d8722fe38696 [formerly c87b832ede1355a7a1526aae0bcb402d4265ead7]
Former-commit-id: 1efc45f812129e86c6907e71d4523d77a1ceda12
2016-07-12 08:14:05 +02:00
ab43085fe7
Utility: Add MTL exporting
...
Former-commit-id: cceef7a11d10cc235bd06655a7c5b10ee1cfdec6 [formerly e68c9322634c9a3f93771d941ae581f24dc98116]
Former-commit-id: 1a117f7cd11d869c1fb179cba54254c9ec6924f2
2016-07-12 08:14:05 +02:00
269b0668cb
Utility/Formats: Make MD2Loader specify diffuse texture path instead of material filepath
...
Former-commit-id: dc073017799c9cdbd74fc52f9f33cd4cba2f6967 [formerly 0f99dbc95d1787c1af9caa5143976690668f9dcf]
Former-commit-id: 2ae072cad50c2412da655c21f2f3798905d51b85
2016-07-12 08:14:05 +02:00
07c8cbd510
Utility/OBJParser: Fix mistake
...
Former-commit-id: 0e78ba2e8dbcbaa3891f2f789ffab854b7bd753e [formerly b7bbafa45b5e4e2ea4ffd0d796b24ce9ed007f58]
Former-commit-id: 60837af91b5e10d63ea4dfbe0fdec69ac3f97cfd
2016-07-12 08:14:05 +02:00
e4bdb3cdcb
Utility/OBJParser: Prepare for saving
...
Former-commit-id: 5c22f8c9e0f3ab3c336598f24c1fbe8359eec9d9 [formerly e600681b453f363027e0a97a5625c7f8c6592f90]
Former-commit-id: 1eee39365464d38bfe13131b89c87660cfb05273
2016-07-12 08:14:05 +02:00
afc278ebd2
Utility/Mesh: Fix linking
...
Former-commit-id: 954ba6b61a949efaf21fcaa7e0bb28b414438181 [formerly 57fa786549e65d92c82c559d3ea710e8d88b5708]
Former-commit-id: 22e63411636bd8a345f01c823b15f3d1ad979455
2016-07-08 08:40:51 +02:00
9aac187589
Utility/OBJParser: Fix mistake
...
Former-commit-id: a3bbd969e5fddb00011b3343356189df3864c615 [formerly c07e85fcbffe985fa7ac8f11e18160c1440306cc]
Former-commit-id: f218dce6fd6606ffc60d884914b31012d2e568b8
2016-07-08 08:38:34 +02:00
384e11bf79
Utility/STBSaver: Fix error message
...
Former-commit-id: 2ef6f33b8391a3c9fb595845f661cc9b1b79df87 [formerly 609d0b1dcc5484cdcca589f9f49061a4bda7c544]
Former-commit-id: 2cfd8315e60f7eb153642bd3012e6cbc4b88cb29
2016-07-08 08:36:54 +02:00
96dd854ec9
Utility: Allow TriangleIterator and VertexMapper to take constant submesh
...
Former-commit-id: f2a4eeeecf5868a2e51289d3d25d878be9b6bf3d [formerly 028fafc2cf156502a22dd269ac8b14a9accaf80c]
Former-commit-id: 32c9bb55cb63030e67f3287d4c26ef29f1edccbf
2016-07-08 08:36:42 +02:00
18e03246fa
Utility: Fix an oopsie
...
Former-commit-id: 18e56c87721c6498b6e77da4e4de307e6afeb10c [formerly bea39556b13d62b2a48207b2e6dfac1ab9b551cc]
Former-commit-id: 4fa98afe5a20b95cd90a3f3ad66391efe6d31930
2016-07-08 08:35:48 +02:00
b9051067e0
Utility/IndexMapper: Makes it work without index buffers (sequential mode)
...
Former-commit-id: 93f33efed85f0f3464fa7db604dbaaa488679fcd [formerly 77614134455dd70c2bebdb611aa1043da078da9b]
Former-commit-id: 635b19330864dbbba3a15deb7cb1a70742e65cd5
2016-07-08 08:35:36 +02:00
26289139a3
Utility/OBJParser: Prepare for saving
...
Former-commit-id: 89d82ac533c72033927557251278dd1544002a54 [formerly dc3b1ff5e00608ed0dfdee9b57ff6986a1d5ac33]
Former-commit-id: ee2b46fbfb0a0f7cd96ae1b35ec1af30342cd2fb
2016-07-08 08:34:45 +02:00
087c3b104b
Utility/OBJParser: Add saving
...
Former-commit-id: e05fec0cb2309c0a935ff1293b698433390675a7 [formerly bffd283b0c04e45df50adaa7b061aacdda10a0ec]
Former-commit-id: 7792044687e73fa8d5862aa15de373370023249a
2016-07-07 09:00:50 +02:00
84e9b3e148
Utility/OBJParser: Optimized loading
...
Former-commit-id: f84e73928d0596d5933cadea572465ded864192f [formerly 0621b0e5e8f674273190ed08e5d984c085d190a9]
Former-commit-id: 7dae4cbeff3644cdb0246ac3d077ddcb5bc7b51f
2016-07-07 09:00:35 +02:00
819b46f5fc
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
2016-06-13 21:09:55 +02:00
c2d0ebd15e
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: f8a87ba041804b41dbc35db1fb2f99ec51702b8e [formerly 0adbfb8a3baf6330953b0247f4ad5a72af051633]
Former-commit-id: 54fbeafa8fb8034f945086ea06a20c34fb2bfb4d
2016-06-09 08:49:14 +02:00
63ac80c7ff
Utility/Mesh: Replace scale by transform matrix
...
Former-commit-id: b02de61fe0213f5fdd074dfa868db415e9c770c3 [formerly e185f2b410f2a3e04a0f11be28665cf6e8dcb617]
Former-commit-id: d0c7e88fe2b5f8a4aa97640d050751def83f3783
2016-06-09 08:46:44 +02:00
6a583b8231
Fail in copy-paste
...
Former-commit-id: 01bb59a1dcdc1dcf2e5ea36efbda52b1311ce3f1
2016-05-30 20:43:27 +02:00
9f14f63ce8
Slightly faster (about 5%)
...
Former-commit-id: db83aebd174362887b475c7c55a8a027f1ab0bef
2016-05-30 14:27:07 +02:00
aa86db9a88
Fix loading of MD5
...
Former-commit-id: 06120fb3631516af6dd6dc7a295a7393823d8874
2016-05-30 14:26:32 +02:00
3e78dd40ad
Fix some GCC warnings
...
Former-commit-id: b3292fcfd4d029793cb70f97ab608aeb7d0579ef
2016-05-25 13:52:10 +02:00
7ae35a0f80
Utility/DDSLoader: Fix bit reversing for exotic format
...
Former-commit-id: be5a619259410e212fb3124d02d291431c5a0859
2016-05-17 17:09:08 +02:00
1ebe1a8091
Utility: Rework PixelFormat (WIP)
...
Former-commit-id: 1ab609e753783d9767ba23fd4cab9390453bf729
2016-05-17 14:23:45 +02:00
0bd8904878
Utility/*TextDrawer: Fix bounds starting at a negative position
...
Former-commit-id: 4954d0f3d1b10d4b7512c7b57936bc73c7ea69ae
2016-05-11 12:27:18 +02:00
f7b0496d62
UnitTests: Fix errors
...
Former-commit-id: 7d338bd57e8a083e63c5f6387ff37c81109903ed
2016-05-05 21:27:36 +02:00
5e5a83f825
Utility: Fix some warnings
...
Former-commit-id: e7645dc5a618d06f0c99bd54bf44756d68288959
2016-05-03 23:18:08 +02:00
6c9a48d80e
Utility/Formats: Fix MD5 loading
...
Former-commit-id: 05a4ee3745a6f5444a19c15f713fdd21d51a7804
2016-05-03 12:42:52 +02:00
9e3b99bb5a
Make mesh able to carry material informations
...
- Move OBJ Loader to Utility module, where it belongs
- Change Mesh material informations from a path to a parameterlist
- Improve Mesh code
Former-commit-id: 3c18901133fa5ac8281269822f6e2650ddcefd2d
2016-04-30 18:44:33 +02:00
b5f237b58f
Fix some errors
...
Former-commit-id: df7db9ab69395ca969779817fcdc17acb711967d
2016-04-24 04:38:18 +02:00
d1e12a6d2e
Sdk/Binding: Bind Font::GetDefault
...
Former-commit-id: 5245ada09cd376dfaf69f06ca982c89dc438fae8
2016-04-23 22:48:14 +02:00
de76b48fdd
Utility/Loaders: Fix and enable DDS loader (experimental)
...
Former-commit-id: 647e4527d47bc82b25eb713b8e6ffc4f424ba6c3
2016-04-21 13:23:11 +02:00
718713dbdd
Utility/PixelFormat: Add experimental IdentifyFormat method
...
Only supports RGBA8 for now
Former-commit-id: 8661dc7cab767de5d66efebe5e7038807ba712f7
2016-04-21 13:22:31 +02:00
e5f5d7ed11
Utility/PixelFormat: Add ComputeSize method
...
Former-commit-id: 8d9017541a812c98ba96c694cbd10da895338d1d
2016-04-21 13:21:39 +02:00
a31a969409
Replace useless reinterpret_cast by static_cast
...
Former-commit-id: f61d644d968d4fe9523a5cd122e11525a9c2765d
2016-04-07 04:20:18 +02:00
9efed23cbc
Utility/Algorithm: Fixes sphere generation
...
Former-commit-id: 06f96d54f39b77929d9427c714d43202269df67a
2016-04-05 12:47:28 +02:00
d8610d139b
Utility/STBSaver: Fix failure error message
...
Former-commit-id: 5985737a6e1690e66c8e1a2c6a4edb2c74aebdb0
2016-04-01 18:58:58 +02:00
b4e98dc7fc
Formats: Change skip string format
...
Former-commit-id: 75952d298efb69bd9b77df31ee8dc1548442d071
2016-03-09 12:41:39 +01:00
c935c1a293
Graphics/OBJLoader: Allow users to specifiy a vertex count cache when loading
...
Former-commit-id: 87ebc2aefe2c2091fd483793f880724e1ed6ac3d
2016-03-08 13:39:08 +01:00
dce587bd63
Add support for custom resource parameters
...
And allow users to skip a precise loader using them
Former-commit-id: 297af2e4a24ad67c343aae5d89352abf4ea05f63
2016-03-08 13:37:17 +01:00
d6ff7d065e
Utility/Image: Add saver (allowing to save images)
...
Former-commit-id: df78d657256f8a6b7dad5ab11877aae7402608b3
2016-03-08 13:11:09 +01:00
883f2eca39
Extlibs/STB: Update stb_image.h and add stb_image_write.h
...
Former-commit-id: 1b567271240b0207780c2d516fad9e03575ce388
2016-03-07 13:05:21 +01:00
36067e31c4
Utility/Window: Make Window moveable
...
Former-commit-id: 8c780562acc61d15437ed21c16eed92b6dd97373
2016-03-01 14:00:53 +01:00
e9bb81e851
Utility/Algorithm: Fix crash in ComputeAABB
...
Former-commit-id: 58266814fea559c782e6df1145f82a37baf0427c
2016-02-24 17:09:40 +01:00
de59eb1f74
Delete notice in Display
...
Former-commit-id: d3ddf65b5f00af047b4232068553363d88d3ca30
2016-02-21 14:50:01 +01:00
ed62fa5398
Utility/Image: Fix tabs
...
Former-commit-id: 4fd9be606d7cb356bdac14e9d8a9e23d493a549f
2016-01-24 15:23:37 +01:00
4562243c5f
Utility/SimpleTextDrawer: Update SetColor method (will no longer force full regeneration)
...
Former-commit-id: 3f3043ea5c5d3add1358d50eb3f92e452d931dbf
2016-01-08 14:00:54 +01:00
b9ec4a4fc4
Utility/SimpleTextDrawer: Add Clear method
...
Former-commit-id: 10f7c36edb7f0d1705709b070e78792708cdbebf
2016-01-06 19:05:26 +01:00
235fbf1877
Utility/SimpleTextDrawer: Add optimized AppendText method
...
Former-commit-id: 4608e95d19fe5256d205a0d02b75b1f496f629cc
2016-01-05 13:50:52 +01:00
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
Lynix
Gawaboumga
Gawaboumga