Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 05:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

166 commits

Author SHA1 Message Date
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
samcake
68134aafe5 Fix the broken skybox and simplify a bit the vertex shader used 2015-12-11 16:14:55 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Bradley Austin Davis
46d87dda5a Fixing paths for SDL2 and Sixense libs 2015-10-30 19:00:26 -07:00
Andrew Meadows
7fa069cf30 fix line endings grumble gruble 2015-10-20 09:38:25 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Brad Davis
c8aea67505 Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
Brad Davis
7d4b680255 PR comments 2015-10-02 11:57:13 -07:00
Brad Davis
de5e95f7dc Improved procedural surfaces, textures and more standard uniforms 2015-10-02 11:57:13 -07:00
samcake
d3d4775232 THe dataBuffer contining the properties of the skybox is now per instace and not static and shared so it's static from frames to frames 2015-09-30 17:54:20 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
samcake
fa9b0930d2 Bring back the procedural skybox 2015-09-21 14:25:32 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Davis
61fb9924bf Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
Brad Davis
48bd54f81b Eliminate excessive debug logging from procedural setup 2015-09-10 10:57:37 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00