diff --git a/graphics/zeno/Makefile b/graphics/zeno/Makefile new file mode 100644 index 000000000000..d7d47b49da51 --- /dev/null +++ b/graphics/zeno/Makefile @@ -0,0 +1,42 @@ +PORTNAME= zeno +DISTVERSION= 2023.11.16 +CATEGORIES= graphics + +MAINTAINER= freebsd@sysctl.cz +COMMENT= Zen node system - a simulation +WWW= https://zenustech.com/ + +LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= openmpi>0:net/openmpi \ + cgal>=5.0.2:math/cgal \ + onetbb>0:devel/onetbb \ + openvdb>0:misc/openvdb + +USES= cmake compiler:c++17-lang localbase:ldflags eigen:3 qt:5 +USE_QT= buildtools core widgets gui linguisttools network opengl svg qmake +USE_GITHUB= yes +USE_LDCONFIG= yes +GH_ACCOUNT= zenustech + +CMAKE_ON= ZENO_BUILD_EDITOR ZENO_MULTIPROCESS \ + ZENO_BUILD_SHARED ZENO_USE_CCACHE ZENO_NO_WARNING \ + ZENO_IPC_USE_TCP +CMAKE_OFF= ZENO_BUILD_DESIGNER ZENO_BUILD_PLAYER ZENO_INSTALL_TARGET \ + ZENO_WITH_CUDA ZENO_MARCH_NATIVE ZENO_USE_FAST_MATH \ + ZENO_OPTIX_PROC ZENO_WIN32_RC + # ZENO_BUILD_DESIGNER - bug https://github.com/zenustech/zeno/issues/1907 + + # fix on 13.3: "ld: error: undefined reference due to --no-allow-shlib-undefined: +LDFLAGS+= -Wl,--allow-shlib-undefined -L${LOCALBASE}/lib -lomp + +PLIST_FILES= bin/zenoedit \ + bin/autotest \ + lib/libzeno.so +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/zenoedit ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/autotest ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKDIR}/.build/bin/libzeno.so ${STAGEDIR}${PREFIX}/lib + +.include diff --git a/graphics/zeno/distinfo b/graphics/zeno/distinfo new file mode 100644 index 000000000000..09c74176f292 --- /dev/null +++ b/graphics/zeno/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1713709608 +SHA256 (zenustech-zeno-2023.11.16_GH0.tar.gz) = ab6cf15c4daaf5afdf98fe5f25b9d9ceabee665c2fd0450227d22c5060e4696e +SIZE (zenustech-zeno-2023.11.16_GH0.tar.gz) = 87281411 diff --git a/graphics/zeno/files/patch-CMakeLists.txt b/graphics/zeno/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..508f9b91bea9 --- /dev/null +++ b/graphics/zeno/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2023-11-22 19:17:26 UTC ++++ CMakeLists.txt +@@ -26,6 +26,9 @@ if (PROJECT_BINARY_DIR STREQUAL PROJECT_SOURCE_DIR) + "Otherwise ZENO may fail to build, or make Git hard to exclude binary files.") + endif() + ++#set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") ++#set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") ++ + option(ZENO_BUILD_EDITOR "Build ZENO editor" ON) + option(ZENO_BUILD_DESIGNER "Build ZENO designer" OFF) + option(ZENO_BUILD_PLAYER "Build ZENO player" OFF) diff --git a/graphics/zeno/files/patch-ui_zenodesign_CMakeLists.txt b/graphics/zeno/files/patch-ui_zenodesign_CMakeLists.txt new file mode 100644 index 000000000000..ebabd0014646 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenodesign_CMakeLists.txt @@ -0,0 +1,11 @@ +--- ui/zenodesign/CMakeLists.txt.orig 2024-04-22 14:05:16 UTC ++++ ui/zenodesign/CMakeLists.txt +@@ -22,7 +22,7 @@ endif (WIN32) + + file(GLOB_RECURSE source CONFIGURE_DEPENDS *.h *.cpp *.ui) + file(GLOB_RECURSE resource CONFIGURE_DEPENDS *.qrc) +-qt5_add_big_resources(source ${resource}) # cihou msvc: fatal error C1060: compiler is out of heap space ++#qt5_add_big_resources(source ${resource}) # cihou msvc: fatal error C1060: compiler is out of heap space + + add_executable(zenodesign ${source}) + target_include_directories(zenodesign PRIVATE ../3rdparty ../zenoui ../editor) diff --git a/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp b/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp new file mode 100644 index 000000000000..0009b9a9a259 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp @@ -0,0 +1,18 @@ +--- ui/zenodesign/layertreeitemdelegate.cpp.orig 2023-11-22 19:17:26 UTC ++++ ui/zenodesign/layertreeitemdelegate.cpp +@@ -1,7 +1,7 @@ + #include "framework.h" + #include "layerwidget.h" + #include "layertreeitemdelegate.h" +- ++#include "zenostyle.h" + + LayerTreeitemDelegate::LayerTreeitemDelegate(QWidget* parent) + : QStyledItemDelegate(parent), m_treeview(nullptr) +@@ -211,4 +211,4 @@ QSize LayerTreeitemDelegate::sizeHint(const QStyleOpti + void LayerTreeitemDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const + { + QStyledItemDelegate::initStyleOption(option, index); +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenodesign_layerwidget.cpp b/graphics/zeno/files/patch-ui_zenodesign_layerwidget.cpp new file mode 100644 index 000000000000..87c7ea5dc16f --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenodesign_layerwidget.cpp @@ -0,0 +1,18 @@ +--- ui/zenodesign/layerwidget.cpp.orig 2024-04-22 15:08:52 UTC ++++ ui/zenodesign/layerwidget.cpp +@@ -5,7 +5,7 @@ + #include "layertreeitemdelegate.h" + #include "nodeswidget.h" + #include "util.h" +- ++#include "zenostyle.h" + + NodesView* getCurrentView(QWidget* pWidget) + { +@@ -88,4 +88,4 @@ void LayerWidget::resetModel() + m_pLayer->setSelectionModel(selection); + m_pLayer->expandAll(); + } +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenodesign_zpropertiespanel.cpp b/graphics/zeno/files/patch-ui_zenodesign_zpropertiespanel.cpp new file mode 100644 index 000000000000..69517df23310 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenodesign_zpropertiespanel.cpp @@ -0,0 +1,18 @@ +--- ui/zenodesign/zpropertiespanel.cpp.orig 2024-04-22 15:11:05 UTC ++++ ui/zenodesign/zpropertiespanel.cpp +@@ -5,7 +5,7 @@ + #include "styletabwidget.h" + #include "nodesview.h" + #include "nodeswidget.h" +- ++#include "zenostyle.h" + + DesignerMainWin* getMainWindow(QWidget* pWidget) + { +@@ -564,4 +564,4 @@ ZElementPropPanel::ZElementPropPanel(QWidget* parent) + pVBoxLayout->addStretch(); + + setLayout(pVBoxLayout); +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_offlinemain.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_offlinemain.cpp new file mode 100644 index 000000000000..6b01f066bad5 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_offlinemain.cpp @@ -0,0 +1,10 @@ +--- ui/zenoedit/launch/offlinemain.cpp.orig 2024-04-26 16:52:52 UTC ++++ ui/zenoedit/launch/offlinemain.cpp +@@ -14,6 +14,7 @@ + #include + #include "util/apphelper.h" + #include "launch/ztcpserver.h" ++#include "zenoapplication.h" + + int offline_main(const QCoreApplication& app); + int offline_main(const QCoreApplication& app) { diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp new file mode 100644 index 000000000000..e06da93187c3 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp @@ -0,0 +1,14 @@ +--- ui/zenoedit/launch/viewdecode.cpp.orig 2024-04-23 11:14:37 UTC ++++ ui/zenoedit/launch/viewdecode.cpp +@@ -1,4 +1,4 @@ +-#ifdef ZENO_MULTIPROCESS ++//#ifdef ZENO_MULTIPROCESS + #include "viewdecode.h" + #include "zenoapplication.h" + #include +@@ -335,4 +335,4 @@ void viewDecodeAppend(const char *buf, size_t n) + zeno::log_debug("viewDecodeAppend n={}", n); + viewDecodeData.append(buf, n); + } +-#endif ++//#endif diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.h b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.h new file mode 100644 index 000000000000..8740668a906b --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.h @@ -0,0 +1,15 @@ +--- ui/zenoedit/launch/viewdecode.h.orig 2024-04-23 11:14:05 UTC ++++ ui/zenoedit/launch/viewdecode.h +@@ -1,10 +1,10 @@ + #pragma once + +-#ifdef ZENO_MULTIPROCESS ++//#ifdef ZENO_MULTIPROCESS + #include + + void viewDecodeClear(); + void viewDecodeAppend(const char *buf, size_t n); + void viewDecodeSetFrameCache(const char *path, int gcmax); + void viewDecodeFinish(); +-#endif ++//#endif diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp new file mode 100644 index 000000000000..5da73615e8b9 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp @@ -0,0 +1,14 @@ +--- ui/zenoedit/launch/ztcpserver.cpp.orig 2024-04-23 11:08:52 UTC ++++ ui/zenoedit/launch/ztcpserver.cpp +@@ -1,4 +1,4 @@ +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + #include + #include + #include "ztcpserver.h" +@@ -443,4 +443,4 @@ void ZTcpServer::onProcFinished(int exitCode, QProcess + emit runFinished(); + } + +-#endif ++//#endif diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.h b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.h new file mode 100644 index 000000000000..db6000efa04c --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.h @@ -0,0 +1,19 @@ +--- ui/zenoedit/launch/ztcpserver.h.orig 2024-04-23 11:07:59 UTC ++++ ui/zenoedit/launch/ztcpserver.h +@@ -1,7 +1,7 @@ + #ifndef __ZCORE_TCPSERVER_H__ + #define __ZCORE_TCPSERVER_H__ + +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + + #include + #include +@@ -52,6 +52,6 @@ private slots: (private) + int m_port; + }; + +-#endif ++//#endif + + #endif diff --git a/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp b/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp new file mode 100644 index 000000000000..ec33cb89838e --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp @@ -0,0 +1,17 @@ +--- ui/zenoedit/nodesys/zenonode.cpp.orig 2024-04-26 16:28:26 UTC ++++ ui/zenoedit/nodesys/zenonode.cpp +@@ -35,6 +35,7 @@ + #include "settings/zenosettingsmanager.h" + #include + #include ++#include + + + ZenoNode::ZenoNode(const NodeUtilParam ¶ms, QGraphicsItem *parent) +@@ -2079,4 +2080,4 @@ void ZenoNode::onCustomNameChanged() + m_pCategoryItem->setText(text); + ZGraphicsLayout::updateHierarchy(m_pCategoryItem); + } +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp b/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp new file mode 100644 index 000000000000..9c0d47f63196 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp @@ -0,0 +1,10 @@ +--- ui/zenoedit/recordmain.cpp.orig 2024-04-26 16:42:36 UTC ++++ ui/zenoedit/recordmain.cpp +@@ -15,6 +15,7 @@ + #include + #include "common.h" + #include ++#include "zenoapplication.h" + + + //--record true --zsg "C:\zeno\framenum.zsg" --cachePath "C:\tmp" --sframe 0 --frame 10 --sample 1 --optix 1 --path "C:\recordpath" --pixel 4500x3500 --aov 0 --needDenoise 0 diff --git a/graphics/zeno/files/patch-ui_zenoedit_updaterequest_zsnetthread.cpp b/graphics/zeno/files/patch-ui_zenoedit_updaterequest_zsnetthread.cpp new file mode 100644 index 000000000000..39eb9a58ba96 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_updaterequest_zsnetthread.cpp @@ -0,0 +1,18 @@ +--- ui/zenoedit/updaterequest/zsnetthread.cpp.orig 2024-04-22 13:39:23 UTC ++++ ui/zenoedit/updaterequest/zsnetthread.cpp +@@ -37,7 +37,7 @@ void ZsNetThread::run() + + void ZsNetThread::netGet() + { +-#ifdef __linux__ ++#if defined( __linux__) || defined(__FreeBSD__) + return; + #else + CURL* curl; +@@ -73,4 +73,4 @@ void ZsNetThread::netGet() + + emit netReqFinish(data, m_id); + #endif +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp new file mode 100644 index 000000000000..ed94fac2c266 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp @@ -0,0 +1,21 @@ +--- ui/zenoedit/util/apphelper.cpp.orig 2024-04-26 16:44:07 UTC ++++ ui/zenoedit/util/apphelper.cpp +@@ -11,7 +11,11 @@ + #include + #include + #include "viewport/zoptixviewport.h" ++#include "timeline/ztimeline.h" ++#include "zenomodel/include/curveutil.h" ++#include "zenomodel/include/nodesmgr.h" + ++#include "zenoapplication.h" + + QModelIndexList AppHelper::getSubInOutNode(IGraphsModel* pModel, const QModelIndex& subgIdx, const QString& sockName, bool bInput) + { +@@ -494,4 +498,4 @@ void AppHelper::dumpTabsToZsg(QDockWidget* dockWidget, + } + } + } +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h new file mode 100644 index 000000000000..99086973c203 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h @@ -0,0 +1,31 @@ +--- ui/zenoedit/util/apphelper.h.orig 2024-04-26 16:22:35 UTC ++++ ui/zenoedit/util/apphelper.h +@@ -2,19 +2,16 @@ + #define __ZENOEDIT_HELPER__ + + #include +-#include "zenoapplication.h" + #include + #include +-#include "zenomainwindow.h" + #include + #include +-#include +-#include + #include "launch/corelaunch.h" + #include "settings/zsettings.h" + #include "viewport/recordvideomgr.h" + #include "panel/zenospreadsheet.h" +- ++class ZVecEditorItem; ++class ViewPortWidget; + class AppHelper + { + public: +@@ -37,4 +34,4 @@ class AppHelper (public) + }; + + +-#endif +\ No newline at end of file ++#endif diff --git a/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp b/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp new file mode 100644 index 000000000000..4eb6ece7f46d --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp @@ -0,0 +1,14 @@ +--- ui/zenoedit/viewportinteraction/nodesync.cpp.orig 2024-04-26 16:47:28 UTC ++++ ui/zenoedit/viewportinteraction/nodesync.cpp +@@ -1,3 +1,4 @@ ++#include "zenoapplication.h" + #include "nodesync.h" + #include + +@@ -205,4 +206,4 @@ std::string NodeSyncMgr::getPrimSockName(NodeLocation& + return getPrimSockName(node_type.toStdString()); + } + +-} +\ No newline at end of file ++} diff --git a/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp new file mode 100644 index 000000000000..78db1c85294b --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp @@ -0,0 +1,32 @@ +--- ui/zenoedit/zenoapplication.cpp.orig 2024-04-23 10:56:09 UTC ++++ ui/zenoedit/zenoapplication.cpp +@@ -13,9 +13,9 @@ + + ZenoApplication::ZenoApplication(int &argc, char **argv) + : QApplication(argc, argv) +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + , m_server(nullptr) +-#endif ++//#endif + , m_bUIApp(true) + { + initMetaTypes(); +@@ -173,7 +173,7 @@ QStandardItemModel* ZenoApplication::logModel() const + return graphsManagment()->logModel(); + } + +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + ZTcpServer* ZenoApplication::getServer() + { + if (!m_server) { +@@ -182,7 +182,7 @@ ZTcpServer* ZenoApplication::getServer() + } + return m_server; + } +-#endif ++//#endif + + ZenoMainWindow* ZenoApplication::getMainWindow() + { diff --git a/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.h b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.h new file mode 100644 index 000000000000..9d0bc740cbdd --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.h @@ -0,0 +1,45 @@ +--- ui/zenoedit/zenoapplication.h.orig 2023-11-22 19:17:26 UTC ++++ ui/zenoedit/zenoapplication.h +@@ -3,15 +3,15 @@ + + #include + #include "zwidgetostream.h" ++#include "zenomainwindow.h" + #include "cache/zcachemgr.h" + #include "uilogic/procclipboard.h" + #include + + class GraphsManagment; +-class ZenoMainWindow; +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + class ZTcpServer; +-#endif ++//#endif + + class ZenoApplication : public QApplication + { +@@ -26,9 +26,9 @@ class ZenoApplication : public QApplication (public) + QWidget* getWindow(const QString& objName); + std::shared_ptr cacheMgr() const; + std::shared_ptr procClipboard() const; +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + ZTcpServer* getServer(); +-#endif ++//#endif + QStandardItemModel* logModel() const; + bool isUIApplication() const { return m_bUIApp; } + +@@ -39,9 +39,9 @@ private slots: (private) + QString readQss(const QString& qssPath); + void initMetaTypes(); + +-#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) ++//#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) + ZTcpServer* m_server; +-#endif ++//#endif + std::shared_ptr m_spUILogStream; + std::shared_ptr m_spCacheMgr; + std::shared_ptr m_spProcClipboard; diff --git a/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp b/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp new file mode 100644 index 000000000000..28655e79d20e --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp @@ -0,0 +1,11 @@ +--- ui/zenoedit/zenomainwindow.cpp.orig 2024-04-22 13:07:02 UTC ++++ ui/zenoedit/zenomainwindow.cpp +@@ -1467,7 +1467,7 @@ void ZenoMainWindow::onZenovisFrameUpdate(bool bGLView + + void ZenoMainWindow::onCheckUpdate() + { +-#ifdef __linux__ ++#if defined( __linux__) || defined(__FreeBSD__) + return; + #else + ZCheckUpdateDlg dlg(this); diff --git a/graphics/zeno/files/patch-zeno_include_zeno_utils_PropertyVisitor.h b/graphics/zeno/files/patch-zeno_include_zeno_utils_PropertyVisitor.h new file mode 100644 index 000000000000..6a096943b480 --- /dev/null +++ b/graphics/zeno/files/patch-zeno_include_zeno_utils_PropertyVisitor.h @@ -0,0 +1,19 @@ +--- zeno/include/zeno/utils/PropertyVisitor.h.orig 2024-04-25 15:55:29 UTC ++++ zeno/include/zeno/utils/PropertyVisitor.h +@@ -396,12 +396,12 @@ namespace zeno { + } + + if constexpr (IsSharedPtr()) { +- if (!bIsOptional || Primitive->userData().has(KeyName)) { +- ValueRef = Primitive->userData().get(KeyName); ++ if (!bIsOptional || Primitive->userData().template has(KeyName)) { ++ ValueRef = Primitive->userData().template get(KeyName); + } + } else { +- if (!bIsOptional || Primitive->userData().has(KeyName)) { +- ValueRef = Primitive->userData().get2(KeyName); ++ if (!bIsOptional || Primitive->userData().template has(KeyName)) { ++ ValueRef = Primitive->userData().template get2(KeyName); + } + } + }; diff --git a/graphics/zeno/files/patch-zeno_src_extra_GlobalComm.cpp b/graphics/zeno/files/patch-zeno_src_extra_GlobalComm.cpp new file mode 100644 index 000000000000..a15914f4a00a --- /dev/null +++ b/graphics/zeno/files/patch-zeno_src_extra_GlobalComm.cpp @@ -0,0 +1,10 @@ +--- zeno/src/extra/GlobalComm.cpp.orig 2024-04-21 08:28:40 UTC ++++ zeno/src/extra/GlobalComm.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #ifdef __linux__ + #include + #include diff --git a/graphics/zeno/files/patch-zenovis_src_Scene.cpp b/graphics/zeno/files/patch-zenovis_src_Scene.cpp new file mode 100644 index 000000000000..b5f0794c8bf9 --- /dev/null +++ b/graphics/zeno/files/patch-zenovis_src_Scene.cpp @@ -0,0 +1,12 @@ +--- zenovis/src/Scene.cpp.orig 2024-04-22 12:39:31 UTC ++++ zenovis/src/Scene.cpp +@@ -12,7 +12,9 @@ + #include + #include + #include ++#ifdef ZENO_ENABLE_OPTIX + #include "../xinxinoptix/xinxinoptixapi.h" ++#endif + #include + #include + diff --git a/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp b/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp new file mode 100644 index 000000000000..49761eabee9a --- /dev/null +++ b/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp @@ -0,0 +1,14 @@ +--- zenovis/src/optx/RenderEngineOptx.cpp.orig 2024-04-22 12:40:25 UTC ++++ zenovis/src/optx/RenderEngineOptx.cpp +@@ -1,10 +1,10 @@ ++#ifdef ZENO_ENABLE_OPTIX + #include "optixPathTracer.h" + #include "vec_math.h" + #include "xinxinoptixapi.h" + #include "zeno/utils/vec.h" + #include + #include +-#ifdef ZENO_ENABLE_OPTIX + #include "../../xinxinoptix/xinxinoptixapi.h" + #include "../../xinxinoptix/SDK/sutil/sutil.h" + #include diff --git a/graphics/zeno/pkg-descr b/graphics/zeno/pkg-descr new file mode 100644 index 000000000000..bbe96f0c7ecb --- /dev/null +++ b/graphics/zeno/pkg-descr @@ -0,0 +1 @@ +ZEn NOde system - a simulation & rendering engine in nodes diff --git a/graphics/zeno/zeno2023.diff b/graphics/zeno/zeno2023.diff new file mode 100644 index 000000000000..e69de29bb2d1