Commit graph

2926 commits

Author SHA1 Message Date
samcake
af1180255e fixes from code review 2017-11-08 11:45:40 -08:00
samcake
75ce61c3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-08 11:30:53 -08:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix
Haze mask fix
2017-11-07 17:37:24 -08:00
samcake
0718763ed1 Adjust syntax 2017-11-07 17:31:15 -08:00
samcake
6481e0f713 Address cauterized cluster matrices issue 2017-11-07 12:52:23 -08:00
samcake
053052a95d removing warnings 2017-11-03 13:28:20 -07:00
Sam Gateau
390f5b53ca cleaning more code 2017-11-02 23:55:44 -07:00
Sam Gateau
c11f46a8d3 cleaning more code 2017-11-02 23:35:18 -07:00
Sam Gateau
421aacd8eb Yes 2017-11-02 22:45:19 -07:00
Sam Gateau
70134d67eb Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-02 19:49:22 -07:00
Sam Gateau
f097d66721 YEp it s working 2017-11-02 19:49:01 -07:00
samcake
d33c75865e Removing unecessary test 2017-11-02 18:11:13 -07:00
samcake
83bfa1c5f2 Progressing on the cluster updates 2017-11-02 17:57:46 -07:00
Nissim Hadar
d8191e3bd2 Fixed Mask test. 2017-11-02 12:45:18 -07:00
Andrew Meadows
db9c3cc103 make Model::scaleToFit() public not protected 2017-11-02 12:31:36 -07:00
Sam Gateau
56510abd1e Trying to set the ClusterBuffer in the render loop instead of the game loop 2017-11-02 03:45:27 -07:00
Nissim Hadar
2e6c849b63 Added comment. 2017-11-01 20:31:44 -07:00
Nissim Hadar
67552d2b7d Change stencil mask used with Haze. 2017-11-01 17:39:37 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Nissim Hadar
b00db6a68f Correction. 2017-10-30 19:20:49 -07:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -07:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Andrew Meadows
2710dca37c fix rendering of Circles and Quads 2017-10-26 22:58:50 -07:00
Sam Gateau
6051a3913f Merge pull request #11684 from NissimHadar/bugFix8610
Bug fix 8610
2017-10-26 10:55:29 -07:00
Nissim Hadar
2ec62ecc9b Reduced haze background blend range to 27,000 metres. 2017-10-25 15:12:01 -07:00
Nissim Hadar
bfab466827 Bug 8610. 2017-10-25 14:13:53 -07:00
Nissim Hadar
8d11ace1a6 Bug 8610. 2017-10-25 13:46:59 -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
Brad Hefta-Gaub
ef78711b7b Merge pull request #11663 from AndrewMeadows/shape-sharing
fix incorrect collision shape sharing for some ModelEntityItem configurations
2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub
2a865f3a45 Merge pull request #11666 from SamGondelman/mirrorMode
Fix backwards HUD in mirror mode
2017-10-24 21:03:29 -07:00
SamGondelman
046e5ca716 fix backwards HUD in mirror mode 2017-10-24 13:24:09 -07:00
Andrew Meadows
27f4d182d9 fix scale of rendered collision geometry 2017-10-24 13:23:46 -07:00
Nissim Hadar
f81675e3b4 Changed blend range from 32,000 m to 30,000m 2017-10-24 13:17:09 -07:00
LaShonda Hopper
d1ab1c5e26 [WL21389] Fixes issue with the ShapeData vert buffer offset (details below).
When computing the buffer view offset for ShapeData the vertex vector
size should be scaled by a single vec3 size as opposed to 2.

This fix is taken from PR discussion:
 https://github.com/1P-Cusack/hifi/pull/10

 Proposed by: Andrew Meadows <andrew@highfidelity.io>

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:25 -04:00
LaShonda Hopper
226d51b8f5 [WL21389] Fix scaling issue when computing hull point list (details below).
The entity dimensions should be scaled by 1 as opposed to 0.5.

Changes Committed:
    modified:   interface/src/Util.cpp
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:25 -04:00
LaShonda Hopper
d027993ac0 [WL21389] Address code review feedback (details below).
* Renamed squared var to be consistent with format of others in the code base.
* Removed fabsf() that was accidentally left in.
* Reduced squared distance filter within GeometryCache::computeSimpleHullPointListForShape
  as suggested from 0.0025f to recommended 1.0e-6f (1mm^2).

Feedback Link:  https://github.com/highfidelity/hifi/pull/11336#pullrequestreview-70060918

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:25 -04:00
LaShonda Hopper
070660eb04 [WL21389] Switch to _positionView & filter dupe verts for ShapeInfo (details below).
* Adjusts GeometryCache::computeSimpleHullPointListForShape to utilize
  ShapeData::_positionView as opposed to _normalView.
** Also filters out duplicate points or points close enough to be considered
   duplicate vertices.  This provides ShapeFactory with better point data
   and should reduce hits to the dedupe pass within createConvexHull.

Tested:
* Octagon & Tetrahedron
** They looked better than the prior commit, behaved closer to their shape as opposed
   to cone or narrow cylinder like.

Note:
* These changes are based on debug info observations using the Octagon and
  discussion with Andrew Meadows via Slack & https://github.com/highfidelity/hifi/pull/11336#pullrequestreview-69939120

Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:25 -04:00
LaShonda Hopper
0ad95806e3 [WL21389] Update point list function in line with GeometryCache::ShapeData update.
Changes Committed:
    modified:   libraries/render-utils/src/GeometryCache.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
7f9ce5a4cd [WL21389][BuildFix] Minor refactor due to render-utils lib change (details below).
As of Commit b93e91b9, render-utils no longer knows about entity lib.
This commit adjusts for that by altering the signature of
GeometryCache::computeSimpleHullPointListForShape to take in portions
of ShapeEntityItem data as opposed to the entity pointer.

Fixes build failure mentioned in:
 https://github.com/highfidelity/hifi/pull/11336#issuecomment-333635794

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

Changes Committed:
	modified:   interface/src/Util.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:23 -04:00
LaShonda Hopper
789b850846 [WL21389] Addresses feedback from PR #11336.
* Removes todos from ShapeEntityItem::shapeCalculator stub commit.
* Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape.
* Moves cone handling to its own section for better contextual flow.

Changes Committed:
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:23 -04:00
LaShonda Hopper
8a4ac9ebc4 [WL21389] Resolves size_t vs int warnings in GeometryCache.
Reviewed-by: Kris Pivin <krispivin@1stplayable.com>

Changes Committed:
	modified:   libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:23 -04:00
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
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
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00