Bug fixes
This commit is contained in:
parent
48b80fb9ed
commit
1abe40815e
@ -3,6 +3,10 @@
|
|||||||
|
|
||||||
#include "FloatSingle.h"
|
#include "FloatSingle.h"
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include "debug.h"
|
||||||
|
}
|
||||||
|
|
||||||
Propulsion::Propulsion() {
|
Propulsion::Propulsion() {
|
||||||
this->placement = nullptr;
|
this->placement = nullptr;
|
||||||
this->motorCount = 0;
|
this->motorCount = 0;
|
||||||
@ -33,7 +37,7 @@ void Propulsion::AddMotors(Placement* things, unsigned int thingCount) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Propulsion::AddQuadcopter(Quadcopter* quadcoper) {
|
void Propulsion::AddQuadcopter(Quadcopter* quadcopter) {
|
||||||
this->quadcopter = quadcopter;
|
this->quadcopter = quadcopter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,6 +5,10 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include "debug.h"
|
||||||
|
}
|
||||||
|
|
||||||
SensorPlacement::SensorPlacement(DistanceSensor* distanceSensor, Vector2 direction) {
|
SensorPlacement::SensorPlacement(DistanceSensor* distanceSensor, Vector2 direction) {
|
||||||
this->distanceSensor = distanceSensor;
|
this->distanceSensor = distanceSensor;
|
||||||
this->switchSensor = nullptr;
|
this->switchSensor = nullptr;
|
||||||
@ -65,8 +69,8 @@ float Sensing::DistanceForward(float angle) {
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
DistanceSensor* distanceSensor = (DistanceSensor*)placement.thing;
|
DistanceSensor* distanceSensor = (DistanceSensor*)placement.thing;
|
||||||
float sensorAngle = placement.direction.x;
|
float sensorAngle = placement.direction.z;
|
||||||
if (sensorAngle > -angle && sensorAngle < angle) {
|
if (sensorAngle > 0 && sensorAngle < angle) {
|
||||||
minDistance = fmin(minDistance, distanceSensor->GetDistance());
|
minDistance = fmin(minDistance, distanceSensor->GetDistance());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user