John Conklin II
1341774450
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype
...
Add a Q_DECLARE_METATYPE in TextureCache.
2018-03-08 09:37:06 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials
...
Material reflection
2018-03-07 14:29:31 -08:00
SamGondelman
b56f755034
material reflection
2018-02-23 17:58:46 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Simon Walton
63e2084395
Add a Q_DECLARE_METATYPE in TextureCache.
...
There was a missing declaration that was causing an assert in the
Qt meta-object system on startup in debug builds:
Q_DECLARE_METATYPE(QWeakPointer<NetworkTexture>)
Bug fixed by Clement.
2018-02-22 17:29:06 -08:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
SamGondelman
38290064c1
replace materials by name, hide material mode for now
2018-02-13 13:24:08 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Brad Davis
3e3a585b92
Fixing compile warnings
2018-01-30 21:54:29 -08:00
Brad Davis
1b35ff9b85
Use a distinct KTX cache location for GLES
2018-01-25 19:32:45 -08:00
Brad Davis
8cb0d0f8fd
Don't use the KTX cache for local files
2018-01-23 13:30:07 -08:00
Brad Davis
1fb125f67f
Don't process empty images
2018-01-19 11:45:11 -08:00
Brad Davis
e2c4af05bd
Don't process empty images
2018-01-19 11:42:31 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Brad Davis
acb95d1355
GLAD polish
2018-01-14 00:10:05 -08:00
Brad Davis
58d4d193f7
Add command line disabling of QML and KTX cache
2018-01-13 12:22:00 -08:00
Brad Davis
6d45238bbd
Allow disabling of KTX cache
2018-01-13 11:32:47 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
Atlante45
4fd83ddd0e
Reduce Image memory usage by moving the data
2017-12-07 12:54:34 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
David Back
7101719295
newline
2017-11-28 13:01:47 -08:00
David Back
5cceceb868
secondary cam texture fixes
2017-11-28 13:00:41 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
...
glTF import DEMO
2017-11-17 14:52:51 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
Brad Hefta-Gaub
b1812c30c9
Merge pull request #11571 from huffman/fix/ktx-thrashing
...
Fix KTX requests thrashing if a mip level can't be assigned
2017-10-13 11:53:24 -07:00
Ryan Huffman
c6672fc4ac
Fix KTX requests thrashing if a mip level can't be assigned
...
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
2017-10-11 14:20:57 -07:00
Ryan Huffman
69b6a8c163
Fix .fst texdir not being followed
...
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.
There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
2017-10-10 18:29:59 -07:00
luiscuenca
1da5c221ac
ModelCache.cpp to coding standard
2017-10-10 13:53:18 -07:00
luiscuenca
297f591ce2
fixed errors and default avatar
2017-10-09 14:37:45 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
SamGondelman
49512c95d7
possibly fix threading crashes, mirror and fade
2017-09-26 16:21:36 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Stephen Birarda
b77ceab661
remove noisy logging added by auto-baking
2017-09-26 10:45:23 -07:00
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
Ryan Huffman
20759b0c97
Merge pull request #11404 from birarda/feat/auto-bake
...
add abort on shutdown to Baker/FBXBaker/TextureBaker
2017-09-19 14:20:56 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Stephen Birarda
e1d79ee8f4
add abort to Baker and subclasses
2017-09-19 13:18:23 -07:00
