mirror of
https://github.com/overte-org/overte.git
synced 2025-04-16 10:28:57 +02:00
use click instead of trigger, change targets to PNG
This commit is contained in:
Stephen Birarda
parent
7d9937e412
commit
6051fcd8f9
5 changed files with 12 additions and 114 deletions
BIN
scripts/system/assets/images/ignore-target.png
Normal file
BIN
scripts/system/assets/images/ignore-target.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
|
|
@ -1,52 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 30 23.1" style="enable-background:new 0 0 30 23.1;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#414042;}
|
||||
.st1{fill:#EF3B4E;}
|
||||
.st2{fill:#FFFFFF;}
|
||||
</style>
|
||||
<polygon class="st0" points="12.2,12 15.4,22.1 18,12 "/>
|
||||
<polygon class="st1" points="12,11.7 15.1,21.8 17.8,11.7 "/>
|
||||
<path class="st0" d="M1.3,1.8H29c0.4,0,0.7,0.3,0.7,0.7v6c0,0.4-0.3,0.7-0.7,0.7H1.3c-0.4,0-0.7-0.3-0.7-0.7v-6
|
||||
C0.6,2.1,0.9,1.8,1.3,1.8z"/>
|
||||
<path class="st1" d="M1.1,1.5h27.7c0.4,0,0.7,0.3,0.7,0.7v6c0,0.4-0.3,0.7-0.7,0.7H1.1c-0.4,0-0.7-0.3-0.7-0.7v-6
|
||||
C0.3,1.8,0.7,1.5,1.1,1.5z"/>
|
||||
<path class="st0" d="M3.8,7.6V3.4h0.8v4.3H3.8z"/>
|
||||
<path class="st0" d="M8.5,7.1C8.2,7.5,7.8,7.7,7.4,7.7c-0.3,0-0.5-0.1-0.8-0.2C6.4,7.3,6.2,7.2,6,7C5.8,6.8,5.7,6.6,5.6,6.3
|
||||
C5.5,6,5.4,5.7,5.4,5.4c0-0.3,0.1-0.5,0.2-0.8C5.6,4.4,5.8,4.2,6,4c0.2-0.2,0.4-0.3,0.6-0.5c0.6-0.3,1.2-0.2,1.8,0.1
|
||||
C8.7,3.8,8.9,4,9,4.3L8.4,4.7C8.3,4.5,8.2,4.4,8,4.2C7.8,4.1,7.6,4.1,7.4,4.1c-0.2,0-0.3,0-0.5,0.1C6.8,4.3,6.7,4.4,6.6,4.5
|
||||
C6.5,4.6,6.4,4.8,6.3,4.9C6.3,5.1,6.2,5.3,6.2,5.5c0,0.2,0,0.4,0.1,0.6c0.1,0.2,0.1,0.3,0.2,0.4C6.7,6.6,6.8,6.7,7,6.8
|
||||
c0.1,0.1,0.3,0.1,0.5,0.1c0.4,0,0.8-0.2,1-0.6V6H7.6V5.4h1.5v2.2H8.5V7.1z"/>
|
||||
<path class="st0" d="M10.9,4.9v2.7H10V3.4h0.6l2.2,2.8V3.4h0.8v4.3h-0.6L10.9,4.9z"/>
|
||||
<path class="st0" d="M16.5,7.7c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.1-0.5-0.3-0.6-0.5c-0.2-0.2-0.3-0.4-0.4-0.7c-0.1-0.3-0.1-0.5-0.1-0.8
|
||||
c0-0.6,0.2-1.1,0.6-1.5c0.2-0.2,0.4-0.4,0.6-0.5c0.3-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.8,0.2C17.6,3.6,17.8,3.8,18,4
|
||||
c0.4,0.4,0.5,0.9,0.5,1.5c0,0.3,0,0.6-0.1,0.8C18.3,6.5,18.2,6.8,18,7c-0.2,0.2-0.4,0.4-0.6,0.5C17.1,7.6,16.8,7.6,16.5,7.7z
|
||||
M15.4,5.5c0,0.2,0,0.4,0.1,0.5c0,0.2,0.1,0.3,0.2,0.5c0.1,0.1,0.2,0.2,0.4,0.3c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1
|
||||
c0.1-0.1,0.3-0.2,0.4-0.4c0.1-0.1,0.2-0.3,0.2-0.5c0.1-0.2,0.1-0.3,0.1-0.5c0-0.2,0-0.4-0.1-0.5c-0.1-0.2-0.1-0.3-0.2-0.5
|
||||
c-0.1-0.1-0.3-0.2-0.4-0.3c-0.3-0.2-0.7-0.2-1,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.1,0.1-0.2,0.3-0.2,0.5C15.4,5.1,15.3,5.3,15.4,5.5z"/>
|
||||
<path class="st0" d="M19.4,7.6V3.4h1.9c0.2,0,0.4,0,0.5,0.1c0.2,0.1,0.3,0.2,0.4,0.3c0.1,0.1,0.2,0.3,0.3,0.5
|
||||
c0.1,0.2,0.1,0.3,0.1,0.5c0,0.3-0.1,0.5-0.2,0.8C22.2,5.7,22,5.9,21.8,6l1,1.6h-0.9L21,6.2h-0.8v1.4H19.4z M20.2,5.4h1
|
||||
c0.1,0,0.2,0,0.2,0c0.1,0,0.1-0.1,0.2-0.2c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.2,0-0.3c0-0.1,0-0.2,0-0.3c0-0.1-0.1-0.2-0.1-0.2
|
||||
c-0.1-0.1-0.1-0.1-0.2-0.1c-0.1,0-0.1,0-0.2-0.1h-1C20.2,4.1,20.2,5.4,20.2,5.4z"/>
|
||||
<path class="st0" d="M26.5,6.9v0.7h-3V3.4h2.9v0.7h-2v1h1.8v0.7h-1.8v1.1H26.5z"/>
|
||||
<path class="st2" d="M3.6,7.4V3.2h0.8v4.2H3.6z"/>
|
||||
<path class="st2" d="M8.3,7C8,7.3,7.6,7.5,7.2,7.4c-0.3,0-0.5,0-0.8-0.1C6.2,7.2,5.9,7,5.8,6.8C5.6,6.6,5.4,6.4,5.3,6.1
|
||||
C5.2,5.9,5.2,5.6,5.2,5.3c0-0.3,0-0.6,0.2-0.9C5.4,4.2,5.6,4,5.8,3.8C6,3.6,6.2,3.4,6.4,3.3C7,3.1,7.7,3.1,8.2,3.4
|
||||
c0.3,0.2,0.5,0.4,0.6,0.7L8.2,4.6C8.1,4.4,8,4.2,7.8,4.1C7.6,4,7.4,3.9,7.2,3.9C7,3.9,6.8,4,6.7,4C6.6,4.1,6.4,4.2,6.3,4.3
|
||||
C6.2,4.5,6.2,4.6,6.1,4.8C6,5,6,5.2,6,5.3c0,0.2,0,0.4,0.1,0.6c0.1,0.2,0.1,0.3,0.2,0.4c0.1,0.1,0.2,0.2,0.4,0.3
|
||||
C6.9,6.7,7,6.8,7.2,6.7c0.4,0,0.8-0.2,1.1-0.6V5.9H7.4V5.3H9v2.2H8.3V7z"/>
|
||||
<path class="st2" d="M10.7,4.7v2.7H9.8V3.2h0.6L12.7,6V3.2h0.8v4.2h-0.7L10.7,4.7z"/>
|
||||
<path class="st2" d="M16.3,7.4c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.1-0.5-0.3-0.6-0.5c-0.2-0.2-0.3-0.4-0.4-0.7c-0.1-0.3-0.1-0.5-0.1-0.8
|
||||
c0-0.6,0.2-1.1,0.6-1.5c0.2-0.2,0.4-0.4,0.6-0.5c0.3-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.8,0.2c0.2,0.1,0.5,0.3,0.6,0.5
|
||||
c0.4,0.4,0.5,0.9,0.5,1.5c0,0.3,0,0.6-0.1,0.8c-0.1,0.3-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.4-0.6,0.5C16.9,7.4,16.6,7.4,16.3,7.4z
|
||||
M15.2,5.3c0,0.2,0,0.4,0.1,0.5c0,0.2,0.1,0.3,0.2,0.5c0.1,0.1,0.2,0.2,0.4,0.3c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1
|
||||
c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.2-0.5c0.1-0.2,0.1-0.3,0.1-0.5c0-0.2,0-0.4-0.1-0.5c-0.1-0.2-0.1-0.3-0.2-0.5
|
||||
C17.1,4.2,17,4.1,16.8,4c-0.3-0.2-0.7-0.2-1,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.1,0.1-0.2,0.3-0.2,0.5C15.2,5,15.2,5.2,15.2,5.3z"/>
|
||||
<path class="st2" d="M19.2,7.4V3.2H21c0.2,0,0.4,0,0.5,0.1c0.2,0.1,0.3,0.2,0.5,0.3c0.1,0.1,0.2,0.3,0.3,0.5
|
||||
c0.1,0.2,0.1,0.3,0.1,0.5c0,0.3-0.1,0.5-0.2,0.8c-0.1,0.2-0.3,0.4-0.6,0.5l1,1.6h-0.9L20.8,6H20v1.4H19.2z M20,5.3h1
|
||||
c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.2-0.2c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0-0.2,0-0.3c0-0.1,0-0.2,0-0.3c0-0.1-0.1-0.2-0.1-0.2
|
||||
C21.3,4.1,21.2,4,21.2,4c-0.1,0-0.1,0-0.2-0.1h-1V5.3z"/>
|
||||
<path class="st2" d="M26.3,6.7v0.7h-3V3.2h2.9v0.7h-2v1H26v0.7h-1.8v1.1C24.2,6.7,26.3,6.7,26.3,6.7z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.6 KiB |
BIN
scripts/system/assets/images/kick-target.png
Normal file
BIN
scripts/system/assets/images/kick-target.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 30 23.1" style="enable-background:new 0 0 30 23.1;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#414042;}
|
||||
.st1{fill:#EF3B4E;}
|
||||
.st2{fill:#FFFFFF;}
|
||||
</style>
|
||||
<path class="st0" d="M1.3,1.7H29c0.4,0,0.7,0.3,0.7,0.7v6c0,0.4-0.3,0.7-0.7,0.7H1.3c-0.4,0-0.7-0.3-0.7-0.7v-6
|
||||
C0.6,2,0.9,1.7,1.3,1.7z"/>
|
||||
<polygon class="st0" points="12.2,12 15.4,22.1 18,12 "/>
|
||||
<path class="st1" d="M1.1,1.4h27.7c0.4,0,0.7,0.3,0.7,0.7v6c0,0.4-0.3,0.7-0.7,0.7H1.1c-0.4,0-0.7-0.3-0.7-0.7v-6
|
||||
C0.3,1.7,0.7,1.4,1.1,1.4z"/>
|
||||
<path class="st0" d="M8.2,7.1V3H9v2l1.8-2h0.8L10,4.8l1.7,2.3h-0.8L9.6,5.2L9,5.8v1.2H8.2z"/>
|
||||
<path class="st0" d="M12.2,7.1V3H13v4.1H12.2L12.2,7.1z"/>
|
||||
<path class="st0" d="M13.8,5c0-0.3,0-0.5,0.1-0.7C14,4,14.1,3.8,14.3,3.6c0.2-0.2,0.4-0.4,0.6-0.5c0.3-0.1,0.5-0.2,0.8-0.2
|
||||
c0.4,0,0.7,0.1,1,0.2c0.3,0.2,0.5,0.4,0.6,0.6l-0.6,0.4c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1,0-0.2,0-0.3,0c-0.2,0-0.3,0-0.5,0.1C15.1,3.9,15,4,14.9,4.1c-0.1,0.1-0.2,0.3-0.2,0.4c0,0.2-0.1,0.3-0.1,0.5
|
||||
c0,0.2,0,0.4,0.1,0.5c0.1,0.2,0.1,0.3,0.2,0.4c0.1,0.1,0.2,0.2,0.4,0.3c0.1,0.1,0.3,0.1,0.5,0.1c0.1,0,0.1,0,0.2,0
|
||||
c0.2,0,0.4-0.2,0.5-0.3c0.1-0.1,0.1-0.2,0.2-0.3l0.6,0.4c-0.1,0.2-0.2,0.3-0.3,0.4c-0.1,0.1-0.3,0.2-0.4,0.3C16.5,7,16.4,7,16.2,7.1
|
||||
c-0.2,0-0.3,0.1-0.5,0.1c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.1-0.4-0.3-0.6-0.6C14,6,13.8,5.5,13.8,5z"/>
|
||||
<path class="st0" d="M18,7.1V3h0.8v2l1.8-2h0.8l-1.6,1.8l1.7,2.3h-0.8l-1.3-1.8l-0.5,0.6v1.2L18,7.1L18,7.1z"/>
|
||||
<path class="st2" d="M8,6.9V2.8h0.8v2l1.8-2h0.8L9.9,4.6l1.7,2.3h-0.8L9.4,5.1L8.8,5.7v1.2H8z"/>
|
||||
<path class="st2" d="M12,6.9V2.8h0.8v4.1H12z"/>
|
||||
<path class="st2" d="M13.6,4.8c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.5,0.4-0.7c0.2-0.2,0.4-0.4,0.6-0.5c0.3-0.1,0.5-0.2,0.8-0.2
|
||||
c0.4,0,0.7,0.1,1,0.2c0.3,0.2,0.5,0.4,0.6,0.6l-0.6,0.4c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1,0-0.2,0-0.3,0c-0.2,0-0.3,0-0.5,0.1c-0.1,0.1-0.3,0.2-0.4,0.3c-0.1,0.1-0.2,0.3-0.2,0.4c0,0.2-0.1,0.3-0.1,0.5
|
||||
c0,0.2,0,0.4,0.1,0.5c0.1,0.2,0.1,0.3,0.2,0.4c0.1,0.1,0.2,0.2,0.4,0.3c0.1,0.1,0.3,0.1,0.5,0.1c0.1,0,0.2,0,0.3,0
|
||||
c0.2,0,0.4-0.2,0.5-0.3c0.1-0.1,0.1-0.2,0.2-0.3L17.2,6c-0.1,0.2-0.2,0.3-0.3,0.4c-0.1,0.1-0.3,0.2-0.4,0.3
|
||||
c-0.1,0.1-0.3,0.1-0.5,0.2C15.9,7,15.7,7,15.6,7c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.1-0.4-0.3-0.6-0.5C13.8,5.9,13.6,5.4,13.6,4.8z"/>
|
||||
<path class="st2" d="M17.9,6.9V2.8h0.8v2l1.8-2h0.8l-1.6,1.8l1.7,2.3h-0.8l-1.3-1.8l-0.5,0.6v1.2C18.7,6.9,17.9,6.9,17.9,6.9z"/>
|
||||
<polygon class="st1" points="12,11.7 15.1,21.8 17.8,11.7 "/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.7 KiB |
|
|
@ -64,7 +64,7 @@ function buttonClicked(){
|
|||
button.clicked.connect(buttonClicked);
|
||||
|
||||
function overlayURL() {
|
||||
return Script.resolvePath("assets/images/" + (Users.canKick ? "kick-target.svg" : "ignore-target.svg"));
|
||||
return Script.resolvePath("assets/images/" + (Users.canKick ? "kick-target.png" : "ignore-target.png"));
|
||||
}
|
||||
|
||||
function updateOverlays() {
|
||||
|
|
@ -104,7 +104,7 @@ function updateOverlays() {
|
|||
var newOverlay = Overlays.addOverlay("image3d", {
|
||||
url: overlayURL(),
|
||||
position: overlayPosition,
|
||||
size: 0.4,
|
||||
size: 1,
|
||||
scale: 0.4,
|
||||
color: { red: 255, green: 255, blue: 255},
|
||||
alpha: 1,
|
||||
|
|
@ -179,14 +179,8 @@ Controller.mousePressEvent.connect(function(event){
|
|||
// But we dont' get mousePressEvents.
|
||||
var triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
|
||||
|
||||
var TRIGGER_GRAB_VALUE = 0.85; // From handControllerGrab/Pointer.js. Should refactor.
|
||||
var TRIGGER_ON_VALUE = 0.4;
|
||||
var TRIGGER_OFF_VALUE = 0.15;
|
||||
var triggered = false;
|
||||
var activeHand = Controller.Standard.RightHand;
|
||||
|
||||
function controllerComputePickRay() {
|
||||
var controllerPose = Controller.getPoseValue(activeHand);
|
||||
function controllerComputePickRay(hand) {
|
||||
var controllerPose = Controller.getPoseValue(hand);
|
||||
if (controllerPose.valid && triggered) {
|
||||
var controllerPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, controllerPose.translation),
|
||||
MyAvatar.position);
|
||||
|
|
@ -196,31 +190,21 @@ function controllerComputePickRay() {
|
|||
}
|
||||
}
|
||||
|
||||
function makeTriggerHandler(hand) {
|
||||
function makeClickHandler(hand) {
|
||||
return function (value) {
|
||||
if (isShowingOverlays) {
|
||||
if (!triggered && (value > TRIGGER_GRAB_VALUE)) { // should we smooth?
|
||||
triggered = true;
|
||||
if (activeHand !== hand) {
|
||||
// No switching while the other is already triggered, so no need to release.
|
||||
activeHand = (activeHand === Controller.Standard.RightHand) ? Controller.Standard.LeftHand : Controller.Standard.RightHand;
|
||||
var pickRay = controllerComputePickRay(hand);
|
||||
if (pickRay) {
|
||||
var overlayIntersection = Overlays.findRayIntersection(pickRay);
|
||||
if (overlayIntersection.intersects) {
|
||||
handleSelectedOverlay(overlayIntersection);
|
||||
}
|
||||
|
||||
var pickRay = controllerComputePickRay();
|
||||
if (pickRay) {
|
||||
var overlayIntersection = Overlays.findRayIntersection(pickRay);
|
||||
if (overlayIntersection.intersects) {
|
||||
handleSelectedOverlay(overlayIntersection);
|
||||
}
|
||||
}
|
||||
} else if (triggered && (value < TRIGGER_OFF_VALUE)) {
|
||||
triggered = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
triggerMapping.from(Controller.Standard.RT).peek().to(makeTriggerHandler(Controller.Standard.RightHand));
|
||||
triggerMapping.from(Controller.Standard.LT).peek().to(makeTriggerHandler(Controller.Standard.LeftHand));
|
||||
triggerMapping.from(Controller.Standard.RTClick).peek().to(makeClickHandler(Controller.Standard.RightHand));
|
||||
triggerMapping.from(Controller.Standard.LTClick).peek().to(makeClickHandler(Controller.Standard.LeftHand));
|
||||
|
||||
triggerMapping.enable();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue