diff --git a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C index 86cfd920d04b48d78a675ab4f52de3569dc21862..001a6aaf9a60c5d9abe2797a8525ffed5282824c 100644 --- a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C +++ b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2021-2022 OpenCFD Ltd. + Copyright (C) 2021-2024 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -70,7 +70,7 @@ static tmp<vectorField> getBoundedColours const scalar boundMax ) { - const label boundDelta = (boundMax - boundMin + ROOTVSMALL); + const scalar boundDelta = (boundMax - boundMin + ROOTVSMALL); auto tresult = tmp<vectorField>::New(field.size()); auto& result = tresult.ref(); @@ -167,7 +167,7 @@ Foam::scalarMinMax Foam::coordSetWriters::gltfWriter::getFieldLimits { const dictionary fieldDict = fieldInfoDict_.subOrEmptyDict(fieldName); - scalarMinMax limits; + scalarMinMax limits(-GREAT, GREAT); fieldDict.readIfPresent("min", limits.min()); fieldDict.readIfPresent("max", limits.max()); @@ -191,7 +191,7 @@ Foam::coordSetWriters::gltfWriter::getAlphaField { // Not specified } - else if (!eptr->stream().peek().isString()) + else if (!eptr->stream().peek().isWord()) { // Value specified diff --git a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H index 48f3c9ab616087b0b80df42d06fdfe57044e7987..62ea57d1df70ce5462e22d813c54f2a43376c19b 100644 --- a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H +++ b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2021-2022 OpenCFD Ltd. + Copyright (C) 2021-2024 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -45,24 +45,27 @@ Description \verbatim formatOptions { - // Apply colours flag (yes | no ) [optional] - colours yes; - - // List of options per field - fieldInfo + gltf { - p - { - // Colour map [optional] - colourMap <colourMap>; - - // Colour map minimum and maximum limits [optional] - // Uses field min and max if not specified - min 0; - max 1; + // Apply colours flag (yes | no ) [optional] + colour yes; - // Alpha channel [optional] (<scalar>) - alpha 0.5; + // List of options per field + fieldInfo + { + p + { + // Colour map [optional] + colourMap <colourMap>; + + // Colour map minimum and maximum limits [optional] + // Uses field min and max if not specified + min 0; + max 1; + + // Alpha channel [optional] (<scalar>) + alpha 0.5; + } } } } @@ -73,35 +76,38 @@ Description \verbatim formatOptions { - // Apply colours flag (yes | no) [optional] - colours yes; + gltf + { + // Apply colours flag (yes | no) [optional] + colour yes; - // Animate tracks (yes | no) [optional] - animate yes; + // Animate tracks (yes | no) [optional] + animate yes; - // Animation properties [optional] - animationInfo - { - // Colour map [optional] - colourMap <colourMap>; + // Animation properties [optional] + animationInfo + { + // Colour map [optional] + colourMap <colourMap>; - // Colour [optional] (<vector> | uniform | field) - colour (1 0 0); // RGB in range [0-1] + // Colour [optional] (<vector> | uniform | field) + colour (1 0 0); // RGB in range [0-1] - //colour uniform; - //colourValue (1 0 0); // RGB in range [0-1] + //colour uniform; + //colourValue (1 0 0); // RGB in range [0-1] - //colour field; - //colourField d; + //colour field; + //colourField d; - // Colour map minimum and maximum limits [optional] - // Note: for colour = field option - // Uses field min and max if not specified - min 0; - max 1; + // Colour map minimum and maximum limits [optional] + // Note: for colour = field option + // Uses field min and max if not specified + min 0; + max 1; - // Alpha channel [optional] (<scalar>) - alpha 0.5; + // Alpha channel [optional] (<scalar>) + alpha 0.5; + } } } \endverbatim