24443 commits

Author	SHA1	Message	Date
Nissim Hadar	97756146b1	Attempt to add qml configuration	2017-10-02 09:09:36 -07:00
Nissim Hadar	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
Nissim Hadar	95f8f1ffc5	Added Varying8	2017-09-29 18:05:48 -07:00
Nissim Hadar	951ce247a2	Working on adding zone to haze.	2017-09-29 17:36:14 -07:00
Nissim Hadar	2e1919eba5	Merge branch 'master' into hazeZone	2017-09-29 15:16:46 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
Sam Gateau	fb5fd346ff	Merge pull request #11492 from SamGondelman/tPose ... Fix getting stuck in T-Pose on avatar switch	2017-09-29 13:37:31 -07:00
Andrew Meadows	8134e2b7f9	fix const violation	2017-09-29 11:34:36 -07:00
Andrew Meadows	32910e6f40	use [this] for lambda capture list	2017-09-29 11:34:35 -07:00
Andrew Meadows	f5f1a64c92	use const ref on pointer, and use dynamic_cast	2017-09-29 11:34:35 -07:00
Andrew Meadows	b16d666026	remove dupe addToNeedsParentFixupList() call	2017-09-29 11:34:35 -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
SamGondelman	f2de03bc38	small fixes and LOD cull children instead of parent	2017-09-29 11:34:35 -07:00
Andrew Meadows	b1b7764056	use 20 degrees of OVERSEND	2017-09-29 11:34:35 -07:00
SamGondelman	c39ac93fc8	fix isVerySimilar	2017-09-29 11:34:35 -07:00
Andrew Meadows	355a59edb1	fix missing entities in differential traversal	2017-09-29 11:34:35 -07:00
Andrew Meadows	d55d45f6aa	check radius in ViewFrustum::isVerySimilar()	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	0597970bb4	faster, more correct ViewFrustum::isVerySimilar() ... remove OVERSEND hack add ViewFrustum::calculateProjection() method used by OctreeQueryNode	2017-09-29 11:34:34 -07:00
SamGondelman	defed80be7	edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes	2017-09-29 11:34:34 -07:00
SamGondelman	7938e301e7	full scene traversal and json filters	2017-09-29 11:34:34 -07:00
SamGondelman	0ad5f47bfd	trying to fix entity editing bugs, needs testing	2017-09-29 11:34:34 -07:00
SamGondelman	6c066605cd	add state to entity tree send thread	2017-09-29 11:34:34 -07:00
Andrew Meadows	b6818c4369	first-pass sending entities from _sendQueue	2017-09-29 11:34:34 -07:00
Andrew Meadows	1562fb153e	cherrypick traverseTreeAndBuildNextPacketPayload()	2017-09-29 11:34:34 -07:00
Andrew Meadows	cf2e500ec4	remove unnecessary const qualifiers	2017-09-29 11:34:33 -07:00
SamGondelman	bb5368eb55	use correct rootSizeScale	2017-09-29 11:34:33 -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	7597088c7c	simpler logic flow	2017-09-29 11:34:33 -07:00
Andrew Meadows	3e50d01734	more correct handling of LOD	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	0758b60afc	abstract DiffTraversal out of EntityTreeSendThread	2017-09-29 11:34:33 -07:00
Andrew Meadows	8d535f9c5a	remove bump to changeFromRemote for server case (revert)	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	dd1febba2f	add missing bump to element changed content	2017-09-29 11:34:33 -07:00
Andrew Meadows	481df49386	on server: note time of entity edit by remote	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	ca470d67b4	fix indentation	2017-09-29 11:34:32 -07:00
Andrew Meadows	7edd99ca0b	add basics for send queue and tree traversal	2017-09-29 11:34:32 -07:00
Andrew Meadows	82ed19386f	make Octree::readBitstreamToTree() virtual	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
Andrew Meadows	55e9ced5c3	cleanup MovingEntitiesOperator	2017-09-29 11:34:32 -07:00
Andrew Meadows	4fa60f5108	cleanup AddEntityOperator	2017-09-29 11:34:32 -07:00