Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 22:34:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27179 commits 25 branches 0 tags 1.1 GiB
Commit graph

237 commits

Author SHA1 Message Date
samcake
1b69b38835 fix shader issue on mac 2015-06-27 06:34:58 -07:00
Sam Gateau
f73e56a93f Covering all the case for rendering the light passes 2015-06-26 15:45:15 -07:00
Sam Gateau
c41ebcae78 Covering all the case for rendering the light passes 2015-06-26 15:40:08 -07:00
Sam Gateau
9994cb7540 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-22 20:00:48 +02:00
Sam Gateau
6444bcab1b commenting out 2015-06-22 20:00:06 +02:00
samcake
ca652730b5 REfine the gpu/Context.slh to get gpu_shader4 and gl_VertexID 2015-06-22 15:47:13 +02:00
Sam Gateau
f7ca1f608f Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders 2015-06-22 14:06:14 +02:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Davis
8e5da5acaa Fix debug compile error 2015-06-18 17:05:49 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Brad Davis
0cdee2d6ec preprocessor error on Linux/Mac 2015-06-18 12:14:55 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Atlante45
e8e1f81880 Make Batch copy constructor explicit 2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57 Add _glUniform1i to Batches 2015-06-18 15:22:48 +02:00
Brad Davis
5c4fa77acd Merge branch 'temp' into overlay 2015-06-18 00:59:31 -07:00
Brad Davis
d9452cfd2e Merge branch 'gpu-error-tweak' into overlay 2015-06-18 00:54:48 -07:00
Brad Davis
dfea571e62 Removing a 'using namespace' from a header and tweaking error checking code 2015-06-18 00:54:35 -07:00
Bradley Austin Davis
1705eb8f80 Reverting some changes, putting overlay rendering in its own state manager 2015-06-17 16:08:19 -07:00
Brad Davis
c8cc3a46b3 Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay 2015-06-17 15:13:35 -07:00
Bradley Austin Davis
a27e06713b Preserve the GL matrix stack when running batch commands 2015-06-17 14:57:14 -07:00
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
ZappoMan
af5a910f58 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-17 09:36:16 -07:00
samcake
febc3333cd Solving the rendering of textured overlay3d 2015-06-17 16:50:35 +02:00
ZappoMan
569971582d more hacking on trying to port atmospheres to the new pipeline 2015-06-16 18:39:35 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Brad Davis
49f4ab99df Revert "Revert "Fix broken identity transforms on OSX"" 
This reverts commit 1feceec0c7.
 2015-06-13 10:03:10 -07:00
ZappoMan
1feceec0c7 Revert "Fix broken identity transforms on OSX" 
This reverts commit 9262839564.
 2015-06-12 12:57:37 -07:00
Bradley Austin Davis
9262839564 Fix broken identity transforms on OSX 2015-06-12 10:33:52 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
samcake
1bff9a17e1 Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though 2015-06-08 17:05:28 +02:00
Sam Gateau
8a93db6f5a more typos and issues on mac 2015-06-08 07:25:32 -07:00
Sam Gateau
862d6abd79 Typo on mac build 2015-06-08 06:57:04 -07:00
Sam Gateau
b7d88e2642 add apotential fix to the issue with viewInverse for Legacy transform path support 2015-06-08 06:46:45 -07:00
Sam Gateau
5e04b399d8 fixing the wrong matrix used 2015-06-08 03:07:17 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Atlante45
e421485908 Add glLineWidth to Batch/GLBackend 2015-06-04 10:54:13 +02:00
Sam Gateau
c8e30ef39e On to a full rendered pipeline 2015-06-01 12:35:54 -07:00
Sam Gateau
4c817547b7 Merging with Brad's branch and trying to get the rendering working 2015-05-31 14:02:20 -07:00
Atlante45
0770f88606 Add glTexParamteri to GLBackend/Batch 2015-05-29 16:50:11 +02:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
Seth Alves
ab86b1d90a code review 2015-05-28 10:29:23 -07:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
Seth Alves
c3c701f807 polyvox no longer has a color 2015-05-27 15:23:01 -07:00