Andrew Meadows
|
dfdf375853
|
use shapeInFrustum() names again
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
|
2016-02-25 18:09:35 -08:00 |
|
Brad Hefta-Gaub
|
202a456e1a
|
Merge pull request #7126 from AndrewMeadows/cleanup
cleanup ViewFrustum method names
|
2016-02-25 16:12:25 -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 |
|
Zach Pomerantz
|
32ce7c6eab
|
Rename light surfaceRadius->falloffRadius
|
2016-02-25 10:02:33 -08:00 |
|
Andrew Meadows
|
9c927ea36b
|
ViewFrustum method renames and whitespace cleanup
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
|
2016-02-25 09:11:28 -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 |
|
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
|
20bfdba14b
|
Avoid light prop copies when setting globalLight
|
2016-02-24 16:20:59 -08:00 |
|
Zach Pomerantz
|
1817b8ef2f
|
Use only skyboxTexture in DeferredLightingEffect
|
2016-02-24 16:07:28 -08:00 |
|
Zach Pomerantz
|
95d98e3ed7
|
Wire up zone ambientURL
|
2016-02-24 16:07:04 -08:00 |
|
Zach Pomerantz
|
124c84c8b9
|
Fix fxaa shader to use texture
|
2016-02-24 13:36:08 -08:00 |
|
Brad Hefta-Gaub
|
3df5d0abad
|
Merge pull request #7161 from zzmp/fix/overlay-model-scale
Use proper getter for model overlay scaling
|
2016-02-24 09:31:47 -08:00 |
|
Chris Collins
|
7f679af186
|
Merge pull request #7176 from zzmp/menu/graphics
Update graphics menus
|
2016-02-24 08:18:58 -08:00 |
|
Zach Pomerantz
|
ea8edb3744
|
Remove antialiasing from menus, default to on
|
2016-02-23 16:24:44 -08:00 |
|
Zach Pomerantz
|
7804ee22d4
|
Consolidate stats for opaque/transparent/other
|
2016-02-23 12:14:00 -08:00 |
|
Zach Pomerantz
|
7c9022fb3e
|
Fix model overlay scaling
|
2016-02-23 10:40:47 -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 |
|
Ryan Huffman
|
e6ccf501fa
|
Merge pull request #7135 from zzmp/fix/grid
Update renderGrid to use a shader, and fix grid edit tools
|
2016-02-22 12:58:23 -08:00 |
|
Zach Pomerantz
|
fd6aa9a78b
|
Add layering to renderGrid, draw edit grid not layered
|
2016-02-19 13:57:32 -08:00 |
|
Zach Pomerantz
|
791d295578
|
Move paint shader functions to Paint.slh
|
2016-02-19 11:48:44 -08:00 |
|
Zach Pomerantz
|
9daefbdb94
|
Fix grid antialiasing
|
2016-02-19 11:39:11 -08:00 |
|
Seth Alves
|
fea60499d4
|
rename poorly named variable
|
2016-02-19 11:32:59 -08:00 |
|
Zach Pomerantz
|
07a5c7bd16
|
Update grid shader for major/minor lines
|
2016-02-19 11:22:01 -08:00 |
|
Seth Alves
|
ee5a82f9b8
|
call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible
|
2016-02-19 10:05:22 -08:00 |
|
Zach Pomerantz
|
2d1c676a8b
|
Add qHash for Vec2FloatPair
|
2016-02-18 16:17:24 -08:00 |
|
Zach Pomerantz
|
2bfbf1b5fd
|
Reimplement renderGrid to use frag shader
|
2016-02-18 11:30:03 -08:00 |
|
Zach Pomerantz
|
7ccb7e1c79
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-17 13:57:42 -08:00 |
|
Zach Pomerantz
|
bab29a0d3e
|
Compare fragLightVec square to LightCutoffSquareRadius
|
2016-02-17 12:49:41 -08:00 |
|
Brad Hefta-Gaub
|
d5c349abec
|
Merge pull request #7114 from samcake/hdr
Adding Ambient lighting to transparent surfaces
|
2016-02-17 09:08:38 -08:00 |
|
samcake
|
29bacd23df
|
Fixing the rendering of the avatar skeleton
|
2016-02-15 18:56:46 -08:00 |
|
samcake
|
a740f4a6de
|
Removing unecessary code
|
2016-02-15 17:41:20 -08:00 |
|
samcake
|
b9d14b74ee
|
Adding the GLobalKeyLighting to transparents, the ambient lighting
|
2016-02-15 17:27:28 -08:00 |
|
samcake
|
0639b2ace0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-02-15 13:27:55 -08:00 |
|
samcake
|
545f276fdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-15 09:29:00 -08:00 |
|
samcake
|
e6d15c3d56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-02-12 18:22:30 -08:00 |
|
samcake
|
4559e75f90
|
Trying to solve the ambient issue
|
2016-02-12 18:22:01 -08:00 |
|
Brad Hefta-Gaub
|
e003fe5f4b
|
Merge pull request #7081 from zzmp/fix/mini-mirror-ao
Disable AO in mini mirror
|
2016-02-12 17:37:45 -08:00 |
|
samcake
|
9bfeb4a1d5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-12 11:31:47 -08:00 |
|
samcake
|
c248732bc7
|
Getting the array initialization right ?
|
2016-02-12 10:27:08 -08:00 |
|
samcake
|
40c283cba2
|
Fixing some warnings
|
2016-02-12 10:21:28 -08:00 |
|
samcake
|
40455af7fc
|
LEss warning
|
2016-02-12 10:16:20 -08:00 |
|
Zach Pomerantz
|
d516e9da78
|
Only run AO in DEFAULT_RENDER_MODE
|
2016-02-12 09:01:54 -08:00 |
|
samcake
|
b94c2c9b7f
|
Introducing a cleaner filtering pipeline, normally it s good to go
|
2016-02-11 18:40:36 -08:00 |
|
Zach Pomerantz
|
d0f3ad75b8
|
Nest Persistent in Config to compile on nix
|
2016-02-11 10:27:32 -08:00 |
|
Zach Pomerantz
|
a7778daed2
|
Change graphics dialog to persisted dropdowns
|
2016-02-11 10:15:13 -08:00 |
|
samcake
|
31230e81bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-11 10:05:58 -08:00 |
|
samcake
|
355b8ee40d
|
THursday morning the frustum culling seems broken in one particular angle
|
2016-02-11 10:05:39 -08:00 |
|
Zach Pomerantz
|
3bace3cdbb
|
Rework the qml for brevity
|
2016-02-11 08:48:01 -08:00 |
|
Zach Pomerantz
|
86412c1890
|
Fix default debug buffer size
|
2016-02-11 08:47:59 -08:00 |
|