Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 20:49:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 25 branches 0 tags 1.1 GiB
Commit graph

3167 commits

Author SHA1 Message Date
SamGondelman
194b7d6655 warning 2017-08-14 16:08:07 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Olivier Prat
c88082301e Small changes to respect coding rules 2017-08-14 22:43:39 +02:00
Olivier Prat
358373aeac Base gradient size edition works again on Elements enter domain event 2017-08-14 11:41:01 +02:00
Olivier Prat
92d5a0c552 Fixed non working fade invert parameter 2017-08-14 11:21:47 +02:00
Olivier Prat
d86c3c4f2a Outline is now drawn with framebuffer with no depth buffer attached to prevent concurrent depth clear on NVidia GPU cards 2017-08-11 11:33:46 +02:00
Olivier Prat
d61652f958 Fixed compilation errors due to merge with master 2017-08-11 10:11:19 +02:00
Olivier Prat
1763ecd4c6 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-11 09:38:00 +02:00
SamGondelman
e4c954e862 merge from master 2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68 properly fix AA stenciling 2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f working on fixing non-AA overlays 2017-08-10 16:07:40 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Olivier Prat
b410f97aef Adjusted kernel size to real pixel blur width 2017-08-10 10:54:28 +02:00
Olivier Prat
189cc8efd0 Outline width is now screen aspect ratio independent 2017-08-10 10:12:10 +02:00
Olivier Prat
392a99f038 Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio 2017-08-09 19:18:16 +02:00
Olivier Prat
0f2c41b009 Added outline intensity 2017-08-09 18:27:39 +02:00
Olivier Prat
57dfe10baf Fixed blur problems on screen edges 2017-08-09 18:15:05 +02:00
Olivier Prat
01a028cbb6 First alpha working version of outline 2017-08-09 18:03:52 +02:00
Olivier Prat
f36500a74c Working outline debugging view 2017-08-09 14:52:52 +02:00
Olivier Prat
cfa23b1758 Writing out depth buffer of outlined objects to texture working 2017-08-09 12:32:32 +02:00
Olivier Prat
0fb4e42e1f Improved PickItemJob with item key filter 2017-08-09 11:52:31 +02:00
Olivier Prat
44ee7c4bf1 Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete 2017-08-08 18:41:57 +02:00
Olivier Prat
27227d6bd2 Simplified pick item jobs by using inherited enabled flag in render::Job::Config 2017-08-08 17:45:17 +02:00
Olivier Prat
7de6079df8 Added PrepareOutline job to save outlined zbuffer 2017-08-08 15:28:36 +02:00
Olivier Prat
add675e16c Create PickItemsJob than can be used to select a render item in front of the camera 2017-08-08 12:04:44 +02:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
a1107deef1 cleanups 2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3 vertex color support in ModelScriptingInterface 2017-07-23 08:06:26 -07:00
Olivier Prat
22acf1aeaf Removed unused variable to suppress warning on Mac and Ubuntu 2017-07-21 13:57:00 +02: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
Seth Alves
72e5fecb4e do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex 2017-07-20 16:34:34 -07:00
Olivier Prat
aaba44cf4d Merge branch 'fade' into fade2 2017-07-20 13:39:56 +02:00
Olivier Prat
a50c267d0b Fading on polyline now works when the polyline is added to the scene 2017-07-20 12:45:14 +02:00
Olivier Prat
7cfccc03a4 Fixed bug on AMD due to improper alignement issues on UBO with layout(std140) in GLSL 2017-07-20 10:31:35 +02:00
Seth Alves
be48268be8 getMeshes handles registration point 2017-07-19 15:02:40 -07:00
Seth Alves
750b7192af trying to get the resulting model to line up with the originals 2017-07-19 13:58:03 -07:00
Seth Alves
a8698c2fbc EntityScriptingInterface::getMeshes support for Model entities 2017-07-19 08:59:09 -07:00
Olivier Prat
b652d94a43 Added fade on poly line entities 2017-07-19 17:11:06 +02:00
Olivier Prat
abc751ef9c Fade seems to be working on shape items with instanced drawing. 2017-07-18 18:25:54 +02:00
Olivier Prat
3316be4dea Working fade parameters through instanced draw calls 2017-07-18 17:01:17 +02:00
Olivier Prat
dbf0b64dfb Refactored Fade.slh to take into account differences between instanced draw and normal draw 2017-07-18 12:49:34 +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
f8b2ffe359 Removed transparency on fading shapes 2017-07-17 15:06:32 +02:00
Olivier Prat
db7871fca7 Merge branch 'fadevoxel' into fadeshape 2017-07-17 14:33:00 +02:00
Olivier Prat
3f8daa21ec Created FadeEffect singleton to be able to get fade item & batch setters for every special entity render 2017-07-17 14:26:41 +02:00
Olivier Prat
146f934019 Cleaned up shader code as fade position is now world position 2017-07-17 11:59:10 +02:00
Olivier Prat
5e5148ca91 Merge branch 'fade' into fadeshape 2017-07-17 09:53:26 +02:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
Seth Alves
12f52e8f20 don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready 2017-07-13 13:18:21 -07:00
Olivier Prat
4d5f2ebdfe Removed unused variable that prevented build on Linux 2017-07-13 18:45:08 +02:00
Olivier Prat
96f0c35b79 Yet some more compilation fixes for Mac and Linux 2017-07-13 18:22:18 +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
53a92c1506 Fade edit is working again and time based transitions are garbage collected 2017-07-13 12:31:10 +02:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +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
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
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
0c3755483b adding assert or checks whenever getting a scene stage 2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +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
Sam Gateau
a8086764da REmoving warnings for unused var 2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47 REmoving comments 2017-07-07 11:38:25 +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
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
Sam Gateau
48b4b5f49c Fixing the bug appearing on Nvidia 284.76 2017-07-05 18:39:09 +02:00
Olivier Prat
b1b11ec756 Correct fix for mac and linux due to multiple Logging.h files 2017-07-05 09:08:51 +02:00
Olivier Prat
23bfc2c13d Fixed compilation on mac and linux 2017-07-04 18:36:54 +02:00
Olivier Prat
5cee2cff9f Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-07-04 17:48:07 +02:00
Olivier Prat
45342a00fd Forced faded objects to double sided (without correct lighting for the moment) 2017-07-04 17:45:32 +02:00
Olivier Prat
704effc0a6 Added cubic interpolation in noise for rounder effect 2017-07-04 17:38:45 +02:00
Olivier Prat
2525fe5869 Working save and load 2017-07-04 17:31:24 +02:00
Olivier Prat
98d915cf0f Smoother ease in / out functions 2017-07-04 14:35:43 +02:00
Olivier Prat
7d851c1cbd Added timing parameters and visual debug of threshold 2017-07-04 12:01:28 +02:00
Olivier Prat
0244dd6325 Working bubble isect trespasser POV 2017-07-04 09:47:23 +02:00
Olivier Prat
57b2bdf709 Working bubble isect owner POV 2017-07-04 09:14:08 +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
f2b8bd4c84 Merged with 21378 2017-07-03 16:44:00 +02:00
Olivier Prat
ec1cf9dc50 Changed array initialization to old style C 2017-07-03 16:42:27 +02:00
Olivier Prat
0d1d262db4 Working on bubble intersections 2017-07-03 16:28:00 +02:00
Olivier Prat
3fddac9f6e Fixed compilation errors with array initializations 2017-07-03 16:12:23 +02:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
af7957491b Working avater enter/leaves + manual threshold 2017-07-03 12:40:58 +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
c5ca23f4ea Changing edited fade category properly updates widgets in edit window 2017-06-29 17:14:20 +02:00
Olivier Prat
fb33b8d1c1 Working edition and emissive edge on fade element enter/leave 2017-06-29 12:59:43 +02: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
76dae279cf Removing the default case from the renderer 2017-06-27 14:24:34 +02:00
Sam Gateau
7687bdc060 less comments & constant 2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980 less comments & constant 2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38 less comments & constant 2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29 less comments & constant 2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d One less constant 2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c CLeaning up comments 2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d Removing commented objects from deferredlighting effect 2017-06-26 14:34:09 +02:00
Olivier Prat
1bb0d51849 Merged with master 2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-26 10:05:04 +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
Anthony J. Thibault
2dcca2125b Merge branch 'master' into feature/pole-vector 2017-06-21 15:50:03 -07:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -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
Olivier Prat
2e3ffe7721 Disabled check on enabled physics when deciding is fade is adequate 2017-06-19 18:19:36 +02:00
Anthony J. Thibault
323dc62ef2 Merge branch 'master' into feature/pole-vector 2017-06-16 17:37:11 -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
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
Olivier Prat
5eeff5aa28 Fixed unwanted red tint due to unreset color attrib in ModelMeshPartPayload 2017-06-14 10:23:12 +02:00
Olivier Prat
ef60f78d2b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-14 10:16:02 +02:00
Anthony J. Thibault
03a6f7082e Merge branch 'master' into feature/pole-vector 2017-06-13 15:37:59 -07:00
Anthony J. Thibault
f20c03fa6e Pole vectors can be controlled via anim vars. 2017-06-13 15:36:05 -07:00
Zach Fox
79b6dc3f78 Remove one more instance of FramebufferCache 2017-06-13 15:26:07 -07:00
Zach Fox
52ea7e7994 Rendering improvements based on spectator-camera changes 2017-06-13 15:19:29 -07:00
Olivier Prat
ace301945c Added scale and duration debug parameters in debugFade.qml 2017-06-13 15:31:04 +02:00
Olivier Prat
24d45e0f5b Updated from upstream master because of change of protocol 2017-06-13 10:43:25 +02:00
Olivier Prat
f3d252ee65 Switched fade curve to easeInOutQuad 2017-06-13 08:50:50 +02:00
Brad Davis
db8bdbc0a6 Merge pull request #10659 from samcake/orange 
simple Render Engine refactors coming from the Spectator Cam project
 2017-06-12 20:31:07 -07:00
Zach Fox
e96c55956f First pass at the fix 2017-06-12 09:53:14 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
samcake
bb38938534 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-09 14:34:25 -07:00
Liv
7785473ccb moving else 2017-06-09 12:59:08 -07:00
Liv
8c488d95d1 Stylish updates 2017-06-09 11:46:38 -07:00
Liv
1808505d8b Coding standard fixes 2017-06-09 10:54:57 -07:00
Liv
34bd2b8a2b style fix 2017-06-08 09:01:01 -07: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
Olivier Prat
20d4fcbbc7 Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL 2017-06-08 09:24:12 +02:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Liv
c3bf915fd4 Changing loop to avoid unused warnings 2017-06-07 15:04:39 -07:00
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -07:00
Olivier Prat
de143d0ea2 Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class 2017-06-06 17:07:20 +02:00
Olivier Prat
a9ab9d2476 Renamed FadeManager to FadeEffect 2017-06-06 16:27:56 +02:00
Olivier Prat
8af2f75996 Added FadeManager to centralize some common fade effect data and functions 2017-06-06 16:11:12 +02:00
Olivier Prat
e7eca7728f Debug fade management moved out of the inner render loop 2017-06-06 14:57:52 +02:00
Liv
5579c409e7 Style fix 2017-06-05 18:03:10 -07:00
Liv
42cb2332d5 Remove unimplemented comment on circle 2017-06-05 17:46:13 -07:00
Liv
393aa84a55 Renaming conical to isConical 2017-06-05 17:45:52 -07:00
Liv
e4963e076a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 17:38:28 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
506f522802 use correct format for float literals 2017-06-05 08:54:05 -07:00
Olivier Prat
1936c209a5 Working fade debugging scripts for both opaque and transparents 2017-06-05 17:21:33 +02:00
Olivier Prat
cce99ef8c4 Added translucent shaders 2017-06-05 16:56:57 +02:00
Olivier Prat
74bb3213e4 Added shadow shader variants 2017-06-05 16:44:32 +02:00
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
Howard Stearns
3d62900daf When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works. 2017-06-03 16:49:16 -07:00
samcake
f70702beb7 Introducing debug flags 2017-06-02 17:54:41 -07:00
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
samcake
4a419f2d07 Merging with upstream 2017-06-01 18:25:24 -07:00
samcake
14f9a9848e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-01 18:05:47 -07:00
samcake
c5e9551bab more cleanup 2017-06-01 18:05:18 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
Sam Cake
ea6be93c9c adding another flavor of the prepare stencil 2017-06-01 01:24:57 -07:00
Sam Cake
e02115bcda clearing up the stencil jobs 2017-05-31 23:00:05 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
Sam Cake
b528c2fc60 Merged 2017-05-31 19:33:14 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Liv
8bcaacbe40 Removing incomplete torus function 2017-05-31 15:46:35 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Sam Cake
32c5dac66a Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil 2017-05-31 00:55:28 -07:00
samcake
8559ed6260 Starting to add the stencil mask for hmd 2017-05-30 16:37:10 -07:00
Liv
2808ab4865 Sort of making progress on torus vertex buffer 2017-05-26 10:45:29 -07:00
Liv
10408a0fe4 basic circle function to be used as base for torus 2017-05-25 15:32:49 -07:00
Liv
fee26c3976 Remove not yet implemented comment from Cone shape 2017-05-25 13:12:08 -07:00
Liv
ffbe39df0a Refactor to add optional conical parameter to existing extrude polygon function 2017-05-25 13:06:24 -07:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Liv
362e08a90d Add extrudePolygon for cylinder 2017-05-25 10:23:28 -07:00
samcake
c256893575 some clean up: 2017-05-23 18:00:22 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Thijs Wenker
712aff7ad6 base scale attachment on the natural dimensions 2017-05-23 17:53:08 +02:00
Chris Collins
207c13c3c3 Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer 
MeshPartPayload keeps weak pointer to Model
 2017-05-22 21:54:40 -07:00
Andrew Meadows
f7db877b7f payload keeps weak pointer to Model 2017-05-22 17:29:15 -07:00
Sam Gateau
589bcc19ce Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer 2017-05-19 17:50:19 -07:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Andrew Meadows
17b6cf29df check for valid resource pointer before use 2017-05-18 15:12:59 -07:00
Sam Gateau
b8a2b38fd5 Displaying the stack of zone components 2017-05-18 12:54:25 -07:00
Andrew Meadows
8d3285f733 verify _rig is valid in Model::deleteGeometry() 2017-05-18 11:11:50 -07:00
Sam Cake
5edcc38eba Polishing the scope shaders 2017-05-18 01:06:59 -07:00
Sam Gateau
966afa1e4a Adding the drawKeyLight shader 2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11 Adding the drawKeyLight shader 2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce Adding the drawKeyLight shader 2017-05-17 18:12:48 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations 
TriangleSet optimizations - ~80% improvement in Ray picking against models
 2017-05-16 20:47:50 -07:00
samcake
2cd2c95940 Adding more debugging tool 2017-05-16 16:12:31 -07:00
Ryan Huffman
8eacf0ad4b Remove unnecessary assert in Model.cpp 
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
 2017-05-16 10:56:33 -07:00
Sam Cake
4c3ddfbff9 Adding debuging of the ambient lighting 2017-05-16 01:01:19 -07:00
samcake
db4387e55d Trying to mess with the defautl texture for skybox 2017-05-15 17:31:29 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
samcake
75facdfa88 Testing the new behavior with the BackgroundStage, 2017-05-09 17:31:18 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
samcake
bbb513220b Moving forward 2017-05-08 17:33:24 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002 
fix render of debug collision shapes
 2017-05-08 20:35:59 +02:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations 
Fix sped up animations
 2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9 Using the items to pick the key light! 2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
samcake
b6c966ef39 Keep iterating on the zones 2017-05-05 18:07:21 -07:00
samcake
bc1e5101ac Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-05 16:13:51 -07:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression 
Feat/normal map compression
 2017-05-05 10:03:01 -07:00
samcake
64317f5fd0 Adding a light item per zone 2017-05-04 16:47:03 -07:00
Andrew Meadows
f11d6eff92 fix typos: RenderItemsMap not RenderItems 2017-05-04 15:43:44 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Atlante45
f728ae7955 Remove unecessary normalize 2017-05-04 12:38:27 -07:00
Atlante45
ea2b188b64 Recompute Y from X/Z for normal maps 2017-05-04 10:33:34 -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
111f0762ea Added debug scripts and fade position is now stable 2017-04-30 14:42:27 +02:00
Olivier Prat
6a39c25dc7 Merged from master because protocol has changed 2017-04-27 10:59:51 +02:00
Olivier Prat
8071c04e98 Added fade effect prototype version 2017-04-27 10:31:06 +02:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
Atlante45
70ece9f0fd Load skybox first and sounds later 2017-04-26 14:57:23 -07:00
Atlante45
a2f7a88433 Start drawing models before we get the textures 2017-04-26 10:49:23 -07:00
Atlante45
6fb074715e Fix alpha rendering bug 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
472c888529 Fix handling of failed ktx downloads 2017-04-26 10:48:24 -07:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -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
samcake
8e73fa3eb4 Separating the task classes in their own folder, and easing the declaration 2017-04-21 18:16:07 -07:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
samcake
5af171f69f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-18 17:08:02 -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
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -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
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
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
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -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
58cec3fb96 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-07 11:55:08 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
samcake
cb94e1009d Adding a job... 2017-04-06 18:10:28 -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
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
samcake
6385a702cd FIxing the bug for image3D overlay drawn in scene 2017-04-04 12:56:43 -07:00
samcake
b18d82bd19 adding different shaders for transparent for simpel 2017-04-04 11:50:38 -07:00
samcake
a882beb2fd Trying to fix the overlay Image3D shading pipeline used 2017-04-03 17:35:28 -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
25edb44b75 Fix the problem with the cursor and scattering, 2017-03-30 15:15:14 -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
samcake
9bc7e41642 Remove extra calls for binding default textures, not needed 2017-03-29 10:57:08 -07:00
samcake
a1bf1beab4 Merge pull request #10014 from samcake/blue 
Fixing the roughness/reflection quantization bug
 2017-03-28 14:50:24 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -07:00
Sam Cake
e87bc91d0e Fixing the roughness/reflection quantization bug 2017-03-26 11:48:02 -07:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215 
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Sam Cake
022e91b35d Clean comments and pixel format used 2017-03-24 00:26:14 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -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
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
samcake
e05abf2a2f Fixing the spherical harmonics gneration 2017-03-20 16:41:21 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
samcake
03e1c5e0f2 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-03-20 15:10:09 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232 
21232 - Remove Mini Mirror from View menu
 2017-03-20 09:55:37 -07:00
Sam Cake
a804bc723f Keep pushing and debugging ambient lighting 2017-03-20 00:32:06 -07:00
Sam Cake
3a08611c26 Fix the typo in the assert for isWireframe 2017-03-19 17:33:28 -07:00
Sam Cake
8584d80bb8 KEep exploring the ambient lighting 2017-03-19 17:00:42 -07:00
Triplelexx
8b845658e2 remove redundant declarations 2017-03-18 05:00:05 +00:00
samcake
8b8f9d7b1a Fix a problem of the ambient lighting diffuse beeing too sstrong, we found a nice balance together with Alan 2017-03-17 18:26:48 -07:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu 
Avatar inputs only contains the audio meter now.
 2017-03-18 00:53:13 +00:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4 
minor cleanup of render pipeline for models and avatars
 2017-03-16 10:39:43 -08:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
Andrew Meadows
cf848d73e4 don't updateClusterMatrices() in render() 2017-03-15 16:03:36 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
samcake
e0f0cc2102 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:49:44 -07:00
Anthony J. Thibault
d38b994f4c Fix for potential crash due to DebugDraw data race. 
(cherry picked from commit 1b8a624edb)
 2017-03-13 15:23:16 -07:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet 
Cleanup how Models do ray-picking and determination of point inside of convex hull
 2017-03-07 14:12:56 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00
Seth Alves
694fc58374 restore missing shading pipeline for simple opaque in deferred 2017-03-07 12:07:24 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08: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
Andrew Meadows
1b8f6b9835 Merge pull request #9784 from samcake/blue 
Fixing Emissive on overlay for models (opaque and transparent)
 2017-03-06 13:24:00 -08:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
samcake
21f36d7212 removing comments and restoring the correct behavior for Pal.js 2017-03-06 12:41:00 -08:00
ZappoMan
af97e9bdd9 CR feedback 2017-03-06 10:49:38 -08:00
ZappoMan
2a663cbcb1 cleanup 2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409 cleanup use of triangleSet for picking 2017-03-05 19:23:55 -08:00
ZappoMan
32add6635d checkpoint on reducing raypicking recalcs 2017-03-04 23:33:17 -08:00
Ken Cooke
a5571bd49d redo unsafe optimization 2017-03-04 16:02:39 -08:00
ZappoMan
9908723bb9 fist cut at basic TriangleSet class 2017-03-03 22:27:38 -08:00
Bradley Austin Davis
efad7da508 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-03 08:59:24 -08:00
Seth Alves
5f570c1ba8 fix up bounds handling in Line3DOverlay 2017-03-02 16:16:48 -08:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
samcake
6ac85aee7e Adding support for the unliti materials too for overlay's 2017-02-28 18:12:35 -08:00
samcake
576660f6ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 18:17:28 -08:00
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -08:00
sam
a53d5e8fbd adjusted the PLumber shape keys to coever non material shapes in main pass 2017-02-25 13:00:37 -08:00
samcake
9ffdc03dc9 setting the shaeKeys for the overly properly because most of them are CustomPipleline 2017-02-24 18:25:24 -08:00
samcake
1b501487fd simple shader checks 2017-02-24 16:03:28 -08:00
Seth Alves
6e9854cad0 don't crash if geometry fails to load 2017-02-24 13:01:01 -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
6d59144a4f Trying to fix the emissive for overlay in front ? 2017-02-23 17:42:02 -08:00
samcake
c7b164d8f2 Adding differenciation for the Material shapeKey bit 2017-02-22 18:21:18 -08:00
samcake
ad40e2d7d9 Trying to address the ktx serialization problem with normal, still have a bug 2017-02-22 17:16:37 -08:00
samcake
a00216cb4f debugging the emissive issue for verlay in front 2017-02-21 18:20:55 -08:00
samcake
55611d2373 Backing up to master 2017-02-21 14:56:07 -08:00
samcake
5e3c79d197 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-21 14:49:52 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
Atlante45
1201932ee9 Fix SSE2 macros for Macos 2017-02-14 14:10:53 -08:00
samcake
9261e81ba2 Cleaning up the interface 2017-02-10 17:47:56 -08:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
samcake
37541e4ed2 Start capping the time budget for draw opaque 2017-02-10 14:29:29 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
sam
2ecda8b64e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-01 18:03:07 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui 
Tablet ui
 2017-02-01 09:38:13 -08:00
samcake
c88d070868 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-01-31 11:49:25 -08:00
samcake
04d5173328 Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda 
compute Model's local bounds outside pending changes queue
 2017-01-31 11:40:21 -08:00
samcake
0b139c906c Assigniing default textures that make sense 2017-01-31 10:56:30 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
Anthony J. Thibault
0f75668923 Moved Model setting of _spatiallyNestableOverride to constructor 2017-01-31 09:36:21 -08:00
samcake
249ec80d74 Writting a better version of the no texture case 2017-01-30 15:48:48 -08:00
Anthony J. Thibault
0962a15a06 Fix for one-frame lag in the tablet stylus. 2017-01-30 15:39:55 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
Andrew Meadows
489fbc6299 compute Model's local bounds outside render lambda 2017-01-27 09:35:36 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Andrew Meadows
b7c1bfaf58 another attempt to fix model transform 2017-01-19 14:01:40 -08:00
Andrew Meadows
d3af420516 fix broken model transforms 2017-01-19 13:07:50 -08:00
Andrew Meadows
1d6f47e3d8 repack to reduce MeshPartPayload footprint 8 bytes 2017-01-19 12:56:08 -08:00
Andrew Meadows
bfbef91f53 re-enable cauterization of meshes for MyAvatar 2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b move cauterization out of Model class 2017-01-19 12:56:07 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders 
Create render forward version of pixel shaders
 2017-01-19 00:48:25 -08:00
Gabriel Calero
5602479988 Create render forward version of pixel shaders 2017-01-18 19:18:59 -03:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
samcake
960f4f0ead Move the drawBOunds job to DrawTasks 2017-01-16 18:33:42 -08:00
samcake
0b9b5d595c Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
Seth Alves
5a81dface9 avoid filling log with bogus warning 2017-01-13 12:00:51 -08:00
Seth Alves
e9422cbf1e fix model scales 2017-01-12 16:38:27 -08:00
Seth Alves
5fa379fea2 fix model scales 2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
samcake
ca53235d54 Merge pull request #9358 from AndrewMeadows/model-cleanup 
minor cleanup for Model rendering code
 2017-01-12 14:30:16 -08:00
Anthony J. Thibault
26a5b5ed91 Fix for rendering of tablet ModelEntity in desktop mode. 
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable.  This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
 2017-01-11 18:37:57 -08:00
Andrew Meadows
c060fd6a68 restore updateClusterMatrices() in render() 2017-01-11 17:33:30 -08:00
Andrew Meadows
e2130d33d9 speedup cauterizedClusterMatrices math 2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Andrew Meadows
87bdaae05a remove scale from ModelMeshPartPayload's transform 2017-01-11 12:38:47 -08:00
Andrew Meadows
bd16824d55 remove cruft: Model::_pupilDilation 2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98 add assert and TODO comment 2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0 cleanup class method declarations 2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6 remove cruft 2017-01-11 06:55:13 -08:00
sam
7a01b856f7 Factorization of the modelTransform out of the cluster matrices 2017-01-11 02:33:56 -08:00
Andrew Meadows
44699fc661 modelToWorld rotation not in cluster matrices 2017-01-10 16:21:13 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Zach Pomerantz
1b948c7a05 add skinned forward model shaders 2017-01-04 15:49:29 -05:00
Zach Pomerantz
6b984d38d3 add opaque forward model shaders 2017-01-04 15:37:17 -05:00
Zach Pomerantz
f7cb2ec85b add plain forward model shaders 2017-01-03 20:41:57 -05:00
Zach Pomerantz
a414ba4cb5 take addPipeline lambda out of initDeferredPipelines 2017-01-03 18:55:13 -05:00
Zach Pomerantz
62eeb0c807 clean RenderPipelines with forward decls 2017-01-03 18:33:14 -05:00
Zach Pomerantz
89917b41fd add Forward Draw for opaques (no pipelines) 2017-01-03 15:18:22 -05:00
Zach Pomerantz
f8e8065e93 mv DrawBounds to end of ForwardTask 2017-01-03 14:56:47 -05:00
Zach Pomerantz
2e274b026d fix line lengths 2017-01-03 14:55:47 -05: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
Zach Pomerantz
c75dd236f2 rm unused forward pipelines 2016-12-29 19:11:06 -05:00
Zach Pomerantz
d00ae05e26 add background to forward renderer 2016-12-29 19:09:06 -05:00
Brad Davis
99af7f2819 Reduce unecessary copying in MeshPartPayload::bindMaterial 2016-12-28 12:11:27 -08:00
Brad Davis
e5e9ab42ea Encapsulate AnimPose members for easier optimizations 2016-12-28 12:11:24 -08: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
8d63067fa5 templatize graphics engine tasks' run method 2016-12-23 14:58:40 -05:00
Zach Pomerantz
dbf4f2d23b mv shadow task setup to jobs 2016-12-23 14:58:40 -05:00
Andrew Meadows
0b0c3f0be4 cleanup some if-logic 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
Ryan Huffman
1d9a32c528 Add FIXME comment to texture setting in Model.cpp 2016-12-16 16:32:53 -08:00
Ryan Huffman
18a166bee8 Fix models not settings textures if not loaded 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00