Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 10:43:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51859 commits 76 branches 59 tags 1.2 GiB
Commit graph

2452 commits

Author SHA1 Message Date
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
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
Seth Alves
5f570c1ba8 fix up bounds handling in Line3DOverlay 2017-03-02 16:16:48 -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
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
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