Commit graph

73 commits

Author SHA1 Message Date
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
a92b65b0e9 now lets see if this works 2014-12-15 12:42:04 -08:00
ZappoMan
7d75d2d1bf make TextureCache work with DependancyManager 2014-12-15 10:34:16 -08:00
ZappoMan
6b39783de7 revert out the InterfaceConfig.h changes 2014-12-15 10:12:04 -08:00
ZappoMan
ca39c79df4 unix compile 2014-12-15 08:50:36 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
2014-10-13 18:00:50 -07:00
Andrzej Kapolka
618f6415da Working on specular bits for deferred lighting. 2014-09-11 19:36:37 -07:00
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
Andrzej Kapolka
1adf3d2878 Go ahead and generate mipmaps for all network-loaded textures. It is the
21st century, after all.
2014-09-11 12:41:12 -07:00
Andrzej Kapolka
21f3f2b90e Switch to deferred lighting for metavoxels. 2014-09-04 17:17:44 -07:00
Andrew Meadows
8057071c12 put averageColor init closer to where it is used 2014-08-25 15:18:57 -07:00
Andrew Meadows
3ad9797607 fix crash: divide by zero when computing avg color 2014-08-25 15:15:27 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Andrzej Kapolka
6e06b63709 For splat textures, use transparent white as a default. 2014-08-21 16:33:09 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrzej Kapolka
5b8ff07449 Working on heightfield textures. 2014-08-18 18:21:48 -07:00
Chris Oates
c79c5df295 Fixing up #define / #if pair so that permutation table change can be turned of by setting #defined variable to 0 instead of having to comment it out. 2014-07-02 13:50:47 -07:00
Chris Oates
2d9a42c07a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a Implemented Improved Perlin Noise in existing "textured voxels" option.
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
2014-07-02 13:09:16 -07:00
barnold1953
508fed9146 Add ability for FBO to have a different res than glWidget 2014-06-27 11:44:05 -07:00
Kai Ludwig
3e1d0536c1 Fix for: #19626 - Fix the Windows 7 crash
The image data for glTexImage2D is size=width x height without any borders. So there must be a border of 0 given when calling glTexImage2D, otherwise there is not enough image data causing crashes when textures get loaded.

The effect occurs reproducible on Win7 with ATI cards. Maybe their OpenGL-Implementation is less robust ...
2014-05-11 16:18:46 +02:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrzej Kapolka
873620e601 Make sure we set the texture data even if the texture URL is invalid. 2014-04-14 12:27:15 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Andrzej Kapolka
56ff423cf5 Let's actually use the result of our format conversion. 2014-03-20 14:27:38 -07:00
Andrzej Kapolka
e34f2ca69b Remove file texture loading (since we can just use file URLs), don't add alpha
channels for opaque textures (and note when textures with alpha channels are
entirely opaque), enforce a maximum texture size of 1024 by 1024.
2014-03-19 16:11:15 -07:00
Andrzej Kapolka
f8e6593bcf Turn off mipmaps. Performance is actually substantially better without them. 2014-03-11 15:24:14 -07:00
Andrzej Kapolka
bc3bba9240 Get rid of unused, expensive "average color" nonsense. 2014-03-11 14:01:23 -07:00
Andrzej Kapolka
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrzej Kapolka
1357aee01e Use mipmaps and trilinear filtering for models. Closes #2180. 2014-03-04 13:03:31 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we
read from the cache, we're reading synchronously from a file.  Closes #2171.
2014-03-03 15:16:13 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of
resources being requested at any one time.
2014-02-27 18:13:40 -08:00
Andrzej Kapolka
6b90a3994d Working on avatar billboards. 2014-02-20 19:22:59 -08:00
Andrzej Kapolka
3edb81baf4 Check for texture translucency, render translucent mesh parts after opaque
ones, without alpha testing, and with back face culling enabled.
2014-01-28 12:01:32 -08:00
stojce
a401d822a3 Merge 2014-01-16 18:39:21 +01:00
stojce
50ad5a4ec8 alternate css background settings for selected items in QTreeView 2014-01-15 23:38:34 +01:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00