Changeset 59:36d92d21300f

Timestamp:

12/18/09 18:51:44 (2 years ago)

Author:

Thibaut GIRKA <thib@…>

Branch:

default

Message:

Implemented sin opcode

Location:

scn2k

Files:

• scn2k_text.cc (modified) (2 diffs)
• scn2k_text.h (modified) (1 diff)
• scn2k_textimpl.cc (modified) (2 diffs)

scn2k/scn2k_text.cc

@@ -153 +153 @@
         RegisterCommand(1, 4, 510, "ReadFrame", (CmdImpl) &Text::impl_ReadFrame);
         RegisterCommand(1, 4, 620, "InitExFrames", (CmdImpl) &Text::impl_InitFrames);
-        RegisterCommand(1, 4, 624, "InitExFramesDecel", NULL);
+        RegisterCommand(1, 4, 624, "InitExFramesDecel", (CmdImpl) &Text::impl_InitFrames);
         RegisterCommand(1, 4, 630, "ReadExFrames", (CmdImpl) &Text::impl_ReadFrames);
 
@@ -165 +165 @@
         RegisterCommand(1, 4, 1001, "pcnt", (CmdImpl) &Text::impl_pcnt);
         RegisterCommand(1, 4, 1002, "abs", (CmdImpl) &Text::impl_abs);
-        RegisterCommand(1, 4, 1003, "power", NULL);
-        RegisterCommand(1, 4, 1004, "sin", NULL);
+        RegisterCommand(1, 4, 1003, "power", (CmdImpl) &Text::impl_power);
+        RegisterCommand(1, 4, 1004, "sin", (CmdImpl) &Text::impl_sin);
         RegisterCommand(1, 4, 1007, "min", (CmdImpl) &Text::impl_min);
         RegisterCommand(1, 4, 1008, "max", (CmdImpl) &Text::impl_max);

scn2k/scn2k_text.h

@@ -278 +278 @@
                 void impl_abs(Cmd& cmd);
                 void impl_power(Cmd& cmd);
+                void impl_sin(Cmd& cmd);
                 void impl_min(Cmd& cmd);
                 void impl_max(Cmd& cmd);

scn2k/scn2k_textimpl.cc

@@ -335 +335 @@
 }
 
+#include "math.h"
+
 void Text::impl_rnd(Cmd& cmd)
 {
@@ -375 +377 @@
 void Text::impl_power(Cmd& cmd)
 {
-        //TODO
-        //cmd.SetSysvar(pow(cmd.args[0].value, cmd.args[1].value));
+        cmd.SetSysvar(pow(cmd.args[0].value, cmd.args[1].value));
+}
+
+void Text::impl_sin(Cmd& cmd)
+{
+        cmd.SetSysvar(sin(cmd.args[0].value * M_PI / 180) * 32640 / cmd.args[1].value);
 }