Andrew Meadows
592d29fc7c
Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration
...
fix collisions with non-default registration
2016-03-07 15:46:13 -08:00
Seth Alves
40c953e0b9
fix model hulls
2016-03-07 11:40:18 -08:00
Seth Alves
8b8604f9b0
move offset handling for models back to how it was before this PR
2016-03-07 11:32:25 -08:00
Seth Alves
c95d1f68f6
remove debug print
2016-03-06 14:38:03 -08:00
Seth Alves
5c585acd9a
offset is included in shape key for models
2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832
fix polyvox hull when registration changes.
2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54
cleanups
2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394
this seems to be working now. more cleanups to come
2016-03-06 12:59:33 -08:00
Seth Alves
8bc2c76a8b
change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape
2016-03-05 08:01:30 -08:00
Seth Alves
5bb50c7ea0
track api change in packDeferredFragment
2016-03-04 17:01:54 -08:00
Seth Alves
9346171695
if entity registration isn't default, adjust physics shapes to match
2016-03-04 16:47:30 -08:00
samcake
16ac69315f
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26
Use keyLight in DLE instead of _skyboxTexture
2016-03-01 14:44:34 -08:00
samcake
630c61e61d
Reflection is working correctly with the PBR property, ship t
2016-02-29 18:54:43 -08:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
Andrew Meadows
c4798870d5
Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix
...
Crash fix for RenderableBoxEntityItem::render
2016-02-26 10:25:50 -08:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
samcake
610189ded3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 14:14:04 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
Anthony J. Thibault
626b170207
Crash fix for RenderableBoxEntityItem::render
2016-02-25 14:10:23 -08:00
Zach Pomerantz
c20bd6cbbc
Update Scene on ZoneEntity update
...
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.
This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b
Avoid double-update of zone
2016-02-25 10:06:19 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Nex Pro
864f00ee61
Fixed inverted particle rendering.
2016-02-24 01:02:17 +00:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2
Render point/spot lights with surface radii
2016-02-22 15:07:08 -08:00
samcake
377ee5a486
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
2c7c6be6a6
fix build buster
2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-02-21 10:10:24 -08:00
Brad Davis
786747c2d7
Properly preserve and restore the GL context after building a web entity
2016-02-20 12:01:34 -08:00
samcake
39a7852979
MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders
2016-02-19 18:43:07 -08:00
Brad Davis
021b86c3fe
Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds
2016-02-19 15:41:40 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
samcake
71863a1550
Fixing the material names
2016-02-16 09:33:24 -08:00
Andrew Meadows
492c026f78
Merge pull request #7102 from zzmp/fix/model-tex-revert
...
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Zach Pomerantz
0e9d696859
Cache renderable model orig texs as QVariantMap
2016-02-15 11:09:10 -08:00
Zach Pomerantz
0903e14b06
Revert model texs when unset
2016-02-12 15:57:24 -08:00
samcake
c4faa091a1
Fixing initialization syntax
2016-02-12 11:31:21 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
James B. Pollack
2889bdd8b2
Merge pull request #7083 from ZappoMan/fixDoublePreload
...
handle two corner cases where preload would get called twice
2016-02-11 16:08:43 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
