这是indexloc提供的服务，不要输入任何密码
Skip to content

Fixed some issues regarding pointers on Android and Web #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2025
Merged

Fixed some issues regarding pointers on Android and Web #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1720490
Fixed an issue where activating the navigate back animation and cance…
MihMihai May 29, 2025
4e65b25
Uncommented the code that prevents the scroll wheel from zooming in a…
MihMihai May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions packages/three_js_core/lib/others/peripherals.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class PeripheralsState extends State<Peripherals> {
late final PanGestureRecognizer panGestureRecognizer;

double _prevScale = 0;
int _pointers = 0;

@override
void initState() {
Expand Down Expand Up @@ -133,21 +134,27 @@ class PeripheralsState extends State<Peripherals> {
},
child: Listener(
onPointerPanZoomStart: panGestureRecognizer.addPointerPanZoom,
// onPointerSignal: (event) {
// if (event is PointerScrollEvent) {
// _onPointerEvent(context, PeripheralType.wheel, event);
// }
// },
onPointerSignal: (event) {
if (event is PointerScrollEvent) {
_onPointerEvent(context, PeripheralType.wheel, event);
}
},
onPointerDown: (PointerDownEvent event) {
_pointers++;
_onPointerEvent(context, PeripheralType.pointerdown, event);
FocusScope.of(context).requestFocus(focusNode);
},
onPointerMove: (PointerMoveEvent event) {
_onPointerEvent(context, PeripheralType.pointermove, event);
},
onPointerUp: (PointerUpEvent event) {
_pointers--;
_onPointerEvent(context, PeripheralType.pointerup, event);
},
onPointerCancel: (PointerCancelEvent event) {
_pointers--;
_onPointerEvent(context, PeripheralType.pointercancel, event);
},
onPointerHover: (PointerHoverEvent event){
_onPointerEvent(context, PeripheralType.pointerHover , event);
},
Expand All @@ -166,15 +173,15 @@ class PeripheralsState extends State<Peripherals> {
}

void _onScaleEvent(BuildContext context, PeripheralType type, event) {
final wpe = WebPointerEvent.fromScaleEvent(context, event);
final wpe = WebPointerEvent.fromScaleEvent(context, event, _pointers);
_emit(type, wpe);
}
void _onDragEvent(BuildContext context, PeripheralType type, event) {
final wpe = WebPointerEvent.fromDragEvent(context, event);
final wpe = WebPointerEvent.fromDragEvent(context, event, _pointers);
_emit(type, wpe);
}
void _onPointerEvent(BuildContext context, PeripheralType type, PointerEvent event) {
final wpe = WebPointerEvent.fromPointerEvent(context, event);
final wpe = WebPointerEvent.fromPointerEvent(context, event, _pointers);
_emit(type, wpe);
}

Expand Down Expand Up @@ -252,12 +259,13 @@ class WebPointerEvent {
}
}

static WebPointerEvent convertPointerEvent(BuildContext context, PointerEvent event) {
static WebPointerEvent convertPointerEvent(BuildContext context, PointerEvent event, int pointerCount) {
final wpe = WebPointerEvent();

wpe.pointerId = event.pointer;
wpe.pointerType = getPointerType(event);
wpe.button = getButton(event);
wpe.pointerCount = pointerCount;

RenderBox getBox = context.findRenderObject() as RenderBox;
final local = getBox.globalToLocal(event.position);
Expand Down Expand Up @@ -296,12 +304,13 @@ class WebPointerEvent {
return wpe;
}

static WebPointerEvent convertDragEvent(BuildContext context, event) {
static WebPointerEvent convertDragEvent(BuildContext context, event, int pointerCount) {
final wpe = WebPointerEvent();

wpe.pointerId = 512;
wpe.pointerType = 'touch_pad';
wpe.button = 0;
wpe.pointerCount = pointerCount;

RenderBox getBox = context.findRenderObject() as RenderBox;
final local = getBox.globalToLocal(event.globalPosition);
Expand Down Expand Up @@ -333,12 +342,13 @@ class WebPointerEvent {

return wpe;
}
static WebPointerEvent convertScaleEvent(BuildContext context, event) {
static WebPointerEvent convertScaleEvent(BuildContext context, event, int pointerCount) {
final wpe = WebPointerEvent();

wpe.pointerId = 522;
wpe.pointerType = 'mouse';
wpe.button = 4;
wpe.pointerCount = pointerCount;

wpe.clientX = event['scale'];
wpe.clientY = event['scale'];
Expand Down Expand Up @@ -369,14 +379,14 @@ class WebPointerEvent {
return wpe;
}

factory WebPointerEvent.fromPointerEvent(BuildContext context, PointerEvent event) {
return convertPointerEvent(context, event);
factory WebPointerEvent.fromPointerEvent(BuildContext context, PointerEvent event, int pointerCount) {
return convertPointerEvent(context, event, pointerCount);
}
factory WebPointerEvent.fromDragEvent(BuildContext context, event) {
return convertDragEvent(context, event);
factory WebPointerEvent.fromDragEvent(BuildContext context, event, int pointerCount) {
return convertDragEvent(context, event, pointerCount);
}
factory WebPointerEvent.fromScaleEvent(BuildContext context, event) {
return convertScaleEvent(context, event);
factory WebPointerEvent.fromScaleEvent(BuildContext context, event, int pointerCount) {
return convertScaleEvent(context, event, pointerCount);
}
@override
String toString() {
Expand Down