Commit graph

83 commits

Author SHA1 Message Date
Stephen Birarda
1e8e337fc7 fix spacing in NetworkGeometry method 2014-11-12 09:48:36 -08:00
Stephen Birarda
5415f8a350 handle texture replacement if model hasn't yet loaded 2014-11-12 09:47:18 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
AndrewMeadows
efd9626c2f Merge pull request #3740 from samcake/temp0
Introduce the input stream stage to the gpu::Batch and apply it for model rendering
2014-11-06 14:14:08 -08:00
Sam Gateau
bed524716d Removed all the prefix to the enum values, since all the enums are in the gpu scope we consider its good to avoid name colisions 2014-11-06 14:01:43 -08:00
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
Sam Gateau
2b27af51f1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-05 09:35:26 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -08:00
Andrzej Kapolka
3b56f613e2 Cone render function, some cleanup of GeometryCache methods. 2014-11-04 13:21:51 -08:00
Sam Gateau
f413f93c62 fix the bug for blend shape when more than one and clean the model rendering with the new stream and buffer gpu api 2014-11-03 23:26:39 -08:00
Sam Gateau
ed067791f2 Fixing format for skin attributes float need to be NFloat 2014-11-03 14:29:11 -08:00
Sam Gateau
fba1526389 Migrating the model rendering code to use the new gpu api for input buffers and stream format 2014-11-03 09:56:14 -08:00
Sam Gateau
2390559969 INtroducing the stream format and the Stream and making it work for the model mesh 2014-10-31 10:02:26 -07:00
Stephen Birarda
e2536dd3f8 remove a debug line 2014-10-27 16:55:24 -07:00
Stephen Birarda
209c12cb1c repairs for texture replacement by name 2014-10-27 16:52:22 -07:00
Stephen Birarda
cc28fe958e add a hack method to NetworkGeometry to change a material texture by name 2014-10-21 15:44:34 -07:00
Stephen Birarda
047ee0a513 pipe texture names through to NetworkTexture 2014-10-21 12:20:12 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
2014-10-03 16:55:58 -07:00
Andrzej Kapolka
e0a56b4a95 Rejiggered the blender handling: allow up to N blenders active at once so
that with small numbers of avatars, the blenders can stack for lower latency.
2014-09-17 17:57:08 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Andrzej Kapolka
97813a2f72 Make sure we note that the blender finished even if the geometry changed. 2014-09-12 15:34:49 -07:00
Andrzej Kapolka
6e06b63709 For splat textures, use transparent white as a default. 2014-08-21 16:33:09 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately
redownloaded.
2014-05-09 17:50:08 -07:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -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
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrzej Kapolka
635f3b6dc3 Perform the mesh blending in worker threads and only when we've actually
received new data.  Closes #2075.  Closes #2348.
2014-03-18 16:38:05 -07:00
Andrzej Kapolka
299dbb93ea Removed "springiness" bits. 2014-03-18 13:57:36 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
2014-03-12 12:10:29 -07:00
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