bug fixes

shreshthtuli · shreshthtuli · commit 4576f75c2fe6 · 2018-04-29T13:49:17.000+05:30
diff --git a/bin/Flock.o b/bin/Flock.o
diff --git a/bin/mainwindow.o b/bin/mainwindow.o
diff --git a/bin/moc_mainwindow.o b/bin/moc_mainwindow.o
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1920</width>
-    <height>1000</height>
+    <height>1038</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -588,6 +588,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="checkBox_4">
+        <property name="text">
+         <string>Wind</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QCheckBox" name="checkBox">
         <property name="text">
diff --git a/include/Boid.h b/include/Boid.h
@@ -140,13 +140,20 @@ class Boid {
     }
 
     //Pvector seek(Pvector v);
-    void run(vector <Boid*> v, int self, bool sep, bool align, bool coh, int wind_x, int wind_y, int wind_z){
+    void run(vector <Boid*> v, int self, bool sep, bool align, bool coh, int wind_x, int wind_y, int wind_z, bool wind){
         //Model the external forces
 
         Pvector new_vel=velocity+acceleration;
-        Pvector wind(wind_x, wind_y, wind_z);
-        wind = wind * (reynolds/1042);
-        Pvector desired_vel=Internal(v,self, sep, align, coh)+Positional()+wind;
+        Pvector desired_vel;
+        if (wind){
+            Pvector wind(wind_x, wind_y, wind_z);
+            wind = wind * (reynolds/1042);
+            desired_vel=Internal(v,self, sep, align, coh)+Positional()+wind;
+        }
+        else {
+            desired_vel=Internal(v,self, sep, align, coh)+Positional();
+        }
+
         Pvector difference=desired_vel-new_vel;
         difference.logistic_limit(max_acc*strength);
         //Pvector pos=Positional();
diff --git a/include/Flock.h b/include/Flock.h
@@ -44,6 +44,7 @@ class Flock : public QGLWidget
     float windx=0;
     float windy=0;
     float windz=0;
+    bool check_wind = false;
 
 public slots:
     void addBoid(float x, float y, float z, float strength, float adv, float sightedness, int fova, int fovb);
diff --git a/include/mainwindow.h b/include/mainwindow.h
@@ -60,6 +60,8 @@ private slots:
 
     void on_horizontalSlider_3_valueChanged(int value);
 
+    void on_checkBox_4_stateChanged(int arg1);
+
 protected:
     int timerId;
     int counter = 0;
diff --git a/include/ui_mainwindow.h b/include/ui_mainwindow.h
@@ -122,6 +122,7 @@ class Ui_MainWindow
     QLabel *label_14;
     QSpacerItem *verticalSpacer;
     QCheckBox *checkBox_2;
+    QCheckBox *checkBox_4;
     QCheckBox *checkBox;
     QCheckBox *sep;
     QCheckBox *align;
@@ -139,7 +140,7 @@ class Ui_MainWindow
     {
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QStringLiteral("MainWindow"));
-        MainWindow->resize(1920, 1000);
+        MainWindow->resize(1920, 1038);
         centralWidget = new QWidget(MainWindow);
         centralWidget->setObjectName(QStringLiteral("centralWidget"));
         horizontalLayout_8 = new QHBoxLayout(centralWidget);
@@ -603,6 +604,11 @@ class Ui_MainWindow
 
         verticalLayout_2->addWidget(checkBox_2);
 
+        checkBox_4 = new QCheckBox(centralWidget);
+        checkBox_4->setObjectName(QStringLiteral("checkBox_4"));
+
+        verticalLayout_2->addWidget(checkBox_4);
+
         checkBox = new QCheckBox(centralWidget);
         checkBox->setObjectName(QStringLiteral("checkBox"));
 
@@ -741,6 +747,7 @@ class Ui_MainWindow
         label_20->setText(QApplication::translate("MainWindow", "g", Q_NULLPTR));
         label_14->setText(QApplication::translate("MainWindow", "where the average mass of the bird is 80g.", Q_NULLPTR));
         checkBox_2->setText(QApplication::translate("MainWindow", "Colour", Q_NULLPTR));
+        checkBox_4->setText(QApplication::translate("MainWindow", "Wind", Q_NULLPTR));
         checkBox->setText(QApplication::translate("MainWindow", "Random calculation", Q_NULLPTR));
         sep->setText(QApplication::translate("MainWindow", "Separation", Q_NULLPTR));
         align->setText(QApplication::translate("MainWindow", "Alignment", Q_NULLPTR));
diff --git a/release/FlockSim.exe b/release/FlockSim.exe
diff --git a/src/Flock.cpp b/src/Flock.cpp
@@ -49,37 +49,37 @@ void Flock::addBoid(float x, float y, float z, float strength, float adv, float
 //Functions for multithreading sequential
 void flocking0(Flock* f){
     for (int i = 0; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking1(Flock* f){
     for (int i = 1; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking2(Flock* f){
     for (int i = 2; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking3(Flock* f){
     for (int i = 3; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 
 //Functions for multithreading random
 void flocking10(Flock* f){
     for (int i = 0; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking11(Flock* f){
     for (int i = 1; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking12(Flock* f){
     for (int i = 2; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 void flocking13(Flock* f){
     for (int i = 3; i < f->flock.size(); i+=4)
-        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);
+        f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);
 }
 
 
diff --git a/src/FlockSim.pro.user b/src/FlockSim.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.1, 2018-04-26T21:45:02. -->
+<!-- Written by QtCreator 4.5.1, 2018-04-29T13:45:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -140,3 +140,11 @@ void MainWindow::on_horizontalSlider_3_valueChanged(int value)
 {
     ui->glwidget->windz = ui->horizontalSlider_3->value();
 }
+
+void MainWindow::on_checkBox_4_stateChanged(int arg1)
+{
+    if(arg1 == 0)
+        ui->glwidget->check_wind = false;
+    else
+        ui->glwidget->check_wind = true;
+}
diff --git a/src/moc_mainwindow.cpp b/src/moc_mainwindow.cpp
@@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_MainWindow_t {
-    QByteArrayData data[19];
-    char stringdata0[426];
+    QByteArrayData data[20];
+    char stringdata0[453];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -49,7 +49,8 @@ QT_MOC_LITERAL(14, 279, 37), // "on_horizontalSlider_3_actionT..."
 QT_MOC_LITERAL(15, 317, 32), // "on_horizontalSlider_valueChanged"
 QT_MOC_LITERAL(16, 350, 5), // "value"
 QT_MOC_LITERAL(17, 356, 34), // "on_horizontalSlider_2_valueCh..."
-QT_MOC_LITERAL(18, 391, 34) // "on_horizontalSlider_3_valueCh..."
+QT_MOC_LITERAL(18, 391, 34), // "on_horizontalSlider_3_valueCh..."
+QT_MOC_LITERAL(19, 426, 26) // "on_checkBox_4_stateChanged"
 
     },
     "MainWindow\0on_AddBoid_released\0\0"
@@ -63,7 +64,8 @@ QT_MOC_LITERAL(18, 391, 34) // "on_horizontalSlider_3_valueCh..."
     "on_horizontalSlider_3_actionTriggered\0"
     "on_horizontalSlider_valueChanged\0value\0"
     "on_horizontalSlider_2_valueChanged\0"
-    "on_horizontalSlider_3_valueChanged"
+    "on_horizontalSlider_3_valueChanged\0"
+    "on_checkBox_4_stateChanged"
 };
 #undef QT_MOC_LITERAL
 
@@ -73,28 +75,29 @@ static const uint qt_meta_data_MainWindow[] = {
        7,       // revision
        0,       // classname
        0,    0, // classinfo
-      14,   14, // methods
+      15,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags
-       1,    0,   84,    2, 0x08 /* Private */,
-       3,    1,   85,    2, 0x08 /* Private */,
-       5,    1,   88,    2, 0x08 /* Private */,
-       6,    1,   91,    2, 0x08 /* Private */,
-       7,    0,   94,    2, 0x08 /* Private */,
-       8,    1,   95,    2, 0x08 /* Private */,
-       9,    1,   98,    2, 0x08 /* Private */,
-      10,    0,  101,    2, 0x08 /* Private */,
-      11,    1,  102,    2, 0x08 /* Private */,
-      13,    1,  105,    2, 0x08 /* Private */,
-      14,    1,  108,    2, 0x08 /* Private */,
-      15,    1,  111,    2, 0x08 /* Private */,
-      17,    1,  114,    2, 0x08 /* Private */,
-      18,    1,  117,    2, 0x08 /* Private */,
+       1,    0,   89,    2, 0x08 /* Private */,
+       3,    1,   90,    2, 0x08 /* Private */,
+       5,    1,   93,    2, 0x08 /* Private */,
+       6,    1,   96,    2, 0x08 /* Private */,
+       7,    0,   99,    2, 0x08 /* Private */,
+       8,    1,  100,    2, 0x08 /* Private */,
+       9,    1,  103,    2, 0x08 /* Private */,
+      10,    0,  106,    2, 0x08 /* Private */,
+      11,    1,  107,    2, 0x08 /* Private */,
+      13,    1,  110,    2, 0x08 /* Private */,
+      14,    1,  113,    2, 0x08 /* Private */,
+      15,    1,  116,    2, 0x08 /* Private */,
+      17,    1,  119,    2, 0x08 /* Private */,
+      18,    1,  122,    2, 0x08 /* Private */,
+      19,    1,  125,    2, 0x08 /* Private */,
 
  // slots: parameters
     QMetaType::Void,
@@ -111,6 +114,7 @@ static const uint qt_meta_data_MainWindow[] = {
     QMetaType::Void, QMetaType::Int,   16,
     QMetaType::Void, QMetaType::Int,   16,
     QMetaType::Void, QMetaType::Int,   16,
+    QMetaType::Void, QMetaType::Int,    4,
 
        0        // eod
 };
@@ -135,6 +139,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 11: _t->on_horizontalSlider_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
         case 12: _t->on_horizontalSlider_2_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
         case 13: _t->on_horizontalSlider_3_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 14: _t->on_checkBox_4_stateChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
         default: ;
         }
     }
@@ -165,13 +170,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 14)
+        if (_id < 15)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 14;
+        _id -= 15;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 14)
+        if (_id < 15)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 14;
+        _id -= 15;
     }
     return _id;
 }

Original file line number	Diff line number	Diff line change
`@@ -49,37 +49,37 @@ void Flock::addBoid(float x, float y, float z, float strength, float adv, float`
`49`	`49`	`//Functions for multithreading sequential`
`50`	`50`	`void flocking0(Flock* f){`
`51`	`51`	`for (int i = 0; i < f->flock.size(); i+=4)`
`52`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`52`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`53`	`53`	`}`
`54`	`54`	`void flocking1(Flock* f){`
`55`	`55`	`for (int i = 1; i < f->flock.size(); i+=4)`
`56`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`56`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`57`	`57`	`}`
`58`	`58`	`void flocking2(Flock* f){`
`59`	`59`	`for (int i = 2; i < f->flock.size(); i+=4)`
`60`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`60`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`61`	`61`	`}`
`62`	`62`	`void flocking3(Flock* f){`
`63`	`63`	`for (int i = 3; i < f->flock.size(); i+=4)`
`64`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`64`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`//Functions for multithreading random`
`68`	`68`	`void flocking10(Flock* f){`
`69`	`69`	`for (int i = 0; i < f->flock.size(); i+=4)`
`70`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`70`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`71`	`71`	`}`
`72`	`72`	`void flocking11(Flock* f){`
`73`	`73`	`for (int i = 1; i < f->flock.size(); i+=4)`
`74`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`74`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`75`	`75`	`}`
`76`	`76`	`void flocking12(Flock* f){`
`77`	`77`	`for (int i = 2; i < f->flock.size(); i+=4)`
`78`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`78`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`79`	`79`	`}`
`80`	`80`	`void flocking13(Flock* f){`
`81`	`81`	`for (int i = 3; i < f->flock.size(); i+=4)`
`82`		`- f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz);`
	`82`	`+ f->flock[i]->run(f->flock, i, f->sep, f->align, f->coh, f->windx, f->windy, f->windz, f->check_wind);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`