Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 06:40:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75648 commits 25 branches 0 tags 1.1 GiB
Commit graph

476 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1e7a69fb90 Merge pull request #7523 from zzmp/fix/tex-load-fixup 
Render alpha textures immediately
 2016-03-31 21:04:04 -07:00
Zach Pomerantz
33d56d974e Set texture size in cache post-proc 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Zach Pomerantz
b90f2b2e0a Use correct textureBaseUrl 2016-03-25 13:17:29 -07:00
Zach Pomerantz
fac54b6ee3 Maintain parity with tex changes 2016-03-25 13:00:18 -07:00
Zach Pomerantz
581bbea36e Accomodate the caching Model 2016-03-25 11:57:40 -07:00
Zach Pomerantz
a262d9960c Mind differently tex'ed instances 2016-03-25 11:47:33 -07:00
Zach Pomerantz
864def31ea Don't refresh NetworkGeometry with cache 2016-03-25 10:56:20 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Zach Pomerantz
c625d36bd8 Persist material transform/params 2016-03-24 19:28:44 -07:00
Zach Pomerantz
eeeb175bb8 Derive NetworkMaterial, avoid copying it 2016-03-24 18:50:44 -07:00
Zach Pomerantz
8d0e419a5c Clean image-reader to drop image sooner 2016-03-24 15:50:48 -07:00
Zach Pomerantz
aa038bac58 Don't cache nested geometries 2016-03-24 14:34:25 -07:00
Zach Pomerantz
4d47126ae4 Don't mark failed models loaded, emit failure 2016-03-24 12:17:55 -07:00
Zach Pomerantz
7f05e4453b Fetch model geometries through cache 2016-03-24 11:35:40 -07:00
samcake
22191a2864 When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity 2016-03-23 16:12:43 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
samcake
3c075532f8 Good to go for merge 2016-03-22 15:14:01 -07:00
samcake
de374c0cac Switching emissive and lightmap somewhere but not big issue 2016-03-21 17:51:57 -07:00
samcake
695e558851 Trying to clena up the problem? 2016-03-21 16:36:47 -07:00
samcake
ec7165983d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-21 13:30:28 -07:00
Anthony Thibault
6e872edcae NetworkGeometry: Fix crash for empty geometry/bad FBX versions 
Interpret empty geometry as an error.
 2016-03-20 12:13:54 -07:00
samcake
225b330d41 Trying to better load aand detect the case for transparent textures oor opacity mask 2016-03-18 12:47:33 -07:00
samcake
d58ac269ee Fixing a bug when albedo map transaprent but not quite loaded yet 2016-03-15 17:01:26 -07:00
Zach Pomerantz
9dcdf26567 Only consider model transparent if all texs are 2016-03-11 15:15:30 -08:00
Zach Pomerantz
3b62e203f7 Cache NetworkGeometry::_hasTransparentTextures 2016-03-11 14:33:18 -08:00
Zach Pomerantz
22d41c833f Update loaded models with texture transparency 2016-03-11 14:27:36 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Zach Pomerantz
1e925d7bd8 Fetch unspecified textures on a delay 
This fixes an abort caused by the assertion
in ResourceCache::getResource: assert(delayLoad).
 2016-03-10 12:28:59 -08:00
Zach Pomerantz
54af58834a Mark Resource loaded after postprocessing 2016-03-09 10:34:07 -08:00
Zach Pomerantz
883d4ba006 Only cache processed textures 2016-03-08 14:39:53 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
Zach Pomerantz
d5a5ce8c70 Refactor helper from lambda to static fn 2016-03-01 13:25:10 -08:00
Zach Pomerantz
19c83e869f Add helper to buildNetworkMaterial 2016-03-01 12:33:55 -08:00
Zach Pomerantz
c5cb3543eb Cache inline textures under fbx 2016-03-01 12:29:32 -08:00
samcake
5401149713 Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial 2016-02-26 12:10:13 -08:00
samcake
d64b9bb6d9 Drafting the support for gloss map 2016-02-26 09:18:40 -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
00782b0e76 GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures 2016-02-22 18:19:36 -08:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
Zach Pomerantz
d21f9d555a Update NetworkMaterial maps when changing textures 2016-02-12 12:37:07 -08:00
Brad Davis
421160eeb6 Make the file parsing threads run at lower priority 2016-02-08 23:55:02 -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
Brad Hefta-Gaub
29b9592c8c Merge pull request #6838 from ctrlaltdavid/20763 
Fix reading model's "textures" property
 2016-01-15 17:02:14 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
David Rowe
a59cbd1aca Merge branch 'master' into 20763 2016-01-14 17:25:44 +13:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Atlante45
3f90312375 Fix for XCode auto indent 2016-01-12 20:49:25 -08:00
David Rowe
fc2bf8f585 Miscellaneous code tidying, noticed in passing 2016-01-08 10:17:36 +13:00
David Rowe
a6bfecf038 Format original textures property string more properly 2016-01-07 16:52:29 +13:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
samcake
762a241fa6 Adding specific path for loading lightmaps 2015-12-02 18:03:58 -08:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
samcake
429d82e650 Fixing review comments 2015-10-06 09:54:37 -07:00
samcake
894c8c0a93 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-05 19:23:30 -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
Brad Davis
83c9ebf06c Fixing Linux build failure 2015-10-02 11:57:14 -07:00
samcake
840f92bd06 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-09-29 10:54:09 -07:00
samcake
2a487a79a3 Getting something done today 2015-09-28 17:24:31 -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
Brad Hefta-Gaub
52842cb287 more warnings fixes 2015-09-22 20:34:40 -07:00
samcake
518f5fe17c Starting to clean the mesh part of the RenderItem.... 2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00