Commit graph

422 commits

Author SHA1 Message Date
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
Atlante45
2e1355618f Use NVTT to mipmap color textures 2017-04-25 15:56:22 -07:00
Atlante45
0428b22b63 Add nvtt external 2017-04-25 15:56:22 -07:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
samcake
9bc7e41642 Remove extra calls for binding default textures, not needed 2017-03-29 10:57:08 -07:00
Seth Alves
651d87dc2a move Qt-related stuff out of model and into model-networking 2017-03-28 07:53:25 -07:00
Seth Alves
2682586c38 some clean-ups and a bug fix in PolyVox to mesh code 2017-03-27 06:50:06 -07:00
Seth Alves
6e40f03c8e cleanups 2017-03-24 15:08:13 -07:00
Seth Alves
8f7f5efade new javascript call: Model.newMesh() 2017-03-24 12:51:00 -07:00
Seth Alves
bb1c556c91 forgot a file 2017-03-23 11:04:50 -07:00
Seth Alves
f5680def55 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-23 09:55:41 -07:00
Seth Alves
ce9bb439b3 change Model api in anticipation of more than just PolyVox being able to give meshes to javascript 2017-03-23 09:55:30 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Seth Alves
98cae8d152 added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript 2017-03-20 09:37:46 -07:00
Seth Alves
b876d22e46 fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels 2017-03-18 22:36:24 -07:00
Seth Alves
488ed081dd Mesh::forEach and Mesh::map 2017-03-18 10:18:04 -07:00
Seth Alves
b3603ce8b3 Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now 2017-03-17 16:52:56 -07:00
samcake
900615fcd5 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:53:29 -07:00
samcake
e0f0cc2102 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:49:44 -07:00
samcake
9843b68878 Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown 2017-03-08 11:56:08 -08:00
sam
1b036b7225 Implement the ktx keyvalue feature for read and write and use it with gpu::Texture to store meat data required for full serialization 2017-03-07 00:58:22 -08:00
Zach Pomerantz
170df4a1f4 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-06 17:14:11 -07:00
Bradley Austin Davis
9051c84b6d Fix warnings 2017-03-03 14:16:27 -08:00
samcake
67d14230c5 Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown 2017-03-03 10:14:04 -08:00
Zach Pomerantz
1425eb0936 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-01 21:01:37 -05:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Zach Pomerantz
c044daf7b2 TextureCache 2017-02-28 13:30:47 -05:00
samcake
f050cc31f2 Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar 2017-02-27 13:32:24 -08:00
samcake
9d593f2ba9 Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown 2017-02-24 09:27:52 -08:00
Brad Davis
594fe9b1be Use hashes of URLs for filenames, due to length constraints 2017-02-23 22:01:53 -08:00
samcake
f564f33db2 Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown 2017-02-23 14:53:13 -08:00
Brad Davis
cd8f3e1b01 Prevent name collisions in KTX from causing crashes 2017-02-23 13:04:04 -08:00
Brad Davis
a168bbf2dd Fix ktx file location, unique->shared pointer 2017-02-23 10:26:59 -08:00
sam
d7cb479dbe clean the clean ups 2017-02-23 02:17:18 -08:00
sam
fbb0a24c4f FIxing the bug preventing to deserialize normals, clean up the ktx usage of the storage::Storage class and cleaning up somewhat the Qt pixel formats used 2017-02-23 02:08:46 -08:00
samcake
bbded6aa51 fix issues while testing the ktxStorage 2017-02-22 19:07:01 -08:00
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
samcake
ad40e2d7d9 Trying to address the ktx serialization problem with normal, still have a bug 2017-02-22 17:16:37 -08:00
Brad Davis
055db531b1 Update 'caching' of textures to KTX file backing 2017-02-22 15:59:05 -08:00
Brad Davis
61ba2dd11e Disable texture cache processing for now 2017-02-22 13:29:10 -08:00
samcake
5e307f247e Add support for the R8 textures 2017-02-21 10:46:49 -08:00
samcake
ba54b5ce11 Rebasing with current upstream 2017-02-21 10:07:42 -08:00
sam
e5c2f6f651 enabled the usage and cube map with KTX correctly 2017-02-21 01:28:13 -08:00
sam
b502b1e200 assigning the names of source to the texture 2017-02-20 19:40:39 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
samcake
94960a7a80 Small bug when accessing inexisting storage from the Pixels 2017-02-17 16:05:11 -08:00
samcake
e6c6cd2825 cleaner unserialization 2017-02-17 12:24:04 -08:00
samcake
2d7ba45667 FIx creationg issue , need a usageType at creation 2017-02-17 12:01:33 -08:00
sam
b4745657e0 progressing on io with ktx 2017-02-17 07:58:10 -08:00