Sam Gateau
ad0fce9c3b
Merge pull request #16431 from sabrina-shanman/instancing_slimmesh
...
(DEV-564) Introduce and populate geometry-only mesh representation from hfm::Mesh
2019-10-31 15:08:52 -07:00
sabrina-shanman
6666df6137
Fix build warnings/errors
2019-10-31 14:49:28 -07:00
sabrina-shanman
297ce9d88b
Remove debug
2019-10-31 13:47:00 -07:00
sabrina-shanman
023d73a25d
Finish TriangleListMesh generation, rename some things
2019-10-31 13:47:00 -07:00
sabrina-shanman
7d37a064f2
Fix crash
2019-10-31 13:46:53 -07:00
Sam Gateau
e9ce467eb9
Crahs because of ?
2019-10-31 13:04:11 -07:00
Sam Gateau
465e8c3e18
Prototyping the slim mesh generation
2019-10-31 12:58:15 -07:00
Sam Gateau
24e6a966a8
Keep exploring
2019-10-31 12:58:08 -07:00
Sam Gateau
927e08acdb
Explore the simple mesh pure pos triangle list idea
2019-10-31 12:57:29 -07:00
Sabrina Shanman
503973ae7c
Merge pull request #16417 from sabrina-shanman/instancing_serializers_conservative
...
(DEV-559) Instancing: FBX and OBJ fixes
2019-10-30 14:58:43 -07:00
sabrina-shanman
4ecd25c8bb
Add TODO for joint.geometricOffset
2019-10-30 14:32:36 -07:00
sabrina-shanman
ecdca05679
Do not apply geometric offset to loaded FBX. Proper fix TBD
2019-10-30 14:28:55 -07:00
sabrina-shanman
9b41fa20c6
Clean up hfm joint geometric offset definition
2019-10-30 14:08:02 -07:00
sabrina-shanman
0d1bd6afbf
Fix wrong transformForCluster for non-root joints with Z up axis
2019-10-30 13:32:30 -07:00
sabrina-shanman
296cd4a47b
Rename globalTransformForCluster(s) -> transformForCluster(s)
2019-10-30 12:05:50 -07:00
sabrina-shanman
c8bf1ddfea
Only recalculate globalTransformForCluster if needed
2019-10-30 12:01:25 -07:00
sabrina-shanman
61825f2e06
Remove joint.transform self-assignment
2019-10-30 11:50:10 -07:00
sabrina-shanman
ff908a36d6
Define separately globalTransformForCluster and localTransformForCluster for clarity
2019-10-30 11:49:28 -07:00
sabrina-shanman
6f5c9924c0
Merge branch 'instancing' into instancing_serializers_conservative
2019-10-30 09:17:09 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master
...
Merge master into instancing
2019-10-30 09:16:04 -07:00
Shannon Romano
2b25dd30d2
Merge pull request #16424 from RebeccaStankus/consoleText
...
Specified color on text edit for console
2019-10-30 09:15:27 -07:00
sabrina-shanman
fe1fe6aa83
Fix build warnings
2019-10-30 09:09:17 -07:00
sabrina-shanman
3c078eeef6
It makes more sense for joint.globalTransform to have the hfmModel.offset applied
2019-10-29 17:37:26 -07:00
sabrina-shanman
28e3fd4bc4
Refactor joint transform definition
2019-10-29 17:37:25 -07:00
Shannon Romano
4d001a1040
Merge pull request #16122 from danteruiz/qt-launcher
...
Qt launcher
2019-10-29 17:05:37 -07:00
sabrina-shanman
27b30a9646
Move hfm debug dump to hfm::Model
2019-10-29 16:49:55 -07:00
Rebecca Stankus
9c0003515a
Specified color on text edit for console
2019-10-29 15:46:16 -07:00
dante ruiz
d752d95a8d
Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher
2019-10-29 15:22:06 -07:00
dante ruiz
5d69d554f9
fix mac update issues
2019-10-29 15:21:54 -07:00
danteruiz
f9446e8247
Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher
2019-10-29 13:45:38 -07:00
danteruiz
3f110d2035
fix windows install process
2019-10-29 13:45:28 -07:00
Shannon Romano
8fc135d972
Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2
...
DEV-2302: Fix for head not turning in third person look at camera mode
2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed
...
Fixed the sprint speeds of Desktop vs HMD
2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes
...
DEV-2285: Fix look at update and allow to release control
2019-10-29 12:56:22 -07:00
Shannon Romano
5221d5940f
Merge pull request #16422 from RebeccaStankus/mac2588
...
Added extra attempt to parent interactive window content on creation
2019-10-29 12:55:09 -07:00
Anthony J. Thibault
e753010411
Fix for head not turning in third person look at camera mode
...
If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the
SkeletonModel::skeletonLoaded signal will not be triggered. In this case the MyAvatar local variable
MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true. This, in turn,
caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head.
Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has
been removed. All conditionals that used to use it have been replased with _skeletonModel->isLoaded().
2019-10-29 12:38:06 -07:00
sabrina-shanman
8686dcac13
Remove FBXSerializer debug
2019-10-29 11:26:19 -07:00
Rebecca Stankus
b8d6a2cf0b
Added extra attempt to parent interactive window content on creation
2019-10-29 11:20:14 -07:00
sabrina-shanman
a70f0f2791
(WIP, has debug) Fix FBXSerializer applying geometric transform inconsistently, let HFM prep calculate FBX extents
2019-10-29 10:47:27 -07:00
Amer
5c3d4649ef
Merge pull request #16420 from amerhifi/dev-2571-alt
...
temp reverting the call to display plugin
2019-10-29 10:12:35 -07:00
sabrina-shanman
f8017d28ff
Separate cluster-related transform from joint.globalTransform
2019-10-29 09:20:17 -07:00
Howard Stearns
368b2bce90
Merge pull request #16375 from SimonWalton-HiFi/avatar-challenge-persist
...
DEV-2390: Persist in checking owner and sending challenges for failures
2019-10-29 08:48:59 -07:00
amerhifi
57302dd223
fixing build warning on mac/linux
2019-10-29 08:34:35 -07:00
amerhifi
37ba50992c
temp reverting the call to display plugin
2019-10-29 07:16:58 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control
2019-10-28 17:51:29 -07:00
Simon Walton
285d73a802
Fix transition from verify-failed to noncertified
2019-10-28 17:47:46 -07:00
Shannon Romano
2bc8c66b96
Merge pull request #16418 from danteruiz/new-qt-prefix
...
DEV-1828: hifi_vcpkg.py crashes try downloading not defined qt url on an unknown linux system or unknown operating system
2019-10-28 16:01:32 -07:00
sabrina-shanman
d961c4a892
Use safeMaterialID in FBXSerializer_Mesh.cpp
2019-10-28 15:32:45 -07:00
danteruiz
c64b716a07
fix hifi_vcpkg.py script crash
2019-10-28 14:21:19 -07:00
dante ruiz
da0ba71373
remove un-needed file
2019-10-28 14:18:17 -07:00
