8f61e2f278
Sdk/ParticleEmitterComponent: Update emitter (they are no longer attached to groups)
...
They are no longer attached to groups, groups attach emitters
Former-commit-id: 9a586151ac4ce932cda5d6c36c3e40718aef7f2c [formerly 830dd96bb020bec7dc7b652acca43fdef2d01971] [formerly 26cf67777c40ca4a6bcc0643a8dea76d46debd30 [formerly d4d7e62390be2a4d44b5a67c5fbabc11aa080de5]]
Former-commit-id: 653b321e01aa182a3dcb0531319cb9a053aadfa8 [formerly c4e742f3aab61f0941729a5739a80a838c6163cd]
Former-commit-id: 6572d614b19d85cbc0844745c45c3bc92deef051
2016-08-06 01:09:13 +02:00
218dfc9bb1
Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release
...
Former-commit-id: 2aeee76d912fe28845cf3654374a70f6035f115b [formerly e5bc7e35688b44ed78e6b76cd2a448ec0f1bb89e] [formerly e2924ddad7955a7b4aa0b11932a4019bddfdf19e [formerly 30651b18c45b8da9bcfda621a6b21d42520e85a1]]
Former-commit-id: 205e52c5da9e9da01a48285f71f9b9dc7603f29b [formerly a4040aaacf0c0eb7625ab739123116e18a4a07a8]
Former-commit-id: abb37a852646924793a2cfd00b74a05c00479cb3
2016-08-06 01:07:09 +02:00
dda41dbd8a
Graphics: Fix build
...
Former-commit-id: f9ff831dc3b5f09e829a949ff213020998a4fd82 [formerly 64dd5b86643363bc6a07d36c666d7f8172e21535] [formerly 288bc4600c43227953960f0ad59633aaa01fa598 [formerly f6a908db55d46775566395b11f719a05a1e9e7e2]]
Former-commit-id: 6cf4ad619557497865bee10757bf41eeeddc73e0 [formerly 19c535c963d5240de50733b1593fb201171f0c93]
Former-commit-id: fb64e1f4f1dfdd34d6431ec99f7a78a2c33e53ed
2016-08-05 22:58:14 +02:00
ac25df0126
Graphics: Separate pipeline state from Material into a new class, MaterialPipeline
...
This allows much more efficient batching, along with pipeline reusage and preparation for the Vulkan API
Former-commit-id: fd2de2f0e9612ea275ee69c5578c68e7169cd05b [formerly 53bd8a5ed5695311b7543ad717df63f93fad2da6] [formerly 171740929652ac9fe30e84983709388859cedd6b [formerly 25096a76678f1052e76f67d26b458077a0632cc3]]
Former-commit-id: 7978dbeb87af2eac9e5501a97afa83849648bf6e [formerly 81b6cce1ee81a2ca8873d3c70d468b2c71510c95]
Former-commit-id: 6663e2721c3f79d5f1e3f33c6183174378b502f4
2016-08-05 22:11:13 +02:00
3cf4cd3d53
Graphics/AbstractRenderQueue: Remove AddBillboard method
...
Former-commit-id: 9429c5e127d9c4d2172d5ae224b60338d62a58ce [formerly 8e723fad4893f182a3d7b7735e5a156973ca6e59] [formerly d961c2da7c6989cd861d4a703608466dede9ba40 [formerly 20783627678843cb2f1c414862193c079d81e168]]
Former-commit-id: b019c83ab483922120a9d37c16e8294694a16aa3 [formerly a651bc66c4cb96962a34ef3f2ade62d91ce1d6b7]
Former-commit-id: 820dcb4d787709600d9306025c34b9feb1ced7b2
2016-08-05 21:55:26 +02:00
1d758d370c
Graphics/InstancedRenderable: Take a const reference to the matrix instead of a non-const one
...
Former-commit-id: 148f4367351f79994f51699a656a938c6784af8f [formerly 27ef2f23da51c156f615bb33e6b3138b44f77498] [formerly 120334bc6e2bd3fcff30fde0febc901d83cdeb9b [formerly 9f4d16e134fb009ce021f4720ffc6d410cc5bd3c]]
Former-commit-id: 55595b1a006dfa313e7f088f76ff6880971530c4 [formerly 7e3a37de6c217d1b7734be14df74c174f6e0b4d6]
Former-commit-id: 0ebdab2df6d218a51c5ee425482bff7c660fddd8
2016-08-05 09:09:14 +02:00
3a18c4bb98
Graphics/Model: Add AddToRenderQueue(renderQueue, matrix, order) overload
...
Former-commit-id: 51b2eb160cee64341f659cb9233f7323648196ff [formerly eed84804d642972f3952ed5ea5c3991afb6c9657] [formerly 9eb1f9d149bf3eb9beeea950d780e713acbd34b1 [formerly eec842ec8bcebc5e04f2b48c18ec608ae5a82014]]
Former-commit-id: 82dee95422af697ba8319c53a60f32bf98ff31da [formerly c797b9f8a5964390dcdd2a55271e7a18896a8d8f]
Former-commit-id: 8c5e34da6e3686be332a84613230a6734b58966a
2016-08-05 09:08:56 +02:00
850f8d78c0
Core/String: Consider tabspace as separator
...
Former-commit-id: c8bfab3e1a921f077c58f61479ddbf2e6bf747ef [formerly 145b8a1c022c4858adf924ce4951c1838507455e] [formerly c55fb22de534afc7d5cadaddac8d0c28c2eb85a6 [formerly 14128b77407ad492722db34dbd9a0f8b5d24a6a3]]
Former-commit-id: 1c100c34e020dcbc0a85318e2799b09bb97b7ab5 [formerly 3d89e9bbbb3b71ddc520600edce8be74f4c9889a]
Former-commit-id: ba244fd2eb84da614f84795fb2e01030fe7455b5
2016-08-05 09:08:45 +02:00
72b8c93aa6
Plugins/Assimp: Handle assimp errors
...
Former-commit-id: 598c4142c600d7a2a55cbb1d0dddb8ad5efb1115 [formerly c8c37bb4ed9420adff14f342058599b162f5a10c] [formerly 32e948d67abc4ade4362448c655837c5082dfc61 [formerly 6d131b24546e91376d8b2a9495b2be2a67b75cb6]]
Former-commit-id: 0c94a403d0bd22654b38778211523f07a1f90b76 [formerly 83cf78c103454e517f4e6729283d7c2d1fb478d9]
Former-commit-id: 7292865595966a925f49ff7ef432a05d97549c83
2016-08-04 01:12:17 +02:00
00fb383f70
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: a3051df8a12d596901043b142ee1fa55a2481644 [formerly 97b1364fc5ba7f22bb28479f0edb351db8e7cfff] [formerly 49730b561eda3f1350e87b2c99c48c04f45c849a [formerly e20bc09b46ea5a6555ef887b1db3a6f7f2b7cb3a]]
Former-commit-id: 78f2eff516042ec38f0f61ab9b4263d968c0488a [formerly c6e7d6d63628402d8a58cf8e95dbb0509d07ff03]
Former-commit-id: b269a6e53c5205aa27ef921f348367f1affde02e
2016-08-04 01:12:06 +02:00
66bc8a5dde
Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
...
Former-commit-id: 8697752459c0f8a99c545ae41eedf6e0382c366e [formerly a855bebde268850fba035f3981e3e907acf33232] [formerly 2894f133ef2b92b49a0642df95393939269ee50b [formerly 348a5a1f8745537e3fb20a0aeac5e89a6f831c19]]
Former-commit-id: 50a4cef7ee7ac3be85cc9ccc6a6b194c4beb79f2 [formerly 49fdda2e6a597ed6251d822ff4b189442c5a9296]
Former-commit-id: ee48615b811e902841ff29529c15a6910fc8e1c1
2016-08-03 13:47:17 +02:00
ee1bd866ab
SDK/StateMachine: Add GetCurrentState function
...
Former-commit-id: 20b8c0d81deb5d5c6aafc1c8d4d261b046f260c3 [formerly 37762eaaf8bd7c0b2434b65dfc62d95d4ae2db15] [formerly 5606a74447be6048ce12a502722a75c726cbf9ef [formerly cc437974e34587cf7f63d8fb7f5447473826ee1c]]
Former-commit-id: 677c22d4ebcfa8bf22a85210712fea061dedc0da [formerly 3979a42d5a2ed3c2635ed654bf6f25b88c32a00e]
Former-commit-id: 0d31a924eead5ed4f384fcbdde6411054c3a9b27
2016-08-03 13:46:42 +02:00
a2fbd9f2d0
Improved declarations
...
Former-commit-id: fae51c9344fd88a35b6c6ebb825ba71e6ca33f1a [formerly 75901e046e5bbe5732846eed7ba7cdc3ebcc7bb2] [formerly c14ba82b5e7849ff610789fc4dca09aa67907200 [formerly f9dd4fd281c9b68aff9affef037d5ce1a3802fd7]]
Former-commit-id: 88f4d343858f42b06420f593efa6a481018e05fb [formerly 09a6ba61ac09ded89c59612aec2ab7263eb75e36]
Former-commit-id: 6268a2a01d13a27f79f18f6282023cac1a8579d4
2016-08-02 13:31:09 +02:00
6f265a1cb3
Revert "Core/RefCounted: Remove persistent boolean"
...
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].
Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]]
Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98]
Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
2016-08-02 13:20:34 +02:00
b058819b9d
Revert "Fix compile"
...
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].
Former-commit-id: c4f7092c80aaa52267789cffec29cd4bdd0890f5 [formerly d91460f5134fdca761c6152f72663cc8cdab7b88] [formerly 355bca8ae9dc9966992d43c2ebcdf693f1003af8 [formerly 8554f03b5f74c04ff6a7bb6c08de41eaf9cf0423]]
Former-commit-id: bd6254953c20e7971e70880d8598b6063ba21395 [formerly 43e67367ed1724862e9983598e843998688e46c0]
Former-commit-id: 11c10b5115995c7e96e0396032eeece6c301b90b
2016-08-02 13:20:31 +02:00
e8c89f158d
Fix compile
...
Former-commit-id: b703781f87d0bd13e7e0436bb9ed5d20ef3cb09f [formerly 4a2bc52bfc39448000a6f3569fd8cfa657bc58ee]
Former-commit-id: 1e42734fafb9eb1a161cfcc3c781927f32c5ad07
2016-08-02 12:56:03 +02:00
07725ceb03
Core/RefCounted: Remove persistent boolean
...
Former-commit-id: 99602e0fa1e54b6fc8e0087ef89d0e2c74bcfc15 [formerly 83374368c28b83e4916958e7a58d54ec663a9842]
Former-commit-id: 603d0c81eada7d1f25058163bbf97672cd96d08c
2016-08-02 12:52:49 +02:00
44174feac6
SDK/ParticleEmitterComponent: Fix missing include
...
Former-commit-id: c644ce38c5df7ba217ba07db68f9bf7e6f00ff71 [formerly 3224ccdeff42968cda92f414bc42c8f803f33740]
Former-commit-id: fa34edce4e8e3d514e43e7101fa5b2678d7a5eae
2016-08-01 12:04:15 +02:00
554c17702b
Build: Fix empty install commands
...
Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
2016-07-31 12:59:04 +02:00
9d018485cb
Build/NDKServer: Fix dependencies, allowing it to exists in server mode
...
Former-commit-id: 8130fc4bd6898f21d08bfad37e3b54676ee34b96 [formerly 9f64adc84777930b63419690bf0e454582989158]
Former-commit-id: 3838886ff2303fe94b69403e1cab51cc4c99a05c
2016-07-31 11:01:47 +02:00
8f50162924
Build: Fix command line arguments being ignored if config.lua loading failed
...
Former-commit-id: a21dc17f960e089dc3f8a2330def494660c682a9 [formerly b776370d7fc80107c412fe91526de7d11d53d501]
Former-commit-id: b5df17fcceeba1996b06c7fa92abf8616a2a8006
2016-07-31 11:01:07 +02:00
654b52bb0c
Sdk: Integrate particles
...
Former-commit-id: 48dac6b378c45130c43f5b8214a7b13a35cf06d1 [formerly c874b77869e750df33a1e77fdb40747b543b2efa]
Former-commit-id: a2c06e5f2b0fe3dd1c74ce2835436a7219260bf8
2016-07-30 15:51:46 +02:00
4efb8f0354
Graphics/ParticleEmitter: No longer inherit from Node
...
Former-commit-id: d2d67fdfc9940cf09b6bf15560c4f8b2b8c3819d [formerly 6deadba03ab57675310b279ce401c1db8b02869b]
Former-commit-id: 115f0a7f6293703be1bd497a107419ec95683dc1
2016-07-30 15:50:41 +02:00
f60ce60cd5
Sdk: Components no longer need to be default-constructibles
...
Former-commit-id: 7fffb2029784fc5361e560e3568d4c739f433a91 [formerly 14435fa68c516f1d16b2c474bef81f9a465cd7be]
Former-commit-id: 8a14c5defaabc15e92ef8e2854de5598683e27ac
2016-07-30 15:50:02 +02:00
2b8032debb
Build: Remove "united" shortcuts (since we have config.lua now)
...
Former-commit-id: d071f7274e5a6420101282a6b094a19e9a35e4b1 [formerly aba8dffc998bf3e574c6f26375081240eb106a8f]
Former-commit-id: 70068527e5b4b974370b6dfd9023a2448eb6471c
2016-07-30 14:06:29 +02:00
528842b11c
Add build/config.lua to .gitignore
...
Former-commit-id: c6e30e048553752e79e14b2284f30a8d11606904 [formerly 7b9f1d013e1a871438733d854455b15d64fe0ccd]
Former-commit-id: 4b65dc81e89fc13ded4e948c7bdbb56379dc89e6
2016-07-29 23:56:38 +02:00
9576759abb
Build: Add a separate config file and library/binary search paths support
...
Former-commit-id: f875de03150e6c505816bf526bc0432c9fffccac [formerly 52eef94d32a8b41b1381cfc63fcb5eb1e058f2b9]
Former-commit-id: 22da03a49982c4f48a1feb6cf7319b07949ad295
2016-07-29 23:47:09 +02:00
095a19e450
SDK/ListenerComponent: Fix warnings
...
Former-commit-id: 7d1294593a24bce6d68a34326d9cb48f76127401 [formerly 6728deb3276df51fe4d850c1bd7a58b30d6fd53a]
Former-commit-id: c7ab5f3d821d86948a39468a67b31a597350eb93
2016-07-29 18:49:16 +02:00
e68b962f4d
Graphics/ParticleGroup: Remove fixed step parameter (wasn't used)
...
Former-commit-id: 28e6d1d11ac699d184e9f0ca90994c1ae6368962 [formerly 696269b6f34dd4f9f61fd1c1f4b93bd2a50fdcdf]
Former-commit-id: d3fbf42609596a03cde0cdaf1256dd014e87087e
2016-07-29 13:55:59 +02:00
3a50c1e553
UnitTests: Fix blocking case
...
Former-commit-id: b504a619172a7c4c57d07d168fe4ae33bbd98210 [formerly 054c9b2c1261c438b74722be9f345417e64f3611]
Former-commit-id: 498b99790dc187ace705a57cd9fdcec43ac1345d
2016-07-29 13:38:00 +02:00
5d6cee8291
Utility/OBJParser: Abort parsing when there's more than one error per two line
...
Former-commit-id: b8126ca529f91492a1d116da7cb446b8eaa25a90 [formerly c33f7b8d27ba18303b839693aa3ef056d1f48ae1]
Former-commit-id: 701965304b9e51ddf1ee2233559f2f97d4a51894
2016-07-29 13:37:44 +02:00
9fa7267523
Graphics: Rename ParticleSystem to ParticleGroup
...
Preparing for integration into the ECS
Former-commit-id: 201e28c9f00ee31f809d9de3d9a37f57a7fe740c [formerly 9b88616308f9801482fc8811a9a19a7231dce2a7]
Former-commit-id: 579f4e9597f94620f922fb145931202d8fc9cc96
2016-07-29 13:24:19 +02:00
364cbed673
Merge pull request #68 from Gawaboumga/Documentation-fixes
...
Various fixes
Former-commit-id: c0b840c22a0b76517c44f31e9da84aa31b707fb4 [formerly 0845c44670023d8c3a9e02395ecd4b7bf38196be]
Former-commit-id: 0fa14ffde182bd4c69a7b201b723a6d94c337542
2016-07-29 12:43:38 +02:00
4c1c8dd2a9
Various fixes
...
Former-commit-id: bc799bb6b028f94a57c30dad8563367ab8a89973 [formerly 6c3e07c34170a8df0a4465d80cdfe9e5b8e04087]
Former-commit-id: e685bae1b31f698856efaf66d7bab8d96cb047f8
2016-07-28 19:22:41 +02:00
3bffbcd1e3
Merge pull request #67 from Ardakaniz/master
...
Sdk/State: Fix State link error
Former-commit-id: 50c80dbbcff42ad8bfed5c69ffc3c4a936cac476 [formerly b3fc8fef5e3db10aa39c8fcf437f01924966e03b]
Former-commit-id: b9beefc7267d35df30a7f2c593d028022f76bd5c
2016-07-28 07:39:23 +02:00
2f91c10679
Sdk/State: Fix State link error
...
Former-commit-id: dfd30810abde2e2901fefb530977894f451abc0d [formerly 970b554c5d21b2f654b079e4da4a2f12dc9e95a8]
Former-commit-id: 0e695a5cf47817c71c19aefcd409d2dce982137a
2016-07-27 20:33:42 +02:00
4b02ab698f
Sdk/State: Make destructor virtual
...
Former-commit-id: 51b552a0f0282173e73c8613d1924cc1e4105ac1 [formerly 1250f95f374a7b67e47667f4a5dd00f9ae5b1a1f]
Former-commit-id: 85a77a07290da117bfcfbe6ccec7bc85b2c170dc
2016-07-26 21:07:20 +02:00
99fde96fee
Build/UnitTest: Fix linking against Network module
...
Former-commit-id: 01a994a6bf23fa8296ef087157d3d88598c1bb31 [formerly 929a9a29884daa2676c9e54f55361ecbd742fe37]
Former-commit-id: d5437f0a27908e9e8a87e04aff14ddbb3c849b07
2016-07-26 21:00:43 +02:00
08b85b477b
Add LICENSE file
...
Former-commit-id: c3b781cb39efac0785c2da23f7f877e0e3db4c09 [formerly f39522f479e4a628f4b3c52806269dc14a62033a]
Former-commit-id: 52a7895664b35053e60da1f6ddb11382ba6b6098
2016-07-26 12:11:36 +02:00
b988c34622
Doc: Fix \see
...
Former-commit-id: 2d9bd386e63fc602f2a92ac083f3e252b9a9b797 [formerly 6fd2cb0e7bb10a68d83b3d44520413f679f8872a]
Former-commit-id: 70d70144834b1dea6055348f70960a5df5197309
2016-07-23 18:24:27 +02:00
25d7112054
Graphics: Add TileMap class
...
Former-commit-id: 0a45b956501998a40a6406f7fff6e6cc85b4b4db [formerly ab84ea10c52b128b17241844e6a4b3887c6618ab]
Former-commit-id: d62bbb11f5205daa6af3f7b9152be3fb213ca564
2016-07-23 18:06:17 +02:00
56443c91e4
Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
...
Former-commit-id: 392c7c33ff64d19e0fe3c7bdc8b22fe17c150887 [formerly d12a3c5f664fccebe0ee40a73bb0310e2d02287e]
Former-commit-id: 22743f015567a8471f97cb90a06175f600ef0f8f
2016-07-21 23:00:09 +02:00
31bc8604a4
Build/Assimp: Fix compilation error because of missing includes
...
Former-commit-id: b13f32ba6a53da69c8243425ca19766c96b97d26 [formerly 66000790be4f8ebe750ebe0d241f764b668278a1]
Former-commit-id: 1da2a2b75eb42f118a1b843463fe715bd5fbabb0
2016-07-18 19:07:12 +02:00
ef7759468a
Utility/OBJSaver: Fix multiple materials saving
...
Former-commit-id: 18d8c235a58fc627bcc4ecbbe5cfcd8fcdf00014 [formerly 358b88c21f73a36051baed60a943643c3ae9b03c]
Former-commit-id: c1f89cb0f375db6c68048f0bc8e857306b6ca034
2016-07-17 21:10:20 +02:00
c7355ad166
Update global headers
...
Former-commit-id: 57e803ee99f077bc0436b5284dc14bab7ab33555 [formerly 1551090a7423e44e74b68452c0f209a121ad8cd8]
Former-commit-id: b275b8b680a3ddee30589d0e5f67a49d0448f066
2016-07-13 12:27:30 +02:00
e3bb204ddf
Prevent GitHub to count external libraries into the project files
...
Former-commit-id: 6ca53002d7211efbcac22d8062d02b19ce9cf85c [formerly 6b0ae084ee52a9d2f12dc251f73db8a9bc5a0d55]
Former-commit-id: 7b9361c5c702b7e53556b7d81a011c599ffeeab0
2016-07-13 12:26:38 +02:00
f8c4dda97f
Delete Image.inl.save-failed
...
Former-commit-id: 160b8d589c85d05886f46f77f191781e966ded37 [formerly 2bd02c1131275b7f48e71966f935c33a8517fa8e]
Former-commit-id: b721cff7e246a88538296e29f9f7234f3773b431
2016-07-12 17:16:20 +02:00
f814f5054e
Utility/Formats: Add OBJSaver (WIP)
...
Former-commit-id: 8f5fab2823f86ff5b12348eacfe238c74281c235 [formerly 9c9ad4880ee31052ae1850c53e4781690ce69f49]
Former-commit-id: bde101aca68d5c6d205bb3d2252d656a6f7e078f
2016-07-12 08:14:05 +02:00
6084ff1707
Utility/Mesh: Add MeshSaver properly
...
Former-commit-id: 08a7fb99853e68e692e1346577c8d616c1f4a6f9 [formerly 626e980416ee0ceea15036bd6355321400a19475]
Former-commit-id: d39fd4d74d2d58c14057b0f769ceb7ce120c103a
2016-07-12 08:14:05 +02:00
ce8461ca35
Utility: Add MTL exporting
...
Former-commit-id: b524c2d445f4c5cdadedabc3a9c38307dbfecb9b [formerly d65160f4e3f2fa2c7c9ddd151c73990c6712b4c1]
Former-commit-id: 7ccdf043ccf793d3d9a5c9d93c65919ac015b52c
2016-07-12 08:14:05 +02:00
Lynix
Gawaboumga
Ardakaniz