Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove tablet material entities code remove create

Browse source
This commit is contained in:
Dante Ruiz 2018-08-07 11:19:22 -07:00
parent 8c5eefcc95
commit 269afb9a49
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/system/controllers/controllerModules/inEditMode.js
View file

@ -19,7 +19,6 @@ Script.include("/~/system/libraries/utils.js");
(function () { (function () {
var MARGIN = 25; var MARGIN = 25;
var TABLET_MATERIAL_ENTITY_NAME = 'Tablet-Material-Entity';
function InEditMode(hand) { function InEditMode(hand) {
this.hand = hand; this.hand = hand;
this.triggerClicked = false; this.triggerClicked = false;
@ -77,13 +76,11 @@ Script.include("/~/system/libraries/utils.js");
} }
} }
if (this.selectedTarget.type === Picks.INTERSECTED_ENTITY) { if (this.selectedTarget.type === Picks.INTERSECTED_ENTITY) {
if (!this.isTabletMaterialEntity(this.selectedTarget.objectID)) { Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({ method: "selectEntity",
method: "selectEntity", entityID: this.selectedTarget.objectID,
entityID: this.selectedTarget.objectID, hand: hand
hand: hand }));
}));
}
} else if (this.selectedTarget.type === Picks.INTERSECTED_OVERLAY) { } else if (this.selectedTarget.type === Picks.INTERSECTED_OVERLAY) {
Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({ Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
method: "selectOverlay", method: "selectOverlay",
@ -98,12 +95,6 @@ Script.include("/~/system/libraries/utils.js");
this.sendPointingAtData(controllerData); this.sendPointingAtData(controllerData);
}; };
this.isTabletMaterialEntity = function(entityID) {
return ((entityID === HMD.homeButtonHighlightMaterialID) ||
(entityID === HMD.homeButtonUnhighlightMaterialID));
};
this.sendPointingAtData = function(controllerData) { this.sendPointingAtData = function(controllerData) {
var rayPick = controllerData.rayPicks[this.hand]; var rayPick = controllerData.rayPicks[this.hand];
var hudRayPick = controllerData.hudRayPicks[this.hand]; var hudRayPick = controllerData.hudRayPicks[this.hand];

9
scripts/system/libraries/entityList.js
View file

@ -111,11 +111,6 @@ EntityListTool = function(shouldUseEditTabletApp) {
return value !== undefined ? value : ""; return value !== undefined ? value : "";
} }
function filterEntity(entityID) {
return ((entityID === HMD.homeButtonHighlightMaterialID) ||
(entityID === HMD.homeButtonUnhighlightMaterialID));
}
that.sendUpdate = function() { that.sendUpdate = function() {
var entities = []; var entities = [];
@ -126,10 +121,6 @@ EntityListTool = function(shouldUseEditTabletApp) {
ids = Entities.findEntities(MyAvatar.position, searchRadius); ids = Entities.findEntities(MyAvatar.position, searchRadius);
} }
ids = ids.filter(function(id) {
return !filterEntity(id);
});
var cameraPosition = Camera.position; var cameraPosition = Camera.position;
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {
var id = ids[i]; var id = ids[i];