Commit graph

15258 commits

Author SHA1 Message Date
samcake
c5c51f2af2 Make sure the resolution level for ao is correct 2016-01-19 18:57:03 -08:00
samcake
dc40337dc1 Adjusting default settings 2016-01-19 18:02:47 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Seth Alves
a2bec2a5bf Merge pull request #6857 from ctrlaltdavid/20779
Fix crash in Running Scripts when edit filter after highlighting script
2016-01-19 11:40:47 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes
Various fixes
2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow
Add RenderShadowTask
2016-01-18 15:45:51 -08:00
Howard Stearns
6f84a67453 Merge pull request #6840 from jherico/qml_cleanup
File dialogs and modal message boxes in QML
2016-01-18 15:04:37 -08:00
Howard Stearns
5caf10beed Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck
Include checking the angular size of entities on the server side for LOD support
2016-01-18 14:13:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub
b8747709ef CR feedback, dead code cleanup 2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove
namechange collisionsWillMove --> dynamic
2016-01-18 11:51:59 -08:00
Seth Alves
3b3720781f fix a place where parent's scale wasn't properly squashed 2016-01-18 11:15:53 -08:00
Seth Alves
d6e3b85237 fix javascript access via localPosition and localRotation 2016-01-18 11:15:32 -08:00
Seth Alves
4232e400cc add getJointIndex call 2016-01-18 11:15:03 -08:00
Zach Pomerantz
6434d98365 Separate directional shaders with(out) shadowmaps 2016-01-18 11:11:28 -08:00
Brad Hefta-Gaub
88af387214 cleanup 2016-01-18 10:10:24 -08:00
samcake
bc579f2605 Clening up the gpu::Timer behavior, now need a way to show it 2016-01-18 09:53:41 -08:00
Brad Hefta-Gaub
2774df38bc check for entity size before including it for LOD 2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
samcake
483c28dc2d Adding gpu timer feature to actually the GPU cost of rendering 2016-01-15 19:00:18 -08:00
David Rowe
51cb9dd05e Fix crash in Running Scripts when edit filter after highlighting script 2016-01-16 15:50:33 +13:00
Zach Pomerantz
7f3e102b5e Rename renderLights to renderItems 2016-01-15 17:55:07 -08:00
Zach Pomerantz
7fd20bb036 Set shadow pipelines manually to avoid duplication 2016-01-15 17:55:07 -08:00
Zach Pomerantz
331d32ef78 Add render Jobs for Shape sorting 2016-01-15 17:55:07 -08:00
Zach Pomerantz
4bbf206f64 Clean up DrawTask 2016-01-15 17:55:07 -08:00
Zach Pomerantz
625eee2b9c Clean RenderShadowTask ctor 2016-01-15 17:55:07 -08:00
Zach Pomerantz
f3a5be9ec0 Decrease shadowMap res to 1024 2016-01-15 17:55:07 -08:00
Zach Pomerantz
562c909ad8 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
b2c9cf7452 Fit shadowmap to viewFrustum better 2016-01-15 17:55:07 -08:00
Zach Pomerantz
2b27e48bf9 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
bc379e920b Update shadow programs 2016-01-15 17:55:07 -08:00
Zach Pomerantz
fad38c0bfb Add uniform buffer to LightStage 2016-01-15 17:55:07 -08:00
Brad Hefta-Gaub
29b9592c8c Merge pull request #6838 from ctrlaltdavid/20763
Fix reading model's "textures" property
2016-01-15 17:02:14 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
Brad Davis
bb02a1eda2 Fix JS web window crash caused by race condition 2016-01-15 14:45:40 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Zach Pomerantz
5c1c1e3a3b Change LightStage setFrustum signature to near/farDepth 2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81 Fix orientation of shadow frustum 2016-01-15 12:43:45 -08:00