samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -08:00
Andrew Meadows
56911bdf1b
sliding texture caps for models
2017-02-03 11:14:40 -08:00
Andrew Meadows
2f8823d103
name change: maxSize to maxNumPixels
2017-02-02 14:09:47 -08:00
Andrew Meadows
64dbfd0819
cap size of textures from FBX files
2017-02-02 13:38:08 -08:00
Andrew Meadows
b4cef787d9
cleanup whitespace
2017-02-02 13:38:08 -08:00
Seth Alves
91e542a7a7
ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one
2017-01-31 21:26:49 -08:00
Seth Alves
bb3155ee61
obj file is now produced in /tmp
2017-01-31 14:29:42 -08:00
Seth Alves
541692c5ca
start on scripting interface to allow saving polyvox meshes to obj files
2017-01-28 15:38:18 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -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
Brad Davis
2383592678
Improve FBX parsing performance by bulk loading of arrays
2017-01-12 16:17:02 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -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
Seth Alves
43536e0046
in C, order of argument evaluation isn't defined
2016-10-28 15:48:54 -07: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
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
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
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
74c92af8e0
Merge pull request #5741 from AndrewMeadows/brokenCapsules
...
fix for bad bounding capsules for avatars
2015-09-09 09:33:57 -07:00
Andrew Meadows
281e4f21fc
fix avatar bounding capsule calculations
2015-09-08 15:03:12 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Anthony J. Thibault
5882ec02d0
Merge branch 'master' into ajt/new-anim-system
2015-09-04 11:05:29 -07:00
Andrew Meadows
16dfc39f5f
fix collision shape of avatars
2015-09-03 18:22:35 -07:00
Anthony J. Thibault
de31b92fd5
Merge branch 'master' into ajt/new-anim-system
2015-09-02 17:53:56 -07:00
Anthony J. Thibault
99586f259c
Renamed bindTransformIsValid to bindTransformFoundInCluster
2015-09-02 13:44:34 -07:00
Andrew Meadows
4a7a384c65
avoid bad joints when computing bounding capsule
2015-09-01 14:12:14 -07:00
Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9
Cleanup
2015-08-28 16:38:07 -07:00
Sam Gateau
e2fce12713
Splitting the FBXREader.cpp file into sub files
2015-08-28 09:51:03 -07:00
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02
REfining th eTextureMap design but still with the issue of the lightmapped model
2015-08-27 09:52:07 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Seth Alves
f53704051f
ifdef out debug prints in OBJ reader
2015-08-26 15:09:58 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Anthony J. Thibault
5a73aef1f8
AnimSkeleton more accurate bind pose generation.
2015-08-24 16:19:16 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Seth Alves
1c8030472a
back out the more controversial changes
2015-08-17 12:40:56 -07:00
Seth Alves
d6322903a2
quiet compiler
2015-08-11 10:12:46 -07:00
Sam Gateau
561a058dc8
cleaning th ecode
2015-08-06 18:53:21 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -07:00
Anthony J. Thibault
da3d35cdfc
Added scaleOffset to FBXJoint::postTransform as it was missing.
...
Also added some documentation/comments to the FBXJoint struct.
2015-08-04 18:14:50 -07:00
Andrew Meadows
b00d47d62e
merge master into cleanup of legacy shapes
2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
ZappoMan
05a4a6aa9b
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
2015-08-01 13:07:56 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123
Added the & references to the const variables
2015-07-30 15:08:02 +02:00
Howard Stearns
ebd0e38d49
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:54:40 -07:00
Seth Alves
b7ecffa0be
treat a "g" in an obj file the same as a "o"
2015-07-29 17:55:56 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Seth Alves
f4a23065b4
if obj data isn't from a url, don't dereference null url pointer
2015-07-27 19:06:14 -07:00
Andrew Meadows
c7f367bfd7
removing unnecessary #include <Shape.h>
2015-07-27 15:30:37 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Marcel Verhagen
d25e09af74
removed the last 2 filename lines, they should not be there.
2015-07-26 00:48:31 +02:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Howard Stearns
3cd1e318b2
Fix https://app.asana.com/0/32622044445063/39927009585710
2015-07-14 13:15:24 -07:00
Marcel Verhagen
fac497dadc
Removed the file where the directory is stripped off the RelativeFilename, and replace \ with /.
...
However this introduces a new problem with the current fbx files who do not have their textures in the original dir but moved it to the dir where the fbx file lives.
Suppose there should be some logic when the texture is not found to look if the texture lives in the dir above the RelativeFilename.
In any case it is not obvious when there is a texture missing on a model, it simply renders black.
2015-07-14 15:31:56 +02:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
b0f5990bd7
fix syntax
2015-06-19 17:13:29 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
ZappoMan
aa05d9f67c
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-10 08:53:33 -07:00
ZappoMan
ba0cecb356
remove attachments from Model - only supported at avatar layer
2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7
first take on the materialKey
2015-06-09 12:17:10 -07:00
Seth Alves
1e2e4001b1
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 10:24:02 -07:00
Seth Alves
0db5ddc5b7
port code from samcake's model branch
2015-05-13 15:43:16 -07:00
Howard Stearns
c0a71da9e3
Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting ( http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj ).
2015-05-09 13:16:34 -07:00
Howard Stearns
8db8e56af0
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 16:41:52 -07:00
Howard Stearns
aad4c06244
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 12:03:56 -07:00
Howard Stearns
9acdb3fb28
Proper defaults for material properties and a fail-safe for missing uv coordinates.
2015-05-07 10:47:50 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Howard Stearns
35337ef2c2
Spell out order-of-evaluation for the compiler.
2015-05-06 12:28:45 -07:00
Howard Stearns
d2dbb2c116
Missing the code!
2015-05-06 11:57:34 -07:00
Howard Stearns
4090f892b2
Merge remote-tracking branch 'upstream/master' into objReader
2015-05-05 14:58:18 -07:00
Sam Gateau
73177cd81d
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-04 14:07:59 -07:00
Sam Gateau
ade404a74d
getting rid of QSHaredPointer in favor of std::shared_ptr
2015-05-04 13:43:30 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Howard Stearns
eb05099261
(Try to) Address header file-location-discrepency between xcode and the jenkinds build environment.
2015-05-01 21:39:19 -07:00
Howard Stearns
e1d47413cc
Material library handling.
...
This is now functionally complete, but it needs testing, and the some tidying up.
2015-05-01 20:54:25 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Sam Gateau
1b558e7390
investigating the semi transparent textured bug
2015-05-01 13:37:04 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
Howard Stearns
ee93e1d300
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader
2015-05-01 09:51:15 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
Howard Stearns
bf45f865a4
Codding standards, and fix an unintentionally duplicated declaration.
2015-04-30 10:07:46 -07:00
Howard Stearns
2687a7b038
Take 2 on making MSVC happy.
2015-04-30 08:25:32 -07:00
Howard Stearns
fd63cb7ed1
Attempt to clean up cross-platform isdigit reference.
2015-04-30 07:28:13 -07:00
Howard Stearns
7245ca4ff3
According to the jenkins build report, Windows/MSVC has a different definition of std C++ than ISO does.
...
Fine. Make our own cross-platform isdigit.
2015-04-29 22:57:41 -07:00
Howard Stearns
242001a589
Restore some very odd modularity used by VHACDUtil.
2015-04-29 22:17:44 -07:00
Howard Stearns
810242e182
coding standard: comparison for pointer types (replaced with object isEmpty)
2015-04-29 16:12:22 -07:00
Howard Stearns
fb825f6d10
Noisy constant for number of vertices in a triangle.
2015-04-29 15:45:38 -07:00
Howard Stearns
3c88146d17
Fix indentation.
2015-04-29 15:39:30 -07:00
Howard Stearns
1e81caab6c
Get rid of superflous this->.
...
Add comments about side-effect of getFloat().
2015-04-29 15:37:39 -07:00
Howard Stearns
1255d46140
coding standard: type formatting and variable names
2015-04-29 15:19:40 -07:00
Howard Stearns
5d729b98d6
coding standard: brace placement
2015-04-29 14:05:30 -07:00
Howard Stearns
bd5272d677
Textures for .obj reader:
...
Refactor so that uv coordinates can be associated with vertices that might otherwise be on different materials.
Defer the assignment vertex/normal/uv assignment until later so that it could potentially be moved directly to model geometry instead of fbx geometry.
Handle the actual uv coordinates.
This version does not handle explicit .mtl files, but it does handle those .obj files that follow the convention that there is a .jpg with the same name as the .obj file.
2015-04-29 13:35:21 -07:00
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Atlante45
bda72025af
Check mesh extend before going through triangles
2015-04-23 16:40:40 +02:00
Atlante45
99b3ef0d75
Move contain function to FBXGeometry
2015-04-22 21:17:12 +02:00
Sam Gateau
f06556ba12
migrate the various list to sort the rendering from explicit names to a more generic key based map
2015-04-16 14:37:39 -07:00
ZappoMan
ae16bab7c2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2015-04-14 13:13:15 -07:00
Seth Alves
efa5c473d2
add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields
2015-04-09 14:29:17 -07:00
Sam Gateau
f0efade06d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-07 12:56:21 -07:00
Seth Alves
9014397167
try again without macro
2015-04-07 09:59:04 -07:00
Sam Gateau
dee651069c
adding support for color attribute in FBX, and displaying it correctly
2015-04-06 23:33:13 -07:00
Seth Alves
8bd77fbcc7
separate out logging for fbx and gpu libraries
2015-04-06 16:52:31 -07:00
Seth Alves
7af32bd67a
put audio and script-engine logging into their own QLoggingCategory
2015-04-06 15:57:18 -07:00
Seth Alves
2fbfa34c5c
removed uneeded logging
2015-04-06 09:14:53 -07:00
ZappoMan
7f4c577e80
end of file
2015-04-03 17:25:39 -07:00
ZappoMan
1a463a0256
more work on improved avatar UI adding model names and backward compatible support
2015-04-03 17:03:22 -07:00
Seth Alves
00449ef7c0
new member variable to remember the order in which meshes appeared in the model file
2015-04-01 17:50:35 -07:00
Seth Alves
36cd69c38a
new member variable to remember the order in which meshes appeared in the model file
2015-04-01 17:50:20 -07:00
Seth Alves
420424a5ee
make it possible to sort meshes into the same order they appear in the model file
2015-04-01 17:49:49 -07:00
Seth Alves
bacd6445f2
pull comments that get used as scaling hints into a hash table
2015-03-31 16:59:13 -07:00
Seth Alves
48144a46b1
don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.
2015-03-31 14:34:35 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
ZappoMan
0366ce9bf5
removed dead code
2015-03-30 17:33:25 -07:00
ZappoMan
002fba8018
first cut at predicting FST type for set avatar
2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -07:00
Seth Alves
cfa30594cc
make obj reader handle faces with more than 4 vertices
2015-03-27 14:24:36 -07:00
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -07:00
Atlante45
e16c8852fb
extra ;
2015-03-27 14:43:09 +01:00
Atlante45
daaba330d5
Turn lambda into helper function
2015-03-27 14:41:32 +01:00
Atlante45
c26b499671
Add forgotten include
2015-03-26 15:58:18 +01:00
Atlante45
716e9bfe4f
Hint order for FST files
2015-03-26 15:40:48 +01:00
Seth Alves
a2bc34ced9
fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review
2015-03-16 10:03:55 -07:00
Seth Alves
b15fd2ef94
compatibility and other fixes for obj reader
2015-03-15 08:08:39 -07:00
Seth Alves
ab8784f1b4
add comment about character capsule being hard-coded
2015-03-09 13:51:08 -07:00
Seth Alves
0833fc588b
coding standard
2015-03-09 06:56:35 -07:00
Seth Alves
3604fd639a
formatting
2015-03-08 20:03:10 -07:00
Seth Alves
804d4a0963
coding standard
2015-03-07 20:31:37 -08:00
Seth Alves
05e0fe3536
object display correctly now?
2015-03-07 11:28:30 -08:00
Seth Alves
f807384dfe
build a joint and caclulate extents. obj models now show up, though not correctly.
2015-03-07 07:55:04 -08:00
Seth Alves
591edc0527
_mesh instance variable doesn't appear to be in use.
2015-03-07 07:51:47 -08:00
Seth Alves
6e79fc8b68
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-06 18:46:13 -08:00
ZappoMan
ffab6ffe48
tweaks to hacks for detecting mixamo files
2015-03-06 15:11:02 -08:00
Seth Alves
858d15d0ba
obj reader sort-of works
2015-03-06 13:15:53 -08:00
Stephen Birarda
44f8e599e2
test the possibility that zlib is no longer required
2015-02-19 15:29:28 -08:00
Stephen Birarda
b2e587dbbd
remove use of include_dependency_includes and use cmake
2015-02-18 14:12:05 -08:00
Stephen Birarda
c110fcbfad
merge with upstream/master
2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb
updates to build guides to remove soxr
2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9
Merge pull request #4289 from birarda/dependencies
...
add gverb and glm as cmake external projects
2015-02-17 10:00:29 -08:00
Stephen Birarda
8c998a65ee
use the glm find_package and check externals
2015-02-13 12:50:32 -08:00
Brad Hefta-Gaub
1827d9f3cd
Merge pull request #4256 from samcake/temp1
...
Getting rid of glLIghts and replacing by the model::Light
2015-02-13 10:49:53 -08:00
Stephen Birarda
26b93731f8
use glm as external project in fbx library
2015-02-13 10:28:06 -08:00
Andrew Meadows
123d73783b
remove warning about unused variable
2015-02-11 08:42:36 -08:00
Andrew Meadows
e6a6946027
merge upstream/master into andrew/thermonuclear
2015-02-09 12:44:52 -08:00
Sam Gateau
ace6dc4faf
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-02-08 23:23:06 -08:00
Brad Hefta-Gaub
12ab841191
Merge pull request #4248 from samcake/temp0
...
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
2015-02-06 16:52:40 -08:00
Sam Gateau
469ee29f0b
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
2015-02-06 16:30:47 -08:00
Sam Gateau
d4566bb1d7
Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters
2015-02-06 15:51:57 -08:00
Stephen Birarda
11f3161029
resolve conflicts on merge with upstream/master
2015-02-04 10:38:05 -08:00
Sam Gateau
6ad484e13f
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-02-03 17:26:27 -08:00
Sam Gateau
5719e277dd
FIx the lightmap not displaying when using the texcoord0
2015-02-03 16:10:31 -08:00
Sam Gateau
d8d0a28d0f
FInd a solution for lightmap without 2nd uvset
2015-02-03 14:34:11 -08:00
Andrew Meadows
28a3c3f469
separate new shape types from legacy
2015-02-03 08:34:06 -08:00
Atlante45
d68b59d4c7
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-01-28 13:13:58 -08:00
Sam Gateau
dc01611f26
Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded
2015-01-28 10:22:37 -08:00
