mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 22:16:58 +02:00
CR feedback
This commit is contained in:
parent
9e71801ae1
commit
6400bb6319
5 changed files with 5 additions and 5 deletions
|
@ -142,7 +142,7 @@ function mousePressEvent(event) {
|
||||||
if (!pickResults.intersects) {
|
if (!pickResults.intersects) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var isDynamic = Entites.getEntityProperties(pickResults.entityID,"dynamic").dynamic;
|
var isDynamic = Entites.getEntityProperties(pickResults.entityID, "dynamic").dynamic;
|
||||||
if (isDynamic) {
|
if (isDynamic) {
|
||||||
grabbedEntity = pickResults.entityID;
|
grabbedEntity = pickResults.entityID;
|
||||||
var props = Entities.getEntityProperties(grabbedEntity)
|
var props = Entities.getEntityProperties(grabbedEntity)
|
||||||
|
|
|
@ -191,7 +191,7 @@ function controller(side) {
|
||||||
};
|
};
|
||||||
var intersection = getRayIntersection(pickRay, true);
|
var intersection = getRayIntersection(pickRay, true);
|
||||||
|
|
||||||
var isDynamic = Entites.getEntityProperties(intersection.entityID,"dynamic").dynamic;
|
var isDynamic = Entites.getEntityProperties(intersection.entityID, "dynamic").dynamic;
|
||||||
|
|
||||||
if (intersection.intersects && isDynamic) {
|
if (intersection.intersects && isDynamic) {
|
||||||
this.laserWasHovered = true;
|
this.laserWasHovered = true;
|
||||||
|
|
|
@ -382,7 +382,7 @@ function MyController(hand) {
|
||||||
|
|
||||||
var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, intersection.entityID, DEFAULT_GRABBABLE_DATA);
|
var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, intersection.entityID, DEFAULT_GRABBABLE_DATA);
|
||||||
|
|
||||||
var properties = Entites.getEntityProperties(intersection.entityID,["locked","name"]);
|
var properties = Entites.getEntityProperties(intersection.entityID, ["locked", "name"]);
|
||||||
|
|
||||||
|
|
||||||
if (properties.name == "Grab Debug Entity") {
|
if (properties.name == "Grab Debug Entity") {
|
||||||
|
|
|
@ -343,7 +343,7 @@ Grabber.prototype.pressEvent = function(event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var isDynamic = Entites.getEntityProperties(pickResults.entityID,"dynamic").dynamic;
|
var isDynamic = Entites.getEntityProperties(pickResults.entityID, "dynamic").dynamic;
|
||||||
if (!isDynamic) {
|
if (!isDynamic) {
|
||||||
// only grab dynamic objects
|
// only grab dynamic objects
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -151,7 +151,7 @@
|
||||||
});
|
});
|
||||||
}, randFloat(10, 200));
|
}, randFloat(10, 200));
|
||||||
}
|
}
|
||||||
var isDynamic = Entites.getEntityProperties(intersection.entityID,"dynamic").dynamic;
|
var isDynamic = Entites.getEntityProperties(intersection.entityID, "dynamic").dynamic;
|
||||||
|
|
||||||
if (isDynamic === 1) {
|
if (isDynamic === 1) {
|
||||||
// Any dynamic entity can be shot
|
// Any dynamic entity can be shot
|
||||||
|
|
Loading…
Reference in a new issue