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

472 commits

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