Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-08-16 10:34:53 -04:00
2 changed files with 3 additions and 1 deletions

View File

@@ -9,7 +9,7 @@ public class CircleFormation extends FormationPattern{
@Override
public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){
if(slots > 1){
float angle = (360f * slotNumber) / slots + slots == 8 ? 22.5f : 0;
float angle = (360f * slotNumber) / slots + (slots == 8 ? 22.5f : 0);
float radius = spacing / (float)Math.sin(180f / slots * Mathf.degRad);
outLocation.set(Angles.trnsx(angle, radius), Angles.trnsy(angle, radius), angle);
}else{