From a3090ed82c60bc29a292f20ef50ba35bccb93ac6 Mon Sep 17 00:00:00 2001 From: Marty Date: Sat, 10 Aug 2019 03:48:19 +0800 Subject: [PATCH 1/4] test --- b.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 b.json diff --git a/b.json b/b.json new file mode 100644 index 0000000..17d16e6 --- /dev/null +++ b/b.json @@ -0,0 +1,29 @@ +{ + "types": [ + "waspot_get_camera", + "waspot_create_actor", + "waspot_move_actor", + "waspot_show_actor", + "waspot_play_audio_actor", + "waspot_touch_actor", + "waspot_get_canvas" + ], + "category": "catEduExtension", + "scripts": [ + "blockly/blocks.js", + "blockly/javascript.js" + ], + "dependencies": [ + "adapter.js", + "webRTC.js", + "camera.js", + "opencv.js", + "imageFilter.js", + "actor.js", + "HotSpot.js", + "waspot-blockly.js" + ], + "msg": "blockly/msg", + "blocksMsg": "blockly/msg/blocks", + "toolbox": "blockly/toolbox.xml" +} From 6c31dd5e195ba82485dff4f63683ee5040e86a9e Mon Sep 17 00:00:00 2001 From: marty5499 Date: Sat, 10 Aug 2019 03:50:38 +0800 Subject: [PATCH 2/4] Delete b.json --- b.json | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 b.json diff --git a/b.json b/b.json deleted file mode 100644 index 17d16e6..0000000 --- a/b.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "types": [ - "waspot_get_camera", - "waspot_create_actor", - "waspot_move_actor", - "waspot_show_actor", - "waspot_play_audio_actor", - "waspot_touch_actor", - "waspot_get_canvas" - ], - "category": "catEduExtension", - "scripts": [ - "blockly/blocks.js", - "blockly/javascript.js" - ], - "dependencies": [ - "adapter.js", - "webRTC.js", - "camera.js", - "opencv.js", - "imageFilter.js", - "actor.js", - "HotSpot.js", - "waspot-blockly.js" - ], - "msg": "blockly/msg", - "blocksMsg": "blockly/msg/blocks", - "toolbox": "blockly/toolbox.xml" -} From 028bbf8c74efad2a301169a1422f9917e1b52870 Mon Sep 17 00:00:00 2001 From: marty5499 Date: Sat, 10 Aug 2019 03:50:57 +0800 Subject: [PATCH 3/4] Update blockly.json --- blockly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly.json b/blockly.json index 17d16e6..e49cf63 100644 --- a/blockly.json +++ b/blockly.json @@ -1,5 +1,5 @@ { - "types": [ + "types": [ "waspot_get_camera", "waspot_create_actor", "waspot_move_actor", From 1af96f63efbd7fc8979328db1836368100be165d Mon Sep 17 00:00:00 2001 From: sheng Date: Thu, 26 Sep 2019 16:57:39 +0800 Subject: [PATCH 4/4] Update blockly.json --- blockly.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/blockly.json b/blockly.json index e49cf63..c02c209 100644 --- a/blockly.json +++ b/blockly.json @@ -1,12 +1,18 @@ { - "types": [ - "waspot_get_camera", - "waspot_create_actor", - "waspot_move_actor", + "types": [ + "waspot_ctrl_video", + "waspot_ctrl_video_action", + "waspot_setting_video", "waspot_show_actor", "waspot_play_audio_actor", "waspot_touch_actor", - "waspot_get_canvas" + "waspot_reloadimg_actor", + "waspot_loadimg_actor", + "waspot_move_actor", + "waspot_set_snd_url_actor", + "waspot_set_image_size", + "waspot_create_actor", + "waspot_get_camera" ], "category": "catEduExtension", "scripts": [