58 commits

Author	SHA1	Message	Date
Sam Gateau	521ce3936b	I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...	2019-10-07 15:19:23 -07:00
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
sabrina-shanman	20fa78e51d	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
David Rowe	70ec84177a	Doc review	2019-05-14 10:32:28 +12:00
David Rowe	73fd61dcf0	Picks, PickType, RayPick JSDoc update	2019-04-25 13:19:07 +12:00
SamGondelman	ca8d64bc05	removing overlays wip	2019-01-24 14:59:45 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
Howard Stearns	05becb870f	remove urls from logs in Interface	2018-11-06 13:47:07 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
sabrina-shanman	e7c70705b2	Actually make the result transform of a collision pick just a position, as documented	2018-09-27 17:33:52 -07:00
sabrina-shanman	44efe648e0	Add scaleWithParent option to collision pick creation	2018-09-27 17:29:42 -07:00
sabrina-shanman	3ac9478101	Assign _mathPick in the Pick constructor	2018-09-27 11:30:57 -07:00
sabrina-shanman	237022d304	Refactor new pick parenting system for use with RayPick, ParabolaPick	2018-09-14 10:28:15 -07:00
sabrina-shanman	d2c41f02e5	Avoid unnecessary type conversion in CollisionPick::getHUDIntersection	2018-09-12 10:36:00 -07:00
sabrina-shanman	87b5605d69	Add normalOnPick to CollisionPickResult	2018-09-12 10:36:00 -07:00
sabrina-shanman	9a86b7451b	Add collision group parameter to collision pick and set my avatar as the default	2018-09-10 14:35:04 -07:00
sabrina-shanman	7839ba42db	Make the Collision Pick threshold scale with the largest dimension of the parent	2018-09-06 11:02:07 -07:00
sabrina-shanman	84a2512f31	Fix collision pick scale not being used	2018-09-05 16:51:27 -07:00
sabrina-shanman	4d85cb17f3	Include full transform in CollisionPick::getResultTransform	2018-08-31 10:46:17 -07:00
sabrina-shanman	9bf088d32b	Just assign mathPick.loaded in CollisionPick::getMathematicalPick	2018-08-31 10:28:45 -07:00
sabrina-shanman	1fe909f9ad	Make CollisionPick::getResultTransform() always return a valid transform	2018-08-29 16:33:51 -07:00
sabrina-shanman	686f9fb18a	Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean	2018-08-29 16:29:59 -07:00
sabrina-shanman	2d73b7845e	Code style fixes	2018-08-29 15:00:01 -07:00
sabrina-shanman	397b03d5d5	Add threshold parameter to collision pick with minimum of 0	2018-08-27 14:12:24 -07:00
sabrina-shanman	6e160ad22f	Add TransformNode-based parenting and implement for CollisionPicks	2018-08-24 15:47:52 -07:00
sabrina-shanman	9c36519e87	Fix cross-platform build error in ColliisonPick.cpp (binding to temporary)	2018-08-20 12:42:23 -07:00
sabrina-shanman	813290aad8	Do filtering with copy vector in CollisionPick::filterIntersections	2018-08-20 11:23:22 -07:00
sabrina-shanman	444224a11a	Fix ignoring elements in CollisionPick::filterIntersections	2018-08-20 11:07:52 -07:00
sabrina-shanman	74f482b361	Revert "Convert entityIntersections/avatarIntersections lists in" ... This reverts commit aa4a6b2eae.	2018-08-20 10:15:28 -07:00
sabrina-shanman	2a182a0033	Revert "Do not create a reference to a shared pointer in CollisionPick.cpp" ... This reverts commit 130cb70a52.	2018-08-20 09:24:07 -07:00
sabrina-shanman	51940898d9	Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections	2018-08-17 16:23:31 -07:00
sabrina-shanman	6081d63f53	Use std::vector::insert for merging CollisionPickResults	2018-08-17 14:23:02 -07:00
sabrina-shanman	e3c39020dc	Exit early from CollisionPick::filterIntersections on empty blacklist	2018-08-17 14:23:02 -07:00
sabrina-shanman	2933038d04	Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum	2018-08-17 14:22:42 -07:00
sabrina-shanman	130cb70a52	Do not create a reference to a shared pointer in CollisionPick.cpp	2018-08-16 10:39:13 -07:00
sabrina-shanman	67ff05739a	Take advantage of CollisionPickResult intersections being shared pointers to avoid copying on result comparison	2018-08-16 09:00:30 -07:00
sabrina-shanman	aa4a6b2eae	Convert entityIntersections/avatarIntersections lists in ... CollisionPickResult to shared pointers	2018-08-16 08:59:29 -07:00
sabrina-shanman	61d12923ea	Do not copy list of collision pick contact points when filtering them	2018-08-15 11:12:50 -07:00
sabrina-shanman	b32b811fff	Move up buildObjectIntersectionsMap in CollisionPick.cpp	2018-08-09 17:24:09 -07:00
sabrina-shanman	26ae688d59	Refactor CollisionPickResult::toVariantMap	2018-08-09 17:11:32 -07:00
sabrina-shanman	c5e9f02372	Finalize Collision Pick API naming convention for intersectingObjects	2018-08-09 16:59:23 -07:00
sabrina-shanman	4f077080b0	Change API naming for intersectingObjects in CollisionPickResult and update docs	2018-08-09 15:29:21 -07:00
sabrina-shanman	c40db2e8f0	Add pick filtering to CollisionPick	2018-08-06 10:50:23 -07:00
sabrina-shanman	c6b24496c8	Add 'loaded' parameter to CollisionPickResult to indicate if the collision region is loaded	2018-08-03 17:56:01 -07:00
sabrina-shanman	e7766039b9	Pass pick variant map into unsuccessful/default collision results	2018-08-03 17:55:54 -07:00
sabrina-shanman	cf34a2cffd	Do not const cast CollisionRegion	2018-08-03 17:55:54 -07:00
sabrina-shanman	a06f85faa8	Consolidate intersection information in CollisionPickResult to one list, and move variant conversion code to source file	2018-08-02 11:27:04 -07:00
sabrina-shanman	de7d974336	Re-name EntityIntersection to ContactTestResult and remove its default constructor, plus update related variables	2018-07-30 16:45:31 -07:00