Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 10:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make avatar go away when ignored, even when pal is up. (But currently, it

Browse source 
comes back!)
This commit is contained in:
howard-stearns 2016-12-22 14:15:51 -08:00 committed by Zach Fox
parent 2f2940b7cc
commit 768b747b3a
8 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
interface/resources/qml/hifi/Pal.qml
View file

@ -190,7 +190,7 @@ Item {
id: nameCard
// Properties
displayName: styleData.value
userName: model.userName
userName: model && model.userName
audioLevel: model.audioLevel
visible: !isCheckBox
// Size
@ -204,15 +204,26 @@ Item {
HifiControls.CheckBox {
visible: isCheckBox
anchors.centerIn: parent
checked: model[styleData.role]
boxSize: 24
onClicked: {
var newValue = !model[styleData.role]
var datum = userData[model.userIndex]
datum[styleData.role] = model[styleData.role] = newValue
Users[styleData.role](model.sessionId)
// Just for now, while we cannot undo things:
userData.splice(model.userIndex, 1)
sortModel()
var key = styleData.role;
if (!newValue) {
key = 'un' + key;
}
if (styleData.role === 'ignore') {
if (newValue) {
ignored[datum.sessionId] = datum;
console.log('fixme hrs adding to ignored', JSON.stringify(datum), 'at', datum.sessionId);
} else {
delete ignored[datum.sessionId];
}
}
console.log('fixme hrs pal action', key, model.sessionId);
Users[key](model.sessionId);
}
}
}
@ -336,6 +347,7 @@ Item {
property var userData: []
property var myData: ({displayName: "", userName: "", audioLevel: 0.0}) // valid dummy until set
property bool iAmAdmin: false
property var ignored: ({}); // FIXME: reset when changing domains
function findSessionIndex(sessionId, optionalData) { // no findIndex in .qml
var i, data = optionalData || userData, length = data.length;
for (var i = 0; i < length; i++) {
@ -354,6 +366,16 @@ Item {
myData = data[myIndex];
data.splice(myIndex, 1);
userData = data;
var ignoredID, index;
for (ignoredID in ignored) {
index = findSessionIndex(ignoredID);
console.log('fixme hrs adding back ignored', ignoredID, index, JSON.stringify(ignored[ignoredID]));
if (-1 === index) { // Add back any missing ignored, because they sometimes take a moment to show up.
userData.push(ignored[ignoredID]);
} else { // Mark existing ignored.
userData[index].ignored = true;
}
}
sortModel();
break;
case 'select':

8
interface/src/avatar/Avatar.cpp
View file

@ -292,7 +292,15 @@ void Avatar::updateAvatarEntities() {
}
}
void Avatar::setShouldDie() {
// This will cause the avatar to be shrunk away and removed (the actual Avatar gets removed), but then it comes back.
_owningAvatarMixer.clear();
// This removes the avatar from physics and makes it shrink away, but does not actualy remvoe Avatar from Avatar Manager.
// FIXME hrs remove, unless it can be made to work cleanly.
// (In which case, this could be on AvatarList/AvatarManager instead, and consider moving pal.js usage to Pal.qml, and removing (un)ignoredNode signalling.)
//DependencyManager::get<AvatarManager>()->handleRemovedAvatar(AvatarSharedPointer(this), AvatarIgnored);
}
void Avatar::simulate(float deltaTime) {
PerformanceTimer perfTimer("simulate");

2
interface/src/avatar/Avatar.h
View file

@ -178,6 +178,8 @@ public:
glm::vec3 getUncachedRightPalmPosition() const;
glm::quat getUncachedRightPalmRotation() const;
Q_INVOKABLE void setShouldDie();
public slots:
// FIXME - these should be migrated to use Pose data instead

1
interface/src/avatar/AvatarManager.cpp
View file

@ -198,6 +198,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
if (avatar->getTargetScale() <= MIN_FADE_SCALE) {
avatar->removeFromScene(*fadingIterator, scene, pendingChanges);
// only remove from _avatarFades if we're sure its motionState has been removed from PhysicsEngine
qDebug() << "fixme hrs at minimum fade scale" << _motionStatesToRemoveFromPhysics.empty();
if (_motionStatesToRemoveFromPhysics.empty()) {
fadingIterator = _avatarFades.erase(fadingIterator);
} else {

1
interface/src/avatar/AvatarManager.h
View file

@ -93,7 +93,6 @@ private:
// virtual overrides
virtual AvatarSharedPointer newSharedAvatar() override;
virtual AvatarSharedPointer addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) override;
virtual void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason = KillAvatarReason::NoReason) override;
QVector<AvatarSharedPointer> _avatarFades;

2
libraries/script-engine/src/UsersScriptingInterface.cpp
View file

@ -19,6 +19,8 @@ UsersScriptingInterface::UsersScriptingInterface() {
connect(nodeList.data(), &LimitedNodeList::canKickChanged, this, &UsersScriptingInterface::canKickChanged);
connect(nodeList.data(), &NodeList::ignoreRadiusEnabledChanged, this, &UsersScriptingInterface::ignoreRadiusEnabledChanged);
connect(nodeList.data(), &NodeList::usernameFromIDReply, this, &UsersScriptingInterface::usernameFromIDReply);
connect(nodeList.data(), &NodeList::ignoredNode, this, &UsersScriptingInterface::ignoredNode);
connect(nodeList.data(), &NodeList::unignoredNode, this, &UsersScriptingInterface::unignoredNode);
}
void UsersScriptingInterface::ignore(const QUuid& nodeID) {

2
libraries/script-engine/src/UsersScriptingInterface.h
View file

@ -95,6 +95,8 @@ public slots:
signals:
void canKickChanged(bool canKick);
void ignoreRadiusEnabledChanged(bool isEnabled);
void ignoredNode(const QUuid& nodeID);
void unignoredNode(const QUuid& nodeID);
/**jsdoc
* Notifies scripts that another user has entered the ignore radius

7
scripts/system/pal.js
View file

@ -329,6 +329,12 @@ pal.visibleChanged.connect(onVisibleChanged);
pal.closed.connect(off);
Users.usernameFromIDReply.connect(usernameFromIDReply);
function onIgnore(sessionId) { // make it go away in the usual way, since we'll still get data keeping it live
// Why doesn't this work from .qml? (crashes)
AvatarList.getAvatar(sessionId).setShouldDie();
}
Users.ignoredNode.connect(onIgnore);
//
// Cleanup.
//
@ -338,6 +344,7 @@ Script.scriptEnding.connect(function () {
pal.visibleChanged.disconnect(onVisibleChanged);
pal.closed.disconnect(off);
Users.usernameFromIDReply.disconnect(usernameFromIDReply);
Users.ignoredNode.disconnect(onIgnore);
off();
});