Merge pull request #210 from krunt/origin/_v8

    unify v8 and node rtScript code

Author: jmgasper

examples/pxScene2d/src/init.js

@@ -17,6 +17,7 @@ limitations under the License.
 */
 
 var isDuk = (typeof Duktape != "undefined")?true:false;
+var isV8 = (typeof _isV8 != "undefined")?true:false;
 
 if (isDuk) {
 global.console = require('console');

examples/pxScene2d/src/pxScene2d.cpp

@@ -3804,16 +3804,12 @@ void pxScriptView::runScript()
 
   if (mCtx)
   {
-#ifdef PXSCENE_V8_TEST
     mPrintFunc = new rtFunctionCallback(printFunc, this);
-#endif
     mGetScene = new rtFunctionCallback(getScene,  this);
     mMakeReady = new rtFunctionCallback(makeReady, this);
     mGetContextID = new rtFunctionCallback(getContextID, this);
 
-#ifdef PXSCENE_V8_TEST
     mCtx->add("print", mPrintFunc.getPtr());
-#endif
     mCtx->add("getScene", mGetScene.getPtr());
     mCtx->add("makeReady", mMakeReady.getPtr());
     mCtx->add("getContextID", mGetContextID.getPtr());
@@ -3822,9 +3818,6 @@ void pxScriptView::runScript()
     mReady = new rtPromise();
 #endif
 
-//#ifdef PXSCENE_V8_TEST
-    //mCtx->runFile(mUrl);
-//#else
     mCtx->runFile("init.js");
 
     char buffer[MAX_URL_SIZE + 50];
@@ -3857,7 +3850,6 @@ void pxScriptView::runScript()
   #endif //ENABLE_RT_NODE
 }
 
-#ifdef PXSCENE_V8_TEST
 rtError pxScriptView::printFunc(int numArgs, const rtValue* args, rtValue* result, void* ctx)
 {
   rtLogInfo(__FUNCTION__);
@@ -3875,7 +3867,6 @@ rtError pxScriptView::printFunc(int numArgs, const rtValue* args, rtValue* resul
 
   return RT_OK;
 }
-#endif
 
 rtError pxScriptView::getScene(int numArgs, const rtValue* args, rtValue* result, void* ctx)
 {

examples/pxScene2d/src/pxScene2d.h

@@ -44,8 +44,6 @@
 #include "rtPromise.h"
 #include "rtThreadQueue.h"
 
-#define PXSCENE_V8_TEST // TODO: remove
-
 #define ANIMATION_ROTATE_XYZ
 
 #include "pxResource.h"
@@ -1156,9 +1154,7 @@ class pxScriptView: public pxIView
 
 protected:
 
-#ifdef PXSCENE_V8_TEST
   static rtError printFunc(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
-#endif
 
   static rtError getScene(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
   static rtError makeReady(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
@@ -1276,9 +1272,7 @@ class pxScriptView: public pxIView
   rtObjectRef mReady;
   rtObjectRef mScene;
   rtRef<pxIView> mView;
-#ifdef PXSCENE_V8_TEST
   rtRef<rtFunctionCallback> mPrintFunc;
-#endif
   rtRef<rtFunctionCallback> mGetScene;
   rtRef<rtFunctionCallback> mMakeReady;
   rtRef<rtFunctionCallback> mGetContextID;

examples/pxScene2d/src/rcvrcore/AppSceneContext.js

@@ -19,6 +19,7 @@ limitations under the License.
 //"use strict";
 
 var isDuk=(typeof Duktape != "undefined")?true:false;
+var isV8=(typeof _isV8 != "undefined")?true:false;
 
 var url = require('url');
 var path = require('path');

examples/pxScene2d/src/rcvrcore/utils/AsyncFileAcquisition.js

@@ -19,6 +19,7 @@ limitations under the License.
 "use strict";
 
 var isDuk=(typeof Duktape != "undefined")?true:false;
+var isV8=(typeof _isV8 != "undefined")?true:false;
 var Logger = require('rcvrcore/Logger').Logger;
 var SceneModuleLoader = require('rcvrcore/SceneModuleLoader');
 var log = new Logger('AsyncFileAcquisition');

examples/pxScene2d/src/rcvrcore/utils/FileArchive.js

@@ -19,6 +19,7 @@ limitations under the License.
 "use strict";
 
 var isDuk = (typeof timers != "undefined")?true:false;
+var isV8 = (typeof _isV8 != "undefined")?true:false;
 
 var fs = require('fs');
 var url = require('url');

examples/pxScene2d/src/shell.js

@@ -17,6 +17,7 @@ limitations under the License.
 */
 
 var isDuk=(typeof Duktape != "undefined")?true:false;
+var isV8 = (typeof _isV8 != "undefined")?true:false;
 
 px.import({ scene: 'px:scene.1.js',
              keys: 'px:tools.keys.js'

examples/pxScene2d/src/test_module_binding.js

@@ -17,4 +17,4 @@ uv_timer_start(tm1, 5000, 0, function () { print("OK1"); uv_timer_stop(tm2); });
 
 uv_run_in_context("print(\"in eval context\");");
 
-print("isV8 " + isV8);
+print("isV8 " + _isV8);

src/CMakeLists.txt

@@ -214,16 +214,15 @@ endif()
 if (SUPPORT_NODE)
     message("Adding Node scripting support")
     add_definitions(-DRTSCRIPT_SUPPORT_NODE)
-    set(PXCORE_FILES ${PXCORE_FILES} rtScriptNode/rtScriptNode.cpp rtScriptNode/jsCallback.cpp rtScriptNode/rtFunctionWrapper.cpp 
-        rtScriptNode/rtObjectWrapper.cpp rtScriptNode/rtWrapperUtils.cpp)
+    set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8Node/rtScriptNode.cpp rtScriptV8Node/jsCallback.cpp rtScriptV8Node/rtFunctionWrapper.cpp 
+        rtScriptV8Node/rtObjectWrapper.cpp rtScriptV8Node/rtWrapperUtils.cpp)
 endif()
 
 if (SUPPORT_V8)
     message("Adding V8 scripting support")
     add_definitions(-DRTSCRIPT_SUPPORT_V8)
-    set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8/rtScriptV8.cpp rtScriptV8/jsCallbackV8.cpp 
-    rtScriptV8/rtFunctionWrapperV8.cpp rtScriptV8/rtObjectWrapperV8.cpp rtScriptV8/rtWrapperUtilsV8.cpp
-    rtScriptV8/rtJsModulesV8.cpp)
+    set(PXCORE_FILES ${PXCORE_FILES} rtScriptV8Node/rtScriptV8.cpp rtScriptV8Node/jsCallback.cpp rtScriptV8Node/rtFunctionWrapper.cpp 
+        rtScriptV8Node/rtObjectWrapper.cpp rtScriptV8Node/rtWrapperUtils.cpp)
 endif()
 
 if (PXCORE_MATRIX_HELPERS)

src/rtScript.cpp

@@ -26,12 +26,8 @@
 
 #include "assert.h"
 
-#ifdef RTSCRIPT_SUPPORT_NODE
-#include "rtScriptNode/rtScriptNode.h"
-#endif
-
-#ifdef RTSCRIPT_SUPPORT_V8
-#include "rtScriptV8/rtScriptV8.h"
+#if defined RTSCRIPT_SUPPORT_NODE || defined RTSCRIPT_SUPPORT_V8
+#include "rtScriptV8Node/rtScriptV8Node.h"
 #endif
 
 #ifdef RTSCRIPT_SUPPORT_DUKTAPE