Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-19 12:13:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deleting only strokes from the whiteboard where the erase button was clicked on

Browse source
This commit is contained in:
ericrius1 2015-10-15 11:38:18 -07:00
parent 55c68e0509
commit 3b59bffb79
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
examples/painting/whiteboard/whiteboardEntityScript.js
View file

@ -93,7 +93,7 @@
this.oldPosition = null;
}
}
} else if(this.intersection.properties.type !== "Unknown") {
} else if (this.intersection.properties.type !== "Unknown") {
//Sometimes ray will pick against an invisible object with type unkown... so if type is unknown, ignore
this.stopPainting();
}
@ -169,7 +169,10 @@
y: 50,
z: 50
},
lifetime: 200
lifetime: 200,
userData: JSON.stringify({
whiteboard: this.entityID
})
});
this.strokePoints = [];
this.strokeNormals = [];
@ -194,10 +197,17 @@
},
eraseBoard: function() {
var entities = Entities.findEntities(this.position, 5);
var distance = Math.max(this.dimensions.x, this.dimensions.y);
var entities = Entities.findEntities(this.position, distance);
entities.forEach(function(entity) {
var name = Entities.getEntityProperties(entity, "name").name;
if (name === "paintStroke") {
var props = Entities.getEntityProperties(entity, ["name, userData"]);
var name = props.name;
if(!props.userData) {
return;
}
var whiteboardID = JSON.parse(props.userData).whiteboard;
if (name === "paintStroke" && JSON.stringify(whiteboardID) === JSON.stringify(_this.entityID)) {
// This entity is a paintstroke and part of this whiteboard so delete it
Entities.deleteEntity(entity);
}
});
@ -205,9 +215,10 @@
preload: function(entityID) {
this.entityID = entityID;
var props = Entities.getEntityProperties(this.entityID, ["position", "rotation", "userData"]);
var props = Entities.getEntityProperties(this.entityID, ["position", "rotation", "userData", "dimensions"]);
this.position = props.position;
this.rotation = props.rotation;
this.dimensions = props.dimensions;
this.normal = Vec3.multiply(Quat.getFront(this.rotation), -1);
this.painting = false;
this.strokes = [];

2
examples/painting/whiteboard/whiteboardSpawner.js
View file

@ -189,4 +189,4 @@ function cleanup() {
// Uncomment this line to delete whiteboard and all associated entity on script close
Script.scriptEnding.connect(cleanup);
// Script.scriptEnding.connect(cleanup);

2
libraries/octree/src/Octree.cpp
View file

@ -724,7 +724,7 @@ bool Octree::findRayIntersection(const glm::vec3& origin, const glm::vec3& direc
OctreeElementPointer& element, float& distance,
BoxFace& face, glm::vec3& surfaceNormal, const QVector<QUuid>& entityIdsToInclude, void** intersectedObject,
Octree::lockType lockType, bool* accurateResult, bool precisionPicking) {
RayArgs args = { origin, direction, element, distance, face, surfaceNormal, intersectedObject, false, precisionPicking};
RayArgs args = { origin, direction, element, distance, face, surfaceNormal, entityIdsToInclude, intersectedObject, false, precisionPicking};
distance = FLT_MAX;
bool requireLock = lockType == Octree::Lock;