Ryan Huffman
c6493b1720
Remove extension from hash in AssetResourceRequest
2015-08-27 10:27:12 -07:00
Ryan Huffman
667db200c0
Cleanup BatchLoader
2015-08-27 09:39:12 -07:00
Ryan Huffman
8765329a46
Add ASSET_TOO_LARGE to AssetUtils
2015-08-27 09:32:39 -07:00
Ryan Huffman
92dbe9997c
Clean up AssetRequest
2015-08-27 09:31:50 -07:00
Ryan Huffman
15854c6715
Make AssetClient methods private
2015-08-27 09:31:34 -07:00
Ryan Huffman
b72e7e356d
Clean up AssertClient
2015-08-27 09:31:17 -07:00
Ryan Huffman
c2fcf5865a
Update log message for uploading assets
2015-08-26 16:02:47 -07:00
Ryan Huffman
d66c521200
Move SendAssetTask to separate file
2015-08-26 15:37:23 -07:00
Ryan Huffman
2e585256ff
Update asset hash to Sha256
2015-08-26 14:20:24 -07:00
Ryan Huffman
269d5bb6da
Resolve bugs with *Cache changes
2015-08-26 14:04:55 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Ryan Huffman
c878eb0cd9
Fix atomics not being initialized in SendQueue
2015-08-26 09:31:03 -07:00
Ryan Huffman
868558b4f0
Add registration of QSharedPointer<NLPacketList> meta type
2015-08-26 09:29:46 -07:00
Ryan Huffman
24faab2089
Add sendPacketList that take Node
2015-08-26 09:29:15 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Clément Brisset
2745cc5d12
Merge pull request #15 from birarda/wait-condition
...
add a wait condition in SendQueue if there's nothing to do
2015-08-26 14:57:16 +02:00
Ryan Huffman
0bfa0c4942
Add progress to AssetResourceRequest
2015-08-25 16:35:41 -07:00
Ryan Huffman
0e98b179dd
Update Asset gettings and uploading in AssetClient
2015-08-25 16:34:44 -07:00
Ryan Huffman
12b2dfb2f9
Clean up HTTPResourceRequest
2015-08-25 15:45:00 -07:00
Ryan Huffman
3eff605d72
Update asset server number
2015-08-25 15:44:37 -07:00
Ryan Huffman
1e6ff8a1e4
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-25 15:25:52 -07:00
Ryan Huffman
3959928bbb
Update ResourceRequest::moveData to getData
2015-08-25 15:20:00 -07:00
Ryan Huffman
2efba00e3e
Update BasePacket::read to do a copy
2015-08-25 15:19:07 -07:00
Ryan Huffman
6bba2f4cb1
Update Packet to properly copy packet position and message number
2015-08-25 15:18:40 -07:00
Ryan Huffman
c1b9613a30
Update PacketList::writeData() to be non-recursive
2015-08-25 14:58:56 -07:00
Stephen Birarda
61507bde09
fix order of member initialization in PacketList
2015-08-25 11:24:26 -07:00
Stephen Birarda
9ff7bfd0b5
some header cleanup in UDTTest output
2015-08-25 11:21:04 -07:00
Stephen Birarda
5e5bd77870
add initialization for all atomics in SendQueue
2015-08-25 09:55:21 -07:00
Stephen Birarda
f7799bcf8f
add TODO for settings fail, cleanup
2015-08-24 17:02:47 -07:00
Stephen Birarda
e84595af49
add a wait condition for empty queue and loss list
2015-08-24 17:02:40 -07:00
Ryan Huffman
4191ccd60d
Move *ResourceRequest objects to separate files
2015-08-24 12:16:20 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Stephen Birarda
1756e60647
complete test for ordered packets in udt-test target
2015-08-20 14:22:05 -07:00
Ryan Huffman
0a290da529
Merge branch 'ordered-sending' into atp-server
2015-08-20 11:50:06 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Stephen Birarda
74d6e5ba89
make sure LNL goes down before domain-server
2015-08-20 10:01:12 -07:00
Ryan Huffman
bb15811f6b
Merge remote-tracking branch 'clement/protocol' into ordered-sending
2015-08-20 09:14:04 -07:00
Atlante45
f6854782a4
Debug/Lock cleanup
2015-08-20 14:57:35 +02:00
Atlante45
62c76d0332
registerListenerForTypes optimisations
2015-08-20 14:56:35 +02:00
Andrew Meadows
5a442bdb30
Merge pull request #5555 from ZappoMan/centerOrigin
...
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
2015-08-19 15:59:04 -07:00
Stephen Birarda
6860f3d126
add readWithoutCopy for clarity in Packet read
2015-08-19 14:32:26 -07:00
Ryan Huffman
5884fcb17b
Merge branch 'ordered-sending' into atp-server
2015-08-19 12:23:31 -07:00
Ryan Huffman
7305135125
Update ResourceManager
2015-08-19 12:16:34 -07:00
Ryan Huffman
4827d326f4
Update ResourceCache to allow multiple downloads on the same resource
2015-08-19 12:11:47 -07:00
Ryan Huffman
d18ce5066f
Fix error with Assignment::Type not being hashable
2015-08-19 11:55:06 -07:00
Ryan Huffman
121d3a77ad
Fix iterator usage in SendQueue
2015-08-19 11:27:31 -07:00
Ryan Huffman
fc29297d87
Update SendQueue::queuePacketList to use splice
2015-08-19 10:55:26 -07:00
Ryan Huffman
df51069305
Rename getAllData to getMessage
2015-08-19 10:39:19 -07:00
Ryan Huffman
ebf112e200
Replace NLPacketList::getSourceID() with const& return
2015-08-19 10:03:52 -07:00
