Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 14:01:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adding hyperlink

Browse source
This commit is contained in:
Dante Ruiz 2018-03-01 16:16:47 -08:00
parent d888e7fd95
commit 1f4aed31f1
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -6121,6 +6121,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data()); scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data()); scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data()); scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());
qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue); qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue);

7
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -449,11 +449,16 @@ Script.include("/~/system/libraries/Xform.js");
if (rayPickInfo.type === Picks.INTERSECTED_ENTITY) { if (rayPickInfo.type === Picks.INTERSECTED_ENTITY) {
if (controllerData.triggerClicks[this.hand]) { if (controllerData.triggerClicks[this.hand]) {
var entityID = rayPickInfo.objectID; var entityID = rayPickInfo.objectID;
var targetProps = Entities.getEntityProperties(entityID, [ var targetProps = Entities.getEntityProperties(entityID, [
"dynamic", "shapeType", "position", "dynamic", "shapeType", "position",
"rotation", "dimensions", "density", "rotation", "dimensions", "density",
"userData", "locked", "type" "userData", "locked", "type", "href"
]); ]);
if (targetProps.href !== "") {
AddressManager.handleLookupString(targetProps.href);
return makeRunningValues(false, [], []);
}
this.targetObject = new TargetObject(entityID, targetProps); this.targetObject = new TargetObject(entityID, targetProps);
this.targetObject.parentProps = getEntityParents(targetProps); this.targetObject.parentProps = getEntityParents(targetProps);

11
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -233,6 +233,16 @@ entityIsDistanceGrabbable = function(props) {
return true; return true;
}; };
entityHasHyperlink = function(entityID) {
var hasHyperlink = false;
var desiredProperties = ["href"];
var entityProperties = Entities.getEntityProperties(entityID, desiredProperties);
print(entityProperties.href);
if (entityProperties.href !== "") {
hasHyperlink = true;
}
return hasHyperlink;
}
getControllerJointIndex = function (hand) { getControllerJointIndex = function (hand) {
if (HMD.isHandControllerAvailable()) { if (HMD.isHandControllerAvailable()) {
@ -398,6 +408,7 @@ if (typeof module !== 'undefined') {
entityIsGrabbable: entityIsGrabbable, entityIsGrabbable: entityIsGrabbable,
NEAR_GRAB_RADIUS: NEAR_GRAB_RADIUS, NEAR_GRAB_RADIUS: NEAR_GRAB_RADIUS,
projectOntoOverlayXYPlane: projectOntoOverlayXYPlane, projectOntoOverlayXYPlane: projectOntoOverlayXYPlane,
entityHasHyperlink: entityHasHyperlink,
projectOntoEntityXYPlane: projectOntoEntityXYPlane, projectOntoEntityXYPlane: projectOntoEntityXYPlane,
TRIGGER_OFF_VALUE: TRIGGER_OFF_VALUE, TRIGGER_OFF_VALUE: TRIGGER_OFF_VALUE,
TRIGGER_ON_VALUE: TRIGGER_ON_VALUE TRIGGER_ON_VALUE: TRIGGER_ON_VALUE