ccolin/m2-ar-projet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix collision detection

Browse Source
This commit is contained in:
ccolin 2021-01-03 13:35:26 +01:00
parent 7e0554bf65
commit 0a6b133c19
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drone_controller.cc
View File

@ -116,7 +116,7 @@ void DroneController::seek(int frame) {
void DroneController::computeCollisions(double sphere_radius) { void DroneController::computeCollisions(double sphere_radius) {
double sqDist = sphere_radius * sphere_radius * 2; double sqDist = sphere_radius * sphere_radius * 4;
for (int i = 0; i < duration; i++) { for (int i = 0; i < duration; i++) {
for (Drone &a : drones) { for (Drone &a : drones) {
a.setTo(i); a.setTo(i);

2
src/main_window.cc
View File

@ -92,8 +92,6 @@ void MainWindow::open(const QString &path) {
settings_pane->setEnabled(true); settings_pane->setEnabled(true);
glw.setPainter(dc); glw.setPainter(dc);
dc->computeCollisions(.1);
pause(); pause();
} }

1
src/settings_pane.cc
View File

@ -10,6 +10,7 @@
SettingsPane::SettingsPane(QWidget *parent) SettingsPane::SettingsPane(QWidget *parent)
:QWidget(parent) { :QWidget(parent) {
QDoubleSpinBox *sphere_radius = new QDoubleSpinBox(); QDoubleSpinBox *sphere_radius = new QDoubleSpinBox();
sphere_radius->setSingleStep(.1);
QCheckBox *show_trajectories = new QCheckBox(); QCheckBox *show_trajectories = new QCheckBox();
QCheckBox *show_support_lines = new QCheckBox(); QCheckBox *show_support_lines = new QCheckBox();
collisions = new QListWidget(); collisions = new QListWidget();