SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
SamGondelman
3b5a0d278d
trying to fix conversion
2018-07-30 17:06:57 -07:00
Simon Walton
4d559bbaee
Don't initialize an atomic; squelch gcc warning
2018-07-27 10:05:34 -07:00
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -07:00
Simon Walton
2c06487df0
Move sending of completion packet up to EntityTreeSendThread
...
I hadn't appreciated the continuous nature of the scene
traversal. Looks good now. Also changed some identifier names.
2018-07-25 17:05:05 -07:00
Simon Walton
47e99cdeac
Initial code for AC side of Enabling Physics plan
...
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
SamGondelman
f9cdfbad7c
cleanup
2018-07-12 17:59:57 -07:00
SamGondelman
16ad9cb5d3
xcolor/rgbcolor conversion
2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30
vec3 conversion
2018-07-11 14:18:22 -07:00
SamGondelman
5bbd5b9e52
vec2 conversion
2018-07-10 16:32:49 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes
...
Entity Script Server memory leak when taking down EntityTree
2018-07-05 15:30:45 -07:00
SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
Andrew Meadows
be0899c41d
remove unnecessary writes to appease Xcode's static analyzer
2018-06-15 11:44:22 -07:00
Ryan Huffman
2b49d84a22
Add better error logging in Octree::writeToJSONFile
2018-06-13 12:57:06 -07:00
Ryan Huffman
c2f08dfdba
Update Octree to atomically persist data
2018-06-13 12:24:09 -07:00
Ryan Huffman
6b159d6124
Remove redundant read of octree data on startup
2018-06-13 11:54:20 -07:00
Simon Walton
9ae3411abe
Have ~OctreeProcessor break cycle instead of using weak pointers
2018-06-12 12:32:27 -07:00
Ryan Huffman
fa22ea7630
Update ES to keep the backup that pushes file size over the limit
2018-06-11 11:58:50 -07:00
Ryan Huffman
11a48915e2
Fix order of variable initialization in OctreePersistThread
2018-06-11 09:48:22 -07:00
Ryan Huffman
94069c964d
Remove unused variable and log message in OctreePersistThread
2018-06-11 08:37:19 -07:00
Ryan Huffman
9afc9d19c5
Cleanup comments and process structure in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
d0af06939f
Update persistInterval to use std::chrono in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
8f4f3db9ce
Add octree backup file cleanup
2018-06-08 16:22:11 -07:00
Ryan Huffman
d476146a56
Move OctreePersistThread off GenericThread and add octree negotiation
2018-06-08 16:22:11 -07:00
Ryan Huffman
2143bae100
Remove unused entity server backups
...
The domain server now handles entity backups so this code is no longer
used.
This also fixes a bug where, if the entity server went down while
writing the persist file, it would leave a lock file behind. When
starting up the next time it would try to recover from the last backup.
Because the entity server no longer gets any backup rules, and the way
it searches for backups, it would end up finding the lock file and
treating it as the most recent backup. This meant that the
models.json.gz file was replaced with an empty file.
2018-06-08 16:17:30 -07:00
David Back
ac33f33828
update version from json in toByteArray
2018-05-31 09:24:16 -07:00
John Conklin II
88163424f0
Merge pull request #13164 from SimonWalton-HiFi/entities-relaying
...
Move down OctreeQueryNode::_viewMutex to OctreeQuery
2018-05-21 10:14:41 -07:00
Simon Walton
454978a9c2
Add more locking of _conicalViews vector
2018-05-14 15:15:58 -07:00
Simon Walton
9bb966dd1d
Push down OctreeQueryNode lock to OctreeQuery and use for conical views
...
Possibly related to
https://highfidelity.manuscript.com/f/cases/14165/entity-server-doesn-t-always-relay-added-entities-to-clients
2018-05-11 17:12:53 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable
...
Merge RC67 stable into master
2018-05-10 17:07:20 -07:00
Seth Alves
db03265a6b
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 10:53:46 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Clement
487a63025f
Fix warning
2018-05-03 18:19:52 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Clement
3283c5eaec
Fix inverted comparaison
2018-05-03 18:19:29 -07:00
Clement
67c119cd2e
Send Entity Query via conical frustums
2018-05-03 18:19:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
Liv Erickson
afea186784
fix for both functions
2018-04-25 14:39:04 -07:00
Liv Erickson
10694e2256
Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace
2018-04-24 17:15:45 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Liv Erickson
d2335ea9f6
fix in where octree imports url so fix is global
2018-04-18 13:18:50 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Ryan Huffman
010356709d
Remove lock file recovery in entity server
...
* We no longer make backups at the ES, so there is no backup to
recover from if we crash during persist to disk.
* When loading the most recent backup we look for files that match our
backup rules. If we have no backup rules we end up grabbing
everything.
* Because we grab everything, we are at risk of grabbing the lock file
and treating it as a backup. In the case where we crash on persist, we
end up replacing the models.json.gz file with the lock file (!!).
This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
2018-04-05 11:52:31 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Simon Walton
d3464378b7
Short local source IDs - checkpoint
...
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
Seth Alves
b8fc9e2469
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-07 07:40:35 -08:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
Ryan Huffman
70bdedc4b3
Fix Edit -> Export Entities exporting gzipped json
...
We were not respecting the doGzip flag.
2018-03-01 16:42:41 -08:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
David Rowe
9c1fa7a8d2
Miscellaneous JSDoc tidying and fixes
2018-02-28 11:44:03 +13:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
Ryan Huffman
8a8830bbd4
Fix writeSubclassData in octree data
2018-02-26 17:06:25 -08:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
David Rowe
a8e05824cd
Entities octree sending functions JSDoc
2018-02-25 14:15:39 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Dante Ruiz
d394c891c5
allow Octreee to load compressed gz files
2018-02-22 10:10:54 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50
Fix entity data not being gzipped when adding id+version
2018-02-15 10:09:20 -08:00
Ryan Huffman
ff5be2d690
Fix entity data ID sometimes being reset
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Olivier Prat
3804917cf4
Orthographic octree selection seems to be working
2018-02-02 09:40:57 +01:00
Nissim Hadar
8206ae6ffb
Removed BackgroundMode packet type.
2018-01-07 13:50:42 -08:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip
...
handle sequence number from reliably sent adds in OctreeEditPacketSender
2017-12-22 12:30:27 -08:00
Stephen Birarda
1a6546999a
track reliably sent adds in sent packet history from OEPS
2017-12-19 16:00:55 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
ZappoMan
66454e7288
fix unix warnings
2017-11-17 16:33:43 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -08:00
ZappoMan
cd0fa989e1
debugging
2017-11-17 08:55:55 -08:00
ZappoMan
e438ac54d5
make adds go over NLPacketList as reliable
2017-11-16 13:16:23 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
ZappoMan
4c4f23e312
Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic
2017-11-16 10:09:46 -08:00
Stephen Birarda
05a38a78c5
don't send octree data without first query
2017-11-14 14:08:27 -08:00
Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
ZappoMan
c6947dd165
some side by side plumbing for NLPackets and NLPacketLists
2017-11-09 18:20:06 -08:00
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -08:00
ZappoMan
d4b4d188ed
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
2017-11-04 13:40:41 -07:00
Zach Fox
6f96e0c7bd
More progress
2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176
It's a start
2017-10-31 11:28:19 -07:00
Zach Fox
91333cdf7b
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-25 10:26:50 -07:00
ZappoMan
5901d1a311
clean up VERSION_ENTITIES stuff
2017-10-24 13:48:27 -07:00
Zach Fox
b35eaf2cc8
Throw a bunch of code at the wall and hope some sticks
2017-10-04 15:06:55 -07:00
Andrew Meadows
0c934e863b
clarify some comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496
namechange: apparentAngle --> angularDiameter
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173
fix Differential scan logic for LOD culling
2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056
use 20 degrees of OVERSEND
2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff
remove ViewFrustum::calculateProjection()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100
zero out OVERSEND hack
2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d
reasonable values for iitial OctreeQueryNode view
...
make sure newViewFrustum is fully initialized before using it
2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e
cherrypick traverseTreeAndBuildNextPacketPayload()
2017-09-29 11:34:34 -07:00
Andrew Meadows
0b0de96894
use memcpy instead of copying one byte at a time
2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1
add LOD culling in DiffTraversal
2017-09-29 11:34:33 -07:00
Andrew Meadows
82ed19386f
make Octree::readBitstreamToTree() virtual
2017-09-29 11:34:32 -07:00
Andrew Meadows
aee35b751e
replace 'unsigned long' with uint64_t
2017-08-18 14:35:48 -07:00
Andrew Meadows
0de109e2e8
cleanup and fix typos
2017-08-18 11:29:47 -07:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
David Kelly
061f084d9f
Get marketplaceID into imported entities
...
Rather than doing this on the backend, we can do it here at the
time we import. Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed. However for now this is enough
to get us moving forward.
2017-07-17 15:08:30 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Atlante45
5777b5e805
Create one packet per node
2017-06-14 11:42:25 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4
add entities file replacement to DS and ES
2017-04-27 16:56:27 -07:00
Stephen Birarda
53e6a77fcc
cleanup EncodeBitstreamParams to use nodeData when possible
2017-03-24 13:41:36 -07:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Stephen Birarda
d4119d5676
fix for non-void set of should force scene
2017-02-16 16:46:09 -08:00
Stephen Birarda
9d336a84ab
force a full scene send for new ancestors/descendants
2017-02-16 16:46:09 -08:00
Stephen Birarda
1b1ae48650
don't recurse on octree elements that have not changed
2017-01-30 17:01:45 -08:00
Howard Stearns
a1afbe7d5e
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter
2017-01-25 19:16:29 -08:00
Stephen Birarda
69b47dcf50
use currentParameters instead of getJSONParameters()
2017-01-24 16:49:17 -08:00
Stephen Birarda
33378ede5c
force full scene send if json parameters changed
2017-01-24 16:34:57 -08:00
Stephen Birarda
6376068021
fix usesFrustum check in OctreeQueryNode
2017-01-20 13:54:46 -08:00
Stephen Birarda
a40c25ddbf
fix repeated send of matching entities
2017-01-19 16:42:14 -08:00
Stephen Birarda
33cde412b1
make getJSONParameters thread-safe
2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66
pass usesFrustum down to EntityTreeElement
2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95
fix for unpack of OctreeQuery
2017-01-18 17:49:54 -08:00
Stephen Birarda
112b119f17
send entities that just stopped matching filter
2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034
leverage JSON filter changes to OctreeQuery in EntityServer
2017-01-18 14:58:36 -08:00
Stephen Birarda
f9f958aef1
provide direct access to OctreeQuery from OHV
2017-01-18 14:58:36 -08:00
Stephen Birarda
6e6f2c50b8
leverage OctreeQuery enhancements in EntityScriptServer/OHV
2017-01-18 14:58:36 -08:00
Stephen Birarda
ed68d5a7a2
add JSON filter to OctreeQuery
2017-01-18 14:58:36 -08:00
howard-stearns
f6446c6806
minimum entity edit filter
2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
Seth Alves
1d0c3d7168
fix checker for unreasonable size of vector of bools
2016-11-03 09:47:24 -07:00
Seth Alves
cfea3cba9b
guard against heap-overflow in the event of bogus entity network data
2016-11-03 06:54:11 -07:00
Seth Alves
64cb5d1b1a
fix QVector<bool> packing when number of joints isn't a multiple of 8
2016-11-02 20:02:07 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
