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

344 commits

Author SHA1 Message Date
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
samcake
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
219b41e813 Fix the mini mirror perf issue and improve the debugDeferredLighting script 2016-07-13 17:37:35 -07:00
samcake
9f91dd5bfc Cleaning the gpu-test app to work with the new deferred pipeline 2016-07-13 10:19:42 -07:00
samcake
51594fefa2 more clean up 2016-07-12 18:21:31 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
samcake
37f7596183 Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass 2016-07-08 09:04:10 -07:00
samcake
5827993125 Fixing warnings 2016-07-07 16:30:10 -07:00
samcake
2a52f1db7f Adding the lighting model class to configure accross the jobs the lighting 2016-07-01 18:36:51 -07:00
samcake
9a604d0ede Bringing Beckmann specular to the lighting 2016-06-30 19:03:24 -07:00
samcake
ab21a5a5d5 FIxing the bad brdf and adding better debug tool and better Pipeline architecture 2016-06-29 18:59:06 -07:00
samcake
d128af48db Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL 2016-06-28 13:47:55 -07:00
samcake
e95a31f760 CLeaning up and debugging the splotch 2016-06-24 09:18:04 -07:00
samcake
884b9211c6 Curvature is looking correct now without artefact, moving on to the lighting 2016-06-23 17:13:48 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
samcake
37a6d29406 Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall 2016-06-17 17:19:49 -07:00
samcake
904efc8076 SPlitting appart the DeferredLIghting Effect 2016-06-17 09:31:32 -07:00
samcake
350f06465d Introducing the deferredFRameTransform to DeferredLighting Effect and simplifying the rendering! 2016-06-16 18:28:08 -07:00
samcake
2d7118dacc clening up the code 2016-05-19 10:21:00 -07:00
samcake
89f18aee3b Simplifying the deferredbuffer clear and enableing z test for lighting pass 2016-05-18 13:14:42 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
samcake
0ee1f039e9 Telling like it is... 2016-03-30 11:15:10 -07:00
samcake
b492c4b52c DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region 2016-03-30 09:32:40 -07:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
samcake
cfcde5032c Post merge with Zach work for environment map 2016-02-26 16:32:29 -08:00
samcake
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
Zach Pomerantz
fdffd8b6e0 Track skybox mipmap levels in DeferredTransform 2016-02-26 13:51:55 -08:00
Zach Pomerantz
712cf911b1 Differentiate global sun and skyStage sun 2016-02-26 11:06:02 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Zach Pomerantz
20bfdba14b Avoid light prop copies when setting globalLight 2016-02-24 16:20:59 -08:00
Zach Pomerantz
1817b8ef2f Use only skyboxTexture in DeferredLightingEffect 2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Zach Pomerantz
8ac84b3fc2 Render point/spot lights with surface radii 2016-02-22 15:07:08 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
samcake
a740f4a6de Removing unecessary code 2016-02-15 17:41:20 -08:00
samcake
e6d15c3d56 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-12 18:22:30 -08:00
samcake
4559e75f90 Trying to solve the ambient issue 2016-02-12 18:22:01 -08:00
Zach Pomerantz
d516e9da78 Only run AO in DEFAULT_RENDER_MODE 2016-02-12 09:01:54 -08:00
Zach Pomerantz
a1ed29e6f8 Rename setupTransparent->setupBatch 2016-02-05 10:53:01 -08:00
Zach Pomerantz
65ddb944d2 Add defaults/light/shaders to plumber 2016-02-03 19:18:56 -08:00
Zach Pomerantz
56cc4dc223 Add Job::Config to RenderShadowTask 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298 Gut RenderContext 2016-01-25 12:14:58 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
samcake
35ea04ae7c fixing the bug that kept AO when ao is off... 2016-01-20 11:13:50 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
Zach Pomerantz
6434d98365 Separate directional shaders with(out) shadowmaps 2016-01-18 11:11:28 -08:00
Zach Pomerantz
bc379e920b Update shadow programs 2016-01-15 17:55:07 -08:00
Zach Pomerantz
0776ae7e72 Add LightStage for rendering lights 2016-01-14 12:49:42 -08:00
Zach Pomerantz
70cc7d87e4 Expose global light through DeferredLighting singleton 2016-01-13 17:52:02 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Zach Pomerantz
c6e6aceb85 Optimize getVertexStream() by using a const& 2015-12-31 11:51:05 -08:00
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
84d1e3b123 Merged with upstream master 2015-12-14 18:30:24 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -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
samcake
5d207d0c9c INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect 2015-12-07 13:19:43 -08:00
Sam Cake
3595d0d719 less commented stuff 2015-12-07 01:15:10 -08:00
Sam Cake
01d48b29aa cleaning code and removing cruft 2015-12-07 01:03:14 -08:00
Sam Cake
a018c51945 Drawing background first in the Lighting buffer then lighting passes with stencil test 2015-12-06 23:51:29 -08:00
samcake
b28e3d0045 Merging MAster and Graphics 2015-12-04 17:51:30 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
samcake
cfd7373585 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-04 16:52:50 -08:00
samcake
ef7ddce2b6 Trying to fix the problem of the background not showing correctly 2015-12-04 16:52:14 -08:00
samcake
3c18664c57 Cleaning all the deferred buffers in the Prepare call 2015-12-04 11:47:57 -08:00
samcake
d593b824e9 Introducing a true Primary Framebuffer and a different Deferred Framebuffer 2015-12-03 17:26:54 -08:00
samcake
72d393905b Introducing the Lighting Buffer where all the lighting is beeing accumulated, apply a manual gamma correction when copying back into the main color buffer 2015-12-03 16:03:32 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
samcake
a5475ed14d Early try fixing the lighting 2015-12-03 10:41:32 -08:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
samcake
12fedb6ff0 Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer 2015-10-05 18:31:05 -07:00
samcake
1bd07b58c3 Fixing the lighting view matrix for stereo again 2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Brad Hefta-Gaub
5b00783f18 more warnings fixes 2015-09-22 20:54:36 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Sam Gateau
b207d97f72 Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
Sam Gateau
882ca5d6c0 Fix the lights not rendering roperly 2015-09-16 15:57:35 -07:00
Sam Gateau
80d25a68b6 Bringing back the eyeView per side to the deferred transform stack 2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945 FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix 2015-09-15 17:48:55 -07:00
Sam Gateau
f00e3829f1 Cleaning for PR 2015-09-15 16:54:04 -07:00
Sam Gateau
dc8756e465 Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation 2015-09-15 14:40:23 -07:00
Sam Gateau
400f90aea4 Introducing a stereo loop that should do the right thing but doesn't yet 2015-09-15 08:34:46 -07:00
Sam Gateau
45dc5be53d DeferredTransform buffer working for the deferred rendering in mono 2015-09-14 17:48:15 -07:00
Sam Gateau
00688172dd work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes 2015-09-14 15:49:05 -07:00
Sam Gateau
3690d5a4c2 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444 work in progress 2015-09-14 12:28:33 -07:00
Brad Davis
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
ZappoMan
87f609b9af remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows 2015-08-07 11:26:07 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Sam Gateau
95682e6270 Introducing the Normal fitting algorithm for better normal in the deferred buffer 2015-08-05 17:17:00 -07:00
Sam Gateau
730ad2da2f removing dead code 2015-08-04 16:37:01 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
ZappoMan
a0666d5e99 testing windows render bug 2015-07-23 13:17:12 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
Bradley Austin Davis
f19800f0de Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO 2015-07-23 12:37:58 -04:00
ZappoMan
c2113ea96b remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Bradley Austin Davis
9596452c32 Trying to fix oculus rendering 2015-07-22 08:07:44 -04:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
052c3c987b Fix some more smart pointer 2015-07-17 18:10:34 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler 
quiet compiler
 2015-07-13 15:55:35 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00