Fabio/aves_panorama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrate to null safety

Browse source
This commit is contained in:
Mark Hu 2021-03-13 12:05:12 +08:00
parent 689b6d52c2
commit f0754548a9
8 changed files with 189 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## [0.4.0] - 03/13/2021
* migrate to null safety
## [0.3.2] - 01/09/2021 ## [0.3.2] - 01/09/2021
* Fixed some bugs * Fixed some bugs

2
README.md
View file

@ -10,7 +10,7 @@ Add panorama as a dependency in your pubspec.yaml file.
```yaml ```yaml
dependencies: dependencies:
panorama: ^0.3.2 panorama: ^0.4.0
``` ```
Import and add the Panorama widget to your project. Import and add the Panorama widget to your project.

30
example/lib/main.dart
View file

@ -1,3 +1,4 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:panorama/panorama.dart'; import 'package:panorama/panorama.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
@ -16,9 +17,9 @@ class MyApp extends StatelessWidget {
} }
class MyHomePage extends StatefulWidget { class MyHomePage extends StatefulWidget {
MyHomePage({Key key, this.title}) : super(key: key); MyHomePage({Key? key, this.title}) : super(key: key);
final String title; final String? title;
@override @override
_MyHomePageState createState() => _MyHomePageState(); _MyHomePageState createState() => _MyHomePageState();
@ -34,6 +35,7 @@ class _MyHomePageState extends State<MyHomePage> {
Image.asset('assets/panorama2.webp'), Image.asset('assets/panorama2.webp'),
Image.asset('assets/panorama_cropped.webp'), Image.asset('assets/panorama_cropped.webp'),
]; ];
ImagePicker picker = ImagePicker();
void onViewChanged(longitude, latitude, tilt) { void onViewChanged(longitude, latitude, tilt) {
setState(() { setState(() {
@ -43,13 +45,16 @@ class _MyHomePageState extends State<MyHomePage> {
}); });
} }
Widget hotspotButton({String text, IconData icon, VoidCallback onPressed}) { Widget hotspotButton({String? text, IconData? icon, VoidCallback? onPressed}) {
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
FlatButton( TextButton(
shape: CircleBorder(), style: ButtonStyle(
color: Colors.black38, shape: MaterialStateProperty.all(CircleBorder()),
backgroundColor: MaterialStateProperty.all(Colors.black38),
foregroundColor: MaterialStateProperty.all(Colors.white),
),
child: Icon(icon), child: Icon(icon),
onPressed: onPressed, onPressed: onPressed,
), ),
@ -142,7 +147,7 @@ class _MyHomePageState extends State<MyHomePage> {
} }
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(widget.title), title: Text(widget.title!),
), ),
body: Stack( body: Stack(
children: [ children: [
@ -152,12 +157,13 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
mini: true, mini: true,
onPressed: () { onPressed: () async {
ImagePicker.pickImage(source: ImageSource.gallery).then((value) { final pickedFile = await picker.getImage(source: ImageSource.gallery);
setState(() { setState(() {
panoImages.add(Image.file(value)); if (pickedFile != null) {
panoImages.add(Image.file(File(pickedFile.path)));
_panoId = panoImages.length - 1; _panoId = panoImages.length - 1;
}); }
}); });
}, },
child: Icon(Icons.panorama), child: Icon(Icons.panorama),

124
example/pubspec.lock
View file

@ -1,62 +1,55 @@
# Generated by pub # Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile # See https://dart.dev/tools/pub/glossary#lockfile
packages: packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.2"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.4.0" version: "2.5.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "1.2.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.14.11" version: "1.15.0"
convert: fake_async:
dependency: transitive dependency: transitive
description: description:
name: convert name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "1.2.0"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -68,82 +61,96 @@ packages:
name: flutter_cube name: flutter_cube
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.3" version: "0.1.1"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: transitive dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.6" version: "2.0.0"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
image: http:
dependency: transitive dependency: transitive
description: description:
name: image name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.4" version: "0.13.0"
http_parser:
dependency: transitive
description:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
image_picker: image_picker:
dependency: "direct main" dependency: "direct main"
description: description:
name: image_picker name: image_picker
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3+4" version: "0.7.2+1"
image_picker_platform_interface:
dependency: transitive
description:
name: image_picker_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.6" version: "0.12.10"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.8" version: "1.3.0"
motion_sensors: motion_sensors:
dependency: transitive dependency: transitive
description: description:
name: motion_sensors name: motion_sensors
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1" version: "0.1.0"
panorama: panorama:
dependency: "direct main" dependency: "direct main"
description: description:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "0.0.2" version: "0.4.0"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.4" version: "1.8.0"
petitparser: pedantic:
dependency: transitive dependency: transitive
description: description:
name: petitparser name: pedantic
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.4.0" version: "1.11.0"
quiver: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: quiver name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.5" version: "2.0.0"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -155,63 +162,56 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.5" version: "1.8.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.3" version: "1.10.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.1.0"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "1.1.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.2.0"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.15" version: "0.2.19"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.6" version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.8" version: "2.1.0"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.5.0"
sdks: sdks:
dart: ">=2.4.0 <3.0.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.12.13 <2.0.0" flutter: ">=1.20.0"

6
example/pubspec.yaml
View file

@ -3,14 +3,14 @@ description: A new Flutter project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
panorama: panorama:
path: ../ path: ../
image_picker: ^0.6.3+4 image_picker: ^0.7.2+1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
@ -21,3 +21,5 @@ flutter:
uses-material-design: true uses-material-design: true
assets: assets:
- assets/ - assets/
publish_to: none

120
lib/panorama.dart
View file

@ -20,7 +20,7 @@ enum SensorControl {
class Panorama extends StatefulWidget { class Panorama extends StatefulWidget {
Panorama({ Panorama({
Key key, Key? key,
this.latitude = 0, this.latitude = 0,
this.longitude = 0, this.longitude = 0,
this.zoom = 1.0, this.zoom = 1.0,
@ -107,70 +107,70 @@ class Panorama extends StatefulWidget {
final double croppedFullHeight; final double croppedFullHeight;
/// This event will be called when the view direction has changed, it contains latitude and longitude about the current view. /// This event will be called when the view direction has changed, it contains latitude and longitude about the current view.
final Function(double longitude, double latitude, double tilt) onViewChanged; final Function(double longitude, double latitude, double tilt)? onViewChanged;
/// This event will be called when the user has tapped, it contains latitude and longitude about where the user tapped. /// This event will be called when the user has tapped, it contains latitude and longitude about where the user tapped.
final Function(double longitude, double latitude, double tilt) onTap; final Function(double longitude, double latitude, double tilt)? onTap;
/// This event will be called when the user has started a long press, it contains latitude and longitude about where the user pressed. /// This event will be called when the user has started a long press, it contains latitude and longitude about where the user pressed.
final Function(double longitude, double latitude, double tilt) onLongPressStart; final Function(double longitude, double latitude, double tilt)? onLongPressStart;
/// This event will be called when the user has drag-moved after a long press, it contains latitude and longitude about where the user pressed. /// This event will be called when the user has drag-moved after a long press, it contains latitude and longitude about where the user pressed.
final Function(double longitude, double latitude, double tilt) onLongPressMoveUpdate; final Function(double longitude, double latitude, double tilt)? onLongPressMoveUpdate;
/// This event will be called when the user has stopped a long presses, it contains latitude and longitude about where the user pressed. /// This event will be called when the user has stopped a long presses, it contains latitude and longitude about where the user pressed.
final Function(double longitude, double latitude, double tilt) onLongPressEnd; final Function(double longitude, double latitude, double tilt)? onLongPressEnd;
/// Specify an Image(equirectangular image) widget to the panorama. /// Specify an Image(equirectangular image) widget to the panorama.
final Image child; final Image? child;
/// Place widgets in the panorama. /// Place widgets in the panorama.
final List<Hotspot> hotspots; final List<Hotspot>? hotspots;
@override @override
_PanoramaState createState() => _PanoramaState(); _PanoramaState createState() => _PanoramaState();
} }
class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin { class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin {
Scene scene; Scene? scene;
Object surface; Object? surface;
double latitude; late double latitude;
double longitude; late double longitude;
double latitudeDelta = 0; double latitudeDelta = 0;
double longitudeDelta = 0; double longitudeDelta = 0;
double zoomDelta = 0; double zoomDelta = 0;
Offset _lastFocalPoint; late Offset _lastFocalPoint;
double _lastZoom; double? _lastZoom;
double _radius = 500; double _radius = 500;
double _dampingFactor = 0.05; double _dampingFactor = 0.05;
double _animateDirection = 1.0; double _animateDirection = 1.0;
AnimationController _controller; late AnimationController _controller;
double screenOrientation = 0.0; double screenOrientation = 0.0;
Vector3 orientation = Vector3(0, radians(90), 0); Vector3 orientation = Vector3(0, radians(90), 0);
StreamSubscription _orientationSubscription; StreamSubscription? _orientationSubscription;
StreamSubscription _screenOrientSubscription; StreamSubscription? _screenOrientSubscription;
StreamController<Null> _streamController; late StreamController<Null> _streamController;
Stream<Null> _stream; Stream<Null>? _stream;
ImageStream _imageStream; ImageStream? _imageStream;
void _handleTapUp(TapUpDetails details) { void _handleTapUp(TapUpDetails details) {
final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy); final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy);
widget.onTap(degrees(o.x), degrees(-o.y), degrees(o.z)); widget.onTap!(degrees(o.x), degrees(-o.y), degrees(o.z));
} }
void _handleLongPressStart(LongPressStartDetails details) { void _handleLongPressStart(LongPressStartDetails details) {
final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy); final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy);
widget.onLongPressStart(degrees(o.x), degrees(-o.y), degrees(o.z)); widget.onLongPressStart!(degrees(o.x), degrees(-o.y), degrees(o.z));
} }
void _handleLongPressMoveUpdate(LongPressMoveUpdateDetails details) { void _handleLongPressMoveUpdate(LongPressMoveUpdateDetails details) {
final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy); final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy);
widget.onLongPressMoveUpdate(degrees(o.x), degrees(-o.y), degrees(o.z)); widget.onLongPressMoveUpdate!(degrees(o.x), degrees(-o.y), degrees(o.z));
} }
void _handleLongPressEnd(LongPressEndDetails details) { void _handleLongPressEnd(LongPressEndDetails details) {
final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy); final Vector3 o = positionToLatLon(details.localPosition.dx, details.localPosition.dy);
widget.onLongPressEnd(degrees(o.x), degrees(-o.y), degrees(o.z)); widget.onLongPressEnd!(degrees(o.x), degrees(-o.y), degrees(o.z));
} }
void _handleScaleStart(ScaleStartDetails details) { void _handleScaleStart(ScaleStartDetails details) {
@ -181,12 +181,12 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
void _handleScaleUpdate(ScaleUpdateDetails details) { void _handleScaleUpdate(ScaleUpdateDetails details) {
final offset = details.localFocalPoint - _lastFocalPoint; final offset = details.localFocalPoint - _lastFocalPoint;
_lastFocalPoint = details.localFocalPoint; _lastFocalPoint = details.localFocalPoint;
latitudeDelta += widget.sensitivity * 0.5 * math.pi * offset.dy / scene.camera.viewportHeight; latitudeDelta += widget.sensitivity * 0.5 * math.pi * offset.dy / scene!.camera.viewportHeight;
longitudeDelta -= widget.sensitivity * _animateDirection * 0.5 * math.pi * offset.dx / scene.camera.viewportHeight; longitudeDelta -= widget.sensitivity * _animateDirection * 0.5 * math.pi * offset.dx / scene!.camera.viewportHeight;
if (_lastZoom == null) { if (_lastZoom == null) {
_lastZoom = scene.camera.zoom; _lastZoom = scene!.camera.zoom;
} }
zoomDelta += _lastZoom * details.scale - (scene.camera.zoom + zoomDelta); zoomDelta += _lastZoom! * details.scale - (scene!.camera.zoom + zoomDelta);
if (widget.sensorControl == SensorControl.None && !_controller.isAnimating) { if (widget.sensorControl == SensorControl.None && !_controller.isAnimating) {
_controller.reset(); _controller.reset();
if (widget.animSpeed != 0) { if (widget.animSpeed != 0) {
@ -207,9 +207,9 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
longitude += _animateDirection * longitudeDelta * _dampingFactor * widget.sensitivity; longitude += _animateDirection * longitudeDelta * _dampingFactor * widget.sensitivity;
longitudeDelta *= 1 - _dampingFactor * widget.sensitivity; longitudeDelta *= 1 - _dampingFactor * widget.sensitivity;
// animate zomming // animate zomming
final double zoom = scene.camera.zoom + zoomDelta * _dampingFactor; final double zoom = scene!.camera.zoom + zoomDelta * _dampingFactor;
zoomDelta *= 1 - _dampingFactor; zoomDelta *= 1 - _dampingFactor;
scene.camera.zoom = zoom.clamp(widget.minZoom, widget.maxZoom); scene!.camera.zoom = zoom.clamp(widget.minZoom, widget.maxZoom);
// stop animation if not needed // stop animation if not needed
if (latitudeDelta.abs() < 0.001 && longitudeDelta.abs() < 0.001 && zoomDelta.abs() < 0.001) { if (latitudeDelta.abs() < 0.001 && longitudeDelta.abs() < 0.001 && zoomDelta.abs() < 0.001) {
if (widget.animSpeed == 0 && _controller.isAnimating) _controller.stop(); if (widget.animSpeed == 0 && _controller.isAnimating) _controller.stop();
@ -258,9 +258,9 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
o = quaternionToOrientation(q * Quaternion.axisAngle(Vector3(0, 1, 0), math.pi * 0.5)); o = quaternionToOrientation(q * Quaternion.axisAngle(Vector3(0, 1, 0), math.pi * 0.5));
widget.onViewChanged?.call(degrees(o.x), degrees(-o.y), degrees(o.z)); widget.onViewChanged?.call(degrees(o.x), degrees(-o.y), degrees(o.z));
q.rotate(scene.camera.target..setFrom(Vector3(0, 0, -_radius))); q.rotate(scene!.camera.target..setFrom(Vector3(0, 0, -_radius)));
q.rotate(scene.camera.up..setFrom(Vector3(0, 1, 0))); q.rotate(scene!.camera.up..setFrom(Vector3(0, 1, 0)));
scene.update(); scene!.update();
} }
void _updateSensorControl() { void _updateSensorControl() {
@ -286,24 +286,24 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
_screenOrientSubscription?.cancel(); _screenOrientSubscription?.cancel();
if (widget.sensorControl != SensorControl.None) { if (widget.sensorControl != SensorControl.None) {
_screenOrientSubscription = motionSensors.screenOrientation.listen((ScreenOrientationEvent event) { _screenOrientSubscription = motionSensors.screenOrientation.listen((ScreenOrientationEvent event) {
screenOrientation = radians(event.angle); screenOrientation = radians(event.angle!);
}); });
} }
} }
void _updateTexture(ImageInfo imageInfo, bool synchronousCall) { void _updateTexture(ImageInfo imageInfo, bool synchronousCall) {
surface?.mesh?.texture = imageInfo.image; surface?.mesh.texture = imageInfo.image;
surface?.mesh?.textureRect = Rect.fromLTWH(0, 0, imageInfo.image.width.toDouble(), imageInfo.image.height.toDouble()); surface?.mesh.textureRect = Rect.fromLTWH(0, 0, imageInfo.image.width.toDouble(), imageInfo.image.height.toDouble());
scene.texture = imageInfo.image; scene!.texture = imageInfo.image;
scene.update(); scene!.update();
} }
void _loadTexture(ImageProvider provider) { void _loadTexture(ImageProvider? provider) {
if (provider == null) return; if (provider == null) return;
_imageStream?.removeListener(ImageStreamListener(_updateTexture)); _imageStream?.removeListener(ImageStreamListener(_updateTexture));
_imageStream = provider.resolve(ImageConfiguration()); _imageStream = provider.resolve(ImageConfiguration());
ImageStreamListener listener = ImageStreamListener(_updateTexture); ImageStreamListener listener = ImageStreamListener(_updateTexture);
_imageStream.addListener(listener); _imageStream!.addListener(listener);
} }
void _onSceneCreated(Scene scene) { void _onSceneCreated(Scene scene) {
@ -316,9 +316,9 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
if (widget.child != null) { if (widget.child != null) {
final Mesh mesh = generateSphereMesh(radius: _radius, latSegments: widget.latSegments, lonSegments: widget.lonSegments, croppedArea: widget.croppedArea, croppedFullWidth: widget.croppedFullWidth, croppedFullHeight: widget.croppedFullHeight); final Mesh mesh = generateSphereMesh(radius: _radius, latSegments: widget.latSegments, lonSegments: widget.lonSegments, croppedArea: widget.croppedArea, croppedFullWidth: widget.croppedFullWidth, croppedFullHeight: widget.croppedFullHeight);
surface = Object(name: 'surface', mesh: mesh, backfaceCulling: false); surface = Object(name: 'surface', mesh: mesh, backfaceCulling: false);
_loadTexture(widget.child.image); _loadTexture(widget.child!.image);
scene.world.add(surface); scene.world.add(surface!);
WidgetsBinding.instance.addPostFrameCallback((_) => _updateView()); WidgetsBinding.instance!.addPostFrameCallback((_) => _updateView());
} }
} }
@ -328,9 +328,9 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
Vector3 positionToLatLon(double x, double y) { Vector3 positionToLatLon(double x, double y) {
// transform viewport coordinate to NDC, values between -1 and 1 // transform viewport coordinate to NDC, values between -1 and 1
final Vector4 v = Vector4(2.0 * x / scene.camera.viewportWidth - 1.0, 1.0 - 2.0 * y / scene.camera.viewportHeight, 1.0, 1.0); final Vector4 v = Vector4(2.0 * x / scene!.camera.viewportWidth - 1.0, 1.0 - 2.0 * y / scene!.camera.viewportHeight, 1.0, 1.0);
// create projection matrix // create projection matrix
final Matrix4 m = scene.camera.projectionMatrix * scene.camera.lookAtMatrix; final Matrix4 m = scene!.camera.projectionMatrix * scene!.camera.lookAtMatrix;
// apply inversed projection matrix // apply inversed projection matrix
m.invert(); m.invert();
v.applyMatrix4(m); v.applyMatrix4(m);
@ -344,24 +344,24 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
Vector3 positionFromLatLon(double lat, double lon) { Vector3 positionFromLatLon(double lat, double lon) {
// create projection matrix // create projection matrix
final Matrix4 m = scene.camera.projectionMatrix * scene.camera.lookAtMatrix * matrixFromLatLon(lat, lon); final Matrix4 m = scene!.camera.projectionMatrix * scene!.camera.lookAtMatrix * matrixFromLatLon(lat, lon);
// apply projection atrix // apply projection atrix
final Vector4 v = Vector4(0.0, 0.0, -_radius, 1.0)..applyMatrix4(m); final Vector4 v = Vector4(0.0, 0.0, -_radius, 1.0)..applyMatrix4(m);
// apply perspective division and transform NDC to the viewport coordinate // apply perspective division and transform NDC to the viewport coordinate
return Vector3( return Vector3(
(1.0 + v.x / v.w) * scene.camera.viewportWidth / 2, (1.0 + v.x / v.w) * scene!.camera.viewportWidth / 2,
(1.0 - v.y / v.w) * scene.camera.viewportHeight / 2, (1.0 - v.y / v.w) * scene!.camera.viewportHeight / 2,
v.z, v.z,
); );
} }
Widget buildHotspotWidgets(List<Hotspot> hotspots) { Widget buildHotspotWidgets(List<Hotspot>? hotspots) {
final List<Widget> widgets = List<Widget>(); final List<Widget> widgets = <Widget>[];
if (hotspots != null && scene != null) { if (hotspots != null && scene != null) {
for (Hotspot hotspot in hotspots) { for (Hotspot hotspot in hotspots) {
final Vector3 pos = positionFromLatLon(hotspot.latitude, hotspot.longitude); final Vector3 pos = positionFromLatLon(hotspot.latitude, hotspot.longitude);
final Offset orgin = Offset(hotspot.width * hotspot.orgin.dx, hotspot.height * hotspot.orgin.dy); final Offset orgin = Offset(hotspot.width * hotspot.orgin.dx, hotspot.height * hotspot.orgin.dy);
final Matrix4 transform = scene.camera.lookAtMatrix * matrixFromLatLon(hotspot.latitude, hotspot.longitude); final Matrix4 transform = scene!.camera.lookAtMatrix * matrixFromLatLon(hotspot.latitude, hotspot.longitude);
final Widget child = Positioned( final Widget child = Positioned(
left: pos.x - orgin.dx, left: pos.x - orgin.dx,
top: pos.y - orgin.dy, top: pos.y - orgin.dy,
@ -411,7 +411,7 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
if (surface == null) return; if (surface == null) return;
if (widget.latSegments != oldWidget.latSegments || widget.lonSegments != oldWidget.lonSegments || widget.croppedArea != oldWidget.croppedArea || widget.croppedFullWidth != oldWidget.croppedFullWidth || widget.croppedFullHeight != oldWidget.croppedFullHeight) { if (widget.latSegments != oldWidget.latSegments || widget.lonSegments != oldWidget.lonSegments || widget.croppedArea != oldWidget.croppedArea || widget.croppedFullWidth != oldWidget.croppedFullWidth || widget.croppedFullHeight != oldWidget.croppedFullHeight) {
surface.mesh = generateSphereMesh(radius: _radius, latSegments: widget.latSegments, lonSegments: widget.lonSegments, croppedArea: widget.croppedArea, croppedFullWidth: widget.croppedFullWidth, croppedFullHeight: widget.croppedFullHeight); surface!.mesh = generateSphereMesh(radius: _radius, latSegments: widget.latSegments, lonSegments: widget.lonSegments, croppedArea: widget.croppedArea, croppedFullWidth: widget.croppedFullWidth, croppedFullHeight: widget.croppedFullHeight);
} }
if (widget.child?.image != oldWidget.child?.image) { if (widget.child?.image != oldWidget.child?.image) {
_loadTexture(widget.child?.image); _loadTexture(widget.child?.image);
@ -452,8 +452,8 @@ class _PanoramaState extends State<Panorama> with SingleTickerProviderStateMixin
class Hotspot { class Hotspot {
Hotspot({ Hotspot({
this.name, this.name,
this.latitude, this.latitude = 0.0,
this.longitude, this.longitude = 0.0,
this.orgin = const Offset(0.5, 0.5), this.orgin = const Offset(0.5, 0.5),
this.width = 32.0, this.width = 32.0,
this.height = 32.0, this.height = 32.0,
@ -461,7 +461,7 @@ class Hotspot {
}); });
/// The name of this hotspot. /// The name of this hotspot.
String name; String? name;
/// The initial latitude, in degrees, between -90 and 90. /// The initial latitude, in degrees, between -90 and 90.
final double latitude; final double latitude;
@ -478,14 +478,14 @@ class Hotspot {
// The height of widget. Default is 32.0 // The height of widget. Default is 32.0
double height; double height;
Widget widget; Widget? widget;
} }
Mesh generateSphereMesh({num radius = 1.0, int latSegments = 16, int lonSegments = 16, ui.Image texture, Rect croppedArea = const Rect.fromLTWH(0.0, 0.0, 1.0, 1.0), double croppedFullWidth = 1.0, double croppedFullHeight = 1.0}) { Mesh generateSphereMesh({num radius = 1.0, int latSegments = 16, int lonSegments = 16, ui.Image? texture, Rect croppedArea = const Rect.fromLTWH(0.0, 0.0, 1.0, 1.0), double croppedFullWidth = 1.0, double croppedFullHeight = 1.0}) {
int count = (latSegments + 1) * (lonSegments + 1); int count = (latSegments + 1) * (lonSegments + 1);
List<Vector3> vertices = List<Vector3>(count); List<Vector3> vertices = List<Vector3>.filled(count, Vector3.zero());
List<Offset> texcoords = List<Offset>(count); List<Offset> texcoords = List<Offset>.filled(count, Offset.zero);
List<Polygon> indices = List<Polygon>(latSegments * lonSegments * 2); List<Polygon> indices = List<Polygon>.filled(latSegments * lonSegments * 2, Polygon(0, 0, 0));
int i = 0; int i = 0;
for (int y = 0; y <= latSegments; ++y) { for (int y = 0; y <= latSegments; ++y) {

105
pubspec.lock
View file

@ -1,62 +1,55 @@
# Generated by pub # Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile # See https://dart.dev/tools/pub/glossary#lockfile
packages: packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.2"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.4.0" version: "2.5.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "1.2.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.14.11" version: "1.15.0"
convert: fake_async:
dependency: transitive dependency: transitive
description: description:
name: convert name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "1.2.0"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -68,61 +61,40 @@ packages:
name: flutter_cube name: flutter_cube
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.3" version: "0.1.1"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.6" version: "0.12.10"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.8" version: "1.3.0"
motion_sensors: motion_sensors:
dependency: "direct main" dependency: "direct main"
description: description:
name: motion_sensors name: motion_sensors
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1" version: "0.1.0"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.4" version: "1.8.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -134,63 +106,56 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.5" version: "1.8.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.3" version: "1.10.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.1.0"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "1.1.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.2.0"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.15" version: "0.2.19"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.6" version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.8" version: "2.1.0"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.5.0"
sdks: sdks:
dart: ">=2.4.0 <3.0.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.10.0" flutter: ">=1.10.0"

8
pubspec.yaml
View file

@ -1,16 +1,16 @@
name: panorama name: panorama
description: Panorama -- A 360-degree panorama viewer. description: Panorama -- A 360-degree panorama viewer.
version: 0.3.2 version: 0.4.0
homepage: https://github.com/zesage/panorama homepage: https://github.com/zesage/panorama
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
flutter_cube: ^0.0.6 flutter_cube: ^0.1.1
motion_sensors: ^0.0.5 motion_sensors: ^0.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: