samcake
e28e85a29c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-06 09:30:53 -07:00
Brad Hefta-Gaub
891cc12d3f
Merge pull request #7549 from zzmp/feat/resource-vis
...
Add a visualization of cacheable resource usage
2016-04-05 15:43:27 -07:00
samcake
710c4a1b8f
TRying to merge and expose counters for in flights transfers
2016-04-05 12:18:30 -07:00
Brad Hefta-Gaub
ff4f693267
Merge pull request #7553 from zzmp/fix/tex-invoke-method
...
Fix ImageReader threading issues
2016-04-04 18:29:24 -07:00
Zach Pomerantz
107cfcf10b
Change Resource setBytes->setSize
2016-04-04 13:59:57 -07:00
samcake
f3e6c490a4
merging with master, moving the TexelFOrmat function to a cpp
2016-04-04 12:03:37 -07:00
Zach Pomerantz
6660f0959b
Merge pull request #7557 from hyperlogic/tony/reset-thread-priority
...
ModelCache: reset thread priority back to normal
2016-04-04 11:07:18 -07:00
Zach Pomerantz
2bd53935fc
Merge branch 'master' of github.com:highfidelity/hifi into fix/tex-invoke-method
2016-04-04 11:00:03 -07:00
Zach Pomerantz
d23d0f6432
Restore thread priority after tex parsing
2016-04-04 10:57:04 -07:00
Anthony J. Thibault
d1898eeac6
ModelCache: reset thread priority back to normal
...
Based on PR feedback on https://github.com/highfidelity/hifi/pull/7550
2016-04-04 10:31:36 -07:00
Brad Davis
4f373937f9
Additional performance markers
2016-04-03 20:41:34 -07:00
Brad Hefta-Gaub
4a78ad877e
Merge pull request #7550 from hyperlogic/tony/avatar-thrasher
...
Model: fixed two crash issues when changing avatars
2016-04-03 13:47:35 -07:00
Zach Pomerantz
79e5286335
Fix ImageReader threading issues
2016-04-03 12:38:18 -07:00
Zach Pomerantz
fc19b60f8a
Avoid setting null texs on uncaching models
2016-04-03 11:25:48 -07:00
Anthony Thibault
07cfa13a82
GeometryReader: We should delete the fbxGeometry if we've lost the resource.
2016-04-03 09:23:53 -07:00
Anthony Thibault
865a77ae20
Model: fixed two crash issues when changing avatars
...
* When the GeometryReader has the last ref to the GeometryResource ptr
It needs to hold on to the reference until invokeMethod is completed.
Otherwise, invokeMethod will call a method on a deleted object, leading
to memory corruption or crashes.
* When the Model URL is changed, the clusterMatrices are invalided and the
RenderItemsSets are cleared. However, there still might be renderItems in
the scene pending changes list that might refer to those RenderItems and their
clusterMatrices. We need to guard against this access to prevent reading from
memory that was previously freed.
Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6 ) test script.
2016-04-02 21:48:22 -07:00
samcake
1ca87fa069
Refactoring a bit the texture loaders to factorize work
2016-04-01 11:44:57 -07:00
Zach Pomerantz
489a2fd0b9
Persist tex base url across caching
2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4
Init tex base url in Geometry ctor
2016-04-01 11:32:13 -07:00
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
