Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 12:27:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30114 commits 69 branches 56 tags 1.2 GiB
Commit graph

126 commits

Author SHA1 Message Date
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
2bec2f0590 make model depend on octree for ViewFrustum 2015-07-14 17:21:46 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
samcake
1f13106f51 FIxed the issue on mac due to the abs function not correctly executing 2015-07-09 15:05:03 -07:00
Sam Gateau
8314fe8c7f FInally getting a nice spot light volume working for all angles 2015-07-09 03:45:19 -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
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Sam Gateau
c41ebcae78 Covering all the case for rendering the light passes 2015-06-26 15:40:08 -07:00
Brad Davis
d4b9a739f5 Still working on GL update 2015-06-23 09:49:10 -07:00
Brad Davis
fbf3a0cbe6 Working on GL 4 2015-06-23 09:48:16 -07:00
Bradley Austin Davis
0000b5a8c8 Working on GL 4.1 core 2015-06-23 09:48:15 -07:00
Brad Davis
f51c43f90d Working on GL 4.1 2015-06-23 09:47:18 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
ZappoMan
fb59939cf4 CR feedback 2015-06-17 10:02:02 -07:00
ZappoMan
689e10cc27 build buster fix 2015-06-17 09:53:50 -07:00
ZappoMan
8162c37013 cleanup 2015-06-17 09:33:15 -07:00
ZappoMan
268bb370cc cleanup 2015-06-17 09:24:42 -07:00
ZappoMan
ea98581d22 reorganize files to cleanup headers 2015-06-17 09:18:00 -07:00
Seth Alves
0ec7d3ded8 fix some float/double jumble 2015-06-17 07:02:54 -07: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
Sam Gateau
2785f1a0e2 Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox 2015-06-10 01:50:52 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
Seth Alves
8cb5717b86 formatting, cleanups 2015-05-27 15:16:15 -07:00
Seth Alves
66760afadb quiet compiler 2015-05-26 14:27:22 -07:00
Seth Alves
728e6d121b changes sam made to get normals to work on a mesh 2015-05-26 14:12:01 -07:00
Seth Alves
fd19c63449 fix bug in mesh 2015-05-21 14:26:40 -07:00
Seth Alves
138077ede9 hook up mesh renderer 2015-05-20 18:22:07 -07:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
David Rowe
2032d36b1f Fix double/float mismatch build warnings 2015-05-13 17:32:40 -07:00
Sam Cake
238d3751c5 cleaning up the SH generation 2015-05-13 16:00:05 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
Sam Cake
536fff4502 Trying to create the SH from the skybox cubemap 2015-05-12 23:11:52 -07:00
Atlante45
00864afe53 Quiet compiler 2015-05-12 17:06:40 +02:00
samcake
449ca6df6d fix the color blending on Mac 2015-05-11 17:27:22 -07:00
Sam Gateau
e6bba04151 Enable the color blending for the skybox 2015-05-11 17:05:45 -07:00