ZappoMan
a19ce6e859
clean up warning
2014-09-05 12:52:04 -07:00
ZappoMan
54a746a846
remove noise
2014-09-05 12:49:23 -07:00
ZappoMan
e1064d8da7
correctly implement data types who assume all child data must be included (e.g. voxels)
2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350
more work on fixing voxels
2014-09-05 11:51:17 -07:00
ZappoMan
f234dbf9a1
converting voxel files to new versioned format with buffer breaks
2014-09-05 10:51:08 -07:00
ZappoMan
5c5658b6e7
Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave
2014-09-05 09:27:27 -07:00
ZappoMan
3c2b534842
dead code cleanup and comment cleanup
2014-09-05 01:50:43 -07:00
ZappoMan
5ec98b8dec
more guards to corrupt voxel files
2014-09-05 01:40:41 -07:00
ZappoMan
a189f077b8
fix huge-mega-voxels and voxel file corruption
2014-09-05 01:13:22 -07:00
Andrew Meadows
faf31f268e
use QHash, not QVector, for Octree content query
2014-09-04 15:20:07 -07:00
Andrew Meadows
e120697a9b
merge upstream/master into andrew/ragdoll
2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Andrew Meadows
54463ab668
add findContentInCube() and typedef CubeList
2014-09-03 13:17:47 -07:00
ZappoMan
756840d541
CR feedback
2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7
fix method names for CR feedback
2014-09-03 12:44:57 -07:00
ZappoMan
9a02545d9e
useless semicolon removal
2014-09-03 12:26:05 -07:00
ZappoMan
f5b9fabdb9
fix CR feedback
2014-09-03 12:12:08 -07:00
ZappoMan
66a2f58192
fix to runaway saving file and optimizations to general encoding paths
2014-09-03 10:55:56 -07:00
ZappoMan
0acbefb6a2
fix but in getMyChildContaining and performance improvement to moving entities
2014-09-03 08:06:42 -07:00
ZappoMan
9fa087571b
tweak to save SVO logic
2014-09-02 17:10:41 -07:00
ZappoMan
2b5d631290
removed a ton of old dead debug code
2014-09-02 08:44:43 -07:00
ZappoMan
f16a48e187
quiet some debugging
2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4
working on addressing issues with sibling cells and server clock skew causing some properties to be ignored
2014-09-01 21:48:03 -07:00
Andrew Meadows
aeb355e3da
re-enabling legacy avatar-vs-voxel collisions
...
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
ZappoMan
f654fac851
fixed a couple crashes in editing entities
2014-08-29 10:56:07 -07:00
ZappoMan
2f90df04ee
correct cleanup of Models/geometry and all EntityItems for various cases
2014-08-27 15:45:45 -07:00
Andrew Meadows
c6253bb51a
AACube vs Sphere and Capsule collision tests
...
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
ZappoMan
30e00bbd69
final pass on entities import/export/overlays working as well as production
2014-08-27 11:34:50 -07:00
ZappoMan
73d5e8c519
more quieting of debug messages
2014-08-22 17:21:27 -07:00
ZappoMan
75bb42fb73
debug cleanup
2014-08-22 10:54:00 -07:00
ZappoMan
17426a1c71
removed tons of debugging
2014-08-20 17:47:16 -07:00
ZappoMan
ef86d86234
split out entity rendering into subclasses, improved rendering of models
2014-08-20 15:49:50 -07:00
ZappoMan
3a5a38c342
support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file
2014-08-19 10:53:45 -07:00
ZappoMan
960e9eb2f4
debugging tweaks
2014-08-19 09:43:09 -07:00
ZappoMan
daffb00bf2
build issues fixed after merge
2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
1b1c386e78
handle root element data that spans multiple MTU
2014-08-18 14:53:57 -07:00
ZappoMan
49cf6dff3a
more DIDNT_FIT logic improvements/fixes
2014-08-18 14:09:01 -07:00
ZappoMan
588d051595
use memmove() instead of memcpy() for overlapping updates and some debugging
2014-08-18 14:07:39 -07:00
ZappoMan
a3bb8b1239
have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues
2014-08-18 09:37:07 -07:00
ZappoMan
f8f0da189f
more work on more entities in a cell
2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4
work on reseved bytes in octree packet data
2014-08-15 11:26:55 -07:00
ZappoMan
abe892ddc3
quiet some debugging
2014-08-14 11:36:53 -07:00
ZappoMan
fbe409a0c2
added lots of debugging for octree edit packet sender bug fixed threading issue
2014-08-14 11:23:56 -07:00
ZappoMan
b7e258519b
fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet
2014-08-13 17:12:03 -07:00
ZappoMan
49e616dd49
first cut at using erase entity message to delete entities
2014-08-13 14:11:56 -07:00
ZappoMan
4bdb8765f5
implement improved pruning on updates/moves/delete passes of the tree added some debug support
2014-08-13 10:29:25 -07:00
ZappoMan
6ce6d8ae47
dont try to create child elements that are smaller than the entities
2014-08-12 14:29:55 -07:00
ZappoMan
3551bd676f
quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds
2014-08-12 13:14:28 -07:00
Stephen Birarda
9d8818eee5
remove OpenSSL requirement from octree library
2014-08-08 13:18:32 -07:00
Stephen Birarda
a99b19d28a
make Qt5 and ZLIB required finds, add OpenSSL to interface
2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c
remove TARGET_NAME from cmake macros where it is not required
2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62
add macro to link shared dependencies to target
2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d
tweak setup_hifi_library to bubble up full path of Qt modules
2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4
remove ssize_t and replace with size_t or int where appropriate
2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e
get to successful cmake after library link macro changes
2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe
repairs for interface build to succeed
2014-08-08 13:17:53 -07:00
Stephen Birarda
2bb37f2d64
more Qt module dependencies sorted out for libraries
2014-08-08 13:17:53 -07:00
Stephen Birarda
33e5826842
remove animation server, bubble up qt modules
2014-08-08 13:17:52 -07:00
Stephen Birarda
9a50532b1f
bubble up sub dependencies to link_hifi_library
2014-08-08 13:17:52 -07:00
ZappoMan
d1589e0d8e
removed addOrUpdateEntity() replaced with more efficient approach
2014-08-07 10:10:44 -07:00
ZappoMan
273853ef24
more work on virtual entities
2014-08-04 16:18:24 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
ZappoMan
23aa5a124e
fix up lastEdited behavior
2014-07-31 11:41:18 -07:00
ZappoMan
77e1867b11
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
2014-07-31 10:34:23 -07:00
Stephen Birarda
ef58453fda
turn off verbose octree packet debug
2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c
call PaymentManager when an OctreeEditPacketSender needs to pay
2014-07-30 18:07:08 -07:00
Stephen Birarda
eba92eb517
have the OctreeEditPacketSender emit a signal when payment is required
2014-07-30 17:21:04 -07:00
Stephen Birarda
04effabe48
Merge branch 'master' into domain-server-auth
2014-07-30 17:14:03 -07:00
Stephen Birarda
2796f71419
library cleanup to suppress warnings on cmake 3.0
2014-07-30 15:06:15 -07:00
Stephen Birarda
ab1be38fd5
reset the cost of the packet back to 0 so it doesn't keep accumulating
2014-07-30 14:02:46 -07:00
Stephen Birarda
7a128e5f77
add satoshi cost to voxel packet debug
2014-07-30 10:14:51 -07:00
Stephen Birarda
66592466ad
pipe satoshi cost down to queuePacketToNodes
2014-07-30 10:05:21 -07:00
Stephen Birarda
6a534a6ff1
send along satoshi costs for voxel additions from VoxelEditPacketSender
2014-07-29 17:31:12 -07:00
ZappoMan
3667eadff0
some various fixes
2014-07-29 13:34:08 -07:00
ZappoMan
230c2f2684
cleanup storage of entity ids on the server, added improved checks for server vs client
2014-07-29 12:52:46 -07:00
Stephen Birarda
39e6d7d31b
octree packet methods can take a cost
2014-07-29 11:40:07 -07:00
ZappoMan
805a88b73b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/editModels.js
interface/src/entities/EntityTreeRenderer.h
libraries/models/src/ModelsScriptingInterface.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-28 13:39:35 -07:00
Atlante45
72a31ec8fc
Removed magic number to use DEFAULT_NEAR/FAR_CLIP
2014-07-25 10:56:44 -07:00
Atlante45
c5ad856e65
Changed DEFAULT_FAR_CLIP to TREE_SCALE
2014-07-25 10:55:42 -07:00
ZappoMan
30aee70346
latest work
2014-07-21 09:18:21 -07:00
ZappoMan
61d998d2ad
tweaks
2014-07-15 10:29:29 -07:00
ZappoMan
2baac96665
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/sit.js
interface/src/Application.cpp
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelsScriptingInterface.cpp
2014-07-15 10:04:40 -07:00
wangyix
ce0101aa2a
fixed octreeEditPacketSender seq numbers errors; untested
2014-07-10 14:53:29 -07:00
ZappoMan
780532bfd8
more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe
2014-07-10 13:42:49 -07:00
ZappoMan
ec0c350f60
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
...
Conflicts:
interface/src/Application.cpp
interface/src/DatagramProcessor.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-03 14:20:40 -07:00
ZappoMan
865566414c
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
...
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
wangyix
fd051310da
prune missing set before constructing nack packets;
...
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
2014-07-01 12:01:51 -07:00
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
ZappoMan
a019b70e58
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
2014-06-24 15:59:17 -07:00
Brad Hefta-Gaub
6d77d438ab
Merge pull request #3057 from AndrewMeadows/ragdoll
...
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
ZappoMan
2d1d4de174
hacking more on the modelID to element map
2014-06-19 16:47:33 -07:00
ZappoMan
fb34d13305
more work on optimized storeModel()
2014-06-19 14:30:44 -07:00
Andrew Meadows
c98631f820
merge upstream/master into andrew/ragdoll
2014-06-18 17:23:24 -07:00
wangyix
761a154a93
Merge remote-tracking branch 'upstream/master'
2014-06-18 15:59:45 -07:00
ZappoMan
28c7c24399
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
libraries/octree/src/AABox.h
2014-06-18 15:27:36 -07:00
Brad Hefta-Gaub
c7b1b504b4
Merge pull request #3047 from birarda/master
...
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
wangyix
827b28ceda
Merge remote-tracking branch 'origin/master'
...
Conflicts:
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
2014-06-18 15:21:19 -07:00
ZappoMan
c54bdb3e8d
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
2014-06-18 15:20:08 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
wangyix
f76b4dc1ab
made getMissingSequenceNumbers() inline
2014-06-18 13:39:49 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -07:00
Clément Brisset
7597191081
Merge pull request #3042 from ZappoMan/editModelFeatures
...
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec
replaced UINT16_MAX at 2 other places
2014-06-18 10:27:02 -07:00
wangyix
b63c88f42c
removed more spaces
2014-06-18 09:38:39 -07:00
wangyix
8c4e365958
added forgotten i++ in sendNackPackets()
...
plus minor style fixes
2014-06-18 09:28:42 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
ZappoMan
5a246fab26
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/src/main.cpp
2014-06-17 17:45:06 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
wangyix
7f4cf3719e
added rollover handling to OctreeSceneStats
2014-06-17 16:40:08 -07:00
wangyix
bdbb12f4dc
switched edit nacks to non-verified
2014-06-17 14:35:40 -07:00
ZappoMan
4413049302
fixed a bug in inside out ray casting returning the wrong face
2014-06-17 13:05:35 -07:00
ZappoMan
9a3f8508cf
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:12:53 -07:00
wangyix
011e7c2de2
removed debug code
2014-06-17 11:53:09 -07:00
wangyix
8187912384
added qDebug() check in SentPacketHistory for seq numbers
...
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
2014-06-17 11:34:35 -07:00
wangyix
6e71523346
added OctreeEditPacketSender::nodeKilled(), no locks yet
...
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
2014-06-17 10:58:44 -07:00
wangyix
dc71f87ea4
edit nacks seem to be working;
...
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
2014-06-17 10:42:56 -07:00
ZappoMan
66cfb63750
added some helpers to Octree and OctreeElements DRY-up some code
2014-06-17 08:55:19 -07:00
ZappoMan
cefbd765da
some convenience features added to AABox and AACube
2014-06-17 08:36:45 -07:00
wangyix
06f8464ec9
edit nacks ready for test; seq numbers sometimes repeat??
2014-06-16 17:17:48 -07:00
wangyix
e3db60d1ef
forgot to add "break;"s
2014-06-16 16:42:04 -07:00
wangyix
18a9d74b88
changed OctreeEditPacketSender to queue packets for resend as nack is parsed
2014-06-16 16:35:30 -07:00
wangyix
5e37704772
SentPacketHistory now handles rollover
...
updated SentPacketHistory path in comments
2014-06-16 15:59:38 -07:00
wangyix
ddfe98ad43
added code to parse nack packets in OctreeEditPacketSender
2014-06-16 15:32:39 -07:00
wangyix
0f7ce694c0
minor changes before moving SentPacketHistory
2014-06-16 13:52:01 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
Andrew Meadows
92159a7ed5
Shape::get/setCenter() instead of get/setPosition()
2014-06-16 08:43:27 -07:00
ZappoMan
12d30e9d62
handle some models don't fit better
2014-06-11 13:25:16 -07:00
ZappoMan
6389fea320
first cut at really using partial appendElementData to make models span packets. still needs work
2014-06-10 16:51:49 -07:00
ZappoMan
a0783f3f4a
try appendElementData() a different way
2014-06-10 10:43:50 -07:00
ZappoMan
5eb6ddbdb3
first cut at support for extra element data
2014-06-09 16:04:25 -07:00
ZappoMan
c5647addf4
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-09 14:10:47 -07:00
ZappoMan
139a64a0d2
fix comment
2014-06-09 14:10:40 -07:00
ZappoMan
6f1ec01797
rename nodeBag to elementBag in a bunch of places
2014-06-09 13:42:44 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
ZappoMan
4e8e5bf53d
first cut at new ModelItem reading, repacking of ModelItem format in case PropertyFlags shrink
2014-06-09 10:39:48 -07:00
ZappoMan
f6e5962593
added new versions of appendData for QString and QByteArray
2014-06-09 08:02:42 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
ZappoMan
165984ff31
clean up includes
2014-06-05 16:02:21 -07:00
ZappoMan
23ef5b5404
added some comments
2014-06-04 10:22:19 -07:00