Commit graph

89 commits

Author SHA1 Message Date
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
dev
ce103acdf6 More debugging of the FBXReader in order to understand how to interpret the material fields 2014-11-24 18:32:36 -08:00
Sam Gateau
6a63099a0f Fixed syntax issues and review critics, put all the debugging code in a #define block 2014-11-24 15:24:20 -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
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrew Meadows
7f4e0c206c cache indeces to toe joints 2014-11-19 09:13:03 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -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
6b1dc67883 some cleanup 2014-10-29 08:17:30 -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
AndrewMeadows
2569f70ac3 Merge pull request #3623 from ey6es/master
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog.  Also added some more default node names to look for on upload.
2014-10-20 09:00:06 -07:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -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
e29188bacd fix SVOs to render again 2014-10-17 11:01:25 -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
37eb40122c Tiny tweak to weight loading: only replace lowest weight if the new weight is
greater.
2014-09-18 13:05:57 -07:00
Andrzej Kapolka
801630e19c Normalize vertex weights if they don't add up to one; replace lowest weight
if we can't find an empty slot.
2014-09-17 13:26:57 -07:00
Andrzej Kapolka
213b4e6ee6 Removed testing code. 2014-09-16 17:53:40 -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
ZappoMan
f88970f8fe moved Extents to shared 2014-09-11 12:32:47 -07:00
ZappoMan
e6fc9d68ff add getUnscaledMeshExtents to FBXGeometry 2014-09-09 17:51:35 -07:00
ZappoMan
1e6b49899a allow FBXReader to parse new format SVO files 2014-09-05 15:12:41 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Stephen Birarda
92b2fe6d68 remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists 2014-08-08 13:22:00 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
1059e9a635 add back more required Qt modules 2014-08-08 13:17:52 -07:00
Stephen Birarda
b5c8a4d2c6 fix requirement of networking in audio library 2014-08-08 13:17:52 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -07:00
Andrew Meadows
b21bac25a1 bug fix for broken seams in models
don't hijack the "weight" variable because it's used elsewhere
2014-07-21 13:41:41 -07:00
Andrew Meadows
58e31abf60 improved collision shapes for fingers 2014-07-17 14:31:16 -07:00
Andrew Meadows
53ee5f2340 minor cleanup around measurements of joint radius 2014-07-17 12:42:18 -07:00
Atlante45
c660986480 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-25 10:49:51 -07:00
Atlante45
9a6f144da9 Added sitting points metadata for fst 2014-06-24 18:21:57 -07:00