Commit graph

3554 commits

Author SHA1 Message Date
David Rowe
e4daaa8d67 ViewFrustum JSDoc 2017-11-12 12:50:39 +13:00
David Rowe
9d9f684af5 Tidying 2017-11-12 11:44:51 +13:00
David Rowe
39ccd7d656 Update JSDoc for Camera API 2017-11-12 11:04:35 +13:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Andrew Meadows
469b68011c
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
div by zero fixes, detected by address sanitizer
2017-11-10 13:47:40 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
2017-11-10 11:31:46 -08:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
Olivier Prat
8b6a2eeb24 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-10 10:19:32 +01:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Olivier Prat
09ee69db30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-06 09:47:48 +01:00
SamGondelman
55ac585cd9 Merge remote-tracking branch 'upstream/master' into ui 2017-11-03 17:32:13 -07:00
SamGondelman
ce58b6c401 trying to fix HUD events, abstracting touch event logic (wip), seth's comments 2017-11-03 17:15:30 -07:00
SamGondelman
dd4275430b fix hover events, working on HUD events 2017-11-02 17:48:37 -07:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00
Atlante45
7616fe193c Migrate the DS config version to the config file 2017-10-31 17:35:23 -07:00
SamGondelman
64665c87b2 replace ids with unsigned ints 2017-10-31 17:07:48 -07:00
Stephen Birarda
b8370128ce remove master config from HifiConfigVariantMap/domain-server 2017-10-31 16:19:50 -07:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07: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
b00d158342 remove DoubleHashKey: it is no longer used 2017-10-27 07:52:51 -07:00
Andrew Meadows
45e571dd02 cleanup ShapeInfo::getHash() 2017-10-27 07:52:51 -07:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
SamGondelman
7951826e49 more advanced laser focusing 2017-10-26 16:10:27 -07:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
Olivier Prat
186b531be6 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-26 15:12:09 +02:00
Olivier Prat
6cf689a385 First draft version of tighter shadow frustum 2017-10-26 12:42:36 +02:00
Andrew Meadows
c14bbb76e6 fix compile errors after merge 2017-10-25 11:57:44 -07:00
Andrew Meadows
2d0b94817c Merge pull request #11336 from 1P-Cusack/21389_PR2
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Seth Alves
815f680475 Merge pull request #11675 from ZappoMan/fixRayPick
fix ray pick in cases where origin is inside of outer bounding box
2017-10-25 07:07:36 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
ZappoMan
9b94f33304 fix ray pick in cases where origin is inside of outer bounding box 2017-10-24 20:48:59 -07:00
Andrew Meadows
996b71fa9a avoid incorrect ShapeManager dupes for compound shapes 2017-10-24 13:23:46 -07:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
LaShonda Hopper
d3e4d22ce1 [WL21389] Resolve ShapeInfo todos (details below).
* Added remaining cylinder/capsule shapes to computeVolume
* Point lists are generated during computeShapeInfo, so shouldn't
  need to be cleared within setParams.
** setSphere/setBox appear to be clear as they're used in tests or
   in local scopes without using point data.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   libraries/shared/src/ShapeInfo.cpp
2017-10-24 14:16:25 -04:00
LaShonda Hopper
5c8e73bb54 [WL21389] Minor: Fix size_t vs int comparison warning.
Changes Committed:
    modified:   libraries/shared/src/ShapeInfo.cpp
2017-10-24 14:16:24 -04:00
LaShonda Hopper
e74ebd53c6 [WL21389] Add SHAPE_TYPE_SIMPLE_HULL case to ShapeInfo::getHash (details below).
Generates hashes for Simple Hull instances by incorporating their
point list into the hash as opposed to the extents.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   libraries/shared/src/ShapeInfo.cpp
2017-10-24 14:16:24 -04:00
LaShonda Hopper
9d64a3b991 [WL21389] Fixes warnings from last commit (details below).
* Fixes int vs size_t comparison warning within ShapeInfo.
* Fixes unused var warning for shapeVerts local var within GeometryCache.

This should fix the mac & ubuntu builds.

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/shared/src/ShapeInfo.cpp
2017-10-24 14:16:24 -04:00
LaShonda Hopper
dbd1a80046 [WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below).
* Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its
  entity::Shape type was changed.
* Adds getNameForShapeType static method to ShapeInfo.
** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp
* Adds collisionShapeType to ShapeEntityItem::debugDump

* Tested creating shapes within the Creation Menu:
** Create Menu -> (Box/Sphere)
*** Observe Properties tab auto-focus
** From Properties tab elect alternate shape type from the Shape Dropdown list.

NOTE:  While this fixes an issue with the collision shape, it doesn't completely
       resolve the issues seen with the polyhedra or polygonal shapes noticed on
       RELEASE-7130 rebase.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   libraries/entities/src/EntityItemProperties.cpp
    modified:   libraries/entities/src/ShapeEntityItem.cpp
    modified:   libraries/shared/src/ShapeInfo.cpp
    modified:   libraries/shared/src/ShapeInfo.h
2017-10-24 14:16:24 -04:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
2017-10-24 14:16:17 -04:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Olivier Prat
68ed061ce5 Again, fix for Mac warning 2017-10-23 16:49:42 +02:00
Olivier Prat
7011fd3731 Removed Mac and Ubuntu warnings 2017-10-23 15:46:11 +02:00
Olivier Prat
0f120a1a2a Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-23 10:08:02 +02:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables
Faster renderables update
2017-10-20 13:43:08 -07:00
SamGondelman
d7745efc8e one global pickmanager 2017-10-19 16:55:24 -07:00
Andrew Meadows
c79bf3bc04 cleanup WANT_DETAILED_PROFILING 2017-10-19 14:31:50 -07:00
SamGondelman
3572f7f5db non-templated pickresult wip 2017-10-19 13:41:16 -07:00
Seth Alves
633f63df54 fix updateQueryAACube return-value 2017-10-19 13:19:19 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
cf960dc44b not a parent or child doesn't mean always recompute queryAACube 2017-10-19 13:19:06 -07:00
Seth Alves
f75e59c0a6 keep grabbed and worn entities from spamming entity-server 2017-10-19 13:18:37 -07:00
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
Olivier Prat
382262da3d Working scissor with correct projected bounding box rect 2017-10-19 16:23:13 +02:00
Olivier Prat
f890c5bb8c Added project rect and scissor test. Need to increase bounds to take into account blur width 2017-10-18 19:40:03 +02:00
SamGondelman
640ad514bc updates based on austin's comments 2017-10-17 17:53:10 -07:00
SamGondelman
05f4883104 get rid of valid 2017-10-17 16:15:54 -07:00
SamGondelman
3ef7ebffba working generalized pickmanager 2017-10-17 15:09:41 -07:00
SamGondelman
596be8ec27 pickmanager wip 2017-10-17 13:16:37 -07:00
Nissim Hadar
5bfbaf4860 Renamed HazeMode to ComponentMode. 2017-10-13 11:24:56 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities
Import av entities
2017-10-12 13:30:53 -07:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Anthony J. Thibault
18d723b6b4 div by zero fixes, detected by address sanitizer 2017-10-10 16:17:39 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities""
This reverts commit 28a8b18060.
2017-10-09 11:52:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub
80f0bd3b79 Merge pull request #11494 from humbletim/add-console-output-basenames
[experiment/feedback] Include script name with all JS/QML debug output
2017-10-06 17:58:19 -07:00
Nissim Hadar
e34fb1c874 Merge branch 'master' into hazeZone 2017-10-06 13:20:12 -07:00
Seth Alves
195d96bd43 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 11:02:35 -07:00
Ryan Huffman
9c06afc4c8 Merge pull request #11326 from cain-kilgore/21537
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Cain Kilgore
b3c3b2d34f Switched Time & Session ID Over 2017-10-05 19:42:31 +01:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81 faster rate counting 2017-10-02 13:08:17 -07:00
Nissim Hadar
ffecf42ebb Some clean-up. 2017-10-01 21:12:29 -07:00
Nissim Hadar
2e1919eba5 Merge branch 'master' into hazeZone 2017-09-29 15:16:46 -07:00
humbletim
fd917917c4 include the source basename in Script.print() && QML/Script console.*() debug output 2017-09-29 14:48:01 -04:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8 fix isVerySimilar 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
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
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Ryan Huffman
0e3c2f2e50 Fix ambiguous conversion to QVariant in StatTracker 2017-09-27 15:22:23 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
SamGondelman
a73fdf4397 fix pointer event properties 2017-09-25 10:19:42 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
Nissim Hadar
953ddfdcd3 First version of adding haze to the zone. 2017-09-21 14:54:16 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Andrew Meadows
b803344f0c Merge pull request #11421 from jherico/fix/transform_log_spam
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
Brad Davis
27350bd7de Don't add items to the scene graph until they have a valid parent chain 2017-09-20 16:52:23 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Atlante45
b9e5957c9f Remove unused Algorithms.h 2017-09-18 16:14:06 -07:00
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
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Cain Kilgore
2427008ff3 Static 2017-09-13 17:40:04 +01:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01: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
Cain Kilgore
f6e22b0733 Changes
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
2017-09-09 17:21:42 +01:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
Cain Kilgore
7b39cb7791 Should work now 2017-09-08 21:44:38 +01:00
Cain Kilgore
dfbd25fd77 Now pls 2017-09-08 20:51:41 +01:00
Cain Kilgore
7f4cc0ed2a Should fix the Mac Build 2017-09-08 20:21:17 +01:00
Cain Kilgore
b953c49461 Commit for Better Logger - WL 21537 2017-09-08 03:20:55 +01:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07: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
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
859ec57ded Move Baking Status 2017-08-25 10:54:33 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -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
Ryan Huffman
b862336d17 Add PathUtils::generateTemporaryDir() 2017-08-21 13:40:51 -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