diff --git a/clang_format b/clang_format index 90bfd53c4c..c7ad0cddfe 100755 --- a/clang_format +++ b/clang_format @@ -12,4 +12,4 @@ else CLANG_FORMAT="${ARNOLD_USD_CLANG_FORMAT}" fi -find $SUBFOLDER \( -path './cmake-build-*' -o -path './schemas/build' -o -path ./build \) -prune -o -regex '.*\.\(c\|cpp\|cxx\|h\|hpp\|hxx\)' -exec echo Formatting: {} \; -exec $CLANG_FORMAT -style=file -i {} \; +find $SUBFOLDER \( -path './cmake-*' -o -path './schemas/build' -o -path ./build \) -prune -o -regex '.*\.\(c\|cpp\|cxx\|h\|hpp\|hxx\)' -exec echo Formatting: {} \; -exec $CLANG_FORMAT -style=file -i {} \; diff --git a/docs/conventions.md b/docs/conventions.md index 36b0b4bbf5..e2df50fc02 100755 --- a/docs/conventions.md +++ b/docs/conventions.md @@ -9,7 +9,7 @@ comments or file names, this means no accents and special characters. For Python, generally follow the [PEP-8 guidelines](http://www.python.org/dev/peps/pep-0008/). -Use the supplied .clang-format (for clang format 7) and the scripts to format the codebase. +Use the supplied .clang-format using clang-format 9.0.1 to format the codebase. ## File names diff --git a/procedural/main.cpp b/procedural/main.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/instancer.cpp b/render_delegate/instancer.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/light.cpp b/render_delegate/light.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/material.cpp b/render_delegate/material.cpp old mode 100755 new mode 100644 index 4dffdf863f..e25179fa32 --- a/render_delegate/material.cpp +++ b/render_delegate/material.cpp @@ -242,17 +242,12 @@ RemapNodeFunc stringPrimvarRemap = [](MaterialEditContext* ctx) { ctx->RenameParam(str::t_fallback, str::t_defaultStr); }; -const std::unordered_map nodeRemapFuncs { - {str::t_UsdPreviewSurface, previewSurfaceRemap}, - {str::t_UsdUVTexture, uvTextureRemap}, - {str::t_UsdPrimvarReader_float, floatPrimvarRemap}, - {str::t_UsdPrimvarReader_float2, float2PrimvarRemap}, - {str::t_UsdPrimvarReader_float3, float3PrimvarRemap}, - {str::t_UsdPrimvarReader_point, float3PrimvarRemap}, - {str::t_UsdPrimvarReader_normal, float3PrimvarRemap}, - {str::t_UsdPrimvarReader_vector, float3PrimvarRemap}, - {str::t_UsdPrimvarReader_float4, float4PrimvarRemap}, - {str::t_UsdPrimvarReader_int, intPrimvarRemap}, +const std::unordered_map nodeRemapFuncs{ + {str::t_UsdPreviewSurface, previewSurfaceRemap}, {str::t_UsdUVTexture, uvTextureRemap}, + {str::t_UsdPrimvarReader_float, floatPrimvarRemap}, {str::t_UsdPrimvarReader_float2, float2PrimvarRemap}, + {str::t_UsdPrimvarReader_float3, float3PrimvarRemap}, {str::t_UsdPrimvarReader_point, float3PrimvarRemap}, + {str::t_UsdPrimvarReader_normal, float3PrimvarRemap}, {str::t_UsdPrimvarReader_vector, float3PrimvarRemap}, + {str::t_UsdPrimvarReader_float4, float4PrimvarRemap}, {str::t_UsdPrimvarReader_int, intPrimvarRemap}, {str::t_UsdPrimvarReader_string, stringPrimvarRemap}, }; diff --git a/render_delegate/mesh.cpp b/render_delegate/mesh.cpp old mode 100755 new mode 100644 index b214a49de0..6d8bfb07c8 --- a/render_delegate/mesh.cpp +++ b/render_delegate/mesh.cpp @@ -140,7 +140,7 @@ inline void _ConvertFaceVaryingPrimvarToBuiltin( AiNodeSetArray(node, arnoldIndexName, HdArnoldGenerateIdxs(numValues, vertexCounts)); } -} +} // namespace HdArnoldMesh::HdArnoldMesh(HdArnoldRenderDelegate* delegate, const SdfPath& id, const SdfPath& instancerId) : HdMesh(id, instancerId), _shape(str::polymesh, delegate, id, GetPrimId()) diff --git a/render_delegate/nodes/driver.cpp b/render_delegate/nodes/driver.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/nodes/nodes.cpp b/render_delegate/nodes/nodes.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/openvdb_asset.cpp b/render_delegate/openvdb_asset.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/points.cpp b/render_delegate/points.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/render_buffer.cpp b/render_delegate/render_buffer.cpp index 7e76c94394..7634c6dbc5 100644 --- a/render_delegate/render_buffer.cpp +++ b/render_delegate/render_buffer.cpp @@ -129,7 +129,8 @@ inline void _WriteBucket( const auto toStep = width * componentCount; const auto fromStep = bucketWidth * bucketComponentCount; - const auto copyOp = [](const typename HdFormatType::type& in) -> typename HdFormatType::type { + const auto copyOp = [](const typename HdFormatType::type& in) -> typename HdFormatType::type + { return _ConvertType::type, typename HdFormatType::type>(in); }; const auto dataWidth = xe - xo; @@ -162,7 +163,7 @@ using WriteBucketFunction = void (*)( using WriteBucketFunctionMap = std::unordered_map; -WriteBucketFunctionMap writeBucketFunctions { +WriteBucketFunctionMap writeBucketFunctions{ // Write to UNorm8 format. {{HdFormatUNorm8, HdFormatSNorm8}, _WriteBucket}, {{HdFormatUNorm8, HdFormatFloat16}, _WriteBucket}, diff --git a/render_delegate/render_delegate.cpp b/render_delegate/render_delegate.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/render_param.cpp b/render_delegate/render_param.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/render_pass.cpp b/render_delegate/render_pass.cpp old mode 100755 new mode 100644 index 7623b573ed..11e488fa95 --- a/render_delegate/render_pass.cpp +++ b/render_delegate/render_pass.cpp @@ -70,10 +70,9 @@ HdArnoldRenderPass::HdArnoldRenderPass( AiNodeSetPtr(_driver, str::aov_pointer, &_renderBuffers); // Even though we are not displaying the prim id buffer, we still need it to detect background pixels. - _fallbackBuffers = { - {HdAovTokens->color, &_fallbackColor}, - {HdAovTokens->depth, &_fallbackDepth}, - {HdAovTokens->primId, &_fallbackPrimId}}; + _fallbackBuffers = {{HdAovTokens->color, &_fallbackColor}, + {HdAovTokens->depth, &_fallbackDepth}, + {HdAovTokens->primId, &_fallbackPrimId}}; _fallbackOutputs = AiArrayAllocate(3, 1, AI_TYPE_STRING); // Setting up the fallback outputs when no const auto beautyString = TfStringPrintf("RGBA RGBA %s %s", AiNodeGetName(_beautyFilter), AiNodeGetName(_driver)); diff --git a/render_delegate/shape.cpp b/render_delegate/shape.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/utils.cpp b/render_delegate/utils.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/volume.cpp b/render_delegate/volume.cpp old mode 100755 new mode 100644 diff --git a/render_delegate/volume.h b/render_delegate/volume.h old mode 100755 new mode 100644 diff --git a/testsuite/test_0038/data/test.cpp b/testsuite/test_0038/data/test.cpp index c084042aef..52d8553c82 100644 --- a/testsuite/test_0038/data/test.cpp +++ b/testsuite/test_0038/data/test.cpp @@ -1,32 +1,31 @@ #include -#include #include +#include #include int main(int argc, char **argv) { - AiMsgSetConsoleFlags(AI_LOG_ALL); - AiBegin(); + AiMsgSetConsoleFlags(AI_LOG_ALL); + AiBegin(); + + AtUniverse *proc_universe = AiUniverse(); + + AiASSLoad("scene.ass"); + // load the usd procedural (containing a sphere) in a separate universe + AiASSLoad(proc_universe, "usd_proc.ass"); + AtNode *proc_a = AiNode(proc_universe, "usd", "usd_proc_a"); + AiNodeSetStr(proc_a, "filename", "usd_proc_a.usda"); + // Call the viewport API on the usd procedural, and fill the main universe + AiProceduralViewport(proc_a, nullptr, AI_PROC_POLYGONS); + AtNode *proc_b = AiNode(proc_universe, "usd", "usd_proc_b"); + AiNodeSetStr(proc_b, "filename", "usd_proc_b.usda"); + // Call the viewport API on the usd procedural, and fill the main universe + AiProceduralViewport(proc_b, nullptr, AI_PROC_BOXES); - AtUniverse *proc_universe = AiUniverse(); - - AiASSLoad("scene.ass"); - // load the usd procedural (containing a sphere) in a separate universe - AiASSLoad(proc_universe, "usd_proc.ass"); - AtNode *proc_a = AiNode(proc_universe, "usd", "usd_proc_a"); - AiNodeSetStr(proc_a, "filename", "usd_proc_a.usda"); - // Call the viewport API on the usd procedural, and fill the main universe - AiProceduralViewport(proc_a, nullptr, AI_PROC_POLYGONS); - AtNode *proc_b = AiNode(proc_universe, "usd", "usd_proc_b"); - AiNodeSetStr(proc_b, "filename", "usd_proc_b.usda"); - // Call the viewport API on the usd procedural, and fill the main universe - AiProceduralViewport(proc_b, nullptr, AI_PROC_BOXES); - - AiUniverseDestroy(proc_universe); - AiRender(); + AiUniverseDestroy(proc_universe); + AiRender(); - AiEnd(); - return 0; - + AiEnd(); + return 0; } diff --git a/testsuite/test_0039/data/test.cpp b/testsuite/test_0039/data/test.cpp index 7464013d3a..fc3bf85434 100644 --- a/testsuite/test_0039/data/test.cpp +++ b/testsuite/test_0039/data/test.cpp @@ -133,7 +133,8 @@ TEST(HdArnoldRenderBuffer, ConvertingValues) } } -int main(int argc, char** argv) { +int main(int argc, char** argv) +{ testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/testsuite/test_0044/data/test.cpp b/testsuite/test_0044/data/test.cpp index 0bd7507ba4..8fd77e5b7d 100644 --- a/testsuite/test_0044/data/test.cpp +++ b/testsuite/test_0044/data/test.cpp @@ -16,7 +16,8 @@ TEST(NdrArnoldParserPlugin, GetDiscoveryTypes) EXPECT_EQ(plugin.GetDiscoveryTypes(), NdrTokenVec{TfToken("arnold")}); } -int main(int argc, char** argv) { +int main(int argc, char** argv) +{ testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/testsuite/test_0045/data/test.cpp b/testsuite/test_0045/data/test.cpp index e64d674849..18895c55d7 100644 --- a/testsuite/test_0045/data/test.cpp +++ b/testsuite/test_0045/data/test.cpp @@ -21,11 +21,11 @@ TEST(TokenizePath, TokenizePath) { std::vector tokens; TokenizePath("/a;/b", tokens, ";", false); - const std::vector result1 {"/a", "/b"}; + const std::vector result1{"/a", "/b"}; EXPECT_EQ(tokens, result1); tokens.clear(); TokenizePath("/a/b", tokens, ";", false); - const std::vector result2 {"/a/b"}; + const std::vector result2{"/a/b"}; EXPECT_EQ(tokens, result2); } @@ -46,7 +46,8 @@ TEST(UsdArnoldWriterRegistry, UsdArnoldWriterRegistry) } } -int main(int argc, char** argv) { +int main(int argc, char** argv) +{ testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/translator/reader/read_light.cpp b/translator/reader/read_light.cpp old mode 100755 new mode 100644 diff --git a/translator/reader/read_shader.cpp b/translator/reader/read_shader.cpp old mode 100755 new mode 100644 diff --git a/translator/reader/reader.h b/translator/reader/reader.h old mode 100755 new mode 100644 diff --git a/translator/reader/utils.cpp b/translator/reader/utils.cpp old mode 100755 new mode 100644 diff --git a/translator/utils/utils.h b/translator/utils/utils.h old mode 100755 new mode 100644 diff --git a/translator/writer/write_arnold_type.cpp b/translator/writer/write_arnold_type.cpp old mode 100755 new mode 100644