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
Howard Stearns
798a225573
Hack to suppress the attempted loading of .mtllib files if the url has a query part that includes "hifiusemat".
2016-03-15 21:11:54 -07:00
Howard Stearns
76b5b6aeeb
clean
2016-03-15 20:31:57 -07:00
Howard Stearns
c9f6b15ac5
checkpoint after lazy mtllib reading
2016-03-15 18:35:59 -07:00
howard-stearns
6161aab0c1
checkpoint
2016-03-15 17:05:01 -07:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
samcake
f82bd441a9
IMproving th ecomment
2016-03-09 10:34:49 -08: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
5299b06e83
Reintroducing the use of the DiffuseFactor so both Bender and MAya looks closer to Hifi
2016-03-08 11:26:16 -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
5401149713
Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial
2016-02-26 12:10:13 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
samcake
a0d7ce145e
Adding support for emissive and occlusion maps, on to pr land
2016-02-24 17:30:29 -08:00
samcake
2f5800a4cc
IMproving the shading model and the loading, added the roughness, needt to clean up
2016-02-23 18:31:38 -08:00
samcake
9d0803e6b8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-23 09:33:54 -08:00
Brad Davis
4169e9be9d
Don't deadlock objreader on shutdown
2016-02-22 14:24:31 -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
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -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
ericrius1
eb5a950f85
texture opacity potential fix
2016-01-20 15:08:39 -08:00
Zach Pomerantz
3280894e29
Load texture by convention with .obj
2015-12-15 19:30:15 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -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
Andrew Meadows
ee751ed1b9
use kDop volume of avatar mesh parts for capsule
2015-11-18 09:22:40 -08:00
Anthony J. Thibault
7367f2a28c
FBXReader: remove debugging logs
2015-10-28 17:55:06 -07:00
Anthony J. Thibault
5acb088c46
FBXReader: More deterministic loading behavior
...
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details ) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.
Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.
This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
Anthony J. Thibault
62c89eaf7d
Joint rotation fix for FBX files exported from Blender.
...
This isn't a great fix. But it will at least allow people to export avatars from Blender.
2015-10-19 13:49:13 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Seth Alves
3db148f3dc
fix obj model meshes
2015-10-08 11:13:52 -07:00
samcake
dd2aa36a11
FIx the shiny objects by actually using the specular map as it should be...
2015-10-06 23:10:03 -07:00
samcake
1788b7b019
Fix the bug created by the previous fix
2015-10-06 10:53:38 -07:00
samcake
429d82e650
Fixing review comments
2015-10-06 09:54:37 -07:00
samcake
1799322c67
Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp
2015-10-04 18:46:35 -07:00
samcake
55f5ab3732
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-04 18:31:56 -07:00
samcake
48416262a1
Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced
2015-10-04 18:31:19 -07:00
samcake
edaa8f998a
Migrating to the new mesh for rendering and having problems with multi part mesh
2015-10-02 18:12:16 -07:00
samcake
edb485cb0f
working on getting the Model payload to use model::Mesh
2015-10-02 12:24:41 -07:00
Anthony J. Thibault
fc7b6dee84
Merge branch 'master' into transmit-joint-translation
2015-10-02 11:40:33 -07:00
samcake
b8ea83099a
Debuggging
2015-10-01 21:13:22 -07:00
samcake
4478ca79ca
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-01 19:55:14 -07:00
Seth Alves
44e4f4dc63
merge from upstraem
2015-10-01 14:55:56 -07:00
Anthony J. Thibault
8bfd38ce7c
FBXReader: When the animation has no animation curve use the joint's default position.
2015-10-01 14:15:02 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
samcake
840f92bd06
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c
merging
2015-09-29 10:53:56 -07:00
samcake
103e1c76b3
Member initialization respecting the standard
2015-09-29 09:26:29 -07:00
samcake
1e9c19d535
Clean the Material FBX code and how we use the factor components for diffuse and specular
2015-09-28 17:46:48 -07:00
samcake
2a487a79a3
Getting something done today
2015-09-28 17:24:31 -07:00
Seth Alves
a8b135b5ca
fix material colors for OBJ models
2015-09-28 17:02:00 -07:00
Seth Alves
8f02ffb76a
git rid of if branch with same code in either branch
2015-09-28 15:32:53 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
Seth Alves
27688fa55b
get obj models to be visible again. textures don't work
2015-09-23 14:46:57 -07:00
samcake
d7d332acd4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
...
t :wq
2015-09-23 09:51:31 -07:00
samcake
518f5fe17c
Starting to clean the mesh part of the RenderItem....
2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
samcake
dfe17e5708
Fix issues from review
2015-09-21 16:12:17 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
samcake
6a714f405c
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
2015-09-21 00:53:48 -07:00
samcake
a41c20a1b7
Fixing buggy hash map look up and cleaning of name
2015-09-20 14:17:55 -07:00
