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

329 commits

Author SHA1 Message Date
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Sam Gateau
65a3e3618a Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 17:06:46 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Sam Gateau
ffaea07130 trying to ge the shadow to render correctly 2015-02-23 07:04:14 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Sam Gateau
4e2d2bc188 Fixing the remaining issue with the avatar rendering path 2015-02-20 12:05:06 -08:00
Sam Gateau
ded78816b5 Fixing the remaining issue with the avatar rendering path 2015-02-20 11:26:08 -08:00
Sam Gateau
d08142d37d replacing glTRansform by gpu/Transform features 2015-02-19 15:12:13 -08:00
Sam Gateau
7e04f8a491 Model almost working with Transform 2015-02-19 09:52:58 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Sam Gateau
11060ed273 trying to tackle the unenderstood transform value not going through corectly? 2015-02-18 16:00:37 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Seth Alves
ef2d386c75 attempt to load Courier if the requested font-family fails to load 2015-02-17 15:12:24 -08:00
Seth Alves
9fcb7591e6 don't crash if font load fails 2015-02-17 14:52:20 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Sam Gateau
d8aa0e0138 replacing the glTransform pipeline for model rendering 2015-02-17 09:44:03 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f replacing the glTransform pipeline for model rendering 2015-02-16 09:31:29 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Stephen Birarda
fa6f6a6b71 use external project glm in render-utils 2015-02-13 10:34:19 -08:00
Sam Gateau
bc2faca9bc Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-13 01:33:21 -08:00
Sam Gateau
e2e61c64b1 Support include path to shaders from the hifi libraries to cmake 2015-02-13 01:30:04 -08:00
Andrew Meadows
7304585103 Merge pull request #4271 from huffman/fix-overlays-text-size 
Fix overlays text size
 2015-02-12 09:35:37 -08:00
Andrew Meadows
357dd963f3 Merge pull request #4273 from ZappoMan/bugfix 
fix the quad color being broken after rendering text
 2015-02-12 09:00:16 -08:00
ZappoMan
7a45b1bc96 fix the quad color being broken after rendering text 2015-02-11 15:50:04 -08:00
Ryan Huffman
341e31a074 Remove extraneous initialized check 2015-02-11 13:08:11 -08:00
Ryan Huffman
51ff897ee5 Update Font to not setup GL until first draw 2015-02-11 12:59:12 -08:00
Brad Hefta-Gaub
9a7ed8055f Merge pull request #4267 from samcake/master 
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
 2015-02-11 09:45:29 -08:00
Sam Gateau
798817f34a Merge branch 'master' of https://github.com/samcake/hifi into temp0 2015-02-10 23:09:12 -08:00
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d fix color issues with quads 2015-02-10 17:35:27 -08:00
Sam Gateau
11beb51ec1 Clean up comments 2015-02-09 18:02:34 -08:00
Sam Gateau
23a54b17ce Clean up comments 2015-02-09 15:33:55 -08:00
Sam Gateau
871f9a849a CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:30:17 -08:00
Sam Gateau
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00
Sam Gateau
559647b7af Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-09 12:26:29 -08:00
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Sam Gateau
48fca4c11d introducing PBR shading 2015-02-08 23:22:14 -08:00
Brad Davis
b28920f4ed Fixing bug in text renderer causing glyphs to float at different depths 2015-02-08 15:37:55 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Sam Gateau
bdf9164c7b debugging the new global light pass 2015-02-06 16:30:07 -08:00
Stephen Birarda
caf50764b4 correct resource name for Q_INIT_RESOURCE 2015-02-06 15:27:50 -08:00
Stephen Birarda
961b5b5346 call Q_INIT_RESOURCE statically from Font constructor 2015-02-06 15:17:53 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
Stephen Birarda
7b5af1e3fd cleanup debug for font load 2015-02-06 12:06:20 -08:00
Stephen Birarda
27b91e7d43 use QIODevice for loadFont method 2015-02-06 12:04:57 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
Stephen Birarda
58d5e0b9d3 fix some asterisk type squishes in TextRenderer 2015-02-06 10:48:10 -08:00
Brad Davis
39794a7a40 Getting rid of some warnings 2015-02-05 21:00:34 -08:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
Sam Gateau
9b0036d010 adding Light and replace glLights also for the first deferred pass 2015-02-05 14:10:06 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Sam Gateau
00a9f55bc3 lightings seems to work correctly now 2015-02-05 10:20:19 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Sam Gateau
8e1eebbbd4 FInally getting the angular attenuation 2015-02-04 17:24:23 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00
Sam Gateau
6c00f29f2b REvisiting the shaders for lighting on deferred pass 2015-02-04 14:01:16 -08:00
Sam Gateau
7d6161598b REvisiting the shaders for lighting on deferred pass 2015-02-04 13:31:39 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Brad Davis
0dcf5b001f Some more cleanup 2015-02-03 23:26:15 -08:00
Brad Davis
9a6175a3b9 Starting to work on replacement for clip planes 2015-02-03 22:10:44 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Brad Davis
cab31e7190 Working on text coordinates 2015-02-03 18:43:24 -08:00
Sam Gateau
1029af140e tiny bit different... 2015-02-03 18:15:20 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Sam Gateau
d8d0a28d0f FInd a solution for lightmap without 2nd uvset 2015-02-03 14:34:11 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
68448daa18 Moving closer to the original coordinate system 2015-02-02 23:29:46 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Sam Gateau
5c4a8a5cda Fixing the spotlight 2015-02-02 17:24:26 -08:00
Sam Gateau
16f12dd267 working on the point light shader edge representation 2015-02-02 16:31:36 -08:00
Sam Gateau
0da38c103f working on the spot light shader 2015-02-02 11:17:35 -08:00
Brad Davis
ab1624b0a8 Adding matrix stack (currently not used 2015-02-01 16:25:17 -08:00
Brad Davis
711506e055 Moving implementation details out of header 2015-02-01 14:15:34 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00
Sam Gateau
56925cee00 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-01-30 17:04:27 -08:00
Sam Gateau
c3e1311ed1 avoid recreating lights every frame, just have a pool of lights edited each frames 2015-01-30 17:03:28 -08:00
dev
6eca52e4f2 point light is working with Mac 2015-01-30 17:01:46 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58:50 -08:00
Sam Gateau
228e629856 working on the spot light now 2015-01-30 11:40:44 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
19047f000a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-30 10:20:55 -08:00
samcake
331104d1c6 Merge pull request #4194 from thoys/texture-max-area-2M 
changing texture size limit from 1024*1024 to 2M  i.e. (1024 * 2048).
 2015-01-29 17:33:35 -08:00
ZappoMan
66567fd89d CR feedback 2015-01-29 17:24:56 -08:00
ZappoMan
c1bb03e9a8 CR feedback 2015-01-29 17:23:48 -08:00
Thijs Wenker
ff29b1c8cc style/conversion fixes 2015-01-30 02:18:51 +01:00
Sam Gateau
264435b695 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-29 17:14:11 -08:00
Sam Gateau
471da3935d working on the lighting 2015-01-29 17:11:50 -08:00
Thijs Wenker
a4c82072a2 changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048). It's dynamic and resizes the texture to the best fit within the 2M area. 2015-01-30 02:00:35 +01:00