Update to duketape-cc

bin/CMakeLists.txt

@@ -1,9 +1,14 @@
-find_package(Duktape)
-find_package(Dukglue)
+find_package(Duktapecc)
 find_package(Raylib)
 
-list(APPEND LIBS raylib duktape dukglue raylib-js-h)
-list(APPEND SOURCES raylib-js.cpp ${duktape_SOURCE_DIR}/extras/console/duk_console.c)
+list(APPEND LIBS raylib duktapecc raylib-js-h)
+list(APPEND SOURCES raylib-js.cpp)
 add_executable(raylib-js ${SOURCES})
 
 target_link_libraries(raylib-js ${LIBS})
+
+
+set_target_properties(raylib-js PROPERTIES
+	CXX_STANDARD 17
+	CXX_EXTENSIONS OFF
+	)

bin/raylib-js.cpp

@@ -2,8 +2,9 @@
 #include <string>
 
 #include "raylib.h"
-#include <duktape.h>
-#include <console/duk_console.h>
+#include <duktape/duktape.hh>
+#include <duktape/mod/mod.stdio.hh>
+#include <duktape/mod/mod.stdlib.hh>
 #include "raylib-js.h"
 
 int main(int argc, char *argv[])
@@ -44,19 +45,20 @@ int main(int argc, char *argv[])
     }
 
     // Construct the Duktape environment.
-    duk_context* ctx = duk_create_heap_default();
-
-    // Initialize the console module.
-    duk_console_init(ctx, 0);
+    duktape::engine js;
+    duktape::mod::stdio::define_in(js);
+    duktape::mod::stdlib::define_in(js);
 
     // Initialize the raylib module.
-    duk_module_raylib_init(ctx);
+    raylibjs::define_in(js);
 
     // Eval the loaded code.
-	dukglue_peval<void>(ctx, contents.c_str());
-
-    // Destroy the environment.
-	duk_destroy_heap(ctx);
+    try {
+	   js.eval<void>(contents.c_str());
+    }
+    catch (const duktape::script_error& e) {
+        std::cout << "Caught '" << e.what() << "'" << std::endl;
+    }
 
     return 0;
 }

cmake/FindDuktapecc.cmake

@@ -0,0 +1,16 @@
+find_package(duktapecc 2.5 QUIET)
+if (NOT duktapecc_FOUND)
+  include(FetchContent)
+  FetchContent_Declare(
+    duktapecc
+    GIT_REPOSITORY https://github.com/stfwi/duktape-cc.git
+    GIT_TAG 4b8d73dc8501779ed85a38c5586bc34ba14eca61
+  )
+  FetchContent_GetProperties(duktapecc)
+  if (NOT duktapecc_POPULATED) # Have we downloaded raylib yet?
+    set(FETCHCONTENT_QUIET NO)
+    FetchContent_Populate(duktapecc)
+    add_library(duktapecc ${duktapecc_SOURCE_DIR}/duktape/duktape.c)
+    target_include_directories(duktapecc PUBLIC ${duktapecc_SOURCE_DIR})
+  endif()
+endif()

cmake/FindRaylib.cmake

@@ -4,7 +4,7 @@ if (NOT raylib_FOUND)
   FetchContent_Declare(
     raylib
     GIT_REPOSITORY https://github.com/raysan5/raylib.git
-    GIT_TAG f3555a1016ec67105d67959a55b0fd9fda29fd25
+    GIT_TAG 5d9df629d79458423faf249b952e595ed68d669b
   )
   FetchContent_GetProperties(raylib)
   if (NOT raylib_POPULATED) # Have we downloaded raylib yet?

include/CMakeLists.txt

@@ -12,3 +12,5 @@ install(FILES
 )
 
 target_include_directories(raylib-js-h INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_dependencies(raylib-js-h duktapecc)

include/raylib-js-structs.h

@@ -2,13 +2,119 @@
 #define RAYLIB_JS_STRUCTS_H__
 
 #include <raylib.h>
-#include <duktape.h>
-#include <dukglue/dukglue.h>
-#include <dukglue/detail_primitive_types.h>
+#include <duktape/duktape.hh>
 
-namespace dukglue {
-namespace types {
+namespace raylibjs {
 
+static void define_structs_vector2(duktape::engine& js) {
+    js.define(
+        duktape::native_object<Vector2>("Vector2")
+        .method("toString", [](duktape::api& stack, Vector2& instance) {
+            stack.push(std::string("Vector2{x:")
+                + std::to_string(instance.x)
+                + std::string(",y:")
+                + std::to_string(instance.y)
+                + std::string("}"));
+            return 1;
+        })
+        /*.constructor([](duktape::api& stack) {
+            if(stack.top()==0) {
+                Vector2 v;
+                return v;
+            } else if(stack.top()==2) {
+                Vector2 v;
+                v.x = stack.get<float>(0);
+                v.y = stack.get<float>(1);
+                return v;
+            } else {
+                throw duktape::script_error("Vector2 constructor needs either none or two arguments (x,y)");
+            }
+        })
+        .getter("x", [](duktape::api& stack, Vector2& instance){
+            stack.push(instance.x);
+        })
+        .getter("y", [](duktape::api& stack, Vector2& instance){
+            stack.push(instance.y);
+        })
+        .setter("x", [](duktape::api& stack, Vector2& instance){
+            instance.x = stack.get<float>(-1);
+        })
+        .setter("y", [](duktape::api& stack, Vector2& instance){
+            instance.y = stack.get<float>(-1);
+        })*/
+    );
+};
+
+
+template <typename=void>
+static void define_structs(duktape::engine& js) {
+    define_structs_vector2(js);
+};
+
+}
+
+/*
+template <> struct conv<Vector2>
+{
+    using type = Vector2;
+
+    static constexpr const char* cc_name() noexcept
+    {
+        return "Vector2";
+    }
+
+    static constexpr const char* ecma_name() noexcept
+    {
+        return "Vector2";
+    }
+
+    static constexpr int nret() noexcept
+    {
+        return 1;
+    }
+
+    static bool is(duk_context* ctx, int index)
+    {
+        auto js = duktape::api(ctx);
+        return js.is_object(index) && js.has_prop_string(index, "x") && js.has_prop_string(index, "y");
+    }
+
+    static type get(duk_context* ctx, int index)
+    {
+        type out;
+        auto js = duktape::api(ctx);
+        js.get_prop_string(index, "x");
+        out.x = js.get_number(-1);
+        js.get_prop_string(index, "y");
+        out.y = js.get_number(-1);
+        return out;
+    }
+
+    static type req(duk_context* ctx, int index)
+    {
+        return get(ctx, index);
+    }
+
+    static type to(duk_context* ctx, int index)
+    {
+        return get(ctx, index);
+    }
+
+    static void push(duk_context* ctx, type val)
+    {
+        auto js = duktape::api(ctx);
+
+        js.push_object();
+        js.push_number(ctx, value.x);
+        js.put_prop_string(ctx, "x");
+        js.push_number(ctx, value.y);
+        js.put_prop_string(ctx, "y");
+
+    }
+};
+*/
+
+/*
 template<>
 struct DukType<::Vector2> {
     typedef std::true_type IsValueType;
@@ -383,6 +489,7 @@ struct DukType<Camera2D> {
         duk_put_prop_string(ctx, obj_idx, "zoom");
     }
 };
+*/
 
 // TODO: Add Font
 // TODO: Add RenderTexture2D
@@ -407,7 +514,4 @@ struct DukType<Camera2D> {
 // TODO: Add Music
 // TODO: Add VrDeviceInfo
 
-}
-}
-
 #endif

include/raylib-js.h

@@ -3,17 +3,19 @@
 
 #include <iostream>
 
-#include <duktape.h>
-#include <dukglue/dukglue.h>
-#include <dukglue/detail_primitive_types.h>
+#include <duktape/duktape.hh>
 
 #include "raylib-js-structs.h"
 #include "raylib-js-globals.h"
 #include "raylib-js-functions.h"
 
-void duk_module_raylib_init(duk_context* ctx) {
-    raylib_js_globals(ctx);
-    raylib_js_register_functions(ctx);
+namespace raylibjs {
+	template <typename=void>
+	static void define_in(duktape::engine& js) {
+		define_globals(js);
+		define_functions(js);
+		define_structs(js);
+	}
 }
 
 #endif

tests/CMakeLists.txt

@@ -29,11 +29,10 @@ macro(ADD_CATCH_TESTS executable)
 endmacro()
 
 
-find_package(Duktape)
-find_package(Dukglue)
+find_package(Duktapecc)
 find_package(Raylib)
 
-list(APPEND LIBS raylib duktape dukglue raylib-js-h)
+list(APPEND LIBS raylib duktapecc raylib-js-h)
 list(APPEND SOURCES raylib-js-test.cpp)
 add_executable(raylib-js-test ${SOURCES})
 

tests/raylib-js-test.cpp

@@ -1,32 +1,36 @@
 #define CATCH_CONFIG_MAIN
 #include "catch.hpp"
 #include "raylib.h"
-#include <duktape.h>
-#include <dukglue/dukglue.h>
+#include <duktape/duktape.hh>
 #include "raylib-js.h"
 
 TEST_CASE("raylib-js", "[raylib-js]") {
     // Create the Duktape environment.
-    duk_context* ctx = duk_create_heap_default();
+    duktape::engine js;
 
     // Register the raylib.js context.
-    duk_module_raylib_init(ctx);
+    raylibjs::define_in(js);
+
+    SECTION("Vector2") {
+        float x = js.eval<float>("var v = Vector2(200, 100); return v.x;")
+        REQUIRE(x == 200);
+    }
+
+    SECTION("Color") {
+        int r = js.eval<int>("RAYWHITE.r");
+        REQUIRE(r == RAYWHITE.r);
+    }
 
     SECTION("IsWindowReady()") {
-        bool output = dukglue_peval<bool>(ctx, "IsWindowReady()");
+        bool output = js.eval<bool>("IsWindowReady()");
         REQUIRE(output == false);
     }
 
     SECTION("GetRandomValue(10,20)") {
-        int output = dukglue_peval<int>(ctx, "GetRandomValue(10,20)");
+        int output = js.eval<int>("GetRandomValue(10,20)");
         REQUIRE(output >= 10);
         REQUIRE(output <= 20);
     }
 
-    SECTION("Color") {
-        int r = dukglue_peval<int>(ctx, "RAYWHITE.r");
-        REQUIRE(r == RAYWHITE.r);
-    }
-
     duk_destroy_heap(ctx);
 }