From nobody Sat Aug 5 15:16:49 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJ5lk2CGLz4m8sj; Sat, 5 Aug 2023 15:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJ5lk1v1wz3f8R; Sat, 5 Aug 2023 15:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691248610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EghECvVo+e/qnQJ8wKDg9/AWBK8tEIxQcJzCxzdoMmc=; b=v5kv0oPhvpey1RAk0z1Pef7YV2bGJDa+G9SfufwZGd8XtXgErngwK/Dexs785cZ710aPyr Z6UkaisLwknlNaLEvdXPU8U9uoCVqjWEGPtP7guex8ccNihRIPhxDn/ELuGnezNGHi1XkS D3+dGXswbyXYj658d8UxwPM2sZIVJtWjUsLOCjgjEdaRbrmfVb9Iz+YGmJuz51GJlQ/xuU XJQZlhB8unP0hOq9Lwmh4K1/tb+73zC8C2md3e5avHIN4592nWZpZSs88G//gTiTR0Whf2 y8RBMko95fSUnPntsxkCZ7TumqQ6EN1hz0iuYvXPwwz6HEHjMcUQ3OIU50tjcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691248610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EghECvVo+e/qnQJ8wKDg9/AWBK8tEIxQcJzCxzdoMmc=; b=rGNTgV52beIlPHyUN6bLionlZ6ipfPiAMt3BM698iCWX34n4H41amhZ0Fee+x4fWnpxGIM nYuTb08AXFTo9H0kIH4qJpDkUqUBSQoVf46sG6Y37Xc/2zcYzyqv/dRFvcSNXQxJhhvbpQ Y1Grq4Q5XKzpr1dz13mnurEOKbFpiclwRMG+Sg1cKw5NiqVRwiedcSmMe658D4Ld0Pf927 WYPYpqIe/GRz2QS8lZp8OiEz3jx5MEBb22JK9LTL1yfKl3I0i9BG2rbG17EIRVXaNXi/7s egE+SXuzyfcKYifNCyJiCNya6TVZVOu3FzOYNISULgQETqPZ8OkQWceFHs9iGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691248610; a=rsa-sha256; cv=none; b=ytX2KY8M+V4/HDVNbdVdu2HUOW+xj37QQX1H7PoTzaFfl/WwtV2FGBMOheVSJXGdd0Xifx 7oXJ9JNi6GNh1DAJa916SJQIbvWizrX/WlTF1st0KRJgUiXXcUnqOgYZqYvtabTS68VACc UR3RcYhV1+H+XUR2APE6I4/ADLjk3mO2kCNHlz0JnLpGY9b2G2k4azH/aTBepRotpFCex9 yzyOAXS0Rutc6fpIx16goHpJ5Q1VOCyjjKxxgh7n+CH2ZyKk2XVYGGEuDNEHOm9Kc9U+Jo 8v4GGTowe6k/7QmLQsFjWQD00gyXquoV4yNsH0yBjWs9eBKJfR4p1RnP5mw+JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJ5lk0qJqzZ9W; Sat, 5 Aug 2023 15:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 375FGnIM010312; Sat, 5 Aug 2023 15:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375FGnbw010311; Sat, 5 Aug 2023 15:16:49 GMT (envelope-from git) Date: Sat, 5 Aug 2023 15:16:49 GMT Message-Id: <202308051516.375FGnbw010311@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 30e39d6277fc - main - cad/freecad: update to 0.21.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30e39d6277fcacc32740feaf969a6358b5fa03a4 Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=30e39d6277fcacc32740feaf969a6358b5fa03a4 commit 30e39d6277fcacc32740feaf969a6358b5fa03a4 Author: Christoph Moench-Tegeder AuthorDate: 2023-08-05 15:14:01 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-08-05 15:16:37 +0000 cad/freecad: update to 0.21.0 Release Notes: https://wiki.freecad.org/Release_notes_0.21 --- cad/freecad/Makefile | 44 +- cad/freecad/distinfo | 6 +- .../files/patch-src_Mod_Import_App_ImportOCAF2.h | 10 - .../patch-src_Mod_MeshPart_App_CMakeLists.txt | 12 + .../files/patch-src_Mod_Part_App_OCCError.h | 12 - ...atch-src_Mod_Raytracing_App_AppRaytracingPy.cpp | 38 -- .../patch-src_Mod_Raytracing_App_LuxFeature.cpp | 41 -- .../patch-src_Mod_Raytracing_App_RayFeature.cpp | 30 - cad/freecad/pkg-plist | 678 +++++++++++++-------- 9 files changed, 477 insertions(+), 394 deletions(-) diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index f7e8b0a5d287..7051fac59702 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,9 +1,5 @@ PORTNAME= FreeCAD -DISTVERSION= 0.20.2 -PORTREVISION= 5 -# use these for bugfixes/snapshots -# DISTVERSION= 0.18-16093 # git rev-list --count -# DISTVERSIONSUFFIX= -g690774c0e +DISTVERSION= 0.21.0 CATEGORIES= cad MAINTAINER= cmt@FreeBSD.org @@ -13,14 +9,19 @@ WWW= https://www.freecadweb.org/ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \ +BUILD_DEPENDS= doxygen:devel/doxygen \ + pybind11-config:devel/py-pybind11@${PY_FLAVOR} \ + pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_INCLUDEDIR}/CXX/Config.hxx:devel/py-cxx \ swig:devel/swig LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ ${PY_BOOST} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ + libfmt.so:devel/libfmt \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \ @@ -30,7 +31,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libarea.so:devel/libarea \ libmed.so:french/med \ libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ - libhdf5-110.so:science/hdf5-110 + libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} @@ -41,9 +42,9 @@ USES= dos2unix compiler:c++17-lang cmake cpe gl eigen:3 fortran jpeg \ USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu -USE_QT= buildtools concurrent core declarative gui location network \ - opengl printsupport qmake:build svg webchannel widgets xml \ - xmlpatterns +USE_QT= buildtools concurrent core declarative designer gui \ + linguisttools location network opengl printsupport \ + qmake:build svg webchannel widgets xml xmlpatterns USE_LDCONFIG= yes CPE_VENDOR= freecad_project @@ -53,6 +54,7 @@ VTK_VER= 9.2 DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL SHEBANG_FILES= src/Tools/freecad-thumbnailer +# our HDF5/CMake integration is messy, so workarounds are required below CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \ -DBUILD_QT5="ON" \ @@ -60,16 +62,30 @@ CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ - -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ - -DHDF5_CFLAGS="-I${LOCALBASE}/include/hdf5-110" \ + -DPYCXX_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ + -DBUILD_ASSEMBLY="OFF" \ + -DBUILD_DESIGNER_PLUGIN="ON" \ + -DBUILD_FLAT_MESH="ON" \ + -DBUILD_VR="OFF" \ + -DFREECAD_USE_EXTERNAL_FMT="ON" \ + -DFREECAD_CREATE_MAC_APP="OFF" \ + -DFREECAD_FREECAD_LIBPACK_USE="OFF" \ + -DFREECAD_USE_EXTERNAL_KDL="OFF" \ + -DFREECAD_USE_EXTERNAL_SMESH="OFF" \ + -DFREECAD_USE_FREETYPE="ON" \ + -DFREECAD_USE_PYBIND11="ON" \ + -Dpybind11_DIR="${PYTHON_SITELIBDIR}/pybind11/share/cmake/pybind11" \ + -DHDF5_CFLAGS="-I${LOCALBASE}/include" \ -DHDF5_FOUND=TRUE \ - -DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-110" \ - -DHDF5_LIBRARIES="-L${LOCALBASE}/lib -lhdf5-110" \ + -DHDF5_VERSION="1.12.2" \ + -DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5" \ + -DHDF5_LIBRARIES="-L${LOCALBASE}/lib -lhdf5" \ -DHDF5_LIBRARY_DIRS="${LOCALBASE}/lib" \ -DPYSIDE2RCCBINARY="${RCC}" \ -DPYSIDE2UICBINARY="${UIC}" \ -DBUILD_ENABLE_CXX_STD=C++17 + CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} # Install XDG icons and files to the standard path CMAKE_ARGS+= -DXDG_DATADIR="${PREFIX}/share" diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo index 94f9a3e40388..fbe59cefabec 100644 --- a/cad/freecad/distinfo +++ b/cad/freecad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670364675 -SHA256 (FreeCAD-FreeCAD-0.20.2_GH0.tar.gz) = be3b0be917142d36074f58782b276973890a3fad850bc1db2db99a5ad0c8732b -SIZE (FreeCAD-FreeCAD-0.20.2_GH0.tar.gz) = 75558140 +TIMESTAMP = 1691075290 +SHA256 (FreeCAD-FreeCAD-0.21.0_GH0.tar.gz) = 31a7f9aef99763904d7ffa9fd2d06e2e318e10e5306dac04710234a564fa778b +SIZE (FreeCAD-FreeCAD-0.21.0_GH0.tar.gz) = 66086371 diff --git a/cad/freecad/files/patch-src_Mod_Import_App_ImportOCAF2.h b/cad/freecad/files/patch-src_Mod_Import_App_ImportOCAF2.h deleted file mode 100644 index 807f2c01750e..000000000000 --- a/cad/freecad/files/patch-src_Mod_Import_App_ImportOCAF2.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Mod/Import/App/ImportOCAF2.h.orig 2023-01-21 23:09:25.522104000 +0100 -+++ src/Mod/Import/App/ImportOCAF2.h 2023-01-21 23:09:52.176852000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt b/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt new file mode 100644 index 000000000000..afd5191ccffe --- /dev/null +++ b/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt @@ -0,0 +1,12 @@ +diff --git src/Mod/MeshPart/App/CMakeLists.txt src/Mod/MeshPart/App/CMakeLists.txt +index 6ee9deb4eb..6fb25015e3 100644 +--- src/Mod/MeshPart/App/CMakeLists.txt ++++ src/Mod/MeshPart/App/CMakeLists.txt +@@ -21,6 +21,7 @@ include_directories( + ${PYTHON_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIR} + ${VTK_INCLUDE_DIRS} ++ ${pybind11_INCLUDE_DIR} + ${EIGEN3_INCLUDE_DIR} + ) + diff --git a/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h b/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h deleted file mode 100644 index 02f00c05cee2..000000000000 --- a/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Mod/Part/App/OCCError.h.orig 2022-12-06 23:30:48.794152000 +0100 -+++ src/Mod/Part/App/OCCError.h 2022-12-06 23:31:40.841019000 +0100 -@@ -50,7 +50,9 @@ - # include - # include - # include -+# if OCC_VERSION_HEX <= 0x070600 - # include -+# endif - # include - # include - diff --git a/cad/freecad/files/patch-src_Mod_Raytracing_App_AppRaytracingPy.cpp b/cad/freecad/files/patch-src_Mod_Raytracing_App_AppRaytracingPy.cpp deleted file mode 100644 index b2b35586f377..000000000000 --- a/cad/freecad/files/patch-src_Mod_Raytracing_App_AppRaytracingPy.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/Mod/Raytracing/App/AppRaytracingPy.cpp.orig 2019-10-04 10:44:17 UTC -+++ src/Mod/Raytracing/App/AppRaytracingPy.cpp -@@ -105,13 +105,13 @@ class Module : public Py::ExtensionModule (pri - - PovTools::writeShape(out,PartName,aShape,(float)0.1); - // This must not be done in PovTools::writeShape! -- out << "// instance to render" << endl -- << "object {" << PartName << endl -- << " texture {" << endl -- << " pigment {color rgb <"<}" << endl -- << " finish {StdFinish } //definition on top of the project" << endl -- << " }" << endl -- << "}" << endl ; -+ out << "// instance to render" << std::endl -+ << "object {" << PartName << std::endl -+ << " texture {" << std::endl -+ << " pigment {color rgb <"<}" << std::endl -+ << " finish {StdFinish } //definition on top of the project" << std::endl -+ << " }" << std::endl -+ << "}" << std::endl ; - return Py::String(out.str()); - } - Py::Object getPartAsLux(const Py::Tuple& args) -@@ -128,10 +128,10 @@ class Module : public Py::ExtensionModule (pri - - // write a material entry - // This must not be done in PovTools::writeShape! -- out << "MakeNamedMaterial \"FreeCADMaterial_" << PartName << "\"" << endl; -- out << " \"color Kd\" [" << r << " " << g << " " << b << "]" << endl; -- out << " \"float sigma\" [0.000000000000000]" << endl; -- out << " \"string type\" [\"matte\"]" << endl << endl; -+ out << "MakeNamedMaterial \"FreeCADMaterial_" << PartName << "\"" << std::endl; -+ out << " \"color Kd\" [" << r << " " << g << " " << b << "]" << std::endl; -+ out << " \"float sigma\" [0.000000000000000]" << std::endl; -+ out << " \"string type\" [\"matte\"]" << std::endl << std::endl; - - LuxTools::writeShape(out,PartName,aShape,(float)0.1); - return Py::String(out.str()); diff --git a/cad/freecad/files/patch-src_Mod_Raytracing_App_LuxFeature.cpp b/cad/freecad/files/patch-src_Mod_Raytracing_App_LuxFeature.cpp deleted file mode 100644 index 96118c364569..000000000000 --- a/cad/freecad/files/patch-src_Mod_Raytracing_App_LuxFeature.cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- src/Mod/Raytracing/App/LuxFeature.cpp.orig 2019-10-04 10:45:53 UTC -+++ src/Mod/Raytracing/App/LuxFeature.cpp -@@ -88,23 +88,23 @@ App::DocumentObjectExecReturn *LuxFeature::execute(voi - const App::Color& c = Color.getValue(); - long t = Transparency.getValue(); - if (t == 0) { -- result << "MakeNamedMaterial \"FreeCADMaterial_" << Name << "\"" << endl -- << " \"color Kd\" [" << c.r << " " << c.g << " " << c.b << "]" << endl -- << " \"float sigma\" [0.000000000000000]" << endl -- << " \"string type\" [\"matte\"]" << endl << endl; -+ result << "MakeNamedMaterial \"FreeCADMaterial_" << Name << "\"" << std::endl -+ << " \"color Kd\" [" << c.r << " " << c.g << " " << c.b << "]" << std::endl -+ << " \"float sigma\" [0.000000000000000]" << std::endl -+ << " \"string type\" [\"matte\"]" << std::endl << std::endl; - } else { - float trans = t/100.0f; -- result << "MakeNamedMaterial \"FreeCADMaterial_Base_" << Name << "\"" << endl -- << " \"color Kd\" [" << c.r << " " << c.g << " " << c.b << "]" << endl -- << " \"float sigma\" [0.000000000000000]" << endl -- << " \"string type\" [\"matte\"]" << endl << endl -- << "MakeNamedMaterial \"FreeCADMaterial_Null_" << Name << "\"" << endl -- << " \"string type\" [\"null\"]" << endl << endl -- << "MakeNamedMaterial \"FreeCADMaterial_" << Name << "\"" << endl -- << " \"string namedmaterial1\" [\"FreeCADMaterial_Null_" << Name << "\"]" << endl -- << " \"string namedmaterial2\" [\"FreeCADMaterial_Base_" << Name << "\"]" << endl -- << " \"float amount\" [" << trans << "]" << endl -- << " \"string type\" [\"mix\"]" << endl << endl; -+ result << "MakeNamedMaterial \"FreeCADMaterial_Base_" << Name << "\"" << std::endl -+ << " \"color Kd\" [" << c.r << " " << c.g << " " << c.b << "]" << std::endl -+ << " \"float sigma\" [0.000000000000000]" << std::endl -+ << " \"string type\" [\"matte\"]" << std::endl << std::endl -+ << "MakeNamedMaterial \"FreeCADMaterial_Null_" << Name << "\"" << std::endl -+ << " \"string type\" [\"null\"]" << std::endl << std::endl -+ << "MakeNamedMaterial \"FreeCADMaterial_" << Name << "\"" << std::endl -+ << " \"string namedmaterial1\" [\"FreeCADMaterial_Null_" << Name << "\"]" << std::endl -+ << " \"string namedmaterial2\" [\"FreeCADMaterial_Base_" << Name << "\"]" << std::endl -+ << " \"float amount\" [" << trans << "]" << std::endl -+ << " \"string type\" [\"mix\"]" << std::endl << std::endl; - } - - LuxTools::writeShape(result,Name.c_str(),shape); diff --git a/cad/freecad/files/patch-src_Mod_Raytracing_App_RayFeature.cpp b/cad/freecad/files/patch-src_Mod_Raytracing_App_RayFeature.cpp deleted file mode 100644 index 92c0f65afdfe..000000000000 --- a/cad/freecad/files/patch-src_Mod_Raytracing_App_RayFeature.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- src/Mod/Raytracing/App/RayFeature.cpp.orig 2019-10-04 10:45:11 UTC -+++ src/Mod/Raytracing/App/RayFeature.cpp -@@ -81,19 +81,19 @@ App::DocumentObjectExecReturn *RayFeature::execute(voi - // This must not be done in PovTools::writeShape! - long t = Transparency.getValue(); - const App::Color& c = Color.getValue(); -- result << "// instance to render" << endl -- << "object {" << Name << endl -- << " texture {" << endl; -+ result << "// instance to render" << std::endl -+ << "object {" << Name << std::endl -+ << " texture {" << std::endl; - if (t == 0) { -- result << " pigment {color rgb <"<}" << endl; -+ result << " pigment {color rgb <"<}" << std::endl; - } - else { - float trans = t/100.0f; -- result << " pigment {color rgb <"< transmit "< transmit "<