Commit graph

61323 commits

Author SHA1 Message Date
LaShonda Hopper
070c664ff2 [WL21389] Add out of bounds safeguard to computeShapeInfo helper (details below).
* Switched direct map indexing to helper function which has out of bounds safeguard.
* Also updated GeometryCache::getShapeForEntityShape default fallback return from
  GeometryCache::NUM_SHAPES to GeometryCache::Sphere inline with general preference
  to act as if a shape is a sphere in the event of an error.

Changes Committed:
	modified:   libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:23 -04:00
LaShonda Hopper
d2350974b5 [WL21389] Avoid vector copy within shapeInfoCalculator.
Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Util.cpp
2017-10-24 14:16:23 -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
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Andrew Meadows
9981a44b71 add hook for ShapeInfo calculator 2017-10-24 14:15:08 -04:00
Seth Alves
58501bd0b0 Merge pull request #11661 from Delanir/Gizmos
FogBugz 7425 - Billboard orientation and grabber move up tool are now dependent on the Avatar referential.
2017-10-24 10:32:29 -07:00
Daniela
059c5c1806 billboard is now using a general formula to calculate the rotation, where we don't assume y is up. Added dependency on the avatar. 2017-10-24 14:49:17 +01:00
Daniela
30a5b00b6e Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-24 14:44:06 +01:00
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00
Seth Alves
7793506d0f Merge pull request #11640 from jherico/fix/fb8406
Fix for shape size flickering
2017-10-23 17:39:36 -07: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
Zach Fox
3e139283ba Remove unnecessary newlines 2017-10-23 17:31:21 -07:00
samcake
ccdda798c0 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-23 17:12:31 -07:00
Zach Fox
97d44e62c8 Fix bugs 2017-10-23 16:52:32 -07:00
Dante Ruiz
0242e8e4ba fixed crash and login password 2017-10-23 16:33:49 -07:00
Zach Fox
53081b51a6 Clean up as much as possible 2017-10-23 16:00:39 -07:00
Andrew Meadows
26226fe968 Merge pull request #11654 from SamGondelman/lineEdit
Update Line3DOverlay renderTransform if end changes
2017-10-23 15:36:37 -07:00
Bradley Austin Davis
4f5851f420 Reducing needless render updates 2017-10-23 15:31:25 -07:00
David Back
80dc98b2c2 remove prints 2017-10-23 14:23:45 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07:00
SamGondelman
55ba093f09 update line render transform on end edit 2017-10-23 13:09:40 -07:00
Zach Fox
f90060afab Merge pull request #11651 from zfox23/commerce_ChangeTimerForDemo
Auto-refresh Wallet Home & Purchases on 4s timer
2017-10-23 12:40:08 -07:00
Zach Fox
03b46c5e62 Merge pull request #11652 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer (Updated)
2017-10-23 12:22:21 -07:00
Seth Alves
d3a859d207 Merge pull request #11648 from ElderOrb/mouse_pointer_fix
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-10-23 11:57:46 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
Zach Fox
30bffdea32 Quick bugfix 2017-10-23 11:45:51 -07:00
Cain Kilgore
b60b58ff35 zFox Changes 2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3 WL 21508 - Improve upon Skybox Changer
This involved a second PR, due to optimizing the way the Skyboxes are laid  out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
Daniela
32b5776743 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-23 18:51:40 +01:00
Zach Fox
5c8451a626 Auto-refresh Wallet Home & Purchases on 4s timer 2017-10-23 10:36:23 -07:00
Melissa Brown
20787c9c7c Merge pull request #11644 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
SamGondelman
9bbb2eb692 austin's comments, send events directly to selected web entity 2017-10-23 10:17:45 -07:00
Cain Kilgore
b42afdaff0 WL 21508 - Cleanup from Code Review 2017-10-23 16:27:28 +01:00
Brad Hefta-Gaub
ea38b32dea Merge pull request #11646 from ZappoMan/callServerEntityMethod
implement support for Entities.callEntityServerMethod()
2017-10-22 18:56:35 -07:00
ZappoMan
44f8bf00bc move remoteCallerID to Script.remoteCallerID 2017-10-22 17:14:11 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
ZappoMan
fb7f6df694 CR feedback 2017-10-22 11:40:41 -07:00
Ken Cooke
c555d0785b Merge pull request #11647 from vladest/create_audio_cues
Add sound cues to create app
2017-10-22 11:34:21 -07:00
beholder
cadf00fecf add missing 'eyeToWorld' assignment 2017-10-22 19:27:04 +03:00
vladest
b791dcba7f Add sound cues to create app 2017-10-22 14:59:53 +02:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Ken Cooke
bd418364e1 Merge pull request #11645 from vladest/goto_sound_cues
Sound cues for GoTo interface
2017-10-21 17:37:56 -07:00
Brad Hefta-Gaub
6607be5b58 Merge pull request #11642 from sethalves/fix-action-deadlock
fix action (grab) deadlock
2017-10-21 12:27:40 -07:00
vladest
cf7b050680 Sound cues for GoTo interface 2017-10-21 20:47:56 +02:00
Cain Kilgore
bc772a2f9a WL 21508 - Improve upon Skybox Changer 2017-10-21 19:42:53 +01:00
Sam Gateau
50a3ccdbca Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-21 10:01:07 -07:00
Bradley Austin Davis
e85494b958 Merge pull request #11643 from SamGondelman/billboard
Fix Image3DOverlay isFacingAvatar
2017-10-21 01:09:50 -07:00
SamGondelman
88b8d7bc46 fix image3d overlay isFacingAvatar 2017-10-20 16:56:42 -07:00
Sam Gateau
7754061505 Merge pull request #11634 from highfidelity/hazeZone
Fogbugz 8477: Crash on loading older domains that have zones without the haze component.
2017-10-20 16:01:13 -07:00