something

This commit is contained in:
xinyang
2019-05-09 20:18:08 +08:00
parent 13ffc6efe6
commit 52dd50ab60
7 changed files with 42 additions and 77 deletions

View File

@@ -53,19 +53,23 @@ int main(int argc, char *argv[]) {
WrapperHead *video_energy;
if (from_camera) {
video_armor = new CameraWrapper(0, "armor");
// video_energy = new CameraWrapper(1, "energy");
video_energy = new CameraWrapper(1, "energy");
} else {
video_armor = new VideoWrapper("/home/xinyang/Desktop/DataSets/video/blue_4.mp4");
video_energy = new VideoWrapper("/home/xinyang/Desktop/DataSets/video/blue_4.mp4");
}
if (video_armor->init()) {
if (video_armor->init() && video_energy->init()) {
cout << "Video source initialization successfully." << endl;
} else {
delete video_armor;
delete video_energy;
cout << "Program fails. Restarting" << endl;
}
Mat energy_src, armor_src;
for(int i=0; i<10; i++){
video_armor->read(armor_src);
// video_energy->read(armor_src);
video_energy->read(armor_src);
}
ArmorFinder armorFinder(ENEMY_BLUE, uart, PROJECT_DIR"/tools/para/");
@@ -74,7 +78,7 @@ int main(int argc, char *argv[]) {
energy.setAllyColor(ally_color);
energy.setRotation(energy_part_rotation);
bool ok = video_armor->read(armor_src) /*&& video_energy->read(armor_src)*/;
bool ok = video_armor->read(armor_src) && video_energy->read(armor_src);
while (ok) {
CNT_TIME(WORD_LIGHT_CYAN, "Total", {
@@ -103,6 +107,7 @@ int main(int argc, char *argv[]) {
});
}
delete video_armor;
delete video_energy;
cout << "Program fails. Restarting" << endl;
}