Seth Alves
|
b590cd5b89
|
avatar-entities which are children of an avatar will scale with the avatar
|
2017-12-02 09:31:43 -08:00 |
|
ZappoMan
|
f63db42c0e
|
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
|
2017-10-28 10:14:25 -07:00 |
|
ZappoMan
|
a7a0f03ede
|
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
|
2017-10-27 18:39:17 -07:00 |
|
Andrew Meadows
|
0bcecdbe66
|
be picky when finding nearby entities at login
|
2017-10-09 10:27:46 -07:00 |
|
Andrew Meadows
|
7597088c7c
|
simpler logic flow
|
2017-09-29 11:34:33 -07:00 |
|
Andrew Meadows
|
3665a3fbee
|
libraries/entities/src/EntityTreeElement.cpp
|
2017-09-29 11:34:33 -07:00 |
|
Andrew Meadows
|
2b31a746e3
|
add content timestamp for EntityTreeElement
|
2017-09-29 11:34:32 -07:00 |
|
Andrew Meadows
|
56bc48b31a
|
don't use octcode data in entity update packets
|
2017-09-29 11:34:32 -07:00 |
|
Brad Davis
|
861b33a845
|
Fix potential nullptr access in EntityTreeElement
|
2017-07-29 17:22:25 -07:00 |
|
Andrew Meadows
|
c7ec82f98a
|
use local copy of _element for thread safety
|
2017-07-13 13:30:57 -07:00 |
|
Andrew Meadows
|
7ea1e7285f
|
map EntityItemID to EntityItemPointer
|
2017-07-13 13:30:57 -07:00 |
|
Brad Davis
|
8130a91b8c
|
Cleanup entity dependencies
|
2017-06-27 19:15:49 -07:00 |
|
Seth Alves
|
5c94147f40
|
children collision hulls appear to be in the right place, now
|
2017-05-19 17:09:42 -07:00 |
|
Stephen Birarda
|
53e6a77fcc
|
cleanup EncodeBitstreamParams to use nodeData when possible
|
2017-03-24 13:41:36 -07:00 |
|
Stephen Birarda
|
a3883a746c
|
add the basic structure for inclusion of ancestors/descendants in ESS queries
|
2017-02-16 16:46:09 -08:00 |
|
Stephen Birarda
|
586c3512a7
|
remove useless additional includeThisEntity sets
|
2017-01-24 17:35:45 -08:00 |
|
Stephen Birarda
|
67a3d97f81
|
cleanup includeThisEntity check
|
2017-01-24 16:41:20 -08:00 |
|
Stephen Birarda
|
543d0ce77e
|
add a comment about usesFrustum check in EntityTreeElement
|
2017-01-24 16:36:44 -08:00 |
|
Stephen Birarda
|
33378ede5c
|
force full scene send if json parameters changed
|
2017-01-24 16:34:57 -08:00 |
|
Stephen Birarda
|
1e25b5012f
|
use a static_cast to get EntityNodeData
|
2017-01-20 14:05:55 -08:00 |
|
Stephen Birarda
|
67951517b4
|
don't grab the JSON filters for each entity checked
|
2017-01-20 13:59:48 -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 |
|
Atlante45
|
20b7bb0c54
|
EntityScriptServer tracks server scripts
|
2017-01-17 16:41:56 -08:00 |
|
Brad Hefta-Gaub
|
dbbed462b4
|
cleanup naked qDebug() calls
|
2016-12-19 22:24:25 -08:00 |
|
Seth Alves
|
6fe35ac0da
|
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
|
2016-12-12 16:04:41 -08:00 |
|
Dante Ruiz
|
1b20cc8bd0
|
more clean up
|
2016-11-30 18:28:50 +00:00 |
|
Dante Ruiz
|
104cbbff7e
|
clean up
|
2016-11-30 18:26:06 +00:00 |
|
Dante Ruiz
|
34d24b947e
|
better implementation
|
2016-11-30 18:03:11 +00:00 |
|
Dante Ruiz
|
daf12047ca
|
removed unnessary comments
|
2016-11-22 18:55:20 +00:00 |
|
Dante Ruiz
|
2dfb745443
|
made some chnages
|
2016-11-22 18:53:03 +00:00 |
|
Dante Ruiz
|
a176c624ab
|
fixed teleport bug
|
2016-11-21 23:04:07 +00:00 |
|
Dante Ruiz
|
1ba769b0ef
|
teleportBug
|
2016-11-21 10:38:20 -08:00 |
|
Ryan Huffman
|
ee50469213
|
Add collidableOnly arg to findRayIntersection
|
2016-10-04 20:19:54 -07:00 |
|
Ryan Huffman
|
da6afb605b
|
Fix default findRayIntersection surfaceNormal to be in world space
|
2016-10-04 20:19:54 -07:00 |
|
Ryan Huffman
|
17c63eb722
|
Add the ability to ignore invisible entities in findRayIntersection
|
2016-10-04 20:19:32 -07:00 |
|
David Rowe
|
38c2efa22f
|
Implement Entities.findInFrustum() method
|
2016-09-09 18:57:48 +12:00 |
|
SamGondelman
|
676f4bdfcf
|
misc fixes from particles branch
|
2016-07-29 15:36:32 -07:00 |
|
Atlante45
|
fc7b271e50
|
Missed OS X Warning
|
2016-06-14 16:29:50 -07:00 |
|
Atlante45
|
71fb0e665f
|
Fix OSX warning
|
2016-06-07 16:46:32 -07:00 |
|
Brad Hefta-Gaub
|
d7eee98acc
|
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
resurrection of threadsafe ViewFrustum
|
2016-05-10 09:06:38 -07:00 |
|
Andrew Meadows
|
7d6424bdcc
|
Head::render() was cruft
|
2016-05-05 18:28:27 -07:00 |
|
Andrew Meadows
|
bcf2cc8074
|
use references not pointers for ViewFrustums
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
|
2016-05-05 18:28:27 -07:00 |
|
Atlante45
|
07adef9465
|
Fix entities collision sounds
|
2016-05-05 14:55:28 -07:00 |
|
Seth Alves
|
e4c91e5064
|
add a heuristic for deciding when it's safe to enable bullet
|
2016-04-12 11:46:00 -07:00 |
|
Brad Hefta-Gaub
|
62a56ecbfa
|
fix typos
|
2016-03-23 17:45:22 -07:00 |
|
Brad Hefta-Gaub
|
fdd0b48ae1
|
reduce log spam
|
2016-03-23 17:06:03 -07:00 |
|
Brad Hefta-Gaub
|
8d4ef28411
|
CR feedback
|
2016-03-08 15:29:04 -08:00 |
|
Brad Hefta-Gaub
|
6d211dd4e5
|
first cut at fixing the scene not stable bug
|
2016-03-08 14:52:21 -08:00 |
|
Andrew Meadows
|
acef6642c9
|
fix logic typo
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
5d1e283508
|
namechange TouchesKeyhole to IntersectsKeyhole
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
dfdf375853
|
use shapeInFrustum() names again
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
9c927ea36b
|
ViewFrustum method renames and whitespace cleanup
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
|
2016-02-25 09:11:28 -08:00 |
|
Brad Hefta-Gaub
|
550b9a98b1
|
fix error in preload logic
|
2016-02-12 14:45:55 -08:00 |
|
James B. Pollack
|
2889bdd8b2
|
Merge pull request #7083 from ZappoMan/fixDoublePreload
handle two corner cases where preload would get called twice
|
2016-02-11 16:08:43 -08:00 |
|
Brad Hefta-Gaub
|
a40a562db2
|
handle two conner cases where preload would get called twice
|
2016-02-11 09:33:52 -08:00 |
|
Seth Alves
|
3fe01ccf10
|
cleanups
|
2016-02-10 18:32:05 -08:00 |
|
Seth Alves
|
1ae47b17f0
|
size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent
|
2016-02-10 16:41:35 -08:00 |
|
Seth Alves
|
4f8a7a080f
|
remove debugging print
|
2016-02-08 15:33:03 -08:00 |
|
Seth Alves
|
82fcfc1d64
|
don't apply clock-skew to a lastEdited of 0
|
2016-02-08 15:31:32 -08:00 |
|
Seth Alves
|
5027157575
|
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
|
2016-01-21 09:31:51 -08:00 |
|
Seth Alves
|
1fef78f60f
|
fix bug where entities that were children of avatars wouldn't be included in entity-server packets to interfaces
|
2016-01-20 19:03:41 -08:00 |
|
Brad Hefta-Gaub
|
b8747709ef
|
CR feedback, dead code cleanup
|
2016-01-18 12:11:23 -08:00 |
|
Brad Hefta-Gaub
|
d10e1cc39d
|
CR feedback, dead code cleanup
|
2016-01-18 12:09:21 -08:00 |
|
Brad Hefta-Gaub
|
88af387214
|
cleanup
|
2016-01-18 10:10:24 -08:00 |
|
Brad Hefta-Gaub
|
2774df38bc
|
check for entity size before including it for LOD
|
2016-01-18 09:06:57 -08:00 |
|
Seth Alves
|
bfa8cc1969
|
merge from upstream
|
2016-01-03 06:47:25 -08:00 |
|
ericrius1
|
8e7dfc07c0
|
Added logic to blacklist entities from raypicking
|
2015-12-24 11:59:47 -08:00 |
|
ericrius1
|
390dce4613
|
Adding blacklist
|
2015-12-24 11:48:40 -08:00 |
|
Seth Alves
|
c74f8bca49
|
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
|
2015-12-14 09:13:36 -08:00 |
|
Seth Alves
|
24fb43e8cd
|
first steps toward a puffed-out query-box for child entities
|
2015-12-12 12:33:14 -08:00 |
|
Atlante45
|
4aaa9ca02f
|
Make OctreeElementBag safer to use
|
2015-11-30 15:23:49 -08:00 |
|
Atlante45
|
a364e85e1d
|
Remove DeleteHooks
|
2015-11-25 17:21:56 -08:00 |
|
Brad Hefta-Gaub
|
2f3cf82202
|
don't apply out of order edits to entities that have been deleted
|
2015-11-18 14:26:18 -08:00 |
|
ericrius1
|
4e5b806934
|
particle effect entities no longer intersect with rays
|
2015-11-04 16:05:29 -08:00 |
|
Brad Hefta-Gaub
|
246e46b69a
|
implement improvement in sphere test
|
2015-10-21 10:46:50 -07:00 |
|
Brad Hefta-Gaub
|
954afe45d3
|
Merge pull request #6112 from ericrius1/rayPickAdditions
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
|
2015-10-21 09:08:56 -07:00 |
|
Brad Hefta-Gaub
|
d34ad2af42
|
improved findEntities(sphere) to check against Non-AABBox of entities
|
2015-10-20 21:01:20 -07:00 |
|
ericrius1
|
0373a481f8
|
Using EntityItemIDs instead of QUuids
|
2015-10-20 09:22:16 -07:00 |
|
ericrius1
|
dcb37ccd73
|
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
|
2015-10-19 13:14:19 -07:00 |
|
ericrius1
|
cfca0fe8c0
|
Adding a color indicator to whiteboard
|
2015-10-14 15:58:18 -07:00 |
|
ericrius1
|
2f620e654b
|
Fixed styling
|
2015-10-12 17:37:51 -07:00 |
|
ericrius1
|
f93b1d3325
|
Correctly whitelisting entities for ray picking
|
2015-10-12 17:05:34 -07:00 |
|
ericrius1
|
d01dda9c81
|
Adding in functionality to include only specified Ids in ray picking
|
2015-10-12 14:40:11 -07:00 |
|
Atlante45
|
bcd148cb87
|
Construct entity properties at definition
|
2015-10-09 12:23:19 -07:00 |
|
Brad Hefta-Gaub
|
430cbcca7e
|
first cut at adding surface normals to ray intersection
|
2015-09-27 21:57:50 -07:00 |
|
Seth Alves
|
49ee251238
|
quiet compiler
|
2015-09-12 09:59:25 -07:00 |
|
Brad Davis
|
9b81842850
|
Merge branch 'master' into homer
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
|
2015-09-11 16:31:18 -07:00 |
|
Seth Alves
|
b1c5a04531
|
respond to code review
|
2015-09-11 09:29:52 -07:00 |
|
Brad Davis
|
b7ffb96adf
|
Working on thread safety for the entity tree
|
2015-09-10 22:28:50 -07:00 |
|
Seth Alves
|
31fcd55d47
|
octree uses shared pointers
|
2015-09-08 11:59:48 -07:00 |
|
ZappoMan
|
4fe8f49d4c
|
move origin to center of domain
|
2015-08-11 23:47:40 -07:00 |
|
Andrew Meadows
|
f09b3eb736
|
set creation time when loading unknown timestamp
|
2015-07-17 12:14:07 -07:00 |
|
ZappoMan
|
0c0b8dbbc1
|
add stats for elements and entities per incoming packet
|
2015-07-02 16:19:13 -07:00 |
|
David Rowe
|
6623d0c552
|
Add "Reload" button associated with entity editor's script URL field
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
|
2015-06-17 16:11:32 -07:00 |
|
Seth Alves
|
5f3b902798
|
remove debugging print
|
2015-06-15 11:24:29 -07:00 |
|
Seth Alves
|
c1668553fd
|
make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening
|
2015-06-15 11:22:07 -07:00 |
|