Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
Brad Davis
b31300406a
Don't extend glow line length
2016-07-15 16:20:05 -07:00
Andrew Meadows
3e43859139
setCollisionModelURL() more symmetric with setURL()
2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc
namechange: fetchResource --> getGeometryResource
2016-07-13 15:13:35 -07:00
Andrew Meadows
9f7d2cf263
NetworkGeometry --> GeometryResourceWatcher
...
Model class gets render and collision geometries with watchers
also changed names for readability
2016-07-13 15:00:12 -07:00
Andrew Meadows
f6681d4b3d
remove unused cruft
2016-07-13 15:00:12 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Brad Davis
2c72037e81
Fixing warnings
2016-07-09 20:43:31 -07:00
Brad Davis
31948bce2d
Support alpha and color gradients in circle overlays
2016-07-09 20:43:30 -07:00
Seth Alves
5c69e55475
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-08 17:43:52 -07:00
Brad Davis
ae1dd29a7a
Fix depth writing for glow lines
2016-07-08 10:27:53 -07:00
Brad Davis
c644c87e69
Fix glow line vanishing, improve transparency interaction
2016-07-07 19:01:41 -07:00
Seth Alves
11542aeca2
pick against avatar's capsule and then against the T-pose mesh
2016-07-07 16:36:25 -07:00
Brad Davis
8ca3630cfa
Support glow effect in 3D line overlays
2016-07-07 13:36:48 -07:00
Seth Alves
5ab82cd7c8
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-02 15:11:59 -07:00
Brad Davis
b7926b8582
Don't render wire geometry with lighting effects
2016-06-30 16:11:05 -07:00
Seth Alves
5f9c7b6ea5
trying to take joint information into account when raypicking against models
2016-06-29 17:02:49 -07:00
Seth Alves
d53c7ae5d8
experimenting
2016-06-29 12:39:04 -07:00
Andrew Meadows
5d5dc2837b
fix comment
2016-06-20 17:29:20 -07:00
Brad Davis
196ab401e5
Merge pull request #8046 from SamGondelman/proceduralRaymarch
...
Exposed orientation and eye position to procedural entity shaders
2016-06-14 09:48:07 -07:00
SamGondelman
8a682450a9
still trying to fix cmake errors
2016-06-10 17:01:22 -07:00
Brad Hefta-Gaub
262e0262fc
Merge pull request #7889 from samcake/color
...
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
2016-06-08 17:38:45 -07:00
Andrew Meadows
c73757f740
use many colors for collision hull rendering
2016-06-03 10:47:54 -07:00
samcake
079f6af2cc
Fixing the gamma correction for the debug view of occlusion
2016-06-02 16:14:46 -07:00
samcake
2489df8229
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-06-02 15:16:41 -07:00
samcake
25eb569433
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-06-02 10:38:40 -07:00
samcake
1dca62f752
Introducing a new technique for normal packing and fixing a bug on the normal buffer format
2016-06-01 17:51:53 -07:00
samcake
3fe9b67e45
FIxing the reflection jittering by moving the normal into world space
2016-05-27 19:24:56 -07:00
Andrew Meadows
1132b4666a
Merge pull request #7975 from jherico/shared_shapes
...
Moving shape definition to a shared location
2016-05-27 07:28:11 -07:00
Brad Davis
2c02c963d4
Moving shape definition to a shared location
2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
samcake
b76cda3c89
Merge pull request #7945 from Geenz/20901
...
20901: Add Range Based Light Attenuation
2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
b8b39b962d
Merge pull request #7868 from jherico/entity_shape
...
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Geenz
bd6f6d2eef
Typo.
...
Not quite sure how this got here.
2016-05-23 09:53:22 -04:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Geenz
ff3fca3dc3
Remove no longer necessary light vector parameter.
2016-05-22 21:50:48 -04:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Geenz
a80f47e550
Merge remote-tracking branch 'highfidelity/master' into 20901
2016-05-20 21:12:42 -04:00
Brad Hefta-Gaub
95f7ea5609
Merge pull request #7922 from samcake/red
...
improve performance of Light volume pass
2016-05-20 09:33:55 -07:00
Geenz
6ecbdc6b9a
Modify evalLightAttenuation to "fade" edges of lights.
...
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.
This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
2016-05-19 20:03:05 -04:00
samcake
2d7118dacc
clening up the code
2016-05-19 10:21:00 -07:00
Zach Pomerantz
e1971f5ed3
Fix shadow bounds checking
2016-05-18 18:58:28 -07:00
samcake
185f069441
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-05-18 13:16:14 -07:00
samcake
89f18aee3b
Simplifying the deferredbuffer clear and enableing z test for lighting pass
2016-05-18 13:14:42 -07:00
samcake
8ec280535b
FIx bad roughness value read from the deferred buffer
2016-05-17 11:13:34 -07:00
samcake
d06c6e2a59
Fix forgotten vertex shader case
2016-05-16 17:54:42 -07:00
Anthony J. Thibault
55b0060df9
Convert JointData from relative frame to absolute.
2016-05-16 17:48:52 -07:00
samcake
a12e56f880
Fix forgotten vertex shader case
2016-05-16 17:43:54 -07:00