diff --git a/dust3d.pro b/dust3d.pro index 70981631..a60efbed 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -398,6 +398,21 @@ HEADERS += src/preferences.h HEADERS += src/shadervertex.h +SOURCES += src/scripteditwidget.cpp +HEADERS += src/scripteditwidget.h + +SOURCES += src/scriptvariableswidget.cpp +HEADERS += src/scriptvariableswidget.h + +SOURCES += src/scriptwidget.cpp +HEADERS += src/scriptwidget.h + +SOURCES += src/scriptrunner.cpp +HEADERS += src/scriptrunner.h + +SOURCES += src/variablesxml.cpp +HEADERS += src/variablesxml.h + SOURCES += src/updateschecker.cpp HEADERS += src/updateschecker.h @@ -741,6 +756,22 @@ HEADERS += thirdparty/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2 SOURCES += thirdparty/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp HEADERS += thirdparty/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h +INCLUDEPATH += thirdparty/quickjs/quickjs-2019-07-09-dust3d + +DEFINES += "CONFIG_VERSION=\"\\\"2019-07-09\\\"\"" + +SOURCES += thirdparty/quickjs/quickjs-2019-07-09-dust3d/quickjs.c +HEADERS += thirdparty/quickjs/quickjs-2019-07-09-dust3d/quickjs.h + +SOURCES += thirdparty/quickjs/quickjs-2019-07-09-dust3d/cutils.c +HEADERS += thirdparty/quickjs/quickjs-2019-07-09-dust3d/cutils.h + +SOURCES += thirdparty/quickjs/quickjs-2019-07-09-dust3d/libunicode.c +HEADERS += thirdparty/quickjs/quickjs-2019-07-09-dust3d/libunicode.h + +SOURCES += thirdparty/quickjs/quickjs-2019-07-09-dust3d/libregexp.c +HEADERS += thirdparty/quickjs/quickjs-2019-07-09-dust3d/libregexp.h + INCLUDEPATH += thirdparty/crc64 SOURCES += thirdparty/crc64/crc64.c diff --git a/languages/dust3d_zh_CN.ts b/languages/dust3d_zh_CN.ts index d02f909e..13619237 100644 --- a/languages/dust3d_zh_CN.ts +++ b/languages/dust3d_zh_CN.ts @@ -398,6 +398,10 @@ Tips: Toggle Color 打开/关闭颜色 + + Script + 脚本 + ExportPreviewWidget diff --git a/resources.qrc b/resources.qrc index bbb815bd..0f0cd02e 100644 --- a/resources.qrc +++ b/resources.qrc @@ -14,6 +14,7 @@ resources/model-meerkat.ds3 resources/model-mosquito.ds3 resources/model-seagull.ds3 + resources/model-procedural-tree.ds3 resources/triangle.png resources/quad.png resources/pentagon.png @@ -25,6 +26,7 @@ shaders/default.frag shaders/default.core.vert shaders/default.core.frag + thirdparty/three.js/dust3d.three.js languages/dust3d_zh_CN.qm ACKNOWLEDGEMENTS.html AUTHORS diff --git a/resources/model-procedural-tree.ds3 b/resources/model-procedural-tree.ds3 new file mode 100755 index 00000000..3e3c29a9 --- /dev/null +++ b/resources/model-procedural-tree.ds3 @@ -0,0 +1,881 @@ +DUST3D 1.0 xml 0000000257 + + + +