Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 16:46:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27629 commits 76 branches 59 tags 1.2 GiB
Commit graph

257 commits

Author SHA1 Message Date
Sam Gateau
6b229d8d2d Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f FInally getting a nice spot light volume working for all angles 2015-07-09 03:45:19 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
samcake
5557dc4da2 clean and release the new deferredLIghtingEffect 2015-07-07 10:00:05 -07:00
Atlante45
541d9ae431 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard 2015-07-06 18:05:43 -07:00
samcake
a2f6693bd7 getting the deferred lighting to work 2015-07-06 14:40:10 -07:00
Atlante45
d243190caf Coding standard 2015-07-04 16:06:39 -07:00
samcake
4019a216d4 Fixed the viewport expressed in int not getting to the shader, needed to be convert to float 2015-07-03 12:12:54 -07:00
samcake
84b70fbaca Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass 2015-07-03 11:36:19 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338 Trying to finalize the look and behavior of th estatus indicators 2015-07-02 15:06:07 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
samcake
b23f68107c Adding the gpu_shader4 for linux and fixing function name for mac 2015-07-01 14:52:23 -07:00
Sam Gateau
2f04a9d3da refining the shader pipeline and trying to pass a Status Getter from the model and fails 2015-07-01 07:47:46 -07:00
Sam Gateau
8bd5e15f73 Exposing the viewport to the shader and have a first draft of the draw status pipeline 2015-06-30 14:43:57 -07:00
Sam Gateau
20cb519c14 first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase 2015-06-30 08:19:00 -07:00
samcake
1b69b38835 fix shader issue on mac 2015-06-27 06:34:58 -07:00
Atlante45
3c49e6231e Sam's fix for pipeline edge case 
Basically if we bind a uniform texture and the pipeline is not setup
correctly on mac
 2015-06-26 16:17:40 -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
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -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
Seth Alves
03a2d190b0 quiet valgrind 2015-06-22 07:18:55 -07: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