/[svn]/linuxsampler/trunk/src/scriptvm/ScriptVM.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/scriptvm/ScriptVM.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3581 by schoenebeck, Fri Aug 30 11:40:25 2019 UTC revision 3590 by schoenebeck, Mon Sep 2 09:03:31 2019 UTC
# Line 170  namespace LinuxSampler { Line 170  namespace LinuxSampler {
170          m_fnSort = new CoreVMFunction_sort;          m_fnSort = new CoreVMFunction_sort;
171          m_fnIntToReal = new CoreVMFunction_int_to_real;          m_fnIntToReal = new CoreVMFunction_int_to_real;
172          m_fnRealToInt = new CoreVMFunction_real_to_int;          m_fnRealToInt = new CoreVMFunction_real_to_int;
173            m_fnRound = new CoreVMFunction_round;
174            m_fnCeil = new CoreVMFunction_ceil;
175            m_fnFloor = new CoreVMFunction_floor;
176            m_fnSqrt = new CoreVMFunction_sqrt;
177            m_fnLog = new CoreVMFunction_log;
178            m_fnLog2 = new CoreVMFunction_log2;
179            m_fnLog10 = new CoreVMFunction_log10;
180            m_fnExp = new CoreVMFunction_exp;
181            m_fnPow = new CoreVMFunction_pow;
182            m_fnSin = new CoreVMFunction_sin;
183            m_fnCos = new CoreVMFunction_cos;
184            m_fnTan = new CoreVMFunction_tan;
185            m_fnAsin = new CoreVMFunction_asin;
186            m_fnAcos = new CoreVMFunction_acos;
187            m_fnAtan = new CoreVMFunction_atan;
188      }      }
189    
190      ScriptVM::~ScriptVM() {      ScriptVM::~ScriptVM() {
# Line 191  namespace LinuxSampler { Line 206  namespace LinuxSampler {
206          delete m_fnSort;          delete m_fnSort;
207          delete m_fnIntToReal;          delete m_fnIntToReal;
208          delete m_fnRealToInt;          delete m_fnRealToInt;
209            delete m_fnRound;
210            delete m_fnCeil;
211            delete m_fnFloor;
212            delete m_fnSqrt;
213            delete m_fnLog;
214            delete m_fnLog2;
215            delete m_fnLog10;
216            delete m_fnExp;
217            delete m_fnPow;
218            delete m_fnSin;
219            delete m_fnCos;
220            delete m_fnTan;
221            delete m_fnAsin;
222            delete m_fnAcos;
223            delete m_fnAtan;
224          delete m_varRealTimer;          delete m_varRealTimer;
225          delete m_varPerfTimer;          delete m_varPerfTimer;
226      }      }
# Line 205  namespace LinuxSampler { Line 235  namespace LinuxSampler {
235          //printf("parserCtx=0x%lx\n", (uint64_t)context);          //printf("parserCtx=0x%lx\n", (uint64_t)context);
236    
237          context->registerBuiltInConstIntVariables( builtInConstIntVariables() );          context->registerBuiltInConstIntVariables( builtInConstIntVariables() );
238            context->registerBuiltInConstRealVariables( builtInConstRealVariables() );
239          context->registerBuiltInIntVariables( builtInIntVariables() );          context->registerBuiltInIntVariables( builtInIntVariables() );
240          context->registerBuiltInIntArrayVariables( builtInIntArrayVariables() );          context->registerBuiltInIntArrayVariables( builtInIntArrayVariables() );
241          context->registerBuiltInDynVariables( builtInDynamicVariables() );          context->registerBuiltInDynVariables( builtInDynamicVariables() );
# Line 333  namespace LinuxSampler { Line 364  namespace LinuxSampler {
364          else if (name == "real") return m_fnIntToReal;          else if (name == "real") return m_fnIntToReal;
365          else if (name == "real_to_int") return m_fnRealToInt;          else if (name == "real_to_int") return m_fnRealToInt;
366          else if (name == "int") return m_fnRealToInt;          else if (name == "int") return m_fnRealToInt;
367            else if (name == "round") return m_fnRound;
368            else if (name == "ceil") return m_fnCeil;
369            else if (name == "floor") return m_fnFloor;
370            else if (name == "sqrt") return m_fnSqrt;
371            else if (name == "log") return m_fnLog;
372            else if (name == "log2") return m_fnLog2;
373            else if (name == "log10") return m_fnLog10;
374            else if (name == "exp") return m_fnExp;
375            else if (name == "pow") return m_fnPow;
376            else if (name == "sin") return m_fnSin;
377            else if (name == "cos") return m_fnCos;
378            else if (name == "tan") return m_fnTan;
379            else if (name == "asin") return m_fnAsin;
380            else if (name == "acos") return m_fnAcos;
381            else if (name == "atan") return m_fnAtan;
382          return NULL;          return NULL;
383      }      }
384    
# Line 374  namespace LinuxSampler { Line 420  namespace LinuxSampler {
420    
421          return m;          return m;
422      }      }
423    
424        std::map<String,vmfloat> ScriptVM::builtInConstRealVariables() {
425            std::map<String,vmfloat> m;
426    
427            m["~NI_MATH_PI"] = M_PI;
428            m["~NI_MATH_E"] = M_E;
429    
430            return m;
431        }
432    
433      VMEventHandler* ScriptVM::currentVMEventHandler() {      VMEventHandler* ScriptVM::currentVMEventHandler() {
434          return m_eventHandler;          return m_eventHandler;
Legend:
Removed from v.3581  
changed lines
  Added in v.3590
  ViewVC Help
Powered by ViewVC