Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0
trying to now show overlays in mirrors
2018-01-19 09:53:41 -08:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Olivier Prat
902bfac380
Merged with master
2018-01-18 18:31:04 +01:00
Seth Alves
97a4f141eb
fix link trouble
2018-01-18 08:12:14 -08:00
Sam Gateau
7a9740d258
visible-perview
2018-01-18 02:18:46 -08:00
SamGondelman
a44c965f56
fix black flashing on transparent objects
2018-01-17 15:59:07 -08:00
samcake
51ed878683
Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview
2018-01-17 09:32:03 -08:00
Olivier Prat
e6caa83d73
Merged with master
2018-01-17 16:35:31 +01:00
Olivier Prat
efa6a8c0b5
Merged with master
2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17
Fixed compilation with new shader system
2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
2018-01-16 19:02:12 +01:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Olivier Prat
54eab1c878
First working local lights on transparent objects
2018-01-15 17:49:55 +01:00
Sam Gateau
d6e771f01d
Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid
2018-01-13 10:02:53 -08:00
samcake
836b69ab1b
exposing several visibility flags
2018-01-12 17:42:18 -08:00
Olivier Prat
814de4ab81
Scribe now outputs shaders as cpp files.
2018-01-12 11:59:19 +01:00
SamGondelman
a9d5dda976
always push default haze to current frame
2018-01-04 17:54:23 -08:00
Nissim Hadar
409eade006
Merge branch 'master' into hazeOnTransparent
2017-12-14 11:41:53 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
...
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
samcake
63fb9b5503
fix float literal syntax
2017-12-11 09:30:31 -08:00
Olivier Prat
a679dc6705
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-11 08:48:48 +01:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Olivier Prat
92e1fe8e5c
Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug
2017-12-08 18:02:27 +01:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Bradley Austin Davis
2a91e98813
Fix iterator names
2017-12-06 14:26:07 -08:00
Brad Davis
e626ca3ccd
Working on scene threading optimizations
2017-12-06 14:26:07 -08:00
Olivier Prat
0b6dcb2717
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-05 09:18:26 +01:00
samcake
1514cdfb2f
extend the set of interface for multi highlight
2017-11-21 17:59:45 -08:00
samcake
a74372b233
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-20 09:26:29 -08:00
Brad Hefta-Gaub
33d35bbe14
Merge pull request #11770 from AndrewMeadows/sort-and-throttle
...
sort and throttle UpdateRenderables work... when necessary
2017-11-19 11:09:08 -08:00
samcake
e0740b323d
keep debuging the seelction highlight
2017-11-17 18:11:18 -08:00
Olivier Prat
d98dfff0a8
Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)
2017-11-17 19:25:21 +01:00
Olivier Prat
f8c241c429
Merged disappearing shadow bug fix from pcf branch
2017-11-16 12:19:19 +01:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom
...
Bloom
2017-11-15 15:11:31 -08:00
Olivier Prat
e4818f1b4f
Merged request changes from shadow
2017-11-15 17:51:06 +01:00
Olivier Prat
f47a3e7d2c
Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake
2017-11-15 09:42:57 +01:00
Andrew Meadows
5050a554a2
remove warning about signed/unsigned comparison
2017-11-14 15:57:17 -08:00
Olivier Prat
5102c8e1b1
Merged with master
2017-11-14 21:56:00 +01:00
Olivier Prat
7515c341ad
Merged with PCF fix with dithered filtering
2017-11-13 14:47:35 +01:00
Olivier Prat
dd6b7b04c2
Merged with master
2017-11-13 14:33:59 +01:00
Olivier Prat
fa58cf2e60
Merged with master
2017-11-13 14:07:48 +01:00
Olivier Prat
103e036b70
Shadow maps rendered in cascades
2017-11-10 18:30:37 +01:00
Olivier Prat
4f7ed38e98
Fixed potential link errors on Mac
2017-11-09 11:26:08 +01:00
Olivier Prat
bccd6df57c
Fixed warning on Mac and Ubuntu
2017-11-09 11:19:28 +01:00
Nissim Hadar
a8a118582d
WIP - passing uniform into model translucency shader.
2017-11-08 09:37:58 -08:00
Nissim Hadar
3d2c8186e7
Added Haze model as input to transparency shader.
2017-11-08 08:01:19 -08:00
Olivier Prat
39604363ea
Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes
2017-11-08 11:38:20 +01:00
Olivier Prat
ffa46b487a
Only non empty selections are now linked to highlight passes
2017-11-07 17:07:37 +01:00
Olivier Prat
9817cb4c44
Added highlight configuration in HighlightStageSetup job
2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02
Renamed outline to highlight
2017-11-07 11:07:25 +01:00
Olivier Prat
9e6472b577
Added OutlineStyleStage
2017-11-06 15:55:57 +01:00
Olivier Prat
fcf1c301b6
Merge branch 'master' of git://github.com/highfidelity/hifi into bloom
2017-11-03 18:12:15 +01:00
Olivier Prat
4b598a6e24
Working stencil mask with object bounding boxes
2017-11-03 14:26:36 +01:00
Olivier Prat
bced566510
Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo
2017-10-27 10:45:43 +02:00
Olivier Prat
5d83284ac5
Fixed small bug in shadow bounds computation
2017-10-26 16:47:20 +02:00
Olivier Prat
6cf689a385
First draft version of tighter shadow frustum
2017-10-26 12:42:36 +02:00
SamGondelman
046e5ca716
fix backwards HUD in mirror mode
2017-10-24 13:24:09 -07:00
Olivier Prat
3227b9d64a
Fixed potential bug when item doesn't have a payload
2017-10-20 09:50:37 +02:00
Olivier Prat
32df0209f3
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-10-19 17:38:05 +02:00
Olivier Prat
410b1904cd
Fixed bug in outline.qml that associated outline tab to wrong outline job config
2017-10-19 17:36:16 +02:00
Olivier Prat
25b3549e04
Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled
2017-10-18 15:00:53 +02:00
Olivier Prat
055270df9c
Removed compilation warnings on Mac and Ubuntu
2017-10-12 19:26:05 +02:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Olivier Prat
f55d44dfc3
Threshold now doesn't downsample anymore. Done in separate pass
2017-10-10 17:49:35 +02:00
SamGondelman
3acbd7820b
build error
2017-10-09 11:48:54 -07:00
Olivier Prat
0261265330
Working bloom but still visually unstable with geometry aliasing
2017-10-09 19:17:51 +02:00
Olivier Prat
cda48cbf67
Three blurs working
2017-10-09 15:13:32 +02:00
Olivier Prat
98d39ff9e0
Merged with master
2017-10-09 09:37:18 +02:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Nissim Hadar
794cb961d5
Merge branch 'master' into hazeZone
2017-10-04 23:03:59 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
Nissim Hadar
d4acb00aa5
Merge branch 'master' into hazeZone
2017-10-03 17:44:31 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
Andrew Meadows
e9d48a2713
fix warning about double-to-float conversion
2017-10-02 13:08:17 -07:00
Nissim Hadar
ffecf42ebb
Some clean-up.
2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c
Merging haze branch.
2017-09-30 00:04:28 -07:00
Nissim Hadar
95f8f1ffc5
Added Varying8
2017-09-29 18:05:48 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Olivier Prat
27b9f3516d
Added mix parameter to blur and bloom
2017-09-25 18:05:30 +02:00
Olivier Prat
22b1507597
Fixed blur to work correctly on four sides of screen
2017-09-25 16:41:20 +02:00
Olivier Prat
443d6dfacb
Added user definable taps in blur task
2017-09-25 14:24:40 +02:00
Brad Davis
27350bd7de
Don't add items to the scene graph until they have a valid parent chain
2017-09-20 16:52:23 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
Olivier Prat
d6d36cbd43
Outline working on voxels
2017-09-08 11:14:06 +02:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3
Created outline task but still need to create specific render job with z-pass shaders
2017-09-06 17:34:29 +02:00
Olivier Prat
700d4a4b43
First working version of outline working with selection interface.
2017-09-06 15:47:10 +02:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Zach Fox
3c7fadb1ce
Final touch
2017-08-24 14:30:42 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Zach Fox
52ef0f2037
More progress
2017-08-23 16:37:13 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
Olivier Prat
b08e2598c2
Some factorization in transition management and transition item application is now completely recursive on sub items and not just level 1 subitems
2017-07-21 12:49:51 +02:00
Olivier Prat
3316be4dea
Working fade parameters through instanced draw calls
2017-07-18 17:01:17 +02:00
Olivier Prat
1f14b6ef38
Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering
2017-07-17 17:50:59 +02:00
Olivier Prat
5e5148ca91
Merge branch 'fade' into fadeshape
2017-07-17 09:53:26 +02:00
Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Olivier Prat
96f0c35b79
Yet some more compilation fixes for Mac and Linux
2017-07-13 18:22:18 +02:00
Olivier Prat
93218da473
Fixed compilation errors on Mac and Linux
2017-07-13 17:51:16 +02:00
Olivier Prat
1b8696fdda
First draft of custom pipeline on geometry cache
2017-07-13 17:09:49 +02:00
Olivier Prat
736ecf0082
Fixed infinite recursion in collectMetaSubItems due to meta sending itself as sub-item
2017-07-13 14:43:41 +02:00
Olivier Prat
21a11d72c4
Added define to activate/deactivate transition support (fade) in Scene
2017-07-13 12:44:26 +02:00
Olivier Prat
53a92c1506
Fade edit is working again and time based transitions are garbage collected
2017-07-13 12:31:10 +02:00
Olivier Prat
4081cd2cbf
Merge branch 'fader' of http://github.com/samcake/hifi into fade
2017-07-13 11:19:28 +02:00
Olivier Prat
2d2722bfc5
Added async transition query on scene
2017-07-13 11:05:04 +02:00
Sam Gateau
b065b99b0b
fix linux compilation maybe
2017-07-13 09:30:04 +02:00
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
Sam Gateau
98cc8c0683
Refining the custom shader pipeline design and registration mechanism
2017-07-12 14:13:58 +02:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
Olivier Prat
381e0c64a8
Working avatar fade in / fade out except that it is also triggered on bubble collisions
2017-07-11 16:43:27 +02:00
Olivier Prat
aba8be595e
Separated fade categories from transition event types
2017-07-11 11:37:24 +02:00
Olivier Prat
9758a6ded0
Edition picking again (but without bounding box highlighting)
2017-07-10 17:57:02 +02:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
Olivier Prat
cc4e168369
Working fade again
2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c
Some objects fade and fixed crash due to invalid meta item id
2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a
First working fade
2017-07-10 15:27:09 +02:00
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
Sam Gateau
c3dd25e499
Drafting the mechanism to add shape pipeline
2017-07-07 18:26:10 +02:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Olivier Prat
4256a1f2a7
Preparing for merge with stage. DOESN'T COMPILE!
2017-07-07 15:16:20 +02:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Olivier Prat
5ab093dc38
Preparing to introducte TransitionStage
2017-07-07 11:01:47 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Olivier Prat
69a7ec42fd
Added fade state in render::Item
2017-07-07 09:16:54 +02:00
Olivier Prat
e178e36963
Fixed compilation error
2017-07-06 17:29:14 +02:00
Olivier Prat
018c0489f4
Merged with 21378
2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
Olivier Prat
5cee2cff9f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-07-04 17:48:07 +02:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
Olivier Prat
972db8f54c
Fixed compilation error on Mac and Linux
2017-07-03 17:17:37 +02:00
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Olivier Prat
87833abd31
Sky working again.
2017-06-30 16:46:25 +02:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Olivier Prat
6a31dc2659
Selection of edited object working
2017-06-29 12:13:55 +02:00
Olivier Prat
8a12d0c106
Fade effect working again for basic enter domain but with various Fade jobs
2017-06-29 08:54:23 +02:00
Sam Gateau
93963b3257
Apply the projection and deferred transform fixes found while working on spectator camera
2017-06-28 15:44:17 +02:00
Sam Gateau
904f22985c
CLeaning up comments
2017-06-26 16:43:04 +02:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Sam Cake
07e18eb3a8
Keep cleaning up the DeferredLightingEffect , removing stage s from there...
2017-06-22 01:12:32 -07:00
samcake
9ae2861ee6
Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements
2017-06-21 18:29:38 -07:00
samcake
56d5f4ec5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 11:25:07 -07:00
Sam Cake
09529f6592
One more refinemnt of the comment
2017-06-21 00:54:04 -07:00
Sam Cake
484aeed589
More comments on the getCOnfig call
2017-06-21 00:36:03 -07:00
Sam Cake
c35be446e6
adding profiling on the script engine call back to timer event
2017-06-21 00:06:45 -07:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
Sam Cake
5b6f6ab84f
Trying to fix the getCOnfig from QML...
2017-06-20 00:25:51 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
Zach Fox
cbdffce88e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
2017-06-19 13:53:29 -07:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Sam Cake
df340a5b55
COmpiling
2017-06-14 22:39:47 -07:00
samcake
d8380923f0
Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages
2017-06-14 18:06:42 -07:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
Olivier Prat
7d58c9a741
Fixed fade for shadow job
2017-06-08 17:09:08 +02:00
Olivier Prat
cba70e6be0
Fade working on voxel objects
2017-06-08 14:57:09 +02:00
samcake
bac66ee4c7
Introducing the renderview task
2017-06-06 18:00:41 -07:00
Olivier Prat
1433ae4b34
Merged from 21274
2017-06-05 11:12:57 +02:00
Sam Cake
1f090d8148
Debugging the size problem and fixing the compression size evaluation
2017-05-22 01:00:34 -07:00
samcake
c449229850
Cleaned up the counters for memory
2017-05-19 17:52:56 -07:00
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
samcake
b466964817
REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior
2017-05-16 18:21:24 -07:00
Sam Gateau
ff3cf7801a
Merge branch 'master' into 21274
2017-05-09 11:48:57 -07:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Olivier Prat
8071c04e98
Added fade effect prototype version
2017-04-27 10:31:06 +02:00
Atlante45
ad16a935e9
Texture::create returns shared pointer
2017-04-25 15:56:23 -07:00
samcake
c36f8da4c0
Fixing build on mac
2017-04-24 10:46:29 -07:00
Sam Cake
33d770c24e
removing the explicit SettingHandle path to REnder?engine
2017-04-24 00:52:09 -07:00
Sam Cake
fa62a1ba9d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-04-22 08:53:44 -07:00
Sam Cake
3691be4a2f
PUshing function to cpp
2017-04-22 08:53:13 -07:00
samcake
8e73fa3eb4
Separating the task classes in their own folder, and easing the declaration
2017-04-21 18:16:07 -07:00
sam gateau
733e268391
FIx the SSBO usage on amd, needed a bit more explanation on the glsl side
2017-04-21 16:17:18 -07:00
sam gateau
0a615f35a7
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-21 14:31:15 -07:00
Sam Cake
321d281919
Separating job/task classes from the render specific
2017-04-21 01:46:44 -07:00
samcake
63fe579022
simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'
2017-04-18 17:05:40 -07:00
Sam Cake
61ed5c3ce9
THank you mac
2017-04-15 01:35:28 -07:00
Sam Cake
038d01ce04
Avoiding temp variable reference to appease mac and fixing a warning
2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d
COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side
2017-04-14 23:22:45 -07:00
Sam Cake
bb15b8c701
ANd fixing the gl41 rendering
2017-04-14 00:46:41 -07:00
Sam Cake
29545f0918
FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend
2017-04-13 23:53:56 -07:00
Sam Cake
78bfc006f1
Prototyping the ResourceBuffer with the DrawBounds Job, yeah
2017-04-13 00:51:02 -07:00
samcake
d41f34ce8d
Adding support for the resource buffer
2017-04-12 19:07:27 -07:00
samcake
5daf365784
Avoiding warning maybe
2017-04-11 12:15:30 -07:00
samcake
612acbc6d5
Avoid pointers on temp var
2017-04-11 10:56:58 -07:00
Sam Cake
1dd98af1dd
And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue)
2017-04-11 01:21:45 -07:00
Sam Cake
80c781bcdc
Fixing warning on mac and more description of the Task class
2017-04-10 22:17:12 -07:00
Sam Cake
5d7accca2b
Avoiding the mac compilation problem maybe
2017-04-10 21:12:00 -07:00
samcake
4a47737d0b
REfining the Config behavior, trying to pr next
2017-04-10 19:01:49 -07:00
Sam Cake
e7fb18bd2f
MOving forward with the TaskConcept and TaskModel, all working
2017-04-10 02:51:19 -07:00
Sam Cake
a458828590
MOving forward with the TaskConcept and TaskModel, all working
2017-04-10 02:30:13 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
samcake
e6844f4294
Cleaning up the basic jobs of render
2017-04-07 18:35:27 -07:00
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -07:00
samcake
91f315f9ce
Adding the concept of selection to the scene
2017-04-06 11:27:48 -07:00
samcake
b8cb79113e
Nitpicking on the correct name maybe...
2017-04-06 10:30:24 -07:00
samcake
3de760abcb
Introduucing the tag to the scene
2017-04-05 18:35:06 -07:00
samcake
8267db6ce5
Add a description of the Transaction class
2017-04-05 14:19:00 -07:00
samcake
026e7bc249
Add a description of the Transaction class
2017-04-05 14:17:26 -07:00
samcake
5629cf425e
Cleaning up the files updated
2017-04-05 13:49:07 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
trent
3b8636b75c
Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.
2017-03-20 17:55:52 -04:00
samcake
0399249a03
Expeand the wireframe to the primitive entities and the polyvox
2017-03-15 16:58:31 -07:00
samcake
ea2f1359bc
Expose rendering in wireframe mode
2017-03-15 12:23:44 -07:00
Brad Davis
8782fe1d93
Merge branch 'master' into smarter_textures
...
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
sam
5257194c48
SImplify the overlay PLumber
2017-02-24 01:11:59 -08:00
sam
e1aad8bd63
Deep dive into the shape key and filters and the PLumber construction
2017-02-24 00:35:10 -08:00
sam
67031850aa
Deep dive into the shape key and filters and the PLumber construction
2017-02-24 00:05:54 -08:00
samcake
c7b164d8f2
Adding differenciation for the Material shapeKey bit
2017-02-22 18:21:18 -08:00
samcake
3cd422e508
Last clean up
2017-02-21 15:02:12 -08:00
samcake
55611d2373
Backing up to master
2017-02-21 14:56:07 -08:00
sam
d56f982dec
Maybe saving the first ktx textures, testing the save pipeline
2017-02-17 07:54:17 -08:00
samcake
37541e4ed2
Start capping the time budget for draw opaque
2017-02-10 14:29:29 -08:00
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
samcake
027bd30cbc
Removing macOS warning
2017-01-18 16:59:50 -08:00
samcake
e3da6aa9f1
Removing the comment
2017-01-18 15:03:31 -08:00
samcake
305e308575
avoiding the exclusive filtering behavior
2017-01-17 10:54:45 -08:00
samcake
960f4f0ead
Move the drawBOunds job to DrawTasks
2017-01-16 18:33:42 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Zach Pomerantz
e406e3d47e
Make Forward DrawBounds enableable
2017-01-03 14:46:51 -05:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Zach Pomerantz
15656a0592
include spatialSelection in RenderFetchCullSortTask::Output
2016-12-30 15:08:16 -05:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Brad Davis
901c020aae
Optimizations, SIMD and const correctness
2016-12-27 15:39:38 -08:00
Zach Pomerantz
ca1a14e5b0
add RenderFetchSortCull task
2016-12-23 15:54:22 -05:00
Zach Pomerantz
0fa3439949
add setOutput for graphics engine tasks
2016-12-23 15:35:28 -05:00
Zach Pomerantz
8d63067fa5
templatize graphics engine tasks' run method
2016-12-23 14:58:40 -05:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
samcake
9031e65aa5
Merge and fix the bug!!!
2016-11-16 19:12:56 -08:00
sam
bcef138545
FIx the context stats
2016-11-04 18:59:30 -07:00
samcake
f274ef1a59
Merging back with upstream and trying to fix counter for them to be more stable
2016-11-04 16:56:03 -07:00
samcake
6926cd274c
Merge with upstream
2016-11-02 18:15:08 -07:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Zach Pomerantz
cf82cc3f50
fix invalid ShapeKey ref
2016-10-18 17:59:30 -07:00
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07:00
sam
567adf651a
FOund 2 bugs causing the empty clusters. now back to working
2016-10-07 05:02:04 -07:00
samcake
5b4829e7b6
Brining back support for the ambinet lighting
2016-09-30 16:24:57 -07:00
samcake
9b94a025fc
Refining the voxelization of the sphere in the view frustum grid
2016-09-26 18:41:53 -07:00
Brad Davis
82db3d5d55
Disable support for framebuffer resizing
2016-09-23 12:04:57 -07:00
samcake
7a7a60a5c4
INtroducing a true stage for updating the light cluster and ui to debug
2016-09-11 00:17:34 -07:00
samcake
a0d09e3316
Fixing the vizualisation shader for world to cluster space
2016-09-10 10:14:31 -07:00
samcake
edb456aa8f
ANd again
2016-09-06 17:16:54 -07:00
samcake
1165c54f67
cleaning up the IndexedContainer in its own file and removing warnings
2016-09-06 16:24:03 -07:00
Brad Hefta-Gaub
8ec5798b7a
Merge pull request #8548 from samcake/blue
...
Exposing GPU & Batch running time to Engine gpu jobs
2016-09-02 09:31:09 -07:00
samcake
0c0109e427
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-01 15:20:34 -07:00
Stephen Birarda
7c45ed043e
fix solo render compile
2016-08-31 14:08:46 -07:00
samcake
2a5ee5d6b1
Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots
2016-08-30 14:28:52 -07:00
samcake
faef8a9930
Adding the timing for GPU support with a simpelr JobConfig
2016-08-30 12:22:21 -07:00
Seth Alves
09b7a5188c
a few more
2016-08-18 10:15:35 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Brad Davis
6d7edd38cc
Rename clearViewTransform
2016-08-12 22:28:59 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
SamGondelman
676f4bdfcf
misc fixes from particles branch
2016-07-29 15:36:32 -07:00
samcake
2618741505
Merging with upstream master and updating my old PR
2016-07-21 17:59:00 -07:00
samcake
8f663f20e0
FIx warnings
2016-07-19 13:24:03 -07:00
samcake
4742f40128
Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion
2016-07-19 12:23:57 -07:00
samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
samcake
a8dd06ad38
Better groupint of the diffuseion of the curvature for easier fix for mini mirror
2016-07-18 19:24:43 -07:00
samcake
34f2a96888
Adding the check for Obscurrance
2016-07-18 18:11:51 -07:00
samcake
5a0ce81516
Performing the curvature generation and diffusion at half the resolution
2016-07-18 03:54:05 -07:00
samcake
378f4576fa
a bit better making the curvature and diffusion passes
2016-07-17 20:18:06 -07:00
samcake
9332f82d54
Carrefully improving the curvature generation performances
2016-07-17 17:13:07 -07:00
samcake
c45f810622
Fixing the mac build
2016-07-14 16:43:56 -07:00
samcake
776bcb6655
FIxing the web entity rendering
2016-07-14 15:49:49 -07:00
Zach Pomerantz
e71a2097a5
update doc for task template
2016-07-14 13:19:49 -07:00
Zach Pomerantz
e4dabc6be4
fix task config initialization
2016-07-14 13:16:19 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
samcake
a42f9a5d0e
FIxing the mini mirror perf issue and the gamma correction
2016-07-14 10:53:13 -07:00
samcake
b9a2b2778e
Adding the support for the subregion in the blur passes to apply it correctly to mini mirror
2016-07-13 18:53:37 -07:00
samcake
51594fefa2
more clean up
2016-07-12 18:21:31 -07:00
samcake
cde17ecaab
Clenaing the rendering and the framebuffer allocations
2016-07-12 14:34:54 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
samcake
fa62a0a73c
One less warning
2016-07-07 18:05:36 -07:00
samcake
8f2bf2b423
Integrating the scattering to the local lights
2016-07-06 17:13:16 -07:00
samcake
2a52f1db7f
Adding the lighting model class to configure accross the jobs the lighting
2016-07-01 18:36:51 -07:00
samcake
ab21a5a5d5
FIxing the bad brdf and adding better debug tool and better Pipeline architecture
2016-06-29 18:59:06 -07:00
samcake
d128af48db
Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL
2016-06-28 13:47:55 -07:00
samcake
197d49fc03
introducing the depth aware blur
2016-06-27 17:04:37 -07:00
samcake
884b9211c6
Curvature is looking correct now without artefact, moving on to the lighting
2016-06-23 17:13:48 -07:00