Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 10:46:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
43516 commits 69 branches 56 tags 1.2 GiB
Commit graph

376 commits

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