Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 10:36:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63325 commits 25 branches 0 tags 1.1 GiB
Commit graph

537 commits

Author SHA1 Message Date
Luis Cuenca
d7c525cf3a glTF importer Demo 
Imports a glTF model as the default avatar.
Geometry data and materials are imported.
No bone information is imported.
 2017-09-05 13:32:51 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision 
Also added debug rendering functionality.
 2017-08-10 15:52:51 -07:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
6f86b266cb support writing of vertex colors 2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953 make OBJ reader able to handle files where some vertices have colors and others don't 2017-07-22 11:57:51 -07:00
trent
559e2e0ebb Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex. 2017-07-20 13:09:17 -04:00
trent
ff3e9263ef Stupid tabs. 2017-07-20 11:40:42 -04:00
trent
d71b0802a7 Added vertex color support to OBJReader.h|cpp. 2017-07-20 11:38:42 -04:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
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
Seth Alves
48c78584c3 fix a bug that could cause OBJ models with external mtl references to hang the loading thread 2017-05-09 11:09:39 -07:00
Ryan Huffman
074a11306c Add support for atp and file urls in OBJReader 2017-05-01 13:22:02 -07:00
Ryan Huffman
8463fffc8c Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures 
Revert "fix relative/absolute path handling for external FBX textures"
 2017-04-10 15:30:40 -07:00
Stephen Birarda
e86db26224 Revert "fix relative/absolute path handling for external FBX textures" 2017-04-10 14:31:02 -07:00
Seth Alves
8d00f0ab8f allow obj reader to either combine meshes or keep parts separate 2017-04-07 15:59:01 -07:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures 
fix relative/absolute path handling for external FBX textures
 2017-04-06 15:58: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
trent
362ffba117 Fixes to OBJReader.cpp style inconsistencies. 2017-04-03 21:54:19 -04:00
trent
5cc87ccc4a Fixed warning for subtly-stupid unused variable. 2017-04-03 19:38:34 -04:00
Stephen Birarda
d4112f0e36 use full relative filepath for texture caching/referencing 2017-04-03 14:57:02 -07:00
trent
bec46747dd Merge branch 'master' of https://github.com/highfidelity/hifi into 21240 2017-04-03 16:46:36 -04:00
trent
2991332652 Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win. 2017-04-03 16:46:22 -04:00
trent
e9035a1efb More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine. 2017-03-30 19:10:15 -04:00
trent
c5bb419bd1 Fixed OBJ reader crash, did not fix OBJ reader not working properly. 2017-03-30 18:16:55 -04:00
trent
864184a107 wip OBJ loader rewrite; wip because it crashes. 2017-03-30 17:11:40 -04:00
trent
5bf3da9a7f Restoring hifi version of the OBJ files to get rid of my debug nonsense. 2017-03-30 16:14:42 -04:00
Seth Alves
36ad3af48e attempt to avoid a hang on shutdown 2017-03-30 11:35:24 -07:00
trent
ada7664749 Merge branch 'master' of https://github.com/highfidelity/hifi into origin/21240 2017-03-28 18:43:30 -04:00
trent
2d0fac794e Committing this work-in-progress loader as an example of how not to do this. 2017-03-28 18:41:38 -04:00
Seth Alves
7641677902 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-28 10:14:49 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -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
Seth Alves
2682586c38 some clean-ups and a bug fix in PolyVox to mesh code 2017-03-27 06:50:06 -07:00
Seth Alves
642cf57976 obj-writer now outputs normals 2017-03-24 12:49:58 -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
Chris Collins
05c40d2930 Merge pull request #9933 from mittens/hotfix/obj-texture-fix 
Fixed the texture assignment for the OBJ loader
 2017-03-22 13:19:01 -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
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Seth Alves
b945d9c4cb fix a bug that caused obj models with no material to randomly use the materials of other things in the view 2017-03-18 14:34:19 -07:00
trent
f1e81c34a3 Fixed the texture assignment for the OBJ loader (it wasn't doing anything with the spceular texture) 2017-03-17 14:34:17 -04:00
Brad Davis
813e3a1bca Fix issue with scaling prior to KTX serialization 2017-03-17 08:05:52 -07:00
Seth Alves
0e8d62c11e delete dead code 2017-03-16 15:24:39 -07:00
Seth Alves
7afe091c52 quiet warnings 2017-03-14 19:47:30 -07:00
Seth Alves
0785172398 quiet warnings 2017-03-14 19:01:13 -07:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Seth Alves
5b28f3a3c4 cleanups 2017-03-14 10:08:34 -07:00
Seth Alves
4a1be69be4 writeOBJToString 2017-03-14 07:11:38 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
ZappoMan
32add6635d checkpoint on reducing raypicking recalcs 2017-03-04 23:33:17 -08:00
samcake
c62108c3c8 Resolve merging conflict 2017-02-09 09:49:59 -08:00
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal 
Ported PAL to tablet
 2017-02-08 21:17:38 -08:00
Anthony J. Thibault
e25ad0f332 Fix debug assert in FBXReader. 2017-02-08 18:56:58 -08: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
samcake
2975f73fc9 merging 2017-02-07 13:13:21 -08:00
Andrew Meadows
8b1f569132 tweak max texture resolution thresholds 2017-02-06 12:13:31 -08:00
samcake
feb36b8dbf Merge branch 'purple' of https://github.com/samcake/hifi into blue 2017-02-06 11:56:45 -08:00
Andrew Meadows
8b2c720e29 sliding texture caps for models 2017-02-06 11:53:37 -08:00
Andrew Meadows
d65cbbb455 name change: maxSize to maxNumPixels 2017-02-06 11:53:37 -08:00
Andrew Meadows
b3ae6f9aec cap size of textures from FBX files 2017-02-06 11:53:37 -08:00
Andrew Meadows
24b1f3ddbc cleanup whitespace 2017-02-06 11:53:37 -08:00
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