@srsergio/taptapp-ar 1.0.14 → 1.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -24,11 +24,16 @@ class CropDetector {
|
|
|
24
24
|
}
|
|
25
25
|
detectMoving(input) {
|
|
26
26
|
const imageData = input;
|
|
27
|
-
//
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
// Expanded to 5x5 grid (25 positions) for better coverage
|
|
28
|
+
const gridSize = 5;
|
|
29
|
+
const dx = this.lastRandomIndex % gridSize;
|
|
30
|
+
const dy = Math.floor(this.lastRandomIndex / gridSize);
|
|
31
|
+
// Calculate offset from center, with overlap for better detection
|
|
32
|
+
const stepX = this.cropSize / 3;
|
|
33
|
+
const stepY = this.cropSize / 3;
|
|
34
|
+
let startY = Math.floor(this.height / 2 - this.cropSize / 2 + (dy - 2) * stepY);
|
|
35
|
+
let startX = Math.floor(this.width / 2 - this.cropSize / 2 + (dx - 2) * stepX);
|
|
36
|
+
// Clamp to valid bounds
|
|
32
37
|
if (startX < 0)
|
|
33
38
|
startX = 0;
|
|
34
39
|
if (startY < 0)
|
|
@@ -37,7 +42,7 @@ class CropDetector {
|
|
|
37
42
|
startX = this.width - this.cropSize - 1;
|
|
38
43
|
if (startY >= this.height - this.cropSize)
|
|
39
44
|
startY = this.height - this.cropSize - 1;
|
|
40
|
-
this.lastRandomIndex = (this.lastRandomIndex + 1) %
|
|
45
|
+
this.lastRandomIndex = (this.lastRandomIndex + 1) % (gridSize * gridSize);
|
|
41
46
|
const result = this._detect(imageData, startX, startY);
|
|
42
47
|
return result;
|
|
43
48
|
}
|
|
@@ -152,11 +152,14 @@ class SimpleAR {
|
|
|
152
152
|
// Matrix is column-major: [m0,m1,m2,m3, m4,m5,m6,m7, m8,m9,m10,m11, m12,m13,m14,m15]
|
|
153
153
|
const tx = worldMatrix[12];
|
|
154
154
|
const ty = worldMatrix[13];
|
|
155
|
-
const
|
|
155
|
+
const matrixScale = Math.sqrt(worldMatrix[0] ** 2 + worldMatrix[1] ** 2);
|
|
156
156
|
const rotation = Math.atan2(worldMatrix[1], worldMatrix[0]);
|
|
157
157
|
// Convert from normalized coords to screen coords
|
|
158
158
|
const screenX = offsetX + (videoW / 2 + tx) * scaleX;
|
|
159
159
|
const screenY = offsetY + (videoH / 2 - ty) * scaleY;
|
|
160
|
+
// Scale factor: use a reasonable multiplier (0.5 instead of 0.01)
|
|
161
|
+
// The matrixScale from the tracking is in image-space coordinates
|
|
162
|
+
const finalScale = matrixScale * scaleX * 0.5;
|
|
160
163
|
// Apply transform
|
|
161
164
|
this.overlay.style.position = 'absolute';
|
|
162
165
|
this.overlay.style.transformOrigin = 'center center';
|
|
@@ -165,7 +168,7 @@ class SimpleAR {
|
|
|
165
168
|
this.overlay.style.transform = `
|
|
166
169
|
translate(${screenX}px, ${screenY}px)
|
|
167
170
|
translate(-50%, -50%)
|
|
168
|
-
scale(${
|
|
171
|
+
scale(${finalScale})
|
|
169
172
|
rotate(${-rotation}rad)
|
|
170
173
|
`;
|
|
171
174
|
}
|
package/package.json
CHANGED
|
@@ -33,19 +33,25 @@ class CropDetector {
|
|
|
33
33
|
detectMoving(input) {
|
|
34
34
|
const imageData = input;
|
|
35
35
|
|
|
36
|
-
//
|
|
37
|
-
const
|
|
38
|
-
const
|
|
36
|
+
// Expanded to 5x5 grid (25 positions) for better coverage
|
|
37
|
+
const gridSize = 5;
|
|
38
|
+
const dx = this.lastRandomIndex % gridSize;
|
|
39
|
+
const dy = Math.floor(this.lastRandomIndex / gridSize);
|
|
39
40
|
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
// Calculate offset from center, with overlap for better detection
|
|
42
|
+
const stepX = this.cropSize / 3;
|
|
43
|
+
const stepY = this.cropSize / 3;
|
|
42
44
|
|
|
45
|
+
let startY = Math.floor(this.height / 2 - this.cropSize / 2 + (dy - 2) * stepY);
|
|
46
|
+
let startX = Math.floor(this.width / 2 - this.cropSize / 2 + (dx - 2) * stepX);
|
|
47
|
+
|
|
48
|
+
// Clamp to valid bounds
|
|
43
49
|
if (startX < 0) startX = 0;
|
|
44
50
|
if (startY < 0) startY = 0;
|
|
45
51
|
if (startX >= this.width - this.cropSize) startX = this.width - this.cropSize - 1;
|
|
46
52
|
if (startY >= this.height - this.cropSize) startY = this.height - this.cropSize - 1;
|
|
47
53
|
|
|
48
|
-
this.lastRandomIndex = (this.lastRandomIndex + 1) %
|
|
54
|
+
this.lastRandomIndex = (this.lastRandomIndex + 1) % (gridSize * gridSize);
|
|
49
55
|
|
|
50
56
|
const result = this._detect(imageData, startX, startY);
|
|
51
57
|
return result;
|
|
@@ -179,13 +179,17 @@ class SimpleAR {
|
|
|
179
179
|
// Matrix is column-major: [m0,m1,m2,m3, m4,m5,m6,m7, m8,m9,m10,m11, m12,m13,m14,m15]
|
|
180
180
|
const tx = worldMatrix[12];
|
|
181
181
|
const ty = worldMatrix[13];
|
|
182
|
-
const
|
|
182
|
+
const matrixScale = Math.sqrt(worldMatrix[0] ** 2 + worldMatrix[1] ** 2);
|
|
183
183
|
const rotation = Math.atan2(worldMatrix[1], worldMatrix[0]);
|
|
184
184
|
|
|
185
185
|
// Convert from normalized coords to screen coords
|
|
186
186
|
const screenX = offsetX + (videoW / 2 + tx) * scaleX;
|
|
187
187
|
const screenY = offsetY + (videoH / 2 - ty) * scaleY;
|
|
188
188
|
|
|
189
|
+
// Scale factor: use a reasonable multiplier (0.5 instead of 0.01)
|
|
190
|
+
// The matrixScale from the tracking is in image-space coordinates
|
|
191
|
+
const finalScale = matrixScale * scaleX * 0.5;
|
|
192
|
+
|
|
189
193
|
// Apply transform
|
|
190
194
|
this.overlay.style.position = 'absolute';
|
|
191
195
|
this.overlay.style.transformOrigin = 'center center';
|
|
@@ -194,7 +198,7 @@ class SimpleAR {
|
|
|
194
198
|
this.overlay.style.transform = `
|
|
195
199
|
translate(${screenX}px, ${screenY}px)
|
|
196
200
|
translate(-50%, -50%)
|
|
197
|
-
scale(${
|
|
201
|
+
scale(${finalScale})
|
|
198
202
|
rotate(${-rotation}rad)
|
|
199
203
|
`;
|
|
200
204
|
}
|