Stephen Birarda
d2bea94768
simplify fileOnUrl to always look right beside FBX
2017-06-09 15:52:21 -07:00
Atlante45
ea870881ee
Log warning when we detect a connection loop
2017-05-25 12:48:21 -07:00
Atlante45
babae456d2
Fix infinite loop in fbx reader
2017-05-25 10:42:33 -07:00
Stephen Birarda
e86db26224
Revert "fix relative/absolute path handling for external FBX textures"
2017-04-10 14:31:02 -07:00
Stephen Birarda
e4021c168e
add special handling for abs drive letter paths from windows
2017-04-05 16:52:22 -07:00
Stephen Birarda
70eada0f76
replace backslashes in parsed fbx relative filepaths
2017-04-04 15:01:18 -07:00
Stephen Birarda
137e73cf21
check absolute path before relative path
2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8
pass URLs to readFBX, not just URL path
2017-04-04 14:34:10 -07:00
Stephen Birarda
4e07a6a865
add new logic for absolute texture paths in FBX
2017-04-04 14:02:00 -07:00
Stephen Birarda
b9783d768e
remove fileOnUrl since it is no longer used
2017-04-04 11:08:30 -07:00
Stephen Birarda
d4112f0e36
use full relative filepath for texture caching/referencing
2017-04-03 14:57:02 -07:00
Andrew Meadows
60bc76e1c4
store cluster indices and weights in uint16_t
2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041
remove unused cruft
2017-03-27 14:40:31 -07:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Brad Davis
a3828ce45c
Fixing comment
2017-03-21 13:42:24 -07:00
Atlante45
73dd2abdaf
Delete old sitting points code
2017-03-20 17:29:44 -07:00
Brad Davis
813e3a1bca
Fix issue with scaling prior to KTX serialization
2017-03-17 08:05:52 -07:00
Brad Hefta-Gaub
07cf87749f
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
Andrew Meadows
8b1f569132
tweak max texture resolution thresholds
2017-02-06 12:13:31 -08:00
Andrew Meadows
8b2c720e29
sliding texture caps for models
2017-02-06 11:53:37 -08:00
Brad Davis
67ce5040ec
Fix bug in FBX parse changes
2017-01-16 10:09:47 -08:00
Brad Davis
29b160d685
Reduce temp qvariant creation and qvariant conversion
2017-01-12 16:17:03 -08:00
Anthony J. Thibault
68b103b46b
Fix for missing fields in static initializer.
2016-12-01 15:21:49 -08:00
Anthony J. Thibault
e96676fea4
Support for the 3ds Max object offset feature
...
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
2016-11-30 18:28:55 -08:00
Anthony J. Thibault
1c6fbc08bf
Speculative fix for crash in FBXReader.cpp
...
I could not reproduce the issue, however looking at the stack trace shows that
the crash is due to indexing past the end of the FBXNode::properties QVariantList.
Guard against this from happening by checking the property length first.
2016-10-17 13:22:17 -07:00
Brad Hefta-Gaub
e32929dce2
added support for material map in FST file
2016-07-11 17:40:07 -07:00
samcake
a619a142ed
Friday night build, working on getting the LUT generated on the GPU
2016-06-24 17:48:40 -07:00
Brad Hefta-Gaub
262e0262fc
Merge pull request #7889 from samcake/color
...
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
2016-06-08 17:38:45 -07:00
samcake
25eb569433
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-06-02 10:38:40 -07:00
Anthony J. Thibault
0035774eb2
Fix for models exported from Daz3D.
...
The way post rotations were being applied was incorrect.
I guess we've never tried a model that used the Maya Rotate Axis property before...
2016-06-02 10:07:09 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
samcake
5050456c32
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-05-16 11:20:14 -07:00
Brad Hefta-Gaub
c443138dd2
Merge pull request #7869 from zzmp/fix/fbx-access
...
Check vector access in fbx reader
2016-05-13 15:29:24 -07:00
samcake
815dcfd90e
Merge branch 'red' of https://github.com/samcake/hifi into color
2016-05-13 11:01:52 -07:00
samcake
f569169662
Trying to support ambient occlusion map from blender
2016-05-13 11:01:15 -07:00
Zach Pomerantz
8db1f296de
Check vector access in fbx reader
2016-05-11 15:17:59 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
samcake
2d573963bb
Introducing the unlit material
2016-05-04 18:50:52 -07:00
samcake
3c80767ec3
Adding the shadingMOdel read from the fbx material
2016-05-03 18:43:20 -07:00
Zach Pomerantz
948af75f8a
Transfer loaded resources with smart ptrs to avoid shutdown deadlock
2016-04-20 13:00:35 -07:00
samcake
34633c2f19
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-22 16:51:32 -07:00
samcake
3274df9923
Fixing the missing field for blender translucent map
2016-03-22 16:18:51 -07:00
Seth Alves
47fb85eaeb
be more defensive in FBXGeometry::convexHullContains
2016-03-22 11:24:12 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
2ef5b3727e
Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash
2016-03-18 14:04:45 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Seth Alves
87dbec8974
add comment
2016-03-17 14:43:00 -07:00
Seth Alves
cea97aa317
fix FBXGeometry::convexHullContains crash
2016-03-17 10:55:24 -07:00
