Clément Brisset
cbe61871dc
Merge pull request #11346 from birarda/feat/draco-in-baking
...
Add mesh compression to baking library and FBXReader
2017-09-14 15:32:58 -07:00
Stephen Birarda
43196cd0a6
fix buffer resizing to only occur when attribute is present
2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4
remove re-grabbing of draco faces
2017-09-14 14:42:40 -07:00
Stephen Birarda
9cb4e2c5f2
address code review comments
2017-09-14 13:58:48 -07:00
Brad Davis
688ee68cf9
Ensure thread-safety for model pointer access
2017-09-14 12:29:23 -07:00
Brad Davis
aef85eb69d
Fix polyline rendering using default texture
2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78
Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime
2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622
Merge branch 'master' into feature/ant-man
2017-09-14 10:37:45 -07:00
Brad Davis
501eee8b10
Fix transform of polylines with high update rates
2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b
Fix polyline crash and flicker
2017-09-14 08:45:36 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Brad Davis
f4d8216501
Fix race condition accessing QString sub-properties in zones
2017-09-13 18:06:21 -07:00
Stephen Birarda
bfb4dd0cdb
disable warning c4267 when including draco
2017-09-13 14:00:41 -07:00
Stephen Birarda
1e6154fbc8
make draco compile flags OS X only
2017-09-13 13:45:26 -07:00
David Kelly
030b39050a
Merge pull request #11343 from davidkelly/dk/oneFileWallet
...
Wallet updates
2017-09-13 11:15:03 -07:00
Atlante45
7d9daea0f6
Transmit baking errors to interface for display.
2017-09-13 09:54:54 -07:00
Stephen Birarda
dc86c6fe73
fixes for warnings in FBXReader/FBXWriter
2017-09-13 09:16:58 -07:00
Andrew Meadows
50b94887fa
Merge pull request #11339 from ElderOrb/case7469
...
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab
Merge pull request #11301 from Menithal/21484-Fix
...
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet
2017-09-13 04:49:13 -07:00
Stephen Birarda
8a9e4029ae
use explicit conversion from size_t to int
2017-09-13 00:23:52 -07:00
Stephen Birarda
4efd9b8453
set explicit draco encoding options
2017-09-12 23:45:34 -07:00
Ryan Huffman
087a95a625
Add explicit draco encoder options to FBXBaker
2017-09-12 23:15:35 -07:00
Stephen Birarda
c445d914d7
make sure material IDs are de-duplicated
2017-09-12 22:04:33 -07:00
Stephen Birarda
88b8fb4c5e
use general worker threads for fbx baking
2017-09-12 20:02:27 -07:00
Ryan Huffman
c9024f5e87
Update FBXBaker to bake triangleIndices and fix faces being lost
2017-09-12 19:59:43 -07:00
Stephen Birarda
b253d3b57c
fix material triangle index insertion
2017-09-12 17:44:53 -07:00
Stephen Birarda
a25e5796dc
use push_back instead of append for extracted mesh vectors
2017-09-12 16:35:21 -07:00
Stephen Birarda
bb7cd58e9a
fix reference to part index
2017-09-12 16:28:12 -07:00
Stephen Birarda
5d9ed78369
fixes for extracted mesh construction
2017-09-12 16:09:40 -07:00
Stephen Birarda
cf282dd3fc
add code to read draco mesh from FBX
2017-09-12 15:04:53 -07:00
Stephen Birarda
61314949ec
add draco as external to FBX library
2017-09-12 14:10:27 -07:00
Ryan Huffman
395c9283dc
Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter
2017-09-12 14:09:59 -07:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
Stephen Birarda
2105f2da92
change unique ID for material and second tex coord
2017-09-12 10:27:07 -07:00
Ryan Huffman
9243cf7590
Remove extraneous logging in FBXWriter
2017-09-12 09:45:46 -07:00
Ryan Huffman
2d9d432221
Update FBXBaker to remove unused nodes from the Geometry node
2017-09-12 09:45:24 -07:00
Ryan Huffman
8fc8b8100d
Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded
2017-09-12 09:44:44 -07:00
beholder
deee6aab1a
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-12 04:24:18 +03:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
anshuman64
996277b34c
Merge pull request #11335 from vladest/menu_fix
...
Make sure root item is created before lambda gets called for desktop …
2017-09-11 12:47:40 -07:00
Ryan Huffman
b1d0df06d9
Add error handling in FBXBaker for empty nodes and failed draco compression
2017-09-11 12:07:41 -07:00
Ryan Huffman
ebd925b966
Add proper per face materials and texCoords1 to fbx baking
2017-09-11 10:52:59 -07:00
vladest
34c1cb6579
Typos and naming fixes
2017-09-11 19:42:05 +02:00
Menithal
40d339a831
21484: Updated code to go with PR feedback
2017-09-11 20:36:29 +03:00
Andrew Meadows
ce3ed68861
Merge pull request #11333 from ctrlaltdavid/faster-fade-in
...
Reduce entity fade-in time
2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d
Merge pull request #11293 from jherico/fix_hmd_menu
...
Fix access to menu on background thread
2017-09-11 08:26:04 -07:00
vladest
dfaa8761e5
Make sure root item is created before lambda gets called for desktop loader
2017-09-10 20:08:40 +02:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12:00
Ryan Huffman
3d6d383a15
Clean up duplicate list code in encodeFBXProperty
2017-09-08 16:58:57 -07:00
Ryan Huffman
9b462171f6
Add draco support to FBXBaker
2017-09-08 16:58:29 -07:00
Seth Alves
f5d77104c3
Merge pull request #11332 from sethalves/squelch-cannot-render
...
suppress repeated 'item could not be rendered' messages
2017-09-08 16:23:22 -07:00
Anthony Thibault
3de518a843
Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose
...
Fix MyAvatar getting stuck in T-pose on loading
2017-09-08 15:18:57 -07:00
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -07:00
Anthony J. Thibault
559ac6786d
Fix MyAvatar getting stuck in T-pose on loading
...
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene(). They both would end up setting the
Model::_addedToScene flag. This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
2017-09-08 11:44:06 -07:00
Stephen Birarda
0d7b50cfb6
remove old texture type method
2017-09-08 09:44:19 -07:00
Olivier Prat
d6d36cbd43
Outline working on voxels
2017-09-08 11:14:06 +02:00
Stephen Birarda
3cf77f377c
remove FBX SDK from CMake files
2017-09-07 18:46:44 -07:00
Stephen Birarda
b153d1e177
use FBXReader/FBXWriter for texture baking in FBXBaker
2017-09-07 18:38:29 -07:00
Anthony J. Thibault
f4f9c29bff
Fix for avatar scale preferences
2017-09-07 15:30:16 -07:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982
Fix crashes in entity rendering on OSX
2017-09-07 14:32:50 -07:00
Ryan Huffman
7214f57376
Update FBXBaker::exportScene with FBXWriter
2017-09-07 14:12:15 -07:00
Ryan Huffman
b60d68c714
Replace FBX SDK loading of file in FBXBaker with FBXReader
2017-09-07 14:00:09 -07:00
Ryan Huffman
7a55c867be
Fix _fbxNode rename to _rootNode in FBXReader
2017-09-07 12:56:46 -07:00
Ryan Huffman
aa1aad0a09
Add FBXWriter for serializing FBXNode
2017-09-07 12:56:36 -07:00
Brad Hefta-Gaub
6a1fe81832
Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002
...
split packet construction from packet sending in OctreeSendThread
2017-09-07 12:36:29 -07:00
Stephen Birarda
1508edb459
use store/load to be clearer about atomics
2017-09-07 12:07:58 -07:00
Stephen Birarda
7859b3b11f
remove image compression choices from Interface settings
2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Chris Collins
12d720805c
Merge pull request #11319 from jherico/async_qml_load_crash
...
Fix potential crash on asynchronous QML loads
2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Olivier Prat
7fb7ebca57
Fixed warning on Mac
2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce
Optimized by removing unnecessary Z buffer copy
2017-09-07 18:33:00 +02:00
Olivier Prat
2003495166
Adjustments to half texel fix
2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b
Modified outline shader to do fill branch on CPU. Fixed assymetric outline
...
due to depth sample not offset by a half texel in shader.
2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b
Fixed non working outline in stereo with new changes
2017-09-07 10:33:55 +02:00
Anthony J. Thibault
2f850826f2
Allow override of near/far clip planes in Oculus and OpenVR plugins
2017-09-06 11:02:44 -07:00
Menithal
e1acf9dbc9
Merge remote-tracking branch 'upstream/master' into 21484-Fix
2017-09-06 20:42:47 +03:00
Olivier Prat
17e992bd14
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-06 19:08:37 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3
Created outline task but still need to create specific render job with z-pass shaders
2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f
Simplified version that works directly with metas
2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43
First working version of outline working with selection interface.
2017-09-06 15:47:10 +02:00
vladest
57643bd904
Merge branch 'master' into audio_devices_split
2017-09-06 14:20:41 +02:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Anthony J. Thibault
f0912987a3
Fix ray picks against HUD sphere at different sensor scale factors
2017-09-05 10:03:19 -07:00
Andrew Meadows
4b8840f307
Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
...
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02:00
Menithal
856452405e
Made Code abit more concise for better compilation
2017-09-05 08:46:37 +03:00
Menithal
119a2703f7
Removed Debug Joints that wasnt used anylonger
2017-09-04 22:20:00 +03:00
Menithal
03e076046b
Added Joint Name check for translations
...
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
2017-09-04 22:16:02 +03:00
