m_olib.c OK (#167)

* m_olib.c OK

* ran format.py

* added functions to header file

* updated graphics macros in two overlays to make them work with format.py

* rename z64camera.h to m_camera2.h

* made recommended changes

1 files changed, 18 insertions, 15 deletions

diff --git a/include/m_olib.h b/include/m_olib.h
index 1f25530..0c10d46 100644
--- a/include/m_olib.h
+++ b/include/m_olib.h
@@ -2,21 +2,24 @@
 #define M_OLIB_H
 
 #include "ultra64.h"
+#include "m_lib.h"
+#include "libc64/math64.h"
+#include "m_camera2.h"
 
-// void distance_between();
-// void distance_between2();
-// void distance_2d();
-// void never_zero();
-// void limiter();
-// void unitvector_by_2pos();
-// void spolar2world();
-// void sglobe2world();
-// void world2spolar();
-// void world2sglobe();
-// void spolar_by_2pos();
-// void sglobe_by_2pos();
-// void radianxy_by_2pos();
-// void degreexy_by_2pos();
-// void sanglexy_by_2pos();
+f32 distance_between(xyz_t* a, xyz_t* b);
+f32 distance_between2(xyz_t* a, xyz_t* b, xyz_t* dest);
+f32 distance_2d(xyz_t* a, xyz_t* b);
+f32 never_zero(f32 val, f32 min);
+f32 limiter(f32 val, f32 max);
+xyz_t unitvector_by_2pos(xyz_t* a, xyz_t* b);
+xyz_t spolar2world(VecSph* sph);
+xyz_t sglobe2world(VecGeo* geo);
+VecSph world2spolar(xyz_t* vec);
+VecGeo world2sglobe(xyz_t* vec);
+VecSph spolar_by_2pos(xyz_t* a, xyz_t* b);
+VecGeo sglobe_by_2pos(xyz_t* a, xyz_t* b);
+xyz_t radianxy_by_2pos(xyz_t* a, xyz_t* b);
+xyz_t degreexy_by_2pos(xyz_t* a, xyz_t* b);
+s_xyz sanglexy_by_2pos(xyz_t* a, xyz_t* b);
 
 #endif