mirror of
https://github.com/lubosz/overte.git
synced 2025-04-27 14:35:30 +02:00
Merge branch 'master' into improve_seated_rotation
This commit is contained in:
DouglasWilcox
commit
64634f51b1
10 changed files with 134 additions and 17 deletions
android/apps/questInterface/src/main
interface
libraries/animation/src
scripts/system/create
|
|
@ -15,6 +15,7 @@
|
|||
<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
|
||||
<uses-feature android:name="android.software.vr.mode" android:required="true"/>
|
||||
<uses-feature android:name="android.hardware.vr.high_performance" android:required="true"/>
|
||||
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
|
||||
|
||||
<application
|
||||
android:name="org.qtproject.qt5.android.bindings.QtApplication"
|
||||
|
|
|
|||
BIN
interface/resources/avatar/animations/settle_to_idle02.fbx
Normal file
BIN
interface/resources/avatar/animations/settle_to_idle02.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/settle_to_idle03.fbx
Normal file
BIN
interface/resources/avatar/animations/settle_to_idle03.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/settle_to_idle04.fbx
Normal file
BIN
interface/resources/avatar/animations/settle_to_idle04.fbx
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -4804,16 +4804,117 @@
|
|||
},
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 59,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/settle_to_idle.fbx"
|
||||
},
|
||||
"id": "idleSettle01",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"blendType": "",
|
||||
"endFrame": 40,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/settle_to_idle02.fbx"
|
||||
},
|
||||
"id": "idleSettle02",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 60,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/settle_to_idle03.fbx"
|
||||
},
|
||||
"id": "idleSettle03",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 82,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/settle_to_idle04.fbx"
|
||||
},
|
||||
"id": "idleSettle04",
|
||||
"type": "clip"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
"currentState": "idleSettle01",
|
||||
"endFrame": 59,
|
||||
"loopFlag": false,
|
||||
"randomSwitchTimeMin": 1,
|
||||
"startFrame": 1,
|
||||
"states": [
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle01",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle02",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle03",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle04",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
}
|
||||
],
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/settle_to_idle.fbx"
|
||||
},
|
||||
"id": "idleSettle",
|
||||
"type": "clip"
|
||||
"type": "randomSwitchStateMachine"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
|
|
@ -5351,7 +5452,7 @@
|
|||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 34,
|
||||
"endFrame": 40,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
|
|
@ -5516,13 +5617,25 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleSettle",
|
||||
"interpDuration": 13,
|
||||
"interpTarget": 14,
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpType": "snapshotPrev",
|
||||
"transitions": [
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "idleSettleOnDone"
|
||||
"var": "idleSettle01OnDone"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "idleSettle02OnDone"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "idleSettle03OnDone"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
"var": "idleSettle04OnDone"
|
||||
},
|
||||
{
|
||||
"state": "idle",
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ public slots:
|
|||
void browseAsync(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
|
||||
|
||||
/**jsdoc
|
||||
* Prompts the user to specify the path and name of a file to save to. Displays a model dialog that navigates the directory
|
||||
* Prompts the user to specify the path and name of a file to save to. Displays a modal dialog that navigates the directory
|
||||
* tree and allows the user to type in a file name.
|
||||
* @function Window.save
|
||||
* @param {string} [title=""] - The title to display at the top of the dialog.
|
||||
|
|
@ -222,7 +222,7 @@ public slots:
|
|||
QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
|
||||
|
||||
/**jsdoc
|
||||
* Prompts the user to specify the path and name of a file to save to. Displays a non-model dialog that navigates the
|
||||
* Prompts the user to specify the path and name of a file to save to. Displays a non-modal dialog that navigates the
|
||||
* directory tree and allows the user to type in a file name. A {@link Window.saveFileChanged|saveFileChanged} signal is
|
||||
* emitted when a file is specified; no signal is emitted if the user cancels the dialog.
|
||||
* @function Window.saveAsync
|
||||
|
|
|
|||
|
|
@ -1492,15 +1492,17 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
|
|||
_animVars.set("isInputBackward", false);
|
||||
_animVars.set("isInputRight", false);
|
||||
_animVars.set("isInputLeft", false);
|
||||
_animVars.set("isNotInput", true);
|
||||
|
||||
if (_isMovingWithMomentum) {
|
||||
_animVars.set("isNotInputSlow", true);
|
||||
_animVars.set("isNotInputNoMomentum", false);
|
||||
} else {
|
||||
_animVars.set("isNotInputSlow", false);
|
||||
_animVars.set("isNotInputNoMomentum", true);
|
||||
}
|
||||
// directly reflects input
|
||||
_animVars.set("isNotInput", true);
|
||||
|
||||
// no input + speed drops to SLOW_SPEED_THRESHOLD
|
||||
// (don't transition run->idle - slow to walk first)
|
||||
_animVars.set("isNotInputSlow", _isMovingWithMomentum);
|
||||
|
||||
// no input + speed didn't get above HAS_MOMENTUM_THRESHOLD since last idle
|
||||
// (brief inputs and movement adjustments)
|
||||
_animVars.set("isNotInputNoMomentum", !_isMovingWithMomentum);
|
||||
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -561,7 +561,8 @@ var toolBar = (function () {
|
|||
if (!properties.grab) {
|
||||
properties.grab = {};
|
||||
if (Menu.isOptionChecked(MENU_CREATE_ENTITIES_GRABBABLE) &&
|
||||
!(properties.type === "Zone" || properties.type === "Light" || properties.type === "ParticleEffect")) {
|
||||
!(properties.type === "Zone" || properties.type === "Light"
|
||||
|| properties.type === "ParticleEffect" || properties.type === "Web")) {
|
||||
properties.grab.grabbable = true;
|
||||
} else {
|
||||
properties.grab.grabbable = false;
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ EntityListTool = function(shouldUseEditTabletApp) {
|
|||
|
||||
var cameraPosition = Camera.position;
|
||||
PROFILE("getMultipleProperties", function () {
|
||||
var multipleProperties = Entities.getMultipleEntityProperties(ids, ['name', 'type', 'locked',
|
||||
var multipleProperties = Entities.getMultipleEntityProperties(ids, ['position', 'name', 'type', 'locked',
|
||||
'visible', 'renderInfo', 'modelURL', 'materialURL', 'imageURL', 'script', 'certificateID',
|
||||
'skybox.url', 'ambientLight.url']);
|
||||
for (var i = 0; i < multipleProperties.length; i++) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue