Move nds trig functions to ds-trig.c

bl0ckeduser · Nov 30, 2011 · afd781b · afd781b
1 parent 4ab3e47
commit afd781b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/clown3d-DS.elf b/clown3d-DS.elf
diff --git a/clown3d-DS.nds b/clown3d-DS.nds
diff --git a/ds-trig.c b/ds-trig.c
@@ -0,0 +1,24 @@
+#ifndef PC_TARGET
+
+#include <nds.h>
+
+/* 
+   NDS trigonometry routines.
+   Copied from sin() and cos() in nehe11.cpp, written by Dovoto.
+*/
+
+float my_sin(float angle)
+{
+	int32 s = sinLerp((int)((angle * DEGREES_IN_CIRCLE) / 360.0));
+
+	return f32tofloat(s);
+}
+
+float my_cos(float angle)
+{
+	int32 c = cosLerp((int)((angle * DEGREES_IN_CIRCLE) / 360.0));
+
+	return f32tofloat(c);
+}
+
+#endif
diff --git a/main.c b/main.c
@@ -489,26 +489,3 @@ void runGameFrame(void)
 
 	gc_collect();
 }
-
-#ifndef PC_TARGET
-
-/* The following routines were copied from
-   nehe11.cpp, written by Dovoto, and renamed
-   from sin, cos to my_sin, my_cos because
-   it didn't seem to build otherwise */
-
-float my_sin(float angle)
-{
-	int32 s = sinLerp((int)((angle * DEGREES_IN_CIRCLE) / 360.0));
-
-	return f32tofloat(s);
-}
-
-float my_cos(float angle)
-{
-	int32 c = cosLerp((int)((angle * DEGREES_IN_CIRCLE) / 360.0));
-
-	return f32tofloat(c);
-}
-
-#endif