Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
ZappoMan
05a4a6aa9b
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
2015-08-01 13:07:56 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123
Added the & references to the const variables
2015-07-30 15:08:02 +02:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
ZappoMan
ba0cecb356
remove attachments from Model - only supported at avatar layer
2015-06-09 12:32:37 -07:00
Seth Alves
0db5ddc5b7
port code from samcake's model branch
2015-05-13 15:43:16 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
Atlante45
99b3ef0d75
Move contain function to FBXGeometry
2015-04-22 21:17:12 +02:00
Seth Alves
36cd69c38a
new member variable to remember the order in which meshes appeared in the model file
2015-04-01 17:50:20 -07:00
Atlante45
716e9bfe4f
Hint order for FST files
2015-03-26 15:40:48 +01:00
Seth Alves
591edc0527
_mesh instance variable doesn't appear to be in use.
2015-03-07 07:51:47 -08:00
ZappoMan
ffab6ffe48
tweaks to hacks for detecting mixamo files
2015-03-06 15:11:02 -08:00
Andrew Meadows
e6a6946027
merge upstream/master into andrew/thermonuclear
2015-02-09 12:44:52 -08:00
Brad Hefta-Gaub
12ab841191
Merge pull request #4248 from samcake/temp0
...
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
2015-02-06 16:52:40 -08:00
Sam Gateau
d4566bb1d7
Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters
2015-02-06 15:51:57 -08:00
Andrew Meadows
28a3c3f469
separate new shape types from legacy
2015-02-03 08:34:06 -08:00
Atlante45
d68b59d4c7
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-01-28 13:13:58 -08:00
Sam Gateau
dc01611f26
Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded
2015-01-28 10:22:37 -08:00
Atlante45
bbf6ae7b01
Move Faceshift constants to their own file in shared
2015-01-23 12:11:08 -08:00
chris
8bb69d0a90
Update std::string instances to QString
2015-01-09 16:22:52 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Andrzej Kapolka
c57fd15bc9
Rather than loading the entire FBX file into a byte array, read it straight
...
from the QNetworkReply.
2014-12-10 15:22:48 -08:00
ZappoMan
a6b86da47a
basics of triangle picking working for models
2014-12-05 11:31:27 -08:00
Sam Gateau
3215957398
better interpretation of the hifi light intensity and fixes for compilation on mac
2014-12-04 12:31:40 -08:00
Sam Gateau
30d87ee026
Trying to capture light information in order to get the one GLobal Light object containg the intensity value
2014-12-04 00:24:08 -08:00
Sam Gateau
845e687fc5
Adding a Hack for the apaartment model to boost the lightmaps
2014-12-01 11:45:07 -08:00
Sam Gateau
321d651d77
Hack for avoiding lightmaps loading in starchamber
2014-11-30 12:54:43 -08:00
Sam Gateau
77077f4e9c
hack a separate emissive information in the g-buffer
2014-11-25 18:17:28 -08:00
Sam Gateau
87471df7a1
First version of the lighmap working
2014-11-21 18:08:34 -08:00
Sam Gateau
7daff18101
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-20 09:57:59 -08:00
Sam Gateau
764ad72471
adding the light map support from FBX
2014-11-20 09:54:41 -08:00
Andrew Meadows
7f4e0c206c
cache indeces to toe joints
2014-11-19 09:13:03 -08:00
ZappoMan
c3d1d13fa9
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes
2014-10-29 11:56:27 -07:00
ZappoMan
17a20ceb16
pass the submesh name as extraInfo in the ray pick result
2014-10-29 10:49:24 -07:00
ZappoMan
a73cad91bc
first cut at reading and mapping submeshes to named models
2014-10-29 08:09:10 -07:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
Stephen Birarda
047ee0a513
pipe texture names through to NetworkTexture
2014-10-21 12:20:12 -07:00
Andrzej Kapolka
1b9b0f9fc9
Look for and store the "Skeleton" type flag so that we can offer only skeleton
...
joints in the dropdown.
2014-10-17 16:51:55 -07:00
ZappoMan
d1f263ecc5
group materials together when rendering models
2014-10-16 14:05:35 -07:00
Andrzej Kapolka
6c907a9d83
Read the emissive color property and use it to effect glow.
2014-09-19 16:49:51 -07:00
Andrzej Kapolka
fbd1efad81
Allow specifying material opacity.
2014-09-16 17:52:39 -07:00
ZappoMan
7db2930d91
remove calls to calculateRotatedExtents() use Extents.rotate() instead
2014-09-11 12:33:38 -07:00
