@operato/scene-indoor-map 0.1.3 → 1.0.0-alpha.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +41 -0
- package/dist/beacon.d.ts +2 -12
- package/dist/beacon.js +14 -7
- package/dist/beacon.js.map +1 -1
- package/dist/camera.d.ts +2 -4
- package/dist/camera.js +6 -10
- package/dist/camera.js.map +1 -1
- package/dist/editors/index.d.ts +1 -1
- package/dist/editors/index.js +2 -2
- package/dist/editors/index.js.map +1 -1
- package/dist/editors/{things-editor-action.d.ts → property-editor-action.d.ts} +1 -1
- package/dist/editors/{things-editor-action.js → property-editor-action.js} +2 -2
- package/dist/editors/property-editor-action.js.map +1 -0
- package/dist/floor.d.ts +2 -15
- package/dist/floor.js.map +1 -1
- package/dist/indoor-map.d.ts +2 -22
- package/dist/indoor-map.js.map +1 -1
- package/dist/rack.d.ts +2 -20
- package/dist/rack.js +17 -9
- package/dist/rack.js.map +1 -1
- package/package.json +6 -6
- package/src/beacon.ts +42 -36
- package/src/camera.ts +79 -94
- package/src/editors/index.ts +2 -2
- package/src/editors/{things-editor-action.ts → property-editor-action.ts} +1 -1
- package/src/floor.ts +2 -2
- package/src/indoor-map.ts +2 -2
- package/src/rack.ts +50 -54
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/editors/things-editor-action.js.map +0 -1
package/dist/rack.js
CHANGED
|
@@ -6,44 +6,52 @@ const NATURE = {
|
|
|
6
6
|
mutable: false,
|
|
7
7
|
resizable: true,
|
|
8
8
|
rotatable: true,
|
|
9
|
-
properties: [
|
|
9
|
+
properties: [
|
|
10
|
+
{
|
|
10
11
|
type: 'number',
|
|
11
12
|
label: 'depth',
|
|
12
13
|
name: 'depth',
|
|
13
14
|
property: 'depth'
|
|
14
|
-
},
|
|
15
|
+
},
|
|
16
|
+
{
|
|
15
17
|
type: 'number',
|
|
16
18
|
label: 'shelves',
|
|
17
19
|
name: 'shelves',
|
|
18
20
|
property: 'shelves'
|
|
19
|
-
},
|
|
21
|
+
},
|
|
22
|
+
{
|
|
20
23
|
type: 'string',
|
|
21
24
|
label: 'location-pattern',
|
|
22
25
|
name: 'locPattern',
|
|
23
26
|
placeholder: '{z}{s}-{u}-{sh}',
|
|
24
27
|
property: 'locPattern'
|
|
25
|
-
},
|
|
28
|
+
},
|
|
29
|
+
{
|
|
26
30
|
type: 'string',
|
|
27
31
|
label: 'zone',
|
|
28
32
|
name: 'zone',
|
|
29
33
|
property: 'zone'
|
|
30
|
-
},
|
|
34
|
+
},
|
|
35
|
+
{
|
|
31
36
|
type: 'string',
|
|
32
37
|
label: 'section',
|
|
33
38
|
name: 'section',
|
|
34
39
|
property: 'section'
|
|
35
|
-
},
|
|
40
|
+
},
|
|
41
|
+
{
|
|
36
42
|
type: 'string',
|
|
37
43
|
label: 'unit',
|
|
38
44
|
name: 'unit',
|
|
39
45
|
property: 'unit'
|
|
40
|
-
},
|
|
46
|
+
},
|
|
47
|
+
{
|
|
41
48
|
type: 'string',
|
|
42
49
|
label: 'shelf-pattern',
|
|
43
50
|
name: 'shelfPattern',
|
|
44
51
|
placeholder: '#',
|
|
45
52
|
property: 'shelfPattern'
|
|
46
|
-
}
|
|
53
|
+
}
|
|
54
|
+
],
|
|
47
55
|
help: 'scene/component/rack'
|
|
48
56
|
};
|
|
49
57
|
export default class Rack extends RectPath(Component) {
|
|
@@ -51,7 +59,7 @@ export default class Rack extends RectPath(Component) {
|
|
|
51
59
|
return true;
|
|
52
60
|
}
|
|
53
61
|
draw(context) {
|
|
54
|
-
var { left, top, width, height, strokeStyle, lineWidth, fillStyle, alpha = 1
|
|
62
|
+
var { left, top, width, height, strokeStyle, lineWidth, fillStyle, alpha = 1 } = this.model;
|
|
55
63
|
context.beginPath();
|
|
56
64
|
context.rect(left, top, width, height);
|
|
57
65
|
context.strokeStyle = strokeStyle;
|
package/dist/rack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rack.js","sourceRoot":"","sources":["../src/rack.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"rack.js","sourceRoot":"","sources":["../src/rack.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright © HatioLab Inc. All rights reserved.\n */\nimport { Component, ComponentNature, RectPath } from '@hatiolab/things-scene'\n\nconst NATURE: ComponentNature = {\n mutable: false,\n resizable: true,\n rotatable: true,\n properties: [\n {\n type: 'number',\n label: 'depth',\n name: 'depth',\n property: 'depth'\n },\n {\n type: 'number',\n label: 'shelves',\n name: 'shelves',\n property: 'shelves'\n },\n {\n type: 'string',\n label: 'location-pattern',\n name: 'locPattern',\n placeholder: '{z}{s}-{u}-{sh}',\n property: 'locPattern'\n },\n {\n type: 'string',\n label: 'zone',\n name: 'zone',\n property: 'zone'\n },\n {\n type: 'string',\n label: 'section',\n name: 'section',\n property: 'section'\n },\n {\n type: 'string',\n label: 'unit',\n name: 'unit',\n property: 'unit'\n },\n {\n type: 'string',\n label: 'shelf-pattern',\n name: 'shelfPattern',\n placeholder: '#',\n property: 'shelfPattern'\n }\n ],\n help: 'scene/component/rack'\n}\n\nexport default class Rack extends RectPath(Component) {\n is3dish() {\n return true\n }\n\n draw(context: CanvasRenderingContext2D) {\n var { left, top, width, height, strokeStyle, lineWidth, fillStyle, alpha = 1 } = this.model\n\n context.beginPath()\n context.rect(left, top, width, height)\n context.strokeStyle = strokeStyle\n context.lineWidth = lineWidth\n context.globalAlpha = alpha * 0.4\n context.stroke()\n\n context.beginPath()\n context.rect(left + width * 0.15, top + height * 0.15, width * 0.7, height * 0.7)\n context.fillStyle = fillStyle\n context.globalAlpha = alpha * 0.5\n context.fill()\n\n context.beginPath()\n context.moveTo(left, top)\n context.lineTo(left + width, top + height)\n context.moveTo(left, top + height)\n context.lineTo(left + width, top)\n context.strokeStyle = strokeStyle\n context.lineWidth = lineWidth\n context.globalAlpha = alpha * 0.4\n context.stroke()\n }\n\n get nature() {\n return NATURE\n }\n\n get hasTextProperty() {\n return false\n }\n}\n\nComponent.register('rack', Rack)\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@operato/scene-indoor-map",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "1.0.0-alpha.1",
|
|
4
4
|
"description": "Indoor Map component for things-scene.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "heartyoh",
|
|
@@ -26,13 +26,13 @@
|
|
|
26
26
|
"migration": "things-factory-migration"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@hatiolab/things-scene": "^2.7.
|
|
29
|
+
"@hatiolab/things-scene": "^2.7.34"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@hatiolab/prettier-config": "^1.0.0",
|
|
33
|
-
"@operato/board": "^0.
|
|
34
|
-
"@things-factory/builder": "^
|
|
35
|
-
"@things-factory/operato-board": "^
|
|
33
|
+
"@operato/board": "^1.0.0-alpha.13",
|
|
34
|
+
"@things-factory/builder": "^5.0.0-alpha.5",
|
|
35
|
+
"@things-factory/operato-board": "^5.0.0-alpha.5",
|
|
36
36
|
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
|
37
37
|
"@typescript-eslint/parser": "^4.33.0",
|
|
38
38
|
"@web/dev-server": "^0.1.28",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"prettier --write"
|
|
58
58
|
]
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "f7ad50f082b788b2776f16c9a329d57c9db9dc77"
|
|
61
61
|
}
|
package/src/beacon.ts
CHANGED
|
@@ -1,53 +1,59 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Copyright © HatioLab Inc. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
-
import { Component, RectPath } from '@hatiolab/things-scene'
|
|
4
|
+
import { Component, ComponentNature, RectPath } from '@hatiolab/things-scene'
|
|
5
5
|
|
|
6
|
-
const NATURE = {
|
|
6
|
+
const NATURE: ComponentNature = {
|
|
7
7
|
mutable: false,
|
|
8
8
|
resizable: true,
|
|
9
9
|
rotatable: true,
|
|
10
|
-
properties: [
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
10
|
+
properties: [
|
|
11
|
+
{
|
|
12
|
+
type: 'number',
|
|
13
|
+
label: 'z-pos',
|
|
14
|
+
name: 'zPos',
|
|
15
|
+
property: 'zPos'
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
type: 'string',
|
|
19
|
+
label: 'mac-address',
|
|
20
|
+
name: 'macAddr',
|
|
21
|
+
property: 'macAddress'
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
type: 'string',
|
|
25
|
+
label: 'identifier',
|
|
26
|
+
name: 'identifier',
|
|
27
|
+
property: 'identifier'
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
type: 'string',
|
|
31
|
+
label: 'uuid',
|
|
32
|
+
name: 'uuid',
|
|
33
|
+
property: 'uuid'
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
type: 'number',
|
|
37
|
+
label: 'major',
|
|
38
|
+
name: 'major',
|
|
39
|
+
property: 'major'
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
type: 'number',
|
|
43
|
+
label: 'minor',
|
|
44
|
+
name: 'minor',
|
|
45
|
+
property: 'minor'
|
|
46
|
+
}
|
|
47
|
+
]
|
|
41
48
|
}
|
|
42
49
|
|
|
43
|
-
|
|
44
50
|
export default class Beacon extends RectPath(Component) {
|
|
45
|
-
|
|
46
51
|
render(context: CanvasRenderingContext2D) {
|
|
47
52
|
this.model.fillStyle = {
|
|
48
53
|
type: 'pattern',
|
|
49
54
|
fitPattern: true,
|
|
50
|
-
image:
|
|
55
|
+
image:
|
|
56
|
+
'data:image/png;base64,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'
|
|
51
57
|
}
|
|
52
58
|
|
|
53
59
|
this.drawFill(context)
|
package/src/camera.ts
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
import { Component, POINT, Properties, RectPath } from '@hatiolab/things-scene'
|
|
1
|
+
import { Component, ComponentNature, POINT, Properties, RectPath } from '@hatiolab/things-scene'
|
|
2
2
|
|
|
3
3
|
/*
|
|
4
4
|
* Copyright © HatioLab Inc. All rights reserved.
|
|
5
5
|
*/
|
|
6
|
-
import Quaternion from './quaternion'
|
|
6
|
+
import Quaternion from './quaternion'
|
|
7
7
|
|
|
8
|
-
type VEC = { x: number
|
|
8
|
+
type VEC = { x: number; y: number; z: number }
|
|
9
9
|
|
|
10
|
-
const NATURE = {
|
|
11
|
-
props: []
|
|
12
|
-
};
|
|
10
|
+
const NATURE: ComponentNature = {}
|
|
13
11
|
|
|
14
12
|
const points = [
|
|
15
13
|
{ x: 0, y: 0, z: 0 },
|
|
@@ -19,58 +17,57 @@ const points = [
|
|
|
19
17
|
{ x: -50, y: -100, z: -100 },
|
|
20
18
|
{ x: 0, y: 0, z: -100 }, // 렌즈의 중심을 표현하는 좌표.
|
|
21
19
|
{ x: 0, y: +50, z: -100 } // 카메라의 위쪽을 표시하기위한 좌표.
|
|
22
|
-
]
|
|
20
|
+
]
|
|
23
21
|
|
|
24
22
|
/* rotate_by_euler와 같이 동작하도록 순서를 맞춤. */
|
|
25
23
|
function rotate_by_quaternion_axis(points: VEC[], pitch: number, roll: number, yaw: number) {
|
|
26
|
-
var qx = Quaternion.fromAxis({ x: 1, y: 0, z: 0 }, pitch)
|
|
27
|
-
var qy = Quaternion.fromAxis({ x: 0, y: 1, z: 0 }, roll)
|
|
28
|
-
var qz = Quaternion.fromAxis({ x: 0, y: 0, z: 1 }, yaw)
|
|
24
|
+
var qx = Quaternion.fromAxis({ x: 1, y: 0, z: 0 }, pitch)
|
|
25
|
+
var qy = Quaternion.fromAxis({ x: 0, y: 1, z: 0 }, roll)
|
|
26
|
+
var qz = Quaternion.fromAxis({ x: 0, y: 0, z: 1 }, yaw)
|
|
29
27
|
|
|
30
|
-
var q = qz.multiply(qy).multiply(qx)
|
|
28
|
+
var q = qz.multiply(qy).multiply(qx)
|
|
31
29
|
|
|
32
|
-
return points.map(point => {
|
|
30
|
+
return points.map(point => {
|
|
31
|
+
return q.multiVec(point)
|
|
32
|
+
})
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
function rotate_by_euler(points: VEC[], pitch: number, roll: number, yaw: number) {
|
|
36
|
+
var cosa = Math.cos(yaw)
|
|
37
|
+
var sina = Math.sin(yaw)
|
|
36
38
|
|
|
37
|
-
var
|
|
38
|
-
var
|
|
39
|
-
|
|
40
|
-
var cosb = Math.cos(roll);
|
|
41
|
-
var sinb = Math.sin(roll);
|
|
39
|
+
var cosb = Math.cos(roll)
|
|
40
|
+
var sinb = Math.sin(roll)
|
|
42
41
|
|
|
43
|
-
var cosc = Math.cos(pitch)
|
|
44
|
-
var sinc = Math.sin(pitch)
|
|
42
|
+
var cosc = Math.cos(pitch)
|
|
43
|
+
var sinc = Math.sin(pitch)
|
|
45
44
|
|
|
46
|
-
var Axx = cosa * cosb
|
|
47
|
-
var Axy = cosa * sinb * sinc - sina * cosc
|
|
48
|
-
var Axz = cosa * sinb * cosc + sina * sinc
|
|
45
|
+
var Axx = cosa * cosb
|
|
46
|
+
var Axy = cosa * sinb * sinc - sina * cosc
|
|
47
|
+
var Axz = cosa * sinb * cosc + sina * sinc
|
|
49
48
|
|
|
50
|
-
var Ayx = sina * cosb
|
|
51
|
-
var Ayy = sina * sinb * sinc + cosa * cosc
|
|
52
|
-
var Ayz = sina * sinb * cosc - cosa * sinc
|
|
49
|
+
var Ayx = sina * cosb
|
|
50
|
+
var Ayy = sina * sinb * sinc + cosa * cosc
|
|
51
|
+
var Ayz = sina * sinb * cosc - cosa * sinc
|
|
53
52
|
|
|
54
|
-
var Azx = -sinb
|
|
55
|
-
var Azy = cosb * sinc
|
|
56
|
-
var Azz = cosb * cosc
|
|
53
|
+
var Azx = -sinb
|
|
54
|
+
var Azy = cosb * sinc
|
|
55
|
+
var Azz = cosb * cosc
|
|
57
56
|
|
|
58
57
|
return points.map(point => {
|
|
59
|
-
let { x, y, z } = point
|
|
58
|
+
let { x, y, z } = point
|
|
60
59
|
|
|
61
60
|
return {
|
|
62
61
|
x: Axx * x + Axy * y + Axz * z,
|
|
63
62
|
y: Ayx * x + Ayy * y + Ayz * z,
|
|
64
63
|
z: Azx * x + Azy * y + Azz * z
|
|
65
64
|
}
|
|
66
|
-
})
|
|
65
|
+
})
|
|
67
66
|
}
|
|
68
67
|
|
|
69
68
|
export default class Camera extends RectPath(Component) {
|
|
70
|
-
|
|
71
69
|
render(context: CanvasRenderingContext2D) {
|
|
72
|
-
|
|
73
|
-
var transformed = this.transformed;
|
|
70
|
+
var transformed = this.transformed
|
|
74
71
|
|
|
75
72
|
if (this.transformed[5].z > 0) {
|
|
76
73
|
this.__drawLines(context, transformed)
|
|
@@ -79,7 +76,6 @@ export default class Camera extends RectPath(Component) {
|
|
|
79
76
|
this.__drawRect(context, transformed)
|
|
80
77
|
this.__drawLines(context, transformed)
|
|
81
78
|
}
|
|
82
|
-
|
|
83
79
|
}
|
|
84
80
|
|
|
85
81
|
private _anim_alpha_yaw: number = 0
|
|
@@ -87,18 +83,14 @@ export default class Camera extends RectPath(Component) {
|
|
|
87
83
|
private _anim_alpha_pitch: number = 0
|
|
88
84
|
|
|
89
85
|
get transformed() {
|
|
90
|
-
var {
|
|
91
|
-
yaw = 0,
|
|
92
|
-
pitch = 0,
|
|
93
|
-
roll = 0
|
|
94
|
-
} = this.model;
|
|
86
|
+
var { yaw = 0, pitch = 0, roll = 0 } = this.model
|
|
95
87
|
|
|
96
88
|
return rotate_by_quaternion_axis(
|
|
97
89
|
points,
|
|
98
90
|
pitch - (this._anim_alpha_pitch || 0),
|
|
99
91
|
roll - (this._anim_alpha_roll || 0),
|
|
100
92
|
yaw - (this._anim_alpha_yaw || 0)
|
|
101
|
-
)
|
|
93
|
+
)
|
|
102
94
|
}
|
|
103
95
|
|
|
104
96
|
static get nature() {
|
|
@@ -106,45 +98,45 @@ export default class Camera extends RectPath(Component) {
|
|
|
106
98
|
}
|
|
107
99
|
|
|
108
100
|
__drawLines(context: CanvasRenderingContext2D, transformed: POINT[]) {
|
|
109
|
-
var center = this.center
|
|
101
|
+
var center = this.center
|
|
110
102
|
|
|
111
|
-
context.beginPath()
|
|
103
|
+
context.beginPath()
|
|
112
104
|
|
|
113
105
|
// 2D좌표에서 Y축이 반대방향이므로 center에서 빼준다.
|
|
114
|
-
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
115
|
-
context.lineTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
116
|
-
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
117
|
-
context.lineTo(center.x + transformed[2].x, center.y - transformed[2].y)
|
|
118
|
-
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
119
|
-
context.lineTo(center.x + transformed[3].x, center.y - transformed[3].y)
|
|
120
|
-
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
121
|
-
context.lineTo(center.x + transformed[4].x, center.y - transformed[4].y)
|
|
122
|
-
|
|
123
|
-
context.strokeStyle = this.model.strokeStyle
|
|
124
|
-
context.stroke()
|
|
125
|
-
context.closePath()
|
|
106
|
+
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
107
|
+
context.lineTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
108
|
+
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
109
|
+
context.lineTo(center.x + transformed[2].x, center.y - transformed[2].y)
|
|
110
|
+
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
111
|
+
context.lineTo(center.x + transformed[3].x, center.y - transformed[3].y)
|
|
112
|
+
context.moveTo(center.x + transformed[0].x, center.y - transformed[0].y)
|
|
113
|
+
context.lineTo(center.x + transformed[4].x, center.y - transformed[4].y)
|
|
114
|
+
|
|
115
|
+
context.strokeStyle = this.model.strokeStyle
|
|
116
|
+
context.stroke()
|
|
117
|
+
context.closePath()
|
|
126
118
|
}
|
|
127
119
|
|
|
128
120
|
__drawRect(context: CanvasRenderingContext2D, transformed: POINT[]) {
|
|
129
|
-
var center = this.center
|
|
121
|
+
var center = this.center
|
|
130
122
|
|
|
131
|
-
context.beginPath()
|
|
123
|
+
context.beginPath()
|
|
132
124
|
|
|
133
125
|
// 2D좌표에서 Y축이 반대방향이므로 center에서 빼준다.
|
|
134
|
-
context.moveTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
135
|
-
context.lineTo(center.x + transformed[2].x, center.y - transformed[2].y)
|
|
136
|
-
context.lineTo(center.x + transformed[3].x, center.y - transformed[3].y)
|
|
137
|
-
context.lineTo(center.x + transformed[4].x, center.y - transformed[4].y)
|
|
138
|
-
context.lineTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
139
|
-
|
|
140
|
-
context.fillStyle = this.model.fillStyle
|
|
141
|
-
context.strokeStyle = this.model.strokeStyle
|
|
142
|
-
context.fill()
|
|
143
|
-
context.stroke()
|
|
144
|
-
|
|
145
|
-
context.beginPath()
|
|
146
|
-
context.ellipse(center.x + transformed[6].x, center.y - transformed[6].y, 5, 5, 0, 0, Math.PI * 2)
|
|
147
|
-
context.stroke()
|
|
126
|
+
context.moveTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
127
|
+
context.lineTo(center.x + transformed[2].x, center.y - transformed[2].y)
|
|
128
|
+
context.lineTo(center.x + transformed[3].x, center.y - transformed[3].y)
|
|
129
|
+
context.lineTo(center.x + transformed[4].x, center.y - transformed[4].y)
|
|
130
|
+
context.lineTo(center.x + transformed[1].x, center.y - transformed[1].y)
|
|
131
|
+
|
|
132
|
+
context.fillStyle = this.model.fillStyle
|
|
133
|
+
context.strokeStyle = this.model.strokeStyle
|
|
134
|
+
context.fill()
|
|
135
|
+
context.stroke()
|
|
136
|
+
|
|
137
|
+
context.beginPath()
|
|
138
|
+
context.ellipse(center.x + transformed[6].x, center.y - transformed[6].y, 5, 5, 0, 0, Math.PI * 2)
|
|
139
|
+
context.stroke()
|
|
148
140
|
}
|
|
149
141
|
|
|
150
142
|
/*
|
|
@@ -155,41 +147,35 @@ export default class Camera extends RectPath(Component) {
|
|
|
155
147
|
*/
|
|
156
148
|
onchange(after: Properties, before: Properties) {
|
|
157
149
|
if (after.hasOwnProperty('data')) {
|
|
158
|
-
let data = after.data
|
|
159
|
-
if (!data.hasOwnProperty('yaw')
|
|
160
|
-
&& !data.hasOwnProperty('pitch')
|
|
161
|
-
&& !data.hasOwnProperty('roll'))
|
|
162
|
-
return;
|
|
150
|
+
let data = after.data
|
|
151
|
+
if (!data.hasOwnProperty('yaw') && !data.hasOwnProperty('pitch') && !data.hasOwnProperty('roll')) return
|
|
163
152
|
|
|
164
153
|
this.set({
|
|
165
154
|
yaw: data.yaw,
|
|
166
155
|
pitch: data.pitch,
|
|
167
156
|
roll: data.roll
|
|
168
157
|
})
|
|
169
|
-
return
|
|
158
|
+
return
|
|
170
159
|
}
|
|
171
160
|
|
|
172
|
-
if (!after.hasOwnProperty('yaw')
|
|
173
|
-
&& !after.hasOwnProperty('pitch')
|
|
174
|
-
&& !after.hasOwnProperty('roll'))
|
|
175
|
-
return;
|
|
161
|
+
if (!after.hasOwnProperty('yaw') && !after.hasOwnProperty('pitch') && !after.hasOwnProperty('roll')) return
|
|
176
162
|
|
|
177
|
-
var self = this
|
|
178
|
-
var diff_yaw = after.yaw - before.yaw
|
|
179
|
-
var diff_pitch = after.pitch - before.pitch
|
|
180
|
-
var diff_roll = after.roll - before.roll
|
|
163
|
+
var self = this
|
|
164
|
+
var diff_yaw = after.yaw - before.yaw
|
|
165
|
+
var diff_pitch = after.pitch - before.pitch
|
|
166
|
+
var diff_roll = after.roll - before.roll
|
|
181
167
|
|
|
182
|
-
this._anim_alpha_yaw = diff_yaw
|
|
183
|
-
this._anim_alpha_pitch = diff_pitch
|
|
184
|
-
this._anim_alpha_roll = diff_roll
|
|
168
|
+
this._anim_alpha_yaw = diff_yaw
|
|
169
|
+
this._anim_alpha_pitch = diff_pitch
|
|
170
|
+
this._anim_alpha_roll = diff_roll
|
|
185
171
|
|
|
186
172
|
this.animate({
|
|
187
173
|
step: function (delta: number) {
|
|
188
|
-
self._anim_alpha_yaw = diff_yaw * (1 - delta)
|
|
189
|
-
self._anim_alpha_pitch = diff_pitch * (1 - delta)
|
|
190
|
-
self._anim_alpha_roll = diff_roll * (1 - delta)
|
|
174
|
+
self._anim_alpha_yaw = diff_yaw * (1 - delta)
|
|
175
|
+
self._anim_alpha_pitch = diff_pitch * (1 - delta)
|
|
176
|
+
self._anim_alpha_roll = diff_roll * (1 - delta)
|
|
191
177
|
|
|
192
|
-
self.invalidate()
|
|
178
|
+
self.invalidate()
|
|
193
179
|
},
|
|
194
180
|
duration: 1000,
|
|
195
181
|
delta: 'circ',
|
|
@@ -197,11 +183,10 @@ export default class Camera extends RectPath(Component) {
|
|
|
197
183
|
x: 1
|
|
198
184
|
},
|
|
199
185
|
ease: 'inout'
|
|
200
|
-
}).start()
|
|
186
|
+
}).start()
|
|
201
187
|
}
|
|
202
|
-
|
|
203
188
|
}
|
|
204
189
|
|
|
205
190
|
// Component.memoize(Camera.prototype, 'transformed', false);
|
|
206
191
|
|
|
207
|
-
Component.register('camera', Camera)
|
|
192
|
+
Component.register('camera', Camera)
|
package/src/editors/index.ts
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
* Copyright © HatioLab Inc. All rights reserved.
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
|
-
import './
|
|
5
|
+
import './ox-property-editor-action'
|
|
6
6
|
|
|
7
7
|
export default [
|
|
8
8
|
{
|
|
9
9
|
type: 'action',
|
|
10
|
-
element: '
|
|
10
|
+
element: 'ox-property-editor-action'
|
|
11
11
|
}
|
|
12
12
|
]
|
|
@@ -8,7 +8,7 @@ import { css, html } from 'lit'
|
|
|
8
8
|
import { OxPropertyEditor } from '@operato/property-editor'
|
|
9
9
|
import { customElement } from 'lit/decorators.js'
|
|
10
10
|
|
|
11
|
-
@customElement('
|
|
11
|
+
@customElement('ox-property-editor-action')
|
|
12
12
|
export default class ThingsEditorAction extends OxPropertyEditor {
|
|
13
13
|
static styles = [
|
|
14
14
|
...OxPropertyEditor.styles,
|
package/src/floor.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Copyright © HatioLab Inc. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
-
import { Component, Container } from '@hatiolab/things-scene'
|
|
4
|
+
import { Component, ComponentNature, Container } from '@hatiolab/things-scene'
|
|
5
5
|
|
|
6
6
|
import IndoorMap from './indoor-map'
|
|
7
7
|
|
|
8
|
-
const NATURE = {
|
|
8
|
+
const NATURE: ComponentNature = {
|
|
9
9
|
mutable: false,
|
|
10
10
|
resizable: true,
|
|
11
11
|
rotatable: true,
|
package/src/indoor-map.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Copyright © HatioLab Inc. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
-
import { CardLayout, Component, Container, Model, POINT, State } from '@hatiolab/things-scene'
|
|
4
|
+
import { CardLayout, Component, ComponentNature, Container, Model, POINT, State } from '@hatiolab/things-scene'
|
|
5
5
|
|
|
6
6
|
import Floor from './floor'
|
|
7
7
|
|
|
@@ -12,7 +12,7 @@ function rgba(r: number, g: number, b: number, a: number) {
|
|
|
12
12
|
return `rgba(${r}, ${g}, ${b}, ${a})`
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
const NATURE = {
|
|
15
|
+
const NATURE: ComponentNature = {
|
|
16
16
|
mutable: false,
|
|
17
17
|
resizable: true,
|
|
18
18
|
rotatable: true,
|