Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 11:22:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53760 commits 67 branches 56 tags 1.2 GiB
Commit graph

470 commits

Author SHA1 Message Date
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