From a8a06c48048a21206a6c88a5639ce6daafc2bc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?furby=E2=84=A2?= Date: Wed, 14 Feb 2024 11:39:14 -0600 Subject: [PATCH] Checking swift import validity. * OpenTimelineIO done. * Imath done. * OpenEXR done. * OpenImageIO done. * OpenColorIO done. * ImGui done. * OneTBB done. * Python done. --- .swiftformat | 68 +++++++++++++++++++++++---- Package.swift | 2 + Sources/MetaversalDemo/Creator.swift | 4 +- composite.exr | Bin 1309 -> 1309 bytes 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/.swiftformat b/.swiftformat index 43531ff8..6d2a748d 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,36 +1,84 @@ -# format options - +--acronyms ID,URL,UUID --allman true +--assetliterals visual-width +--asynccapturing +--beforemarks --binarygrouping 4,8 +--categorymark "MARK: %c" +--classthreshold 0 +--closingparen balanced +--closurevoid remove --commas always +--conflictmarkers reject --decimalgrouping 3,6 --elseposition same-line ---voidtype void +--emptybraces no-space +--enumnamespaces always +--enumthreshold 0 --exponentcase lowercase --exponentgrouping disabled +--extensionacl on-extension +--extensionlength 0 +--extensionmark "MARK: - %t + %c" --fractiongrouping disabled ---header "/* --------------------------------------------------------------\n * :: : M E T A V E R S E : ::\n * --------------------------------------------------------------\n * This program is free software; you can redistribute it, and/or\n * modify it under the terms of the GNU General Public License as \n * published by the Free Software Foundation; either version 2 of \n * the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Check out\n * the GNU General Public License for more details.\n *\n * You should have received a copy for this software license, the \n * GNU General Public License along with this program; or, if not\n * write to the Free Software Foundation, Inc., to the address of\n * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n *\n * Copyright (C) 2023 Wabi Foundation. All Rights Reserved.\n * --------------------------------------------------------------\n * . x x x . o o o . x x x . : : : . o x o . : : : .\n * -------------------------------------------------------------- */" +--fragment false +--funcattributes preserve +--generictypes +--groupedextension "MARK: %c" +--guardelse auto +--header "/* ----------------------------------------------------------------\n * :: : M E T A V E R S E : ::\n * ----------------------------------------------------------------\n * This software is Licensed under the terms of the Apache License,\n * version 2.0 (the \"Apache License\") with the following additional\n * modification; you may not use this file except within compliance\n * of the Apache License and the following modification made to it.\n * Section 6. Trademarks. is deleted and replaced with:\n *\n * Trademarks. This License does not grant permission to use any of\n * its trade names, trademarks, service marks, or the product names\n * of this Licensor or its affiliates, except as required to comply\n * with Section 4(c.) of this License, and to reproduce the content\n * of the NOTICE file.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND without even an\n * implied warranty of MERCHANTABILITY, or FITNESS FOR A PARTICULAR\n * PURPOSE. See the Apache License for more details.\n *\n * You should have received a copy for this software license of the\n * Apache License along with this program; or, if not, please write\n * to the Free Software Foundation Inc., with the following address\n * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n *\n * Copyright (C) 2024 Wabi Foundation. All Rights Reserved.\n * ----------------------------------------------------------------\n * . x x x . o o o . x x x . : : : . o x o . : : : .\n * ---------------------------------------------------------------- */" --hexgrouping 4,8 --hexliteralcase uppercase --ifdef indent +--importgrouping testable-last --indent 2 --indentcase true ---importgrouping testable-bottom +--indentstrings true +--lifecycle +--lineaftermarks true --linebreaks lf +--markcategories true +--markextensions always +--marktypes always --maxwidth none +--modifierorder +--nevertrailing +--nospaceoperators +--nowrapoperators --octalgrouping 4,8 --operatorfunc spaced +--organizetypes actor,class,enum,struct --patternlet hoist --ranges spaced +--redundanttype infer-locals-only --self remove +--selfrequired --semicolons inline +--shortoptionals always +--smarttabs enabled +--someAny true --stripunusedargs always +--structthreshold 0 --swiftversion 5.9 +--tabwidth unspecified +--throwcapturing +--trailingclosures --trimwhitespace always +--typeattributes preserve +--typeblanklines remove +--typemark "MARK: - %t" +--varattributes preserve +--voidtype void --wraparguments preserve --wrapcollections preserve ---emptybraces no-space - -# rules - ---enable blankLineAfterImports,docComments,isEmpty,spaceInsideBraces,wrapMultilineStatementBraces \ No newline at end of file +--wrapconditions preserve +--wrapeffects preserve +--wrapenumcases always +--wrapparameters default +--wrapreturntype preserve +--wrapternary default +--wraptypealiases preserve +--xcodeindentation disabled +--yodaswap always +--disable trailingCommas +--enable blankLineAfterImports,docComments,isEmpty diff --git a/Package.swift b/Package.swift index d526c783..1aced0c3 100644 --- a/Package.swift +++ b/Package.swift @@ -624,6 +624,8 @@ let package = Package( name: "MetaversalDemo", dependencies: [ .target(name: "ImGui"), + .target(name: "Imath"), + .target(name: "OpenEXR"), .target(name: "OCIOBundle"), .target(name: "OpenColorIO"), .target(name: "OpenImageIO"), diff --git a/Sources/MetaversalDemo/Creator.swift b/Sources/MetaversalDemo/Creator.swift index 799227d9..c1cd2bf7 100644 --- a/Sources/MetaversalDemo/Creator.swift +++ b/Sources/MetaversalDemo/Creator.swift @@ -28,10 +28,12 @@ * . x x x . o o o . x x x . : : : . o x o . : : : . * ---------------------------------------------------------------- */ +import Imath import ImGui +import OCIOBundle import OpenColorIO +import OpenEXR import OpenImageIO -import OCIOBundle import OpenTime import OpenTimelineIO #if canImport(Python) diff --git a/composite.exr b/composite.exr index 1aca367211584d14980250e061c133ded8acb3dd..01986a7a9e5dd6a81874a35bb6ba62300a236cc5 100644 GIT binary patch delta 18 ZcmbQsHJ59GI=i8jv5}RD!A8CJEC4YB1x)|| delta 18 ZcmbQsHJ59GI=g|Dfr*uo@kYJ(EC4X@1xx?{