Revision 1178
More fixes
| branches/simulator/projects/simulator/simulator/core/world.c | ||
|---|---|---|
| 68 | 68 |
return -1; |
| 69 | 69 |
} |
| 70 | 70 |
|
| 71 |
if( ((2*Vr.x*(Or.x - Oc.x))*(2*Vr.x*(Or.x - Oc.x)) - 4*Vr.x*(Or.x - Oc.x)*(Or.x - Oc.x)) = 0) // Discriminant = 0 |
|
| 71 |
if( ((2*Vr.x*(Or.x - Oc.x))*(2*Vr.x*(Or.x - Oc.x)) - 4*Vr.x*(Or.x - Oc.x)*(Or.x - Oc.x)) == 0) // Discriminant = 0
|
|
| 72 | 72 |
{
|
| 73 |
return -((2*Vr.x*(Or.x - Oc.x))*(2*Vr.x*(Or.x - Oc.x))2 - 4*Vr.x*(Or.x - Oc.x)*(Or.x - Oc.x)) / (2*Vr.x));
|
|
| 73 |
return (-((2*Vr.x*(Or.x - Oc.x))*(2*Vr.x*(Or.x - Oc.x))2 - 4*Vr.x*(Or.x - Oc.x)*(Or.x - Oc.x)) / (2*Vr.x)));
|
|
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 | 76 |
|
Also available in: Unified diff