Skip to content

Commit fe0df88

Browse files
VirtualStarryVirtualStarry
committed
feat(hand&body&face): 修正部分bug,增加前后镜头切换
1 parent 3fce812 commit fe0df88

File tree

13 files changed

+67
-31
lines changed

13 files changed

+67
-31
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm run init
1919

2020
如果你有 bug 反馈或其他任何建议，欢迎提 issue 给我们。
2121

22-
如果你愿意一起来完善小程序示例，欢迎通过 PR 的方式贡献代码。为了保证代码风格的统一，在编写代码之前，请在项目根目录运行以下命令安装依赖：
22+
如果你愿意一起来完善小程序示例，欢迎通过 PR 的方式贡献代码。为了保证代码风格的统一，在编写代码之前，请在项目根目录miniprogram下运行以下命令安装依赖：
2323

2424
```
2525
npm install

‎cloudfunctions/ARDemo/wx-server-sdk-wxg-service/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ exports.main = async (event, context) => {
102102
首先在需要使用该能力的云函数的目录下安装 `@tencent/cloud-functions-tools`：
103103

104104
```shell
105-
tnpm install --save-dev @tencent/cloud-functions-tools@latest
105+
npm install --save-dev @tencent/cloud-functions-tools@latest
106106
```
107107

108108
注意，云函数中同时需安装 `wx-server-sdk` 和 `@tencent/wx-server-sdk-wxg-service`
109109

110110
```bash
111111
npm install --save wx-server-sdk@latest
112-
tnpm install --save @tencent/wx-server-sdk-wxg-service@latest
112+
npm install --save @tencent/wx-server-sdk-wxg-service@latest
113113
```
114114

115115

‎miniprogram/packageAPI/pages/ar/body-detect/behavior.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function getBehavior() {
1515
fps: 0,
1616
memory: 0,
1717
cpu: 0,
18+
cameraPosition: 0,
1819
},
1920
methods: {
2021
onReady() {
@@ -28,8 +29,8 @@ export default function getBehavior() {
2829
const pixelRatio = info.pixelRatio
2930
const calcSize = (width, height) => {
3031
console.log(`canvas size: width = ${width} , height = ${height}`)
31-
this.canvas.width = width * pixelRatio / 2
32-
this.canvas.height = height * pixelRatio / 2
32+
this.canvas.width = width * pixelRatio
33+
this.canvas.height = height * pixelRatio
3334
this.setData({
3435
width,
3536
height,
@@ -103,8 +104,8 @@ export default function getBehavior() {
103104

104105
const calcSize = (width, height, pixelRatio) => {
105106
console.log(`canvas size: width = ${width} , height = ${height}`)
106-
this.canvas.width = width * pixelRatio / 2
107-
this.canvas.height = height * pixelRatio / 2
107+
this.canvas.width = width * pixelRatio
108+
this.canvas.height = height * pixelRatio
108109
this.setData({
109110
width,
110111
height,

‎miniprogram/packageAPI/pages/ar/body-detect/body-detect.js

+13-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ var EDGE_FSHADER_SOURCE =
140140
varying vec2 posJudge;
141141
142142
float box(float x, float y){
143-
float xc = clamp (x - centerPoint.x, -1.0 , 1.0);
144-
float yc = clamp (y - centerPoint.y, -1.0 , 1.0);
143+
float xc = x - centerPoint.x;
144+
float yc = y - centerPoint.y;
145145
vec2 point = vec2(xc, yc);
146146
float right = rightTopPoint.x;
147147
float top = rightTopPoint.y;
@@ -243,6 +243,17 @@ Component({
243243
init() {
244244
this.initGL()
245245
},
246+
switchCamera(event){
247+
if(this.session.config){
248+
const config = this.session.config
249+
let pos = Number(event.currentTarget.dataset.value)
250+
config.cameraPosition = pos
251+
this.session.config = config
252+
this.setData({
253+
cameraPosition:event.currentTarget.dataset.value
254+
})
255+
}
256+
},
246257
render(frame) {
247258
var gl = this.gl
248259

‎miniprogram/packageAPI/pages/ar/body-detect/body-detect.wxml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<view class="container page" data-weui-theme="{{theme}}">
22
<view><canvas type="webgl" id="webgl" style="width: {{width}}px; height: {{height}}px" bindtouchend="onTouchEnd">
33
</canvas></view>
4-
<view class="page-body-text tc" style="height:20%">提示：将摄像头对准人体, 检测到的人体将会被标记出识别框和人体部位标记点</view>
4+
<view class="page-body-text tc" style="height:20%">提示：将摄像头对准人体, 检测到的人体将会被标记出识别框和人体部位标记点
5+
<view wx:if="{{cameraPosition == 0}}">
6+
<button type="primary" bindtap="switchCamera" data-value="1" disabled="{{buttonDisable}}">切换为前置摄像头</button>
7+
</view>
8+
<view wx:else>
9+
<button type="primary" bindtap="switchCamera" data-value="0" disabled="{{buttonDisable}}">切换为后置摄像头</button>
10+
</view>
11+
</view>
512
</view>

‎miniprogram/packageAPI/pages/ar/face-detect/behavior.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function getBehavior() {
1515
fps: 0,
1616
memory: 0,
1717
cpu: 0,
18+
cameraPosition: 0,
1819
},
1920
methods: {
2021
onReady() {
@@ -28,8 +29,8 @@ export default function getBehavior() {
2829
const pixelRatio = info.pixelRatio
2930
const calcSize = (width, height) => {
3031
console.log(`canvas size: width = ${width} , height = ${height}`)
31-
this.canvas.width = width * pixelRatio / 2
32-
this.canvas.height = height * pixelRatio / 2
32+
this.canvas.width = width * pixelRatio
33+
this.canvas.height = height * pixelRatio
3334
this.setData({
3435
width,
3536
height,
@@ -113,8 +114,8 @@ export default function getBehavior() {
113114

114115
const calcSize = (width, height, pixelRatio) => {
115116
console.log(`canvas size: width = ${width} , height = ${height}`)
116-
this.canvas.width = width * pixelRatio / 2
117-
this.canvas.height = height * pixelRatio / 2
117+
this.canvas.width = width * pixelRatio
118+
this.canvas.height = height * pixelRatio
118119
this.setData({
119120
width,
120121
height,

‎miniprogram/packageAPI/pages/ar/face-detect/face-detect.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ var EDGE_FSHADER_SOURCE =
140140
varying vec2 posJudge;
141141
142142
float box(float x, float y){
143-
float xc = clamp (x - centerPoint.x, -1.0 , 1.0);
144-
float yc = clamp (y - centerPoint.y, -1.0 , 1.0);
143+
float xc = x - centerPoint.x;
144+
float yc = y - centerPoint.y;
145145
vec2 point = vec2(xc, yc);
146146
float right = rightTopPoint.x;
147147
float top = rightTopPoint.y;
@@ -248,7 +248,8 @@ Component({
248248
switchCamera(event){
249249
if(this.session.config){
250250
const config = this.session.config
251-
config.cameraPosition = Number(event.currentTarget.dataset.value)
251+
let pos = Number(event.currentTarget.dataset.value)
252+
config.cameraPosition = pos
252253
this.session.config = config
253254
this.setData({
254255
cameraPosition:event.currentTarget.dataset.value

‎miniprogram/packageAPI/pages/ar/face-detect/face-detect.wxml

-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
<button type="primary" bindtap="switchCamera" data-value="0" disabled="{{buttonDisable}}">切换为后置摄像头</button>
1010
</view>
1111
</view>
12-
13-
1412
</view>

‎miniprogram/packageAPI/pages/ar/hand-detect/behavior.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function getBehavior() {
1515
fps: 0,
1616
memory: 0,
1717
cpu: 0,
18+
cameraPosition: 0
1819
},
1920
methods: {
2021
onReady() {
@@ -28,8 +29,8 @@ export default function getBehavior() {
2829
const pixelRatio = info.pixelRatio
2930
const calcSize = (width, height) => {
3031
console.log(`canvas size: width = ${width} , height = ${height}`)
31-
this.canvas.width = width * pixelRatio / 2
32-
this.canvas.height = height * pixelRatio / 2
32+
this.canvas.width = width * pixelRatio
33+
this.canvas.height = height * pixelRatio
3334
this.setData({
3435
width,
3536
height,
@@ -112,8 +113,8 @@ export default function getBehavior() {
112113

113114
const calcSize = (width, height, pixelRatio) => {
114115
console.log(`canvas size: width = ${width} , height = ${height}`)
115-
this.canvas.width = width * pixelRatio / 2
116-
this.canvas.height = height * pixelRatio / 2
116+
this.canvas.width = width * pixelRatio
117+
this.canvas.height = height * pixelRatio
117118
this.setData({
118119
width,
119120
height,

‎miniprogram/packageAPI/pages/ar/hand-detect/hand-detect.js

+14-5
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,17 @@ Component({
243243
init() {
244244
this.initGL()
245245
},
246+
switchCamera(event){
247+
if(this.session.config){
248+
const config = this.session.config
249+
let pos = Number(event.currentTarget.dataset.value)
250+
config.cameraPosition = pos
251+
this.session.config = config
252+
this.setData({
253+
cameraPosition:event.currentTarget.dataset.value
254+
})
255+
}
256+
},
246257
render(frame) {
247258
var gl = this.gl
248259

@@ -291,11 +302,9 @@ Component({
291302
gl.useProgram(this.rectEdgeProgram)
292303
gl.program = this.rectEdgeProgram
293304

294-
// for (var i = 0; i < anchor2DList.length; i++) {
295-
// onDrawRectEdge(gl, anchor2DList[i].origin.x, anchor2DList[i].origin.y, anchor2DList[i].size.width, anchor2DList[i].size.height)
296-
// }
297-
298-
onDrawRectEdge(gl, anchor2DList[0].origin.x, anchor2DList[0].origin.y, anchor2DList[0].size.width, anchor2DList[0].size.height)
305+
for (var i = 0; i < anchor2DList.length; i++) {
306+
onDrawRectEdge(gl, anchor2DList[i].origin.x, anchor2DList[i].origin.y, anchor2DList[i].size.width, anchor2DList[i].size.height)
307+
}
299308
}
300309
},
301310
},

‎miniprogram/packageAPI/pages/ar/hand-detect/hand-detect.wxml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<view class="container page" data-weui-theme="{{theme}}">
22
<view><canvas type="webgl" id="webgl" style="width: {{width}}px; height: {{height}}px" bindtouchend="onTouchEnd">
33
</canvas></view>
4-
<view class="page-body-text tc" style="height:20%">提示：将摄像头对准手部, 检测到的手部将会被标记出识别框和手部标记点</view>
4+
<view class="page-body-text tc" style="height:20%">提示：将摄像头对准手部, 检测到的手部将会被标记出识别框和手部标记点
5+
<view wx:if="{{cameraPosition == 0}}">
6+
<button type="primary" bindtap="switchCamera" data-value="1" disabled="{{buttonDisable}}">切换为前置摄像头</button>
7+
</view>
8+
<view wx:else>
9+
<button type="primary" bindtap="switchCamera" data-value="0" disabled="{{buttonDisable}}">切换为后置摄像头</button>
10+
</view>
11+
</view>
512
</view>

‎miniprogram/packageAPI/pages/ar/visionkit-basic-v2/visionkit-basic-v2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"usingComponents": {},
33
"disableScroll": true,
4-
"navigationBarTitleText": "VisionKit基础"
4+
"navigationBarTitleText": "VisionKit基础-v2"
55
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"description": "WeChat miniprogram demo",
55
"scripts": {
6-
"init": "npm run sync && cd cloudfunctions/ && tnpm i --production && cd ../miniprogram/ && tnpm i --production",
6+
"init": "npm run sync && cd cloudfunctions/ && npm i --production && cd ../miniprogram/ && npm i --production",
77
"lint": "eslint .",
88
"wxss:transform-vars": "gulp transform-css-vars",
99
"sync": "git submodule update --init --recursive",

0 commit comments

Comments
 (0)