Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 05:42:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86676 commits 6 branches 1 tag 1.1 GiB
Commit graph

171 commits

Author SHA1 Message Date
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
SamGondelman
de5643b5b9 quint64 -> uint64_t 2019-03-25 10:33:32 -07:00
SamGondelman
4fd2c4449d new procedural uniforms for time 2019-03-21 12:15:03 -07:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
sabrina-shanman
b2af6d1374 Have only one ColorChannel enum as header in image library 2019-02-12 16:14:41 -08:00
sabrina-shanman
2b355e9d52 Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared 2019-02-12 11:56:44 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
SamGondelman
4c9fb168c7 enable backface culling on procedurals 2019-02-06 10:55:36 -08:00
SamGondelman
93e32f1bd5 fix skybox depth testing 2019-01-30 12:25:48 -08:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
Sam Gondelman
7936dd1ac4
fix build errors again 2018-11-28 23:01:02 -08:00
Sam Gondelman
66d77d2df8
fix build error 2 2018-11-28 21:45:50 -08:00
Sam Gondelman
dc32472bd6
fix build error 2018-11-28 20:42:45 -08:00
SamGondelman
2acb6b6857 v3 procedurals and shader fixes 2018-11-28 17:58:27 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Brad Davis
5a43462218 Remove unneeded shader directive 2018-10-23 10:40:12 -07:00
Brad Davis
3f2f5b18ec Reimplement procedural uniforms without extension requirements 2018-10-23 10:40:12 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
Brad Davis
a0ef0c0b13 Fix procedurals 2018-08-06 10:31:14 -07:00
Brad Davis
8eb97dc79c PR feedback 2018-08-03 14:58:12 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
SamGondelman
7771661948 fix particle spread properties 2018-06-15 17:35:49 -07:00
samcake
0e66ca1dfd Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned 2018-05-18 13:25:08 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
Olivier Prat
9e462e777c Fixed compilation error with transparent procedurals 2018-05-11 11:01:24 +02:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
SamGondelman
0c069574c5 forward pipelines for primitives 2018-04-10 15:56:08 -07:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Brad Davis
4eb77b1970 Disable procedural surfaces on GLES 2018-01-23 12:25:43 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Ryan Huffman
aca7ad27c6 Fix ktx dependencies 2017-04-26 10:47:32 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -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
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 Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Ryan Jones
7b0756c745 remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions 2016-11-30 16:37:04 -08:00
Ryan Jones
3ccc493871 add helpers for v3 and shaders 2016-11-29 15:40:20 -08:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Zach Pomerantz
1971063b9a clean up Procedural::parseShader 2016-08-29 13:56:39 -07:00
Zach Pomerantz
c740b263a8 detect unset skybox 2016-08-23 15:16:26 -07:00
Ryan Huffman
1d2ea3be03 Fix transparent items not being rendered correctly against procedural skybox 2016-08-15 16:35:25 -07:00
SamGondelman
0f988fb209 don't always mark _shaderDirty when user data changes unless url actually changes 2016-08-11 13:05:16 -07:00
SamGondelman
d8545bc7a3 fix procedural transparency 2016-08-10 13:49:35 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam 
don't log spam on empty URL
 2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
Brad Hefta-Gaub
3e459085ac don't log spam on empty URL 2016-06-15 09:25:46 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
SamGondelman
7b21d71180 try to fix cmake error 2016-06-10 14:09:04 -07:00
SamGondelman
53435fc730 removed extra argument 2016-06-10 14:04:33 -07:00
SamGondelman
f32e29ac2d small changes 2016-06-10 13:46:02 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00
SamGondelman
8cccd5416a try to fix mac errors 2016-06-09 16:10:27 -07:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Brad Davis
11de8a52b2 fix broken procedural skybox when leaving and re-entering 2016-05-22 22:52:56 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Zach Pomerantz
eb2e254aa6 Release px resources when unused 2016-04-01 14:46:52 -07:00
Zach Pomerantz
0e9b783ca3 Release skybox texs when not rendering 2016-04-01 14:46:50 -07:00
Zach Pomerantz
1a8cca3dcc Clarify use of procedural's dirty atomic flag 2016-03-15 10:51:55 -07:00
Zach Pomerantz
ff07e47626 Make procedural dirty marker atomic 2016-03-14 17:52:13 -07:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00
Zach Pomerantz
27884b26e9 Mark px shaders dirty on change 2016-03-10 22:53:07 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Zach Pomerantz
4eca43027a Add texture, color to px skybox 2016-03-10 21:05:36 -08:00
Zach Pomerantz
505ae71e30 Pass px userData by const ref 2016-03-10 15:22:19 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Zach Pomerantz
64042327ec Use version tmp var 2016-03-10 11:08:15 -08:00
Zach Pomerantz
9b89e46e65 Make procedural userData thread-safe 2016-03-10 10:12:55 -08:00
Zach Pomerantz
1640314076 Use one procedural for skybox (avoid copies) 2016-03-10 10:12:22 -08:00
Zach Pomerantz
74e1d32221 Reuse procedural on skybox 2016-03-09 19:40:27 -08:00
Zach Pomerantz
4022474b48 Constrain procedural updates to render thread 2016-03-09 19:39:38 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
samcake
ae124ebede Tuning the proedural shader support to work with the current default: gamma corrected emissive 2015-12-21 12:00:30 -08:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
ed2d45d0b6 HMD Mirror looks correct 2015-12-14 16:18:44 -08:00
samcake
1597d3d466 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2015-12-14 10:25:22 -08:00
samcake
2aad26154e THis should fix the mirror and the skybox issue 2015-12-14 10:24:51 -08:00
Ken Cooke
67d6965f14 Revert "Fix the broken skybox and simplify a bit the vertex shader used" 
This reverts commit 68134aafe5.
 2015-12-13 16:14:38 -08:00
Atlante45
b8495a6912 Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win 2015-12-11 18:05:47 -08:00