Andrew Meadows
793a760272
merge upstream master into "radians" project
2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Andrzej Kapolka
bc3bba9240
Get rid of unused, expensive "average color" nonsense.
2014-03-11 14:01:23 -07:00
Andrzej Kapolka
d2f947aee1
Working on LRU cache for resources.
2014-03-10 10:49:38 -07:00
Stephen Birarda
90d4bbee78
Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm
2014-03-06 09:16:22 -08:00
Andrzej Kapolka
ad25455f86
Track hysteresis for next model separately, but just in case, don't use
...
recursion to fall back on hysteresis value. Closes #2209 .
2014-03-05 18:06:14 -08:00
Stephen Birarda
7451cfe130
remove glm so it is referenced only externally
2014-03-04 15:19:47 -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
Andrzej Kapolka
380b0536b3
Indentation fix.
2014-02-28 16:18:44 -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
cd2bd32210
Delay loading models until we know that we need them (i.e., that we're not
...
beyond billboard distance). Closes #2121 .
2014-02-27 12:30:46 -08:00
Andrzej Kapolka
1afd3ab712
Fixes for OS X warnings.
2014-02-13 17:07:57 -08:00
Andrzej Kapolka
078b15c02d
Add some hysteresis on the LOD switching to prevent rapid switching back
...
and forth.
2014-02-13 16:20:43 -08:00
Andrzej Kapolka
ff01470850
Wait until each LOD level is actually requested before we start loading;
...
before a level is loaded, try to use the closest already-loaded level.
2014-02-13 14:25:01 -08:00
Andrzej Kapolka
6a39290bf5
Basic LOD switching based on distance to camera.
2014-02-13 13:37:29 -08:00
Andrzej Kapolka
b6d77ec637
Switched from loading FBX and FST simultaneously to loading FST first, then
...
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model. Also fixed a bug with the fallback models (they were
invisible after second failure).
2014-02-11 14:20:52 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -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
afa7a429b9
Fixing build after merge
2014-01-24 07:41:53 +01:00
Andrzej Kapolka
0a3d6ae5e0
More work on metavoxel editing (grid, etc.)
2014-01-21 19:31:56 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Andrzej Kapolka
0694a7d4a5
When we fail to download textures or geometry, retry after steadily increasing
...
delays. Closes #1471 .
2014-01-13 16:09:36 -08:00
Andrzej Kapolka
55de8ceb85
Use blue default texture when we fail to load a normal map.
2013-10-31 14:46:51 -07:00
Andrzej Kapolka
06e050f1c1
Normal map support almost there.
2013-10-29 22:13:00 -07:00
Andrzej Kapolka
bae4a17605
Voxel attachments.
2013-10-24 13:59:04 -07:00
Andrzej Kapolka
ba25087b3e
Support for multiple mesh "parts" (with different materials), fix for
...
untextured meshes.
2013-10-15 15:58:34 -07:00
Andrzej Kapolka
db30e729d4
More work towards skinning.
2013-10-14 16:46:17 -07:00
Andrzej Kapolka
6e012ea6d2
When computing average model color, skip eyes and weight rest by number of
...
vertices.
2013-10-10 16:04:42 -07:00
Andrzej Kapolka
4c073426c8
Ball and cone color from average geometry colors.
2013-10-10 13:41:50 -07:00
Andrzej Kapolka
60306af3e9
Default springiness, allow springiness on non-blended meshes.
2013-10-08 13:35:02 -07:00
Andrzej Kapolka
2fc1af8c1a
Fix for relative texture paths.
2013-10-03 15:47:43 -07:00
Andrzej Kapolka
5756733aef
Load mapping and use it for offset, joint mappings, blendshape mappings.
2013-10-03 14:03:01 -07:00
Andrzej Kapolka
c98dec8a65
Dilate our network-downloaded textures.
2013-10-02 11:59:14 -07:00
Andrzej Kapolka
97cbef1d59
Avoid warnings on invalid URLs, delete reply when reference is deleted.
2013-10-02 10:23:04 -07:00
Andrzej Kapolka
3c3cf0b002
Basic geometry sharing/texture loading.
2013-10-01 10:50:09 -07:00
Hifi Test Account
5f90e1a4e9
Fix the last commit. Remove compile error and increased buffer size to
...
to account for the increased size of vertexData.
2013-08-07 12:30:45 -07:00
Hifi Test Account
1e7dbbbccd
Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class.
2013-08-07 12:07:41 -07:00
Hifi Test Account
05d933bf33
Successful static half cylinder backing.
2013-08-06 18:38:41 -07:00
Hifi Test Account
d725bcdbff
Fix renderHalfCylinder so it only has 2 args now.
2013-08-06 18:09:51 -07:00
Mark Peng
57efea40ee
Add untested renderHalfCylinder function to GeometryCache/
2013-08-05 19:52:02 -07:00
Andrzej Kapolka
03de2f3ea7
Render a green plane with fog, per Grayson's request.
2013-08-05 11:41:42 -07:00
Andrzej Kapolka
7ab1055d47
Derp, need to bind the element array buffer.
2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d
Turns out sincos is a GNU thing.
2013-06-24 17:16:06 -07:00
Andrzej Kapolka
ef7c6ebdc6
Basic blinking.
2013-06-21 18:11:31 -07:00
