Commit graph

31137 commits

Author SHA1 Message Date
Phil Palmer
72725e783a Small optimisations and tidying of things that were noticed in passing. No behaviour should change.
* Removed the deprecated MyAvatar.setToggleHips script function and the "Toggle Hips Following" option from the Developer menu.  They had no effect on any code.
* In CharacterController::applyMotor, prevented unnecessary calls to btVector3::rotate() when the motor has no rotation.  This change also improves readability through the use of clearly-named lambdas.
* In AvatarData::getFauxJointIndex, prevented unnecessary string comparisons when the named joint is a real joint rather than a faux one.
* In Avatar::getJointIndex, removed an unnecessary call to QHash<QString, int>::contains(), by supplying a default index for QHash<QString, int>::value().
* Removed unnecessary condition "forwardLeanAmount < 0" in MyAvatar::FollowHelper::shouldActivateHorizontal_userSitting.
* Corrected the return type of MyAvatar::getSitStandStateChange from float to bool.
* Added a missing 'f' suffix to a float literal in PreferencesDialog.cpp.
2021-02-19 21:55:08 -05:00
Kalila L
dfa9b55223 Add back removed lines and add FIXME's. 2021-02-10 16:19:53 -05:00
Kalila L
65bef5d3d4 Fix profile errors in QML. (also add FIXME's) 2021-02-10 06:52:29 -05:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
Kalila
b826743212
Merge pull request #951 from HifiExperiments/pivot
Model Entities: useOriginalPivot Property
2021-02-10 00:42:51 -05:00
Kalila
69e5d1261b
Merge pull request #996 from digisomni/fix/vircadia-branding-alpha
Update About Dialog and remove Vircadia "Alpha" references
2021-02-04 17:18:39 -05:00
Kalila
62b70fda4e
Merge pull request #932 from AleziaKurdis/CreateApp_DEC2020_RotateAsNextClickedSurface
Create Application: Snap To Next Clicked Surface
2021-02-04 17:15:32 -05:00
HifiExperiments
56fa143ee6 Merge remote-tracking branch 'upstream/master' into pivot 2021-02-02 22:27:49 -08:00
HifiExperiments
8f3ed5d66d
Merge pull request #971 from HifiExperiments/apitraceFix
Fix crashes when running with QML disabled in VR
2021-02-01 21:56:11 -08:00
Kalila L
01cdb49930 Adjust spacing on about tablet dialog. 2021-02-01 21:51:18 -05:00
Kalila L
ea88d29145 CR 2021-02-01 17:34:09 -05:00
Kalila L
9ea1e7e464 Update about dialog. 2021-02-01 06:00:55 -05:00
Kalila L
8abfe2ead0 Add releaseName property to About namespace. 2021-02-01 03:42:24 -05:00
Kalila L
cdb217e9a2 Remove requirement of admin / logged in to teleport to people in nearby users. 2021-01-30 20:05:52 -05:00
Kalila L
c57b1a92f3 CR + update user agent. 2021-01-30 02:16:53 -05:00
HifiExperiments
19cd0fa6ad CR 2021-01-29 22:31:17 -08:00
HifiExperiments
f2c9452846
Update AssetMappingsScriptingInterface.cpp 2021-01-29 22:12:48 -08:00
HifiExperiments
bae12e4e39
Update interface/src/scripting/AssetMappingsScriptingInterface.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-01-29 17:11:24 -08:00
HifiExperiments
64e9cf6884
Update interface/src/ui/InteractiveWindow.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-01-29 17:10:56 -08:00
Kalila
cd0755d1bb
Update interface/resources/qml/Web3DSurface.qml
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
2021-01-29 13:35:27 -05:00
Kalila
b516b29e64
Update WebView.qml 2021-01-29 13:34:52 -05:00
Kalila
4576632b69
Update FlickableWebViewCore.qml 2021-01-29 13:31:06 -05:00
Kalila L
dac9c49175 Add QML portions of userAgent handling. (FML) 2021-01-29 06:01:43 -05:00
Alezia Kurdis
22b935ee65
Add Icon for Radius Search of the Create App
Add Icon for Radius Search of the Create App
2021-01-28 23:55:09 -05:00
Kalila
cacead73ae
Merge pull request #975 from digisomni/feature/release-naming
Add "RELEASE_NAME" env variable.
2021-01-28 17:34:39 -05:00
HifiExperiments
54d57afdae use rotation property to determine which axis is facing you 2021-01-21 19:21:38 -08:00
HifiExperiments
ff6f7233e4 I'm a big dumb idiot 2021-01-21 17:39:50 -08:00
Nick Levesque
c3d7e02964 Fix small typo in getPlatformTierNames() 2021-01-21 18:45:10 -05:00
Kalila
a1fe046350
Merge pull request #953 from Phil-Palmer/fix/alpha-zwrite
Disable z-write for transparent draws
2021-01-21 17:54:59 -05:00
HifiExperiments
2667af3682 more safeguards 2021-01-20 21:25:30 -08:00
Kalila L
a0747b2912 Add "RELEASE_NAME" env variable. 2021-01-20 01:17:45 -05:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08:00
HifiExperiments
1f71a23082 optimize picking 2021-01-17 13:09:09 -08:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
Phil Palmer
1cdc3610c3 Disable z-write for transparent fonts, grid entities and teleport beams
as suggested in the review here: https://github.com/vircadia/vircadia/pull/953#pullrequestreview-560779456
2021-01-05 06:47:33 -05:00
Phil Palmer
a54a40dc2c Apply suggestion from code review: fix debug message. 2021-01-04 15:55:34 -05:00
Phil Palmer
5d1bd5cc19 * Apply suggestions from code review
Fix JSDoc comments and debug messages.
2021-01-04 00:57:17 -05:00
Phil
646a5798e6
Apply suggestions from code review
Tidying (bracing style, spaces, remove final comma from enum, fix JSDoc comments).

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-01-04 00:12:57 -05:00
Phil Palmer
3cc08022fc Leaning and lean recentering now work as intended at any avatar scale.
Individually tested each of these scale fixes in third-person view.
Simplify withinBaseOfSupport.
Change input parameter from float& to float (isWithinThresholdHeightMode).
Debug: remove unnecessary Y offset that didn't scale properly with the avatar (drawBaseOfSupport).
2020-12-31 05:09:06 -05:00
Phil Palmer
4a0bde415b Fix an old confusing comment from 952b112271 2020-12-31 00:06:25 -05:00
Phil Palmer
c5fe49bc30 Decouple MyAvatar.centerOfGravityModelEnabled from the user standing state.
Engine code no longer controls MyAvatar.centerOfGravityModelEnabled.  Maybe we should deprecate it now, since its reason to exist seemed to be only to disable the CG model while the user was sitting, which is now done more explicitly (see below).

MyAvatar::FollowHelper:
- rename shouldActivateHorizontal to shouldActivateHorizontal_userSitting, now private.
- rename shouldActivateHorizontalCG to shouldActivateHorizontal_userStanding, now private.
- add new shouldActivateHorizontal that calls one of the above based on the user's sit/stand state.
- these functions no longer modify their 'myAvatar' parameter.

Add USER_CAN_TURN_BODY_WHILE_SITTING (false), which retains the old rotation behaviour of lean recentering:
a lean recenter doesn't rotate the body if the user is sitting (new: unless the feet are tracked).
In other words, the lean recentering assumes the user isn't on a swivel chair and keeps the avatar pointing in the same direction.  It might be good to expose that as an option.  (Regardless, rotation recentering does kick-in if they turn too far).
2020-12-30 23:14:42 -05:00
Phil Palmer
a95d29d327 Fix leaning not using center-of-gravity model in mode 'Allow avatar to stand: When I'm standing'.
computeHipsInSensorFrame was accidentally setting useCenterOfGravityModel to false if !getHMDCrouchRecenterEnabled.  Now it sets it to true if !getHMDCrouchRecenterEnabled.  So if artificial standing is disabled, it uses center-of-gravity regardless of the user's sit/stand state.
2020-12-30 21:36:24 -05:00
Phil Palmer
44324584b4 Fix accidental change of bracing style. 2020-12-30 04:30:52 -05:00
Phil Palmer
8d3e2ae9ee Remove MyAvatar "squat" recenter from ad6bbc7ff6
The "squat" recenter pre-dates the sit/stand detection, but the current version basically came from ad6bbc7ff6 in 2018.  I'm removing it because it doesn't seem useful anymore (with or without the other changes in this branch).

What it did (on the current master) :
- If "Avatar leaning behavior" was "Auto"
- and the user was standing
- but their head was more than 5cm below standing height
- and their chest was upright
- for 30 seconds
- do a vertical recenter so that the avatar stands straight (instead of having knees bent).
When the user stood up straight after that recenter, the avatar would hover off the ground until the next recenter (eg. walking).
2020-12-30 04:21:24 -05:00
Phil Palmer
8cf7660993 Replace a tab with spaces. 2020-12-30 02:00:28 -05:00
Phil Palmer
8ca6421376 Correct the name of a scale factor (had inverted meaning). 2020-12-30 01:56:05 -05:00
Phil Palmer
cba79c72f5 Re-added API features that are no longer used internally; marked them as deprecated.
As suggested in the review here: https://github.com/vircadia/vircadia/pull/928/files#r549821976

Re-added and deprecated MyAvatar.userRecenterModel.  Retained the functionality of setUserRecenterModel, and approximated that of getUserRecenterModel (some stand+lean preference pairs had no equivalent before).

Re-added and deprecated MyAvatar.isSitStandStateLocked.  Approximated the functionality of getIsSitStandStateLocked.
Didn't retain that of setIsSitStandStateLocked, because it wouldn't be useful on its own; someone using it would probably want setUserRecenterModel instead (or new functions to set the standing and leaning preferences).

isSitStandStateLocked's reason to exist was that we could stop keeping track of the user's real-world sit/stand state (in updateSitStandState), and instead pretend the user was always standing (for SitStandModelType::ForceStand) or always sitting (for SitStandModelType::ForceSit).
That determined whether the avatar was allowed to lean (wouldn't lean if the user was sitting or in ForceSit).
Now though, the user explicitly chooses when the avatar may lean: never / just when the user is standing / even when the user is sitting.

These API features were removed in 2179c153de ("VR fixes for: couldn't sit on the floor, wrong walk directions").
2020-12-30 01:01:35 -05:00