Commit graph

3326 commits

Author SHA1 Message Date
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Andrew Meadows
4b8840f307 Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Seth Alves
ca86ce59c2 fix a bug that cuased dynamic children to wink in and out and then vanish 2017-08-30 17:44:42 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class.
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Anthony J. Thibault
4f830cf1dc Calculate jump speed based on canonical jump height. 2017-08-25 15:34:51 -07:00
Anthony J. Thibault
e0ff7f5f40 Moved speed constants into AvatarConstants.h 2017-08-25 10:47:54 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Anthony J. Thibault
246097b65e WIP support for scale within SpatiallyNestable class.
currently disabled by the SPATIALLY_NESTABLE_SCALE_SUPPORT pre-processor symbol.
2017-08-24 11:18:38 -07:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
2017-08-21 17:42:24 -07:00
Anthony J. Thibault
d196743986 Added Avatar::getHeight() method 2017-08-21 17:42:22 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
Anthony J. Thibault
f72a94e195 warning fixes 2017-08-11 17:28:50 -07:00
Anthony J. Thibault
b050d2c4c7 fix case on include for linux 2017-08-11 15:15:43 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision
Also added debug rendering functionality.
2017-08-10 15:52:51 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Brad Davis
0e508432c4 PR comments 2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389
WL21389 PR1:  Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Brad Davis
17b06e8e12 Fix log warnings from non-notifiable properties 2017-07-29 11:54:39 -07:00
LaShonda Hopper
cc4fbc97cd [WL21389] PR1 Update based on code review discussion & feedback (details below).
* Removed some left overs from prior approach.
* Moved _collisionShapeType & getShapeType override from ShapeEntityItem to
  RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903)
* Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID
** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909

Note(s):
* Retested and the cylinder behaves as expected along with the Box & Sphere shapes
  save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048)
* Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to
  ellipsoid behavior given default change.

Changes Committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/shared/src/ShapeInfo.cpp
2017-07-28 15:59:17 -04:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Andrew Meadows
6b386000db initialize 'success' and use for return value 2017-07-27 17:11:13 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
Brad Davis
8d37e54a4e Merge pull request #11051 from highfidelity/qt59
Changes for Qt 5.9 warnings and build issues
2017-07-25 15:05:28 -07:00
LaShonda Hopper
ef1e426273 [WL21389] Some code and todo cleanup in prep for PR1.
Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
2017-07-25 15:27:02 -04:00
Leander Hasty
d155c02640 [WL21389] wip and modifications based on comments
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518

Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.

Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
2017-07-25 15:20:35 -04:00
LaShonda Hopper
75403124b6 [WL21389] Addresses physics library dependency and has some other fixes (details below).
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting

NOTE(s):
  This compiles and runs.  Cylinder is spawned and treated as CYLINDER_Y.

TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0 [WL21389] Collision Shapes need to be updated (details below).
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision.  The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.

ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.

ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system.  This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.

Note(s):
    This is similar to the original approach save translation between entity::Shape and ShapeType
    isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
    directly solves the issue of getting the actual ShapeType used by the time it's needed
    to determine the bullet collision object type created when initializing the physic information.

    Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
    ShapeFactory which handles creating the bullet collision objects when setting up
    physics on the ShapeEntityItems.

Known Issue(s):
    This doesn't compile.  It appears that the Entity Library needs to know about
    the Physics Library.  The naive attempt at providing that link failed to resolve
    all compilation issues.

    Current Error:
    C1083: Cannot open include file: btBulletDynamicsCommon.h:
    No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
       C:\projects\cusack\libraries\physics\src\ShapeFactory.h	15	1	entities

	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/physics/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
	new file:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
2017-07-25 14:43:07 -04:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00