Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86507 commits 25 branches 0 tags 1.1 GiB
Commit graph

586 commits

Author SHA1 Message Date
luiscuenca
67cc5bd7f2 Fix warnings and wrong shapes position for myAvatar 2019-01-16 10:52:34 -07:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04 
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
 2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
Roxanne Skelly
6317ceb9b3 Case20277 - Ignoring user causes loading orb to appear at /0,0,0 
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
 2019-01-15 13:34:29 -08:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
Andrew Meadows
9ea6968e35 fix bug where attached AvatarEntities do not update in timely fashion 2019-01-09 17:40:18 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0 MyAvatar.setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
cbcd70aee6 namechanges and comments to help clarify necessary fixes 2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Andrew Meadows
d622635a71 fix wording in comment to reflect new 'HostType' parameter 2019-01-09 17:27:14 -08:00
Andrew Meadows
c4115bece3 remove unused ScriptEngine instance 2019-01-09 17:27:14 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
61b8d005b5 scripts can edit AvatarEntities again 2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0 correctly load AvatarEntities from settings redux 2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
Andrew Meadows
d3fea94540 send AvatarEntities via raw data packet 2019-01-09 17:27:14 -08:00
luiscuenca
95fca826a5 Add fit AABox for avatar and implement multisphere on shapeManager 2019-01-09 17:49:19 -07:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates 
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
 2019-01-09 14:55:23 -08:00
luiscuenca
39dc25ea92 Merge branch 'master' into multiSphereAvatar04 
# Conflicts:
#	interface/src/avatar/OtherAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
 2019-01-08 15:41:33 -07:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
SamGondelman
b5b7574c48 set created 2019-01-04 16:52:11 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Jeff Clinton
c2c744b44e
Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed 
Correctly set avatar-scale timestamp when changing in Avatar class
 2019-01-04 10:00:46 -08:00
Andrew Meadows
65a7e15f5d don't send AvatarEntity updates when not necessary 2019-01-03 17:57:11 -08:00
Anthony Thibault
fa137f0586 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-03 13:19:11 -08:00
Seth Alves
3c0243419b trying again on avatar-entity grab releases 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation 
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
 2018-12-31 13:37:22 -08:00
luiscuenca
bd21d0589a Merge branch 'master' into otherAvatarMotionStates01 2018-12-30 10:55:05 -07:00
luiscuenca
4a8bbd79fe other avatars motion states 2018-12-30 10:53:28 -07:00
Simon Walton
9cb53af023 Correct set avatar-scale timestamp when changing in Avatar class 2018-12-19 16:13:12 -08:00
amantley
42a17980cb fixed mac build conflict, unused variable 2018-12-17 16:21:22 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police 
Case 19409, Case 19468: Fading fixes and shader cleanup
 2018-11-13 15:00:23 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library 
(case 19302) Create the HFM library and namespace
 2018-11-13 12:03:53 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
SamGondelman
df1a848811 fix fade out 2018-11-12 12:58:40 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model 
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
 2018-11-05 15:00:06 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm 
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-02 16:44:31 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix 
Extra joints on soft entities keep their local transform
 2018-11-01 09:29:16 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
luiscuenca
b8cd5045c7 Extra joints on soft entities keep their local transform 2018-10-24 12:54:09 -07:00
SamGondelman
a3c42363cc please for the love of god 2018-10-24 12:43:01 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation 
Add animations to Avatar Transit
 2018-10-24 10:51:21 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation 2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f Hold flickering fixed and refactor 2018-10-20 15:22:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape 
Move blendshape buffers to render thread
 2018-10-19 11:55:44 -07:00
luiscuenca
bb5c042f16 Blend network animation 2018-10-18 17:51:20 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
luiscuenca
078baa86e4 Sitting abort post transit animation 2018-10-16 13:16:01 -07:00
luiscuenca
ad09007bd8 Fix flickering holded entity, renames and refactors 2018-10-13 16:32:51 -07:00
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -07:00
luiscuenca
de1b6e717f Cancel animation on chained trasits 2018-10-11 11:35:56 -07:00
luiscuenca
1adac78828 fix errors and set new anim parameters 2018-10-11 10:45:35 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Seth Alves
de8ae9156c fix build on clang 7 2018-10-09 12:25:01 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
luiscuenca
b39391ca7a From first frame 2018-09-17 13:53:57 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e Revert "cycle avatar entity IDs for new avatar mixer" 
This reverts commit 20912349a4.
 2018-09-12 12:22:07 -07:00
luiscuenca
889e033048 fix warnings 2018-09-12 11:20:23 -07:00
luiscuenca
4d381b9d04 Smooth other avatars positions 2018-09-12 10:01:41 -07:00
Anthony Thibault
bc5d9a46a2 Avatar loading orb now indicates status 
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
 2018-09-11 13:12:46 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck 
fix Agent teardown of recording and ScriptEngine(s)
 2018-09-10 10:51:52 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -07:00
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
sabrina-shanman
e8ce152687 Scale collision picks relative to parent by adding and using more 
specialized transform nodes.
 2018-09-05 16:51:28 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix 
Avatar without Neck Joint bug 14620
 2018-08-30 14:52:44 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00
Stephen Birarda
a76b50ce33 fix teardown of recording and ScriptEngine(s) 2018-08-27 15:07:19 -07:00
luiscuenca
3d959ca7ee Refactoring and cleaning 2018-08-23 15:52:42 -07:00
Andrew Meadows
99aafb1f95 move code from Avatar to OtherAvatar 2018-08-23 12:59:28 -07:00
John Conklin II
1320a34a18
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON 
Don't include old attachment data on new avatar recordings
 2018-08-23 10:51:33 -07:00
luiscuenca
b3d127c953 Fix flickering 2018-08-22 14:31:34 -07:00
luiscuenca
5f4903f884 Record entities 2018-08-22 08:53:51 -07:00
Stephen Birarda
4875738a05 always add to detached, flag update on full replace 2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
amantley
93baad7387 removed unnecessary computation of head height from eye position code 2018-08-09 14:35:44 -07:00
amantley
f26d6b8c3d cleaned up code and changed the forward offset for the default eyes when there is no neck bone 2018-08-09 12:15:35 -07:00
amantley
a3f2fd1f23 removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization 2018-08-09 11:33:27 -07:00
amantley
c774dd7f5b debugging to solve the no-neck crazy scale problem 2018-08-08 17:52:22 -07:00
r3tk0n
1aa9fcd41a
Fix a typo 
In jsdoc comments for getWorldFeetPosition() in Avatar.h
 2018-08-06 21:23:06 -07:00
MuteTab
d04ac2b8ed Fixed jsdoc comments for Avatar::getWorldFeetPosition 2018-08-06 19:40:47 -07:00
MuteTab
40889c8f09 Added getWorldFeetPosition() function to Avatar 2018-08-06 15:35:54 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
David Rowe
e4f13c97f7 Fix JSDoc for MyAvatar.getLeftPalmRotation and getRightPalmRotation 2018-07-14 14:01:08 +12:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix 
Fix closed eyelids when head is tilted down
 2018-07-05 08:50:22 -07:00
luiscuenca
f770bcd389 Better eyePitch computation 2018-06-29 17:15:03 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
luiscuenca
2264425f9f Fix eyelid behaviour 2018-06-28 16:41:39 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
ea76def2b5 more white space errors 2018-06-26 17:18:35 -07:00
amantley
1fcaf16b0c removed editor auto format errors 2018-06-26 17:07:55 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07:00
Angus Antley
232dc21c7b add orb code added to otheravatar.cpp 2018-06-26 06:38:09 +01:00
Angus Antley
b8dea4b869 adding changes to add the orb when an avatar is processed by the avatar mixer 
and when a new model is being loaded for an avatar.  The orb is removed
when the geometry has loaded.
 2018-06-26 06:27:18 +01:00
John Conklin II
0e2675e0d8
Merge pull request #13392 from roxanneskelly/roxie-bugfixes 
Remove debug logging message spam for avatar entities that have scripts
 2018-06-25 10:42:43 -07:00
Sam Gondelman
44a7d04b2a
Merge pull request #13426 from SamGondelman/avatarPriority 
Highest loading priorities for avatars and attachments
 2018-06-22 11:22:10 -07:00
Sam Gateau
dea3f91c0b
Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash 
fix crash on Mac when watching someone else turn with HMD
 2018-06-21 11:55:39 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload 
workload project part 1
 2018-06-20 15:39:01 -07:00
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -07:00
Andrew Meadows
17a0dd574a remove debug cruft 2018-06-19 14:36:57 -07:00
Andrew Meadows
b557717dab to avoid NaN: don not rely on glm::angle(quat) UYKWYAD 2018-06-19 14:27:27 -07:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Roxanne Skelly
5bc7694ed6 Merge branch 'master' of https://github.com/highfidelity/hifi into roxie-bugfixes 2018-06-15 16:46:09 -07:00
Roxanne Skelly
f6c624dcc3 Remove logging messages for behaviors that are expected. 
Attached entities with scripts are now being sold on the marketplace
(rWatch) and are now being worn by various users.  Because of this, it's
now common for the 'removing entity scripts' case to be hit in code for
every update, which causes debug log messages every 60 seconds for each
entity entity with a script.

Repro: Have an avatar wear rWatch.  With a second instance of interface,
turn on verbose logging while the first avatar is local.  See debug logging
60 times a second.

Fix: Given attached entities with scripts are happening, it's not an
exceptional case and should probably not be logged.
 2018-06-15 16:31:09 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags 
Scripted Blendshapes and Procedural Face Movement Flags
 2018-06-13 10:32:59 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
amantley
b1c578ecaa fixed white space in head.cpp 2018-06-07 22:13:53 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
amantley
67fc7b90b5 fixed get and set semi nibble to deal with 16 bits 2018-06-07 15:43:21 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
amantley
97831e61f0 removed stray comments 2018-06-07 12:54:46 -07:00
amantley
6a11ddc349 removed print statements and removed the setting of procedural head variables in avatarData.cpp 2018-06-06 17:50:50 -07:00
amantley
dca93ca61f fixed setatone16 function to return the correct result for additional flags 2018-06-06 16:44:12 -07:00
amantley
0c879d85b5 added print statements and removed summed coeff from avatarData.cpp 2018-06-05 17:33:32 -07:00
amantley
5132466ca0 kept the transient coeff. and sending the blendshapes accross the 
network. and removed procedural updates to face from myhead.cpp
 2018-06-05 13:32:45 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
amantley
01848fafe0 made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present 2018-06-01 11:37:11 -07:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
samcake
221b513b19 Oh boy 2018-05-25 16:33:34 -07:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -07:00
Sam Gateau
b8b337dbe4 There and back again... 2018-05-24 01:18:36 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
samcake
184d50b018 Well 2018-05-22 17:55:26 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00
Anthony J. Thibault
c29bf51226 Fix for avatar glitches, head and legs folding into chest. 
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.

This particular issue is caused by an interaction between the default value flag and the joint changed culling.

When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.

When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.

Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.

I've done three things to help mitigate this issue.

1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it.  No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
   translations from the default pose.  This will help the case where a client receives a non default value, but has no previous history.

(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
 2018-04-16 14:58:33 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
samcake
a896e9872c adressing the avatar vissibility switch 2018-03-14 17:09:23 -07:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
samcake
9bec8cdd0b Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-12 12:01:00 -07:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Sam Gateau
dc122b4ce8 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-07 18:14:44 -08:00
Seth Alves
9f2be4db8f Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 15:04:38 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
Seth Alves
636c271dc3 merge from upstream 2018-02-27 09:21:08 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Seth Alves
666fa77be2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 13:53:20 -08:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
Seth Alves
77febe0aab save avatar-entities which are created while using a serverless domain 2018-02-23 16:03:08 -08:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
Anthony J. Thibault
86351f19a9 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-22 08:44:21 -08:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05: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
Andrew Meadows
e7495d830b maintain Space proxies for entities 2018-02-20 17:39:05 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Dante Ruiz
bbcf865db3 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities 2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8 don't update avatar entities if the avatars ID is AVATAR_SELF_ID 2018-02-15 15:02:45 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
samcake
6357f36a97 Fixing names 2018-02-14 10:39:14 -08:00
Anthony J. Thibault
d2c199104e Avatars use Dual Quaternion Skinning and Model Entities do not. 2018-02-13 17:47:49 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
samcake
a98f55298b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-02-13 13:06:58 -08:00
samcake
f64e5f2444 Introducing the cull group 2018-02-13 13:06:26 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -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
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -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
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
SamGondelman
c8aded0688 watch for attachment texture loading 2018-01-18 12:40:02 -08:00
Seth Alves
45406177e5 avoid a deadlock when clearing avatar entities 2018-01-17 17:56:25 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08:00
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Dante Ruiz
980807c657 make changes 2018-01-10 16:50:41 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00