Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-24 23:30:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62161 commits 74 branches 59 tags 1.2 GiB
Commit graph

3056 commits

Author SHA1 Message Date
Olivier Prat
6acff216d9 Reduced blur tap for slightly better performance 2017-10-19 19:00:09 +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
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02:00
Olivier Prat
382262da3d Working scissor with correct projected bounding box rect 2017-10-19 16:23:13 +02:00
Olivier Prat
111966b987 Fixed potential bug with outline frame buffer allocations. Still problems with avatar outline rect 2017-10-19 12:39:34 +02:00
Olivier Prat
cc30c0b841 Expanded scissor rect with outline blur width 2017-10-19 11:35:26 +02:00
Olivier Prat
f890c5bb8c Added project rect and scissor test. Need to increase bounds to take into account blur width 2017-10-18 19:40:03 +02:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
Olivier Prat
8cabd1c953 Fixed graphics bug with filled 2017-10-18 15:06:54 +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
9ed5185a3e Multiple outline group config working 2017-10-17 10:01:06 +02:00
Andrew Meadows
339edc67c8 ifdef out more per-frame-per-entity profiling 2017-10-16 17:27:53 -07:00
Andrew Meadows
fb1c075a12 fix animating entities 2017-10-16 15:55:25 -07:00
Olivier Prat
70f892e67d Ready to plug multiple selections javascript side 2017-10-16 17:02:13 +02:00
Olivier Prat
1b67223e0e Preparing for multiple outline groups in shader 2017-10-16 12:38:44 +02:00
Olivier Prat
e42699c0ea Added multiple selections but still only first linked to outline 2017-10-16 10:57:06 +02:00
Olivier Prat
8d79313a9d Working mask rendering and debugging 2017-10-16 09:42:58 +02:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Olivier Prat
2658d65814 Preparing for outline color mask 2017-10-13 12:02:21 +02:00
Olivier Prat
049e3d47b6 Preparing for support of multiple concurrent outlines by adding mask id buffer 2017-10-13 10:23:42 +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
Andrew Meadows
d9ba75ca72 fix warning about implicit cast from 64 to 32 bits 2017-10-11 06:07:07 -07:00
Andrew Meadows
886422cbef remove unused variable 2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2 remove unused variable 2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a more correct use of BufferView in GeometryCache 2017-10-10 17:02:26 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Nissim Hadar
3070778b39 Fixed typo in comment. 2017-10-10 10:20:04 -07:00
Olivier Prat
d3add89b3c Adjusted bloom size range 2017-10-10 18:28:42 +02:00
Olivier Prat
f55d44dfc3 Threshold now doesn't downsample anymore. Done in separate pass 2017-10-10 17:49:35 +02:00
Olivier Prat
76305c5285 Better debugging options for bloom 2017-10-10 14:49:04 +02:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -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
0d3d309bce Quarter size debug rendering of bloom 2017-10-09 11:49:29 +02:00
Olivier Prat
50ab73009a Working threshold mask and debug on Bloom 2017-10-09 11:09:51 +02:00
Olivier Prat
98d39ff9e0 Merged with master 2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3 Multiple gaussians as Unreal. First draft 2017-10-09 09:35:38 +02:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00
Nissim Hadar
e02876f1ea Zone position/direction sent to haze uniform. 2017-10-06 17:24:20 -07:00
SamGondelman
b4a3ab9204 fix debugDeferredLighting 2017-10-06 15:46:10 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Nissim Hadar
8fad23aefd Keylight working. 2017-10-06 12:49:43 -07:00
Nissim Hadar
47a6f2d7c9 Initial work on adding keylight direction. 2017-10-06 12:01:15 -07:00
Nissim Hadar
9918757061 Initial work on adding keylight direction. 2017-10-06 11:43:57 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
SamGondelman
a6b7578c3c start fixing asynch issue, fixes model loading! 2017-10-05 12:30:00 -07:00
Sam Gateau
328d900533 Trying a simpler technique to find the best velocity candidate and cleaning default config 2017-10-05 00:57:17 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8 WIP - implementing range+altitude mode. 2017-10-04 23:03:21 -07:00
Nissim Hadar
6dcd8b7b57 Haze Range works. 2017-10-04 21:47:20 -07:00
Nissim Hadar
97f775f6f1 Clean-up. 2017-10-04 21:36:42 -07:00
Sam Gateau
69e68ef5ad Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-10-04 18:58:33 -07:00
SamGondelman
3a6e84e681 trying to fix model issue 2017-10-04 17:26:12 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
Nissim Hadar
48e5b9d1bc Haze enable/disable from UI works. 2017-10-03 17:42:04 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Nissim Hadar
1cf7f5a732 For testing. 2017-10-03 09:54:44 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
Nissim Hadar
cdbf067a24 Rename (haze)getParametersBuffer to getHazeParametersBuffer. 
Add corrections from Sam
 2017-10-02 16:54:02 -07:00
Nissim Hadar
ca4c5969d9 Clean-up. 2017-10-02 14:36:45 -07:00
Nissim Hadar
29d5e772d4 Removed "..Is.." from various methods. 2017-10-02 12:42:46 -07:00
Nissim Hadar
48fb7522c0 Removed blank line 2017-10-02 11:42:04 -07:00
Nissim Hadar
20a42d6fbd Fixed model name string 2017-10-02 10:11:34 -07:00
Nissim Hadar
97756146b1 Attempt to add qml configuration 2017-10-02 09:09:36 -07:00
Nissim Hadar
bdd469cec4 Integrated haze shader into this branch. 2017-10-01 21:52:34 -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
f26345a3f0 Working on adding zone to haze. 2017-09-29 15:15:49 -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
Nissim Hadar
0acf4b9de9 Working on adding zone to haze. 2017-09-28 23:53:53 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
Nissim Hadar
9d0cf16c20 Fixed Ubuntu warnings. 2017-09-27 19:33:04 -07:00
Nissim Hadar
784f928433 After merge. 2017-09-27 18:46:55 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1 Implemented HazePropertyGroup and added the haze shader. Shader does not work yet! 2017-09-27 17:43:09 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash 
Fix mirror and fade threading crashes
 2017-09-27 16:17:04 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
Nissim Hadar
eaab056d66 Adding HazeStage 2017-09-27 09:12:57 -07:00
Nissim Hadar
4d501d6510 Adding HazeStage 2017-09-27 08:01:19 -07:00
Nissim Hadar
2394d0931c Adding HazeStage 2017-09-26 19:05:11 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface 
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
 2017-09-26 17:40:23 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00
SamGondelman
49512c95d7 possibly fix threading crashes, mirror and fade 2017-09-26 16:21:36 -07:00
samcake
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA 
Text3D Overlays and Entities fixes and no-AA
 2017-09-26 12:26:08 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Sam Gateau
ff1101cc69 Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix 
Experimental Fix: Entity Shader Lightmap use / emissive
 2017-09-26 09:39:33 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Menithal
19a290be70 Fixed Entity Shader emmissive 
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
 2017-09-26 00:12:45 +03: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
bcec3680b6 First draft 2017-09-25 11:51:23 +02:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
Brad Hefta-Gaub
bafb59e691 Merge pull request #11436 from SamGondelman/missingModels 
Fix missing models
 2017-09-23 13:56:50 -07:00
samcake
59006411c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
SamGondelman
bc477608ee fix alpha on glowLines 2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
samcake
89682a2e2c SImple first steps to apply jittering correctly in stereo 2017-09-20 10:18:25 -07:00
samcake
fd8868f609 Moving the render transform evaualtion in game loop for Models 2017-09-19 17:30:20 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
SamGondelman
f68a588323 rename isAA isAntiAliased 2017-09-13 10:24:10 -07:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
samcake
2d2e75e933 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-08 12:39:59 -07:00
Olivier Prat
d6d36cbd43 Outline working on voxels 2017-09-08 11:14:06 +02:00
Olivier Prat
7fb7ebca57 Fixed warning on Mac 2017-09-07 19:03:22 +02:00
Olivier Prat
6b5ca0c6ce Optimized by removing unnecessary Z buffer copy 2017-09-07 18:33:00 +02:00
Olivier Prat
2003495166 Adjustments to half texel fix 2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b Modified outline shader to do fill branch on CPU. Fixed assymetric outline 
due to depth sample not offset by a half texel in shader.
 2017-09-07 12:15:38 +02:00
Sam Gateau
12d063c008 Not trying to unjitter the history coordinate 2017-09-07 02:14:52 -07:00
Sam Gateau
965118aa47 Introducing covariance clipping and it works better, cleaning the controls and debugs 2017-09-07 02:05:06 -07:00
Olivier Prat
b9eb317d9b Fixed non working outline in stereo with new changes 2017-09-07 10:33:55 +02:00
samcake
dbdcef3d33 making the 9 fetch the default for the constraining pass 2017-09-06 17:40:59 -07:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +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
75e06b691f Simplified version that works directly with metas 2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43 First working version of outline working with selection interface. 2017-09-06 15:47:10 +02:00
samcake
e70f261de4 Adding the full code path, starting debugging the problems in hmd, 2017-09-05 18:09:46 -07:00
Sam Gateau
78fee71524 seprating the constraint function 2017-09-05 10:04:49 -07:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00
samcake
b243475cc9 New stuff for better rendering f ui 2017-09-01 15:32:23 -07:00
Sam Gateau
59c980894e adding disabling of jittering for comparison 2017-08-31 23:51:19 -07:00
Sam Gateau
a3f1c487f1 adding disabling of jittering for comparison 2017-08-31 23:42:43 -07:00
samcake
ddb598203e COmparing against fxaa 2017-08-31 18:27:47 -07:00
samcake
f031bf5661 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-31 09:22:19 -07:00
Sam Gateau
16fbe00ef5 FIxing the jittering projection modification 2017-08-30 22:42:55 -07:00
samcake
37f440031f Expose Hlaton 16 sequence 2017-08-30 17:59:06 -07:00
Zach Fox
3f0d44990a Hook up bounding box rendering to Selection Scripting Interface 2017-08-30 14:54:23 -07:00
samcake
af09ae0686 Some more refinment, no clear changes though 2017-08-29 18:12:05 -07:00
samcake
66d35118cb Refining the debugging to better understand the issues 2017-08-28 18:14:46 -07:00
samcake
7d8356686c Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-28 09:28:00 -07:00
Sam Gateau
0f67f9bc52 Eposing the jitter sequence and debugging it 2017-08-27 22:08:33 -07:00
samcake
21987c4c5d Adding the code for the color clamping 2017-08-25 16:58:05 -07:00