Ryan Huffman
36744d72d6
Fix warning using init list for QVariantMap
2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0
Move default skybox out of global and make irradiance gen optional
2016-08-08 16:03:03 -07:00
Seth Alves
b953e6f0ff
when an avatar URL fails, switch to the default
2016-08-01 18:12:30 -07:00
Anthony Thibault
2429b82b5e
Support for animGraphUrl override in FST file.
2016-07-21 17:17:08 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Andrew Meadows
cba49be9ea
fix compile bug
2016-07-13 15:13:35 -07:00
Andrew Meadows
c106f4c3a0
fix crash for null pointer
2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc
namechange: fetchResource --> getGeometryResource
2016-07-13 15:13:35 -07:00
Andrew Meadows
c50d41c532
finish name changes as per PR feedback
2016-07-13 15:13:35 -07:00
Andrew Meadows
9f7d2cf263
NetworkGeometry --> GeometryResourceWatcher
...
Model class gets render and collision geometries with watchers
also changed names for readability
2016-07-13 15:00:12 -07:00
samcake
3ec14fd746
MErging and still trying to understand the curvature isssue
2016-06-22 18:06:55 -07:00
samcake
25eb569433
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-06-02 10:38:40 -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
Atlante45
0878d87ac7
remove some unnecessary dependencies
2016-05-14 14:50:02 -07:00
Zach Pomerantz
09d879e19f
Remove delayLoad
2016-05-09 18:09:48 -07:00
Zach Pomerantz
7f496ea069
Fix colliding fbx tex names
2016-05-05 17:54:00 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
Zach Pomerantz
13945aa4d9
Annotate all virtual fns with override
2016-04-30 13:48:59 -07:00
Zach Pomerantz
de8145ec71
Nest TextureType JS interface in Type
2016-04-27 19:20:41 -07:00
Zach Pomerantz
6e12493ed7
Add default NetworkTexture::_textureLoader
2016-04-21 10:54:03 -07:00
Zach Pomerantz
cba5bff89e
Make ResourceCache::prefetch private and comment
2016-04-21 10:33:35 -07:00
Zach Pomerantz
df4857947b
Add prefetch overload for texture specificity
2016-04-20 20:18:22 -07:00
Zach Pomerantz
c096b0dfa1
Add TextureType to NetworkTexture for reflection
2016-04-20 20:18:22 -07:00
Zach Pomerantz
a148a69a35
Move cache to bottom of texture header
2016-04-20 20:18:22 -07:00
Zach Pomerantz
3c7fc95d6c
Allow url-only cache queries for tex, model
2016-04-20 20:14:15 -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
c35d81260d
Load local texture files through the same code as network
2016-04-17 10:20:01 -07:00
Brad Hefta-Gaub
21f30f1a10
Merge pull request #7672 from zzmp/fix/name-caches
...
Name exposed cache objects
2016-04-14 18:02:36 -07:00
Zach Pomerantz
bb02af793c
Name exposed cache objects
2016-04-14 17:00:18 -07:00
Atlante45
785eda44cd
CR
2016-04-13 13:29:00 -07:00
Atlante45
c8aeecdabd
Don't fire onGeoMappLoading twice
2016-04-12 13:51:11 -07:00
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
