Brad Davis
a3828ce45c
Fixing comment
2017-03-21 13:42:24 -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
samcake
bb9957b7f1
using comments from review
2016-03-08 18:45:20 -08:00
samcake
afbec33f36
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-08 16:12:21 -08:00
Zach Pomerantz
77958e2a48
Change FBXReader impl to recognize inlined tex
2016-03-08 12:23:23 -08:00
samcake
3a810152fb
Trying to consolidate the FBX reader for Blender /maya
2016-03-07 18:30:22 -08:00
samcake
9fb318570b
Ajusting the pure Ambient SH lighting pass and more review issues
2016-03-01 12:24:44 -08:00
samcake
903824809c
trying to have better support for the materials
2016-02-18 18:33:32 -08:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
samcake
d7edc8c2ba
Adding more fields ready for the PBR stingray materials
2016-02-17 16:06:30 -08:00
samcake
2ed7f997e3
A few changes in the material call back
2016-02-17 10:44:15 -08:00
samcake
b03f639e2c
Renaming and rearranging the material fields to support PBR fbx materials
2016-02-16 17:20:23 -08:00
samcake
f98f8d5bbb
Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"
2016-01-22 11:51:02 -08:00
ericrius1
0ffcf437e9
Fix for transparent textures not being rendered with opacity
2016-01-20 16:22:49 -08:00
Anthony J. Thibault
8f46b8a765
Added USE_PRE_ROT_FROM_ANIM option to AnimClip
...
This will allow us in the future to pull preRotations from
animations instead of the model skeleton. It is disabled
by default because our current animations preRotations are
not correct for the left hand.
2015-11-23 15:58:18 -08:00
Andrew Meadows
5c6df734c5
initialize vector of vec3's
2015-11-18 10:47:53 -08:00
Andrew Meadows
ae88057ad9
remove dangling whitespace
2015-11-18 10:24:10 -08:00
