coderofsalvation/xrfragment-haxe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gazer bugfix

Browse source
This commit is contained in:
Leon van Kammen 2023-10-14 22:07:12 +02:00
parent b3c8d06955
commit a5f65fdf03
5 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dist/xrfragment.aframe.js vendored
View file

@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
const raycaster = new Raycaster(); const raycaster = new Raycaster();
const tempMatrix = new Matrix4(); const tempMatrix = new Matrix4();
function nocollide(){
if( nocollide.tid ) return // ratelimit
_event.type = "nocollide"
scope.objects.map( (c) => c.dispatchEvent(_event) )
nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
}
// Pointer Events // Pointer Events
const element = renderer.domElement; const element = renderer.domElement;
@ -2174,15 +2167,16 @@ AFRAME.registerComponent('xrf-gaze',{
material="color: #BBBBBB; shader: flat"> material="color: #BBBBBB; shader: flat">
</a-entity>` </a-entity>`
}else{ }else{
cam.innerHTML = '' //if( document.querySelector('[cursor]') )
// document.querySelector('[cursor]').setAttribute("visible",false)
} }
}, },
init:function(data){ init:function(data){
this.immersive = false; this.immersive = false;
let enabled = () => AFRAME.utils.device.isMobile() let enabled = () => AFRAME.utils.device.isMobile()
let setVisible = () => this.el.setAttribute('visible', enabled() ) let setVisible = () => document.querySelector('[cursor]').setAttribute('visible', enabled() )
this.setGazer(enabled()) this.setGazer(enabled())
setVisible(); if( enabled() ) setVisible();
document.querySelector("a-scene").addEventListener('exit-vr', () => { document.querySelector("a-scene").addEventListener('exit-vr', () => {
this.immersive = false; this.immersive = false;
@ -2203,14 +2197,6 @@ AFRAME.registerComponent('xrf-gaze',{
} }
this.el.addEventListener("mouseenter", highlightMesh(true) ) this.el.addEventListener("mouseenter", highlightMesh(true) )
this.el.addEventListener("mouseleave", highlightMesh(false ) ) this.el.addEventListener("mouseleave", highlightMesh(false ) )
//this.el.addEventListener('click',function(evt){
// document.querySelector('a-scene').querySelector('#player').setAttribute('position',{
// x:this.getAttribute('position').x,
// y:this.getAttribute('position').y,
// z:this.getAttribute('position').z
// });
//});
} }
}); });
window.AFRAME.registerComponent('xrf-get', { window.AFRAME.registerComponent('xrf-get', {

7
dist/xrfragment.three.js vendored
View file

@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
const raycaster = new Raycaster(); const raycaster = new Raycaster();
const tempMatrix = new Matrix4(); const tempMatrix = new Matrix4();
function nocollide(){
if( nocollide.tid ) return // ratelimit
_event.type = "nocollide"
scope.objects.map( (c) => c.dispatchEvent(_event) )
nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
}
// Pointer Events // Pointer Events
const element = renderer.domElement; const element = renderer.domElement;

7
dist/xrfragment.three.module.js vendored
View file

@ -941,13 +941,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
const raycaster = new Raycaster(); const raycaster = new Raycaster();
const tempMatrix = new Matrix4(); const tempMatrix = new Matrix4();
function nocollide(){
if( nocollide.tid ) return // ratelimit
_event.type = "nocollide"
scope.objects.map( (c) => c.dispatchEvent(_event) )
nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
}
// Pointer Events // Pointer Events
const element = renderer.domElement; const element = renderer.domElement;

15
src/3rd/js/aframe/xrf-gaze.js
View file

@ -19,15 +19,16 @@ AFRAME.registerComponent('xrf-gaze',{
material="color: #BBBBBB; shader: flat"> material="color: #BBBBBB; shader: flat">
</a-entity>` </a-entity>`
}else{ }else{
cam.innerHTML = '' //if( document.querySelector('[cursor]') )
// document.querySelector('[cursor]').setAttribute("visible",false)
} }
}, },
init:function(data){ init:function(data){
this.immersive = false; this.immersive = false;
let enabled = () => AFRAME.utils.device.isMobile() let enabled = () => AFRAME.utils.device.isMobile()
let setVisible = () => this.el.setAttribute('visible', enabled() ) let setVisible = () => document.querySelector('[cursor]').setAttribute('visible', enabled() )
this.setGazer(enabled()) this.setGazer(enabled())
setVisible(); if( enabled() ) setVisible();
document.querySelector("a-scene").addEventListener('exit-vr', () => { document.querySelector("a-scene").addEventListener('exit-vr', () => {
this.immersive = false; this.immersive = false;
@ -48,13 +49,5 @@ AFRAME.registerComponent('xrf-gaze',{
} }
this.el.addEventListener("mouseenter", highlightMesh(true) ) this.el.addEventListener("mouseenter", highlightMesh(true) )
this.el.addEventListener("mouseleave", highlightMesh(false ) ) this.el.addEventListener("mouseleave", highlightMesh(false ) )
//this.el.addEventListener('click',function(evt){
// document.querySelector('a-scene').querySelector('#player').setAttribute('position',{
// x:this.getAttribute('position').x,
// y:this.getAttribute('position').y,
// z:this.getAttribute('position').z
// });
//});
} }
}); });

7
src/3rd/js/three/InteractiveGroup.js
View file

@ -30,13 +30,6 @@ xrf.InteractiveGroup = function(THREE,renderer,camera){
const raycaster = new Raycaster(); const raycaster = new Raycaster();
const tempMatrix = new Matrix4(); const tempMatrix = new Matrix4();
function nocollide(){
if( nocollide.tid ) return // ratelimit
_event.type = "nocollide"
scope.objects.map( (c) => c.dispatchEvent(_event) )
nocollide.tid = setTimeout( () => nocollide.tid = null, 10 )
}
// Pointer Events // Pointer Events
const element = renderer.domElement; const element = renderer.domElement;