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
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Brad Hefta-Gaub
7397b884e7
support for fbx2016 format
2016-08-30 09:07:39 -07:00
Brad Davis
4c150efc11
Categorize some debug logging in FBX parsing
2016-08-11 12:09:56 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
samcake
307243da8b
cleaning compilation warnings and tuning the FBX material mapping pass
2016-07-13 11:04:53 -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
samcake
3ec14fd746
MErging and still trying to understand the curvature isssue
2016-06-22 18:06:55 -07:00
samcake
0c882832bf
Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)
2016-06-20 17:58:35 -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
c1fa096e78
adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map
2016-05-16 15:42:48 -07:00
samcake
5050456c32
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-05-16 11:20:14 -07:00
Atlante45
0878d87ac7
remove some unnecessary dependencies
2016-05-14 14:50:02 -07:00
Brad Hefta-Gaub
b1d86c8881
Merge pull request #7898 from samcake/red
...
Fix broken rendering for simple metallic material
2016-05-13 17:22:36 -07:00
samcake
cdb9cb6519
Fixing the metallic simple material rendering black from obj
2016-05-13 16:33: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
80c80091e4
Cleaning up code
2016-05-11 11:12:39 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
samcake
a8347cac6e
Getting the unlit to work from the pipeline, and found the isLinear for texture bug!
2016-05-06 18:36:55 -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
Brad Hefta-Gaub
c962cfbda3
Merge pull request #7712 from zzmp/guard/obj-access
...
Guard OBJ at operators
2016-04-22 13:43:59 -07:00
Zach Pomerantz
62f1e8d129
Fix checked_at in OBJReader to use ref
2016-04-21 10:02:35 -07:00
Zach Pomerantz
d28b12ec3c
Guard OBJ at operators
2016-04-20 13:04:45 -07:00
Zach Pomerantz
948af75f8a
Transfer loaded resources with smart ptrs to avoid shutdown deadlock
2016-04-20 13:00:35 -07:00
Brad Davis
4f373937f9
Additional performance markers
2016-04-03 20:41:34 -07:00
howard-stearns
51a4154ae7
Check results of qUncompress, and catch fbx reader throws in utility
...
programs.
2016-03-30 16:56:39 -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
afa6e6e30a
Merge pull request #7414 from zzmp/fix/leaking-reply
...
Delete used QNetworkReply
2016-03-21 16:06:45 -07:00
Zach Pomerantz
40aabe7fae
Delete used QNetworkReply
2016-03-21 13:30:01 -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
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
howard-stearns
b9a3e130cb
Safer early-bail for fetch of subresources of .obj models.
2016-03-18 15:02:30 -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
Brad Hefta-Gaub
a6ecfd789c
Merge pull request #7381 from sethalves/fix-crashes-1
...
fix FBXGeometry::convexHullContains crash
2016-03-17 16:00:58 -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
Howard Stearns
e25c547cb7
whitespace
2016-03-16 09:50:05 -07:00
