From df4b93198812a2ab6b707f3362016f8559fe2db4 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Tue, 18 Mar 2025 22:54:43 +0000 Subject: [PATCH] Configuration - Resource structure reorganization #429 Reorganized resources to keep source part in src and real-time scripts in resource folder. For the installation result no changes, still installed to src for windows. --- CMakeLists.txt | 4 +- adm/cmake/occt_resources.cmake | 50 +- adm/templates/DRAWEXE.vcxproj.user.in | 6 +- adm/templates/custom.build.bat.in | 2 +- adm/templates/custom.build.sh.in | 2 +- adm/templates/header.in | 3 +- {src => resources}/BOPAlgo/BOPAlgo.msg | 0 resources/BOPAlgo/FILES | 1 + {src => resources}/DrawResources/CURVES.tcl | 0 .../DrawResources/CheckCommands.tcl | 0 {src => resources}/DrawResources/DrawDefault | 0 {src => resources}/DrawResources/DrawPlugin | 0 {src => resources}/DrawResources/DrawTK.tcl | 0 {src => resources}/DrawResources/FILES | 0 {src => resources}/DrawResources/Geometry.tcl | 0 .../DrawResources/InitEnvironment.tcl | 0 {src => resources}/DrawResources/Move.tcl | 0 {src => resources}/DrawResources/OCC_logo.png | Bin {src => resources}/DrawResources/PROFIL.tcl | 0 {src => resources}/DrawResources/SCAN.tcl | 0 {src => resources}/DrawResources/SURFACES.tcl | 0 .../DrawResources/StandardCommands.tcl | 0 .../DrawResources/StandardViews.tcl | 0 .../DrawResources/TKTopTest.tcl | 0 .../DrawResources/TestCommands.tcl | 0 {src => resources}/DrawResources/Vector.tcl | 0 .../DrawResources/dfb_attribns.gif | Bin .../DrawResources/dfb_attribute.gif | Bin .../DrawResources/dfb_folder.gif | Bin {src => resources}/DrawResources/dftree.tcl | 0 {src => resources}/DrawResources/lamp.ico | Bin resources/SHMessage/FILES | 2 + {src => resources}/SHMessage/SHAPE.fr | 0 {src => resources}/SHMessage/SHAPE.us | 0 {src => resources}/Shaders/Declarations.glsl | 0 .../Shaders/DeclarationsImpl.glsl | 0 {src => resources}/Shaders/Display.fs | 0 resources/Shaders/FILES | 27 + {src => resources}/Shaders/LightShadow.glsl | 0 .../Shaders/PBRCookTorrance.glsl | 0 .../Shaders/PBRDirectionalLight.glsl | 0 .../Shaders/PBRDistribution.glsl | 0 {src => resources}/Shaders/PBREnvBaking.fs | 0 {src => resources}/Shaders/PBREnvBaking.vs | 0 {src => resources}/Shaders/PBRFresnel.glsl | 0 {src => resources}/Shaders/PBRGeometry.glsl | 0 .../Shaders/PBRIllumination.glsl | 0 {src => resources}/Shaders/PBRPointLight.glsl | 0 {src => resources}/Shaders/PBRSpotLight.glsl | 0 {src => resources}/Shaders/PathtraceBase.fs | 0 .../Shaders/PhongDirectionalLight.glsl | 0 .../Shaders/PhongPointLight.glsl | 0 {src => resources}/Shaders/PhongShading.fs | 0 {src => resources}/Shaders/PhongShading.vs | 0 .../Shaders/PhongSpotLight.glsl | 0 .../Shaders/PointLightAttenuation.glsl | 0 {src => resources}/Shaders/RaytraceBase.fs | 0 {src => resources}/Shaders/RaytraceBase.vs | 0 {src => resources}/Shaders/RaytraceRender.fs | 0 {src => resources}/Shaders/RaytraceSmooth.fs | 0 .../Shaders/SkydomBackground.fs | 0 .../Shaders/TangentSpaceNormal.glsl | 0 {src => resources}/StdResource/FILES | 0 .../StdResource/MigrationSheet.txt | 0 {src => resources}/StdResource/Plugin | 0 {src => resources}/StdResource/Standard | 0 {src => resources}/StdResource/StandardLite | 0 {src => resources}/StdResource/TObj | 0 {src => resources}/StdResource/XCAF | 0 resources/TObj/FILES | 1 + {src => resources}/TObj/TObj.msg | 0 {src => resources}/Textures/1d_elevation.rgb | Bin .../Textures/2d_MatraDatavision.rgb | Bin {src => resources}/Textures/2d_alienskin.rgb | Bin {src => resources}/Textures/2d_aluminum.rgb | Bin {src => resources}/Textures/2d_blue_rock.rgb | Bin .../Textures/2d_bluewhite_paper.rgb | Bin {src => resources}/Textures/2d_brushed.rgb | Bin {src => resources}/Textures/2d_bubbles.rgb | Bin {src => resources}/Textures/2d_bumps.rgb | Bin {src => resources}/Textures/2d_cast.rgb | Bin {src => resources}/Textures/2d_chess.rgba | Bin {src => resources}/Textures/2d_chipbd.rgb | Bin {src => resources}/Textures/2d_clouds.rgb | Bin {src => resources}/Textures/2d_flesh.rgb | Bin {src => resources}/Textures/2d_floor.rgb | Bin {src => resources}/Textures/2d_galvnisd.rgb | Bin {src => resources}/Textures/2d_grass.rgb | Bin {src => resources}/Textures/2d_knurl.rgb | Bin {src => resources}/Textures/2d_maple.rgb | Bin {src => resources}/Textures/2d_marble.rgb | Bin {src => resources}/Textures/2d_mottled.rgb | Bin {src => resources}/Textures/2d_rain.rgb | Bin {src => resources}/Textures/2d_rock.rgb | Bin resources/Textures/FILES | 31 + {src => resources}/Textures/env_clouds.rgb | Bin {src => resources}/Textures/env_cv.rgb | Bin {src => resources}/Textures/env_lines.rgb | Bin {src => resources}/Textures/env_medit.rgb | Bin {src => resources}/Textures/env_pearl.rgb | Bin {src => resources}/Textures/env_road.rgb | Bin {src => resources}/Textures/env_sky1.rgb | Bin {src => resources}/Textures/env_sky2.rgb | Bin {src => resources}/UnitsAPI/CurrentUnits | 0 resources/UnitsAPI/FILES | 4 + {src => resources}/UnitsAPI/MDTVBaseUnits | 0 {src => resources}/UnitsAPI/MDTVCurrentUnits | 0 {src => resources}/UnitsAPI/Units.dat | 0 {src => resources}/XRResources/FILES | 0 .../XRResources/occtvr_actions.json | 0 .../XRResources/occtvr_bindings_generic.json | 0 .../occtvr_bindings_holographic_hmd.json | 0 .../occtvr_bindings_index_hmd.json | 0 .../XRResources/occtvr_bindings_rift.json | 0 .../XRResources/occtvr_bindings_touch.json | 0 .../XRResources/occtvr_bindings_vive.json | 0 .../occtvr_bindings_vive_controller.json | 0 .../occtvr_bindings_vive_cosmos.json | 0 .../XRResources/occtvr_bindings_vive_pro.json | 0 resources/XSMessage/FILES | 2 + {src => resources}/XSMessage/XSTEP.fr | 0 {src => resources}/XSMessage/XSTEP.us | 0 {src => resources}/XSTEPResource/FILES | 0 {src => resources}/XSTEPResource/IGES | 0 {src => resources}/XSTEPResource/STEP | 0 {src => resources}/XmlOcafResource/FILES | 0 .../XmlOcafResource/XmlOcaf.xsd | 0 .../XmlOcafResource/XmlOcaf_SmallTypes.xsd | 0 .../XmlOcafResource/XmlOcaf_TDF.xsd | 0 .../XmlOcafResource/XmlOcaf_TDataStd.xsd | 0 .../XmlOcafResource/XmlOcaf_TDataStd_Name.xsd | 0 .../XmlOcafResource/XmlOcaf_TDocStd.xsd | 0 .../XmlOcafResource/XmlOcaf_TFunction.xsd | 0 .../XmlOcafResource/XmlOcaf_TNaming.xsd | 0 .../XmlOcaf_TNaming_NamedShape.xsd | 0 .../XmlOcafResource/XmlOcaf_TPrsStd.xsd | 0 .../XmlOcafResource/XmlXcaf.xsd | 0 src/BOPAlgo/BOPAlgo_BOPAlgo_msg.pxx | 14 +- src/BOPAlgo/FILES | 1 - src/SHMessage/FILES | 2 - src/SHMessage/SHMessage_SHAPE_fr.pxx | 273 ++++ src/SHMessage/SHMessage_SHAPE_us.pxx | 5 +- src/Shaders/FILES | 27 - src/Shaders/Shaders_DeclarationsImpl_glsl.pxx | 51 +- src/Shaders/Shaders_Declarations_glsl.pxx | 44 +- src/Shaders/Shaders_Display_fs.pxx | 14 +- src/Shaders/Shaders_LightShadow_glsl.pxx | 26 +- src/Shaders/Shaders_PBRCookTorrance_glsl.pxx | 5 +- .../Shaders_PBRDirectionalLight_glsl.pxx | 6 +- src/Shaders/Shaders_PBRDistribution_glsl.pxx | 8 +- src/Shaders/Shaders_PBREnvBaking_fs.pxx | 25 +- src/Shaders/Shaders_PBREnvBaking_vs.pxx | 5 +- src/Shaders/Shaders_PBRFresnel_glsl.pxx | 5 +- src/Shaders/Shaders_PBRGeometry_glsl.pxx | 5 +- src/Shaders/Shaders_PBRIllumination_glsl.pxx | 8 +- src/Shaders/Shaders_PBRPointLight_glsl.pxx | 5 +- src/Shaders/Shaders_PBRSpotLight_glsl.pxx | 11 +- src/Shaders/Shaders_PathtraceBase_fs.pxx | 113 +- .../Shaders_PhongDirectionalLight_glsl.pxx | 6 +- src/Shaders/Shaders_PhongPointLight_glsl.pxx | 8 +- src/Shaders/Shaders_PhongShading_fs.pxx | 197 +++ src/Shaders/Shaders_PhongShading_vs.pxx | 49 + src/Shaders/Shaders_PhongSpotLight_glsl.pxx | 8 +- .../Shaders_PointLightAttenuation_glsl.pxx | 15 +- src/Shaders/Shaders_RaytraceBase_fs.pxx | 119 +- src/Shaders/Shaders_RaytraceBase_vs.pxx | 30 +- src/Shaders/Shaders_RaytraceRender_fs.pxx | 5 +- src/Shaders/Shaders_RaytraceSmooth_fs.pxx | 8 +- src/Shaders/Shaders_SkydomBackground_fs.pxx | 7 +- .../Shaders_TangentSpaceNormal_glsl.pxx | 17 +- src/TObj/FILES | 1 - src/TObj/TObj_TObj_msg.pxx | 5 +- src/Textures/FILES | 31 - src/UnitsAPI/FILES | 4 - src/UnitsAPI/UnitsAPI_Units_dat.pxx | 1262 ++++++----------- src/XSMessage/FILES | 2 - src/XSMessage/XSMessage_XSTEP_fr.pxx | 1032 ++++++++++++++ src/XSMessage/XSMessage_XSTEP_us.pxx | 258 ++-- 178 files changed, 2413 insertions(+), 1439 deletions(-) rename {src => resources}/BOPAlgo/BOPAlgo.msg (100%) create mode 100644 resources/BOPAlgo/FILES rename {src => resources}/DrawResources/CURVES.tcl (100%) rename {src => resources}/DrawResources/CheckCommands.tcl (100%) rename {src => resources}/DrawResources/DrawDefault (100%) rename {src => resources}/DrawResources/DrawPlugin (100%) rename {src => resources}/DrawResources/DrawTK.tcl (100%) rename {src => resources}/DrawResources/FILES (100%) rename {src => resources}/DrawResources/Geometry.tcl (100%) rename {src => resources}/DrawResources/InitEnvironment.tcl (100%) rename {src => resources}/DrawResources/Move.tcl (100%) rename {src => resources}/DrawResources/OCC_logo.png (100%) rename {src => resources}/DrawResources/PROFIL.tcl (100%) rename {src => resources}/DrawResources/SCAN.tcl (100%) rename {src => resources}/DrawResources/SURFACES.tcl (100%) rename {src => resources}/DrawResources/StandardCommands.tcl (100%) rename {src => resources}/DrawResources/StandardViews.tcl (100%) rename {src => resources}/DrawResources/TKTopTest.tcl (100%) rename {src => resources}/DrawResources/TestCommands.tcl (100%) rename {src => resources}/DrawResources/Vector.tcl (100%) rename {src => resources}/DrawResources/dfb_attribns.gif (100%) rename {src => resources}/DrawResources/dfb_attribute.gif (100%) rename {src => resources}/DrawResources/dfb_folder.gif (100%) rename {src => resources}/DrawResources/dftree.tcl (100%) rename {src => resources}/DrawResources/lamp.ico (100%) create mode 100755 resources/SHMessage/FILES rename {src => resources}/SHMessage/SHAPE.fr (100%) rename {src => resources}/SHMessage/SHAPE.us (100%) rename {src => resources}/Shaders/Declarations.glsl (100%) rename {src => resources}/Shaders/DeclarationsImpl.glsl (100%) rename {src => resources}/Shaders/Display.fs (100%) create mode 100644 resources/Shaders/FILES rename {src => resources}/Shaders/LightShadow.glsl (100%) rename {src => resources}/Shaders/PBRCookTorrance.glsl (100%) rename {src => resources}/Shaders/PBRDirectionalLight.glsl (100%) rename {src => resources}/Shaders/PBRDistribution.glsl (100%) rename {src => resources}/Shaders/PBREnvBaking.fs (100%) rename {src => resources}/Shaders/PBREnvBaking.vs (100%) rename {src => resources}/Shaders/PBRFresnel.glsl (100%) rename {src => resources}/Shaders/PBRGeometry.glsl (100%) rename {src => resources}/Shaders/PBRIllumination.glsl (100%) rename {src => resources}/Shaders/PBRPointLight.glsl (100%) rename {src => resources}/Shaders/PBRSpotLight.glsl (100%) rename {src => resources}/Shaders/PathtraceBase.fs (100%) rename {src => resources}/Shaders/PhongDirectionalLight.glsl (100%) rename {src => resources}/Shaders/PhongPointLight.glsl (100%) rename {src => resources}/Shaders/PhongShading.fs (100%) rename {src => resources}/Shaders/PhongShading.vs (100%) rename {src => resources}/Shaders/PhongSpotLight.glsl (100%) rename {src => resources}/Shaders/PointLightAttenuation.glsl (100%) rename {src => resources}/Shaders/RaytraceBase.fs (100%) rename {src => resources}/Shaders/RaytraceBase.vs (100%) rename {src => resources}/Shaders/RaytraceRender.fs (100%) rename {src => resources}/Shaders/RaytraceSmooth.fs (100%) rename {src => resources}/Shaders/SkydomBackground.fs (100%) rename {src => resources}/Shaders/TangentSpaceNormal.glsl (100%) rename {src => resources}/StdResource/FILES (100%) rename {src => resources}/StdResource/MigrationSheet.txt (100%) rename {src => resources}/StdResource/Plugin (100%) rename {src => resources}/StdResource/Standard (100%) rename {src => resources}/StdResource/StandardLite (100%) rename {src => resources}/StdResource/TObj (100%) rename {src => resources}/StdResource/XCAF (100%) create mode 100755 resources/TObj/FILES rename {src => resources}/TObj/TObj.msg (100%) rename {src => resources}/Textures/1d_elevation.rgb (100%) rename {src => resources}/Textures/2d_MatraDatavision.rgb (100%) rename {src => resources}/Textures/2d_alienskin.rgb (100%) rename {src => resources}/Textures/2d_aluminum.rgb (100%) rename {src => resources}/Textures/2d_blue_rock.rgb (100%) rename {src => resources}/Textures/2d_bluewhite_paper.rgb (100%) rename {src => resources}/Textures/2d_brushed.rgb (100%) rename {src => resources}/Textures/2d_bubbles.rgb (100%) rename {src => resources}/Textures/2d_bumps.rgb (100%) rename {src => resources}/Textures/2d_cast.rgb (100%) rename {src => resources}/Textures/2d_chess.rgba (100%) rename {src => resources}/Textures/2d_chipbd.rgb (100%) rename {src => resources}/Textures/2d_clouds.rgb (100%) rename {src => resources}/Textures/2d_flesh.rgb (100%) rename {src => resources}/Textures/2d_floor.rgb (100%) rename {src => resources}/Textures/2d_galvnisd.rgb (100%) rename {src => resources}/Textures/2d_grass.rgb (100%) rename {src => resources}/Textures/2d_knurl.rgb (100%) rename {src => resources}/Textures/2d_maple.rgb (100%) rename {src => resources}/Textures/2d_marble.rgb (100%) rename {src => resources}/Textures/2d_mottled.rgb (100%) rename {src => resources}/Textures/2d_rain.rgb (100%) rename {src => resources}/Textures/2d_rock.rgb (100%) create mode 100755 resources/Textures/FILES rename {src => resources}/Textures/env_clouds.rgb (100%) rename {src => resources}/Textures/env_cv.rgb (100%) rename {src => resources}/Textures/env_lines.rgb (100%) rename {src => resources}/Textures/env_medit.rgb (100%) rename {src => resources}/Textures/env_pearl.rgb (100%) rename {src => resources}/Textures/env_road.rgb (100%) rename {src => resources}/Textures/env_sky1.rgb (100%) rename {src => resources}/Textures/env_sky2.rgb (100%) rename {src => resources}/UnitsAPI/CurrentUnits (100%) create mode 100755 resources/UnitsAPI/FILES rename {src => resources}/UnitsAPI/MDTVBaseUnits (100%) rename {src => resources}/UnitsAPI/MDTVCurrentUnits (100%) rename {src => resources}/UnitsAPI/Units.dat (100%) rename {src => resources}/XRResources/FILES (100%) rename {src => resources}/XRResources/occtvr_actions.json (100%) rename {src => resources}/XRResources/occtvr_bindings_generic.json (100%) rename {src => resources}/XRResources/occtvr_bindings_holographic_hmd.json (100%) rename {src => resources}/XRResources/occtvr_bindings_index_hmd.json (100%) rename {src => resources}/XRResources/occtvr_bindings_rift.json (100%) rename {src => resources}/XRResources/occtvr_bindings_touch.json (100%) rename {src => resources}/XRResources/occtvr_bindings_vive.json (100%) rename {src => resources}/XRResources/occtvr_bindings_vive_controller.json (100%) rename {src => resources}/XRResources/occtvr_bindings_vive_cosmos.json (100%) rename {src => resources}/XRResources/occtvr_bindings_vive_pro.json (100%) create mode 100755 resources/XSMessage/FILES rename {src => resources}/XSMessage/XSTEP.fr (100%) rename {src => resources}/XSMessage/XSTEP.us (100%) rename {src => resources}/XSTEPResource/FILES (100%) rename {src => resources}/XSTEPResource/IGES (100%) rename {src => resources}/XSTEPResource/STEP (100%) rename {src => resources}/XmlOcafResource/FILES (100%) rename {src => resources}/XmlOcafResource/XmlOcaf.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_SmallTypes.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TDF.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TDataStd.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TDocStd.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TFunction.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TNaming.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd (100%) rename {src => resources}/XmlOcafResource/XmlOcaf_TPrsStd.xsd (100%) rename {src => resources}/XmlOcafResource/XmlXcaf.xsd (100%) create mode 100644 src/SHMessage/SHMessage_SHAPE_fr.pxx create mode 100644 src/Shaders/Shaders_PhongShading_fs.pxx create mode 100644 src/Shaders/Shaders_PhongShading_vs.pxx create mode 100644 src/XSMessage/XSMessage_XSTEP_fr.pxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e5c78c783..c3f730e430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1140,9 +1140,9 @@ foreach(RESOURCE ${RESOURCES}) get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY) if(NOT "${RESOURCE_FOLDER}" STREQUAL "") get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME) - OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}") + OCCT_INSTALL_FILE_OR_DIR ("resources/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}") else() - OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}") + OCCT_INSTALL_FILE_OR_DIR ("resources/${RESOURCE}" "${INSTALL_DIR_RESOURCE}") endif() endforeach() diff --git a/adm/cmake/occt_resources.cmake b/adm/cmake/occt_resources.cmake index d51df4d367..e83c205cc7 100644 --- a/adm/cmake/occt_resources.cmake +++ b/adm/cmake/occt_resources.cmake @@ -3,8 +3,8 @@ macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource) set (RESOURCE_FILES) set (isResDirectory FALSE) - if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}") - file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES) + if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/resources/${CurrentResource}") + file (STRINGS "${CMAKE_SOURCE_DIR}/resources/${CurrentResource}/FILES" RESOURCE_FILES) set (CurrentResource_Directory "${CurrentResource}") set (isResDirectory TRUE) else() @@ -27,37 +27,23 @@ macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource) string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}") set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx") - set (toProcessResFile TRUE) - if (isResDirectory) - list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex) - if ("${aResIndex}" STREQUAL "-1") - set (toProcessResFile FALSE) - endif() - endif() - - if (toProcessResFile) - message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}") - - # generate content for header file - set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file src/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n") - - # read resource file - file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST) - - set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =") - foreach (line IN LISTS RESOURCE_FILE_LINES_LIST) - string (REPLACE "\"" "\\\"" line "${line}") - set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n \"${line}\\n\"") - endforeach() - set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};") - - # Save generated content to header file - set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}") - if (EXISTS "${HEADER_FILE}") - file (REMOVE "${HEADER_FILE}") - endif() - configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF) + message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/resources/${CurrentResource_Directory}/${RESOURCE_FILE}") + # generate content for header file + set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file resources/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n") + # read resource file + file (STRINGS "${CMAKE_SOURCE_DIR}/resources/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST) + set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =") + foreach (line IN LISTS RESOURCE_FILE_LINES_LIST) + string (REPLACE "\"" "\\\"" line "${line}") + set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n \"${line}\\n\"") + endforeach() + set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};\n\n") + # Save generated content to header file + set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}") + if (EXISTS "${HEADER_FILE}") + file (REMOVE "${HEADER_FILE}") endif() + configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF) endif() endforeach() endif() diff --git a/adm/templates/DRAWEXE.vcxproj.user.in b/adm/templates/DRAWEXE.vcxproj.user.in index bd55e253fd..c18a68bc75 100644 --- a/adm/templates/DRAWEXE.vcxproj.user.in +++ b/adm/templates/DRAWEXE.vcxproj.user.in @@ -3,7 +3,7 @@ CASROOT=@CMAKE_SOURCE_DIR@ CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ -CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src +CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resource CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests @@ -16,7 +16,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH% CASROOT=@CMAKE_SOURCE_DIR@ CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ -CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src +CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resource CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests @@ -29,7 +29,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH% CASROOT=@CMAKE_SOURCE_DIR@ CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ -CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src +CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resource CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests diff --git a/adm/templates/custom.build.bat.in b/adm/templates/custom.build.bat.in index b968dc854a..dde4ba064f 100644 --- a/adm/templates/custom.build.bat.in +++ b/adm/templates/custom.build.bat.in @@ -35,7 +35,7 @@ if /I "%VCVER%" == "@COMPILER@" ( ) set "CSF_OCCTIncludePath=@CMAKE_BINARY_DIR@/inc" - set "CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src" + set "CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/resource" set "CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data" set "CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples" set "CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests" diff --git a/adm/templates/custom.build.sh.in b/adm/templates/custom.build.sh.in index 1fc041f87a..76e17fbde7 100644 --- a/adm/templates/custom.build.sh.in +++ b/adm/templates/custom.build.sh.in @@ -24,7 +24,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then export CSF_OCCTBinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@" export CSF_OCCTLibPath="@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@" export CSF_OCCTIncludePath="@CMAKE_BINARY_DIR@/@INSTALL_DIR_INCLUDE@" - export CSF_OCCTResourcePath="@CMAKE_SOURCE_DIR@/src" + export CSF_OCCTResourcePath="@CMAKE_SOURCE_DIR@/resource" export CSF_OCCTDataPath="@CMAKE_SOURCE_DIR@/data" export CSF_OCCTSamplesPath="@CMAKE_SOURCE_DIR@/samples" export CSF_OCCTTestsPath="@CMAKE_SOURCE_DIR@/tests" diff --git a/adm/templates/header.in b/adm/templates/header.in index 80c75f9cb8..ad257c450f 100644 --- a/adm/templates/header.in +++ b/adm/templates/header.in @@ -1 +1,2 @@ -@OCCT_HEADER_FILE_CONTENT@ +// clang-format off +@OCCT_HEADER_FILE_CONTENT@// clang-format on diff --git a/src/BOPAlgo/BOPAlgo.msg b/resources/BOPAlgo/BOPAlgo.msg similarity index 100% rename from src/BOPAlgo/BOPAlgo.msg rename to resources/BOPAlgo/BOPAlgo.msg diff --git a/resources/BOPAlgo/FILES b/resources/BOPAlgo/FILES new file mode 100644 index 0000000000..85b0e8e107 --- /dev/null +++ b/resources/BOPAlgo/FILES @@ -0,0 +1 @@ +BOPAlgo.msg diff --git a/src/DrawResources/CURVES.tcl b/resources/DrawResources/CURVES.tcl similarity index 100% rename from src/DrawResources/CURVES.tcl rename to resources/DrawResources/CURVES.tcl diff --git a/src/DrawResources/CheckCommands.tcl b/resources/DrawResources/CheckCommands.tcl similarity index 100% rename from src/DrawResources/CheckCommands.tcl rename to resources/DrawResources/CheckCommands.tcl diff --git a/src/DrawResources/DrawDefault b/resources/DrawResources/DrawDefault similarity index 100% rename from src/DrawResources/DrawDefault rename to resources/DrawResources/DrawDefault diff --git a/src/DrawResources/DrawPlugin b/resources/DrawResources/DrawPlugin similarity index 100% rename from src/DrawResources/DrawPlugin rename to resources/DrawResources/DrawPlugin diff --git a/src/DrawResources/DrawTK.tcl b/resources/DrawResources/DrawTK.tcl similarity index 100% rename from src/DrawResources/DrawTK.tcl rename to resources/DrawResources/DrawTK.tcl diff --git a/src/DrawResources/FILES b/resources/DrawResources/FILES similarity index 100% rename from src/DrawResources/FILES rename to resources/DrawResources/FILES diff --git a/src/DrawResources/Geometry.tcl b/resources/DrawResources/Geometry.tcl similarity index 100% rename from src/DrawResources/Geometry.tcl rename to resources/DrawResources/Geometry.tcl diff --git a/src/DrawResources/InitEnvironment.tcl b/resources/DrawResources/InitEnvironment.tcl similarity index 100% rename from src/DrawResources/InitEnvironment.tcl rename to resources/DrawResources/InitEnvironment.tcl diff --git a/src/DrawResources/Move.tcl b/resources/DrawResources/Move.tcl similarity index 100% rename from src/DrawResources/Move.tcl rename to resources/DrawResources/Move.tcl diff --git a/src/DrawResources/OCC_logo.png b/resources/DrawResources/OCC_logo.png similarity index 100% rename from src/DrawResources/OCC_logo.png rename to resources/DrawResources/OCC_logo.png diff --git a/src/DrawResources/PROFIL.tcl b/resources/DrawResources/PROFIL.tcl similarity index 100% rename from src/DrawResources/PROFIL.tcl rename to resources/DrawResources/PROFIL.tcl diff --git a/src/DrawResources/SCAN.tcl b/resources/DrawResources/SCAN.tcl similarity index 100% rename from src/DrawResources/SCAN.tcl rename to resources/DrawResources/SCAN.tcl diff --git a/src/DrawResources/SURFACES.tcl b/resources/DrawResources/SURFACES.tcl similarity index 100% rename from src/DrawResources/SURFACES.tcl rename to resources/DrawResources/SURFACES.tcl diff --git a/src/DrawResources/StandardCommands.tcl b/resources/DrawResources/StandardCommands.tcl similarity index 100% rename from src/DrawResources/StandardCommands.tcl rename to resources/DrawResources/StandardCommands.tcl diff --git a/src/DrawResources/StandardViews.tcl b/resources/DrawResources/StandardViews.tcl similarity index 100% rename from src/DrawResources/StandardViews.tcl rename to resources/DrawResources/StandardViews.tcl diff --git a/src/DrawResources/TKTopTest.tcl b/resources/DrawResources/TKTopTest.tcl similarity index 100% rename from src/DrawResources/TKTopTest.tcl rename to resources/DrawResources/TKTopTest.tcl diff --git a/src/DrawResources/TestCommands.tcl b/resources/DrawResources/TestCommands.tcl similarity index 100% rename from src/DrawResources/TestCommands.tcl rename to resources/DrawResources/TestCommands.tcl diff --git a/src/DrawResources/Vector.tcl b/resources/DrawResources/Vector.tcl similarity index 100% rename from src/DrawResources/Vector.tcl rename to resources/DrawResources/Vector.tcl diff --git a/src/DrawResources/dfb_attribns.gif b/resources/DrawResources/dfb_attribns.gif similarity index 100% rename from src/DrawResources/dfb_attribns.gif rename to resources/DrawResources/dfb_attribns.gif diff --git a/src/DrawResources/dfb_attribute.gif b/resources/DrawResources/dfb_attribute.gif similarity index 100% rename from src/DrawResources/dfb_attribute.gif rename to resources/DrawResources/dfb_attribute.gif diff --git a/src/DrawResources/dfb_folder.gif b/resources/DrawResources/dfb_folder.gif similarity index 100% rename from src/DrawResources/dfb_folder.gif rename to resources/DrawResources/dfb_folder.gif diff --git a/src/DrawResources/dftree.tcl b/resources/DrawResources/dftree.tcl similarity index 100% rename from src/DrawResources/dftree.tcl rename to resources/DrawResources/dftree.tcl diff --git a/src/DrawResources/lamp.ico b/resources/DrawResources/lamp.ico similarity index 100% rename from src/DrawResources/lamp.ico rename to resources/DrawResources/lamp.ico diff --git a/resources/SHMessage/FILES b/resources/SHMessage/FILES new file mode 100755 index 0000000000..c2e796828e --- /dev/null +++ b/resources/SHMessage/FILES @@ -0,0 +1,2 @@ +msgfile:::SHAPE.fr +msgfile:::SHAPE.us diff --git a/src/SHMessage/SHAPE.fr b/resources/SHMessage/SHAPE.fr similarity index 100% rename from src/SHMessage/SHAPE.fr rename to resources/SHMessage/SHAPE.fr diff --git a/src/SHMessage/SHAPE.us b/resources/SHMessage/SHAPE.us similarity index 100% rename from src/SHMessage/SHAPE.us rename to resources/SHMessage/SHAPE.us diff --git a/src/Shaders/Declarations.glsl b/resources/Shaders/Declarations.glsl similarity index 100% rename from src/Shaders/Declarations.glsl rename to resources/Shaders/Declarations.glsl diff --git a/src/Shaders/DeclarationsImpl.glsl b/resources/Shaders/DeclarationsImpl.glsl similarity index 100% rename from src/Shaders/DeclarationsImpl.glsl rename to resources/Shaders/DeclarationsImpl.glsl diff --git a/src/Shaders/Display.fs b/resources/Shaders/Display.fs similarity index 100% rename from src/Shaders/Display.fs rename to resources/Shaders/Display.fs diff --git a/resources/Shaders/FILES b/resources/Shaders/FILES new file mode 100644 index 0000000000..f619bbed1f --- /dev/null +++ b/resources/Shaders/FILES @@ -0,0 +1,27 @@ +srcinc:::Declarations.glsl +srcinc:::DeclarationsImpl.glsl +srcinc:::LightShadow.glsl +srcinc:::PBRCookTorrance.glsl +srcinc:::PBRDirectionalLight.glsl +srcinc:::PBRDistribution.glsl +srcinc:::PBREnvBaking.fs +srcinc:::PBREnvBaking.vs +srcinc:::PBRFresnel.glsl +srcinc:::PBRGeometry.glsl +srcinc:::PBRIllumination.glsl +srcinc:::PBRPointLight.glsl +srcinc:::PBRSpotLight.glsl +srcinc:::PhongShading.fs +srcinc:::PhongShading.vs +srcinc:::PhongDirectionalLight.glsl +srcinc:::PhongPointLight.glsl +srcinc:::PhongSpotLight.glsl +srcinc:::PointLightAttenuation.glsl +srcinc:::Display.fs +srcinc:::RaytraceBase.fs +srcinc:::RaytraceRender.fs +srcinc:::PathtraceBase.fs +srcinc:::RaytraceBase.vs +srcinc:::RaytraceSmooth.fs +srcinc:::TangentSpaceNormal.glsl +srcinc:::SkydomBackground.fs diff --git a/src/Shaders/LightShadow.glsl b/resources/Shaders/LightShadow.glsl similarity index 100% rename from src/Shaders/LightShadow.glsl rename to resources/Shaders/LightShadow.glsl diff --git a/src/Shaders/PBRCookTorrance.glsl b/resources/Shaders/PBRCookTorrance.glsl similarity index 100% rename from src/Shaders/PBRCookTorrance.glsl rename to resources/Shaders/PBRCookTorrance.glsl diff --git a/src/Shaders/PBRDirectionalLight.glsl b/resources/Shaders/PBRDirectionalLight.glsl similarity index 100% rename from src/Shaders/PBRDirectionalLight.glsl rename to resources/Shaders/PBRDirectionalLight.glsl diff --git a/src/Shaders/PBRDistribution.glsl b/resources/Shaders/PBRDistribution.glsl similarity index 100% rename from src/Shaders/PBRDistribution.glsl rename to resources/Shaders/PBRDistribution.glsl diff --git a/src/Shaders/PBREnvBaking.fs b/resources/Shaders/PBREnvBaking.fs similarity index 100% rename from src/Shaders/PBREnvBaking.fs rename to resources/Shaders/PBREnvBaking.fs diff --git a/src/Shaders/PBREnvBaking.vs b/resources/Shaders/PBREnvBaking.vs similarity index 100% rename from src/Shaders/PBREnvBaking.vs rename to resources/Shaders/PBREnvBaking.vs diff --git a/src/Shaders/PBRFresnel.glsl b/resources/Shaders/PBRFresnel.glsl similarity index 100% rename from src/Shaders/PBRFresnel.glsl rename to resources/Shaders/PBRFresnel.glsl diff --git a/src/Shaders/PBRGeometry.glsl b/resources/Shaders/PBRGeometry.glsl similarity index 100% rename from src/Shaders/PBRGeometry.glsl rename to resources/Shaders/PBRGeometry.glsl diff --git a/src/Shaders/PBRIllumination.glsl b/resources/Shaders/PBRIllumination.glsl similarity index 100% rename from src/Shaders/PBRIllumination.glsl rename to resources/Shaders/PBRIllumination.glsl diff --git a/src/Shaders/PBRPointLight.glsl b/resources/Shaders/PBRPointLight.glsl similarity index 100% rename from src/Shaders/PBRPointLight.glsl rename to resources/Shaders/PBRPointLight.glsl diff --git a/src/Shaders/PBRSpotLight.glsl b/resources/Shaders/PBRSpotLight.glsl similarity index 100% rename from src/Shaders/PBRSpotLight.glsl rename to resources/Shaders/PBRSpotLight.glsl diff --git a/src/Shaders/PathtraceBase.fs b/resources/Shaders/PathtraceBase.fs similarity index 100% rename from src/Shaders/PathtraceBase.fs rename to resources/Shaders/PathtraceBase.fs diff --git a/src/Shaders/PhongDirectionalLight.glsl b/resources/Shaders/PhongDirectionalLight.glsl similarity index 100% rename from src/Shaders/PhongDirectionalLight.glsl rename to resources/Shaders/PhongDirectionalLight.glsl diff --git a/src/Shaders/PhongPointLight.glsl b/resources/Shaders/PhongPointLight.glsl similarity index 100% rename from src/Shaders/PhongPointLight.glsl rename to resources/Shaders/PhongPointLight.glsl diff --git a/src/Shaders/PhongShading.fs b/resources/Shaders/PhongShading.fs similarity index 100% rename from src/Shaders/PhongShading.fs rename to resources/Shaders/PhongShading.fs diff --git a/src/Shaders/PhongShading.vs b/resources/Shaders/PhongShading.vs similarity index 100% rename from src/Shaders/PhongShading.vs rename to resources/Shaders/PhongShading.vs diff --git a/src/Shaders/PhongSpotLight.glsl b/resources/Shaders/PhongSpotLight.glsl similarity index 100% rename from src/Shaders/PhongSpotLight.glsl rename to resources/Shaders/PhongSpotLight.glsl diff --git a/src/Shaders/PointLightAttenuation.glsl b/resources/Shaders/PointLightAttenuation.glsl similarity index 100% rename from src/Shaders/PointLightAttenuation.glsl rename to resources/Shaders/PointLightAttenuation.glsl diff --git a/src/Shaders/RaytraceBase.fs b/resources/Shaders/RaytraceBase.fs similarity index 100% rename from src/Shaders/RaytraceBase.fs rename to resources/Shaders/RaytraceBase.fs diff --git a/src/Shaders/RaytraceBase.vs b/resources/Shaders/RaytraceBase.vs similarity index 100% rename from src/Shaders/RaytraceBase.vs rename to resources/Shaders/RaytraceBase.vs diff --git a/src/Shaders/RaytraceRender.fs b/resources/Shaders/RaytraceRender.fs similarity index 100% rename from src/Shaders/RaytraceRender.fs rename to resources/Shaders/RaytraceRender.fs diff --git a/src/Shaders/RaytraceSmooth.fs b/resources/Shaders/RaytraceSmooth.fs similarity index 100% rename from src/Shaders/RaytraceSmooth.fs rename to resources/Shaders/RaytraceSmooth.fs diff --git a/src/Shaders/SkydomBackground.fs b/resources/Shaders/SkydomBackground.fs similarity index 100% rename from src/Shaders/SkydomBackground.fs rename to resources/Shaders/SkydomBackground.fs diff --git a/src/Shaders/TangentSpaceNormal.glsl b/resources/Shaders/TangentSpaceNormal.glsl similarity index 100% rename from src/Shaders/TangentSpaceNormal.glsl rename to resources/Shaders/TangentSpaceNormal.glsl diff --git a/src/StdResource/FILES b/resources/StdResource/FILES similarity index 100% rename from src/StdResource/FILES rename to resources/StdResource/FILES diff --git a/src/StdResource/MigrationSheet.txt b/resources/StdResource/MigrationSheet.txt similarity index 100% rename from src/StdResource/MigrationSheet.txt rename to resources/StdResource/MigrationSheet.txt diff --git a/src/StdResource/Plugin b/resources/StdResource/Plugin similarity index 100% rename from src/StdResource/Plugin rename to resources/StdResource/Plugin diff --git a/src/StdResource/Standard b/resources/StdResource/Standard similarity index 100% rename from src/StdResource/Standard rename to resources/StdResource/Standard diff --git a/src/StdResource/StandardLite b/resources/StdResource/StandardLite similarity index 100% rename from src/StdResource/StandardLite rename to resources/StdResource/StandardLite diff --git a/src/StdResource/TObj b/resources/StdResource/TObj similarity index 100% rename from src/StdResource/TObj rename to resources/StdResource/TObj diff --git a/src/StdResource/XCAF b/resources/StdResource/XCAF similarity index 100% rename from src/StdResource/XCAF rename to resources/StdResource/XCAF diff --git a/resources/TObj/FILES b/resources/TObj/FILES new file mode 100755 index 0000000000..2e8866d5b6 --- /dev/null +++ b/resources/TObj/FILES @@ -0,0 +1 @@ +TObj.msg diff --git a/src/TObj/TObj.msg b/resources/TObj/TObj.msg similarity index 100% rename from src/TObj/TObj.msg rename to resources/TObj/TObj.msg diff --git a/src/Textures/1d_elevation.rgb b/resources/Textures/1d_elevation.rgb similarity index 100% rename from src/Textures/1d_elevation.rgb rename to resources/Textures/1d_elevation.rgb diff --git a/src/Textures/2d_MatraDatavision.rgb b/resources/Textures/2d_MatraDatavision.rgb similarity index 100% rename from src/Textures/2d_MatraDatavision.rgb rename to resources/Textures/2d_MatraDatavision.rgb diff --git a/src/Textures/2d_alienskin.rgb b/resources/Textures/2d_alienskin.rgb similarity index 100% rename from src/Textures/2d_alienskin.rgb rename to resources/Textures/2d_alienskin.rgb diff --git a/src/Textures/2d_aluminum.rgb b/resources/Textures/2d_aluminum.rgb similarity index 100% rename from src/Textures/2d_aluminum.rgb rename to resources/Textures/2d_aluminum.rgb diff --git a/src/Textures/2d_blue_rock.rgb b/resources/Textures/2d_blue_rock.rgb similarity index 100% rename from src/Textures/2d_blue_rock.rgb rename to resources/Textures/2d_blue_rock.rgb diff --git a/src/Textures/2d_bluewhite_paper.rgb b/resources/Textures/2d_bluewhite_paper.rgb similarity index 100% rename from src/Textures/2d_bluewhite_paper.rgb rename to resources/Textures/2d_bluewhite_paper.rgb diff --git a/src/Textures/2d_brushed.rgb b/resources/Textures/2d_brushed.rgb similarity index 100% rename from src/Textures/2d_brushed.rgb rename to resources/Textures/2d_brushed.rgb diff --git a/src/Textures/2d_bubbles.rgb b/resources/Textures/2d_bubbles.rgb similarity index 100% rename from src/Textures/2d_bubbles.rgb rename to resources/Textures/2d_bubbles.rgb diff --git a/src/Textures/2d_bumps.rgb b/resources/Textures/2d_bumps.rgb similarity index 100% rename from src/Textures/2d_bumps.rgb rename to resources/Textures/2d_bumps.rgb diff --git a/src/Textures/2d_cast.rgb b/resources/Textures/2d_cast.rgb similarity index 100% rename from src/Textures/2d_cast.rgb rename to resources/Textures/2d_cast.rgb diff --git a/src/Textures/2d_chess.rgba b/resources/Textures/2d_chess.rgba similarity index 100% rename from src/Textures/2d_chess.rgba rename to resources/Textures/2d_chess.rgba diff --git a/src/Textures/2d_chipbd.rgb b/resources/Textures/2d_chipbd.rgb similarity index 100% rename from src/Textures/2d_chipbd.rgb rename to resources/Textures/2d_chipbd.rgb diff --git a/src/Textures/2d_clouds.rgb b/resources/Textures/2d_clouds.rgb similarity index 100% rename from src/Textures/2d_clouds.rgb rename to resources/Textures/2d_clouds.rgb diff --git a/src/Textures/2d_flesh.rgb b/resources/Textures/2d_flesh.rgb similarity index 100% rename from src/Textures/2d_flesh.rgb rename to resources/Textures/2d_flesh.rgb diff --git a/src/Textures/2d_floor.rgb b/resources/Textures/2d_floor.rgb similarity index 100% rename from src/Textures/2d_floor.rgb rename to resources/Textures/2d_floor.rgb diff --git a/src/Textures/2d_galvnisd.rgb b/resources/Textures/2d_galvnisd.rgb similarity index 100% rename from src/Textures/2d_galvnisd.rgb rename to resources/Textures/2d_galvnisd.rgb diff --git a/src/Textures/2d_grass.rgb b/resources/Textures/2d_grass.rgb similarity index 100% rename from src/Textures/2d_grass.rgb rename to resources/Textures/2d_grass.rgb diff --git a/src/Textures/2d_knurl.rgb b/resources/Textures/2d_knurl.rgb similarity index 100% rename from src/Textures/2d_knurl.rgb rename to resources/Textures/2d_knurl.rgb diff --git a/src/Textures/2d_maple.rgb b/resources/Textures/2d_maple.rgb similarity index 100% rename from src/Textures/2d_maple.rgb rename to resources/Textures/2d_maple.rgb diff --git a/src/Textures/2d_marble.rgb b/resources/Textures/2d_marble.rgb similarity index 100% rename from src/Textures/2d_marble.rgb rename to resources/Textures/2d_marble.rgb diff --git a/src/Textures/2d_mottled.rgb b/resources/Textures/2d_mottled.rgb similarity index 100% rename from src/Textures/2d_mottled.rgb rename to resources/Textures/2d_mottled.rgb diff --git a/src/Textures/2d_rain.rgb b/resources/Textures/2d_rain.rgb similarity index 100% rename from src/Textures/2d_rain.rgb rename to resources/Textures/2d_rain.rgb diff --git a/src/Textures/2d_rock.rgb b/resources/Textures/2d_rock.rgb similarity index 100% rename from src/Textures/2d_rock.rgb rename to resources/Textures/2d_rock.rgb diff --git a/resources/Textures/FILES b/resources/Textures/FILES new file mode 100755 index 0000000000..40b9c5579a --- /dev/null +++ b/resources/Textures/FILES @@ -0,0 +1,31 @@ +icon:::1d_elevation.rgb +icon:::2d_alienskin.rgb +icon:::2d_aluminum.rgb +icon:::2d_blue_rock.rgb +icon:::2d_bluewhite_paper.rgb +icon:::2d_brushed.rgb +icon:::2d_bubbles.rgb +icon:::2d_bumps.rgb +icon:::2d_cast.rgb +icon:::2d_chipbd.rgb +icon:::2d_clouds.rgb +icon:::2d_flesh.rgb +icon:::2d_floor.rgb +icon:::2d_galvnisd.rgb +icon:::2d_grass.rgb +icon:::2d_knurl.rgb +icon:::2d_maple.rgb +icon:::2d_marble.rgb +icon:::2d_MatraDatavision.rgb +icon:::2d_mottled.rgb +icon:::2d_rain.rgb +icon:::2d_rock.rgb +icon:::2d_chess.rgba +icon:::env_clouds.rgb +icon:::env_cv.rgb +icon:::env_lines.rgb +icon:::env_medit.rgb +icon:::env_pearl.rgb +icon:::env_road.rgb +icon:::env_sky1.rgb +icon:::env_sky2.rgb diff --git a/src/Textures/env_clouds.rgb b/resources/Textures/env_clouds.rgb similarity index 100% rename from src/Textures/env_clouds.rgb rename to resources/Textures/env_clouds.rgb diff --git a/src/Textures/env_cv.rgb b/resources/Textures/env_cv.rgb similarity index 100% rename from src/Textures/env_cv.rgb rename to resources/Textures/env_cv.rgb diff --git a/src/Textures/env_lines.rgb b/resources/Textures/env_lines.rgb similarity index 100% rename from src/Textures/env_lines.rgb rename to resources/Textures/env_lines.rgb diff --git a/src/Textures/env_medit.rgb b/resources/Textures/env_medit.rgb similarity index 100% rename from src/Textures/env_medit.rgb rename to resources/Textures/env_medit.rgb diff --git a/src/Textures/env_pearl.rgb b/resources/Textures/env_pearl.rgb similarity index 100% rename from src/Textures/env_pearl.rgb rename to resources/Textures/env_pearl.rgb diff --git a/src/Textures/env_road.rgb b/resources/Textures/env_road.rgb similarity index 100% rename from src/Textures/env_road.rgb rename to resources/Textures/env_road.rgb diff --git a/src/Textures/env_sky1.rgb b/resources/Textures/env_sky1.rgb similarity index 100% rename from src/Textures/env_sky1.rgb rename to resources/Textures/env_sky1.rgb diff --git a/src/Textures/env_sky2.rgb b/resources/Textures/env_sky2.rgb similarity index 100% rename from src/Textures/env_sky2.rgb rename to resources/Textures/env_sky2.rgb diff --git a/src/UnitsAPI/CurrentUnits b/resources/UnitsAPI/CurrentUnits similarity index 100% rename from src/UnitsAPI/CurrentUnits rename to resources/UnitsAPI/CurrentUnits diff --git a/resources/UnitsAPI/FILES b/resources/UnitsAPI/FILES new file mode 100755 index 0000000000..9f95e64351 --- /dev/null +++ b/resources/UnitsAPI/FILES @@ -0,0 +1,4 @@ +CurrentUnits +MDTVBaseUnits +MDTVCurrentUnits +Units.dat diff --git a/src/UnitsAPI/MDTVBaseUnits b/resources/UnitsAPI/MDTVBaseUnits similarity index 100% rename from src/UnitsAPI/MDTVBaseUnits rename to resources/UnitsAPI/MDTVBaseUnits diff --git a/src/UnitsAPI/MDTVCurrentUnits b/resources/UnitsAPI/MDTVCurrentUnits similarity index 100% rename from src/UnitsAPI/MDTVCurrentUnits rename to resources/UnitsAPI/MDTVCurrentUnits diff --git a/src/UnitsAPI/Units.dat b/resources/UnitsAPI/Units.dat similarity index 100% rename from src/UnitsAPI/Units.dat rename to resources/UnitsAPI/Units.dat diff --git a/src/XRResources/FILES b/resources/XRResources/FILES similarity index 100% rename from src/XRResources/FILES rename to resources/XRResources/FILES diff --git a/src/XRResources/occtvr_actions.json b/resources/XRResources/occtvr_actions.json similarity index 100% rename from src/XRResources/occtvr_actions.json rename to resources/XRResources/occtvr_actions.json diff --git a/src/XRResources/occtvr_bindings_generic.json b/resources/XRResources/occtvr_bindings_generic.json similarity index 100% rename from src/XRResources/occtvr_bindings_generic.json rename to resources/XRResources/occtvr_bindings_generic.json diff --git a/src/XRResources/occtvr_bindings_holographic_hmd.json b/resources/XRResources/occtvr_bindings_holographic_hmd.json similarity index 100% rename from src/XRResources/occtvr_bindings_holographic_hmd.json rename to resources/XRResources/occtvr_bindings_holographic_hmd.json diff --git a/src/XRResources/occtvr_bindings_index_hmd.json b/resources/XRResources/occtvr_bindings_index_hmd.json similarity index 100% rename from src/XRResources/occtvr_bindings_index_hmd.json rename to resources/XRResources/occtvr_bindings_index_hmd.json diff --git a/src/XRResources/occtvr_bindings_rift.json b/resources/XRResources/occtvr_bindings_rift.json similarity index 100% rename from src/XRResources/occtvr_bindings_rift.json rename to resources/XRResources/occtvr_bindings_rift.json diff --git a/src/XRResources/occtvr_bindings_touch.json b/resources/XRResources/occtvr_bindings_touch.json similarity index 100% rename from src/XRResources/occtvr_bindings_touch.json rename to resources/XRResources/occtvr_bindings_touch.json diff --git a/src/XRResources/occtvr_bindings_vive.json b/resources/XRResources/occtvr_bindings_vive.json similarity index 100% rename from src/XRResources/occtvr_bindings_vive.json rename to resources/XRResources/occtvr_bindings_vive.json diff --git a/src/XRResources/occtvr_bindings_vive_controller.json b/resources/XRResources/occtvr_bindings_vive_controller.json similarity index 100% rename from src/XRResources/occtvr_bindings_vive_controller.json rename to resources/XRResources/occtvr_bindings_vive_controller.json diff --git a/src/XRResources/occtvr_bindings_vive_cosmos.json b/resources/XRResources/occtvr_bindings_vive_cosmos.json similarity index 100% rename from src/XRResources/occtvr_bindings_vive_cosmos.json rename to resources/XRResources/occtvr_bindings_vive_cosmos.json diff --git a/src/XRResources/occtvr_bindings_vive_pro.json b/resources/XRResources/occtvr_bindings_vive_pro.json similarity index 100% rename from src/XRResources/occtvr_bindings_vive_pro.json rename to resources/XRResources/occtvr_bindings_vive_pro.json diff --git a/resources/XSMessage/FILES b/resources/XSMessage/FILES new file mode 100755 index 0000000000..a1cfa2da4f --- /dev/null +++ b/resources/XSMessage/FILES @@ -0,0 +1,2 @@ +msgfile:::XSTEP.fr +msgfile:::XSTEP.us diff --git a/src/XSMessage/XSTEP.fr b/resources/XSMessage/XSTEP.fr similarity index 100% rename from src/XSMessage/XSTEP.fr rename to resources/XSMessage/XSTEP.fr diff --git a/src/XSMessage/XSTEP.us b/resources/XSMessage/XSTEP.us similarity index 100% rename from src/XSMessage/XSTEP.us rename to resources/XSMessage/XSTEP.us diff --git a/src/XSTEPResource/FILES b/resources/XSTEPResource/FILES similarity index 100% rename from src/XSTEPResource/FILES rename to resources/XSTEPResource/FILES diff --git a/src/XSTEPResource/IGES b/resources/XSTEPResource/IGES similarity index 100% rename from src/XSTEPResource/IGES rename to resources/XSTEPResource/IGES diff --git a/src/XSTEPResource/STEP b/resources/XSTEPResource/STEP similarity index 100% rename from src/XSTEPResource/STEP rename to resources/XSTEPResource/STEP diff --git a/src/XmlOcafResource/FILES b/resources/XmlOcafResource/FILES similarity index 100% rename from src/XmlOcafResource/FILES rename to resources/XmlOcafResource/FILES diff --git a/src/XmlOcafResource/XmlOcaf.xsd b/resources/XmlOcafResource/XmlOcaf.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf.xsd rename to resources/XmlOcafResource/XmlOcaf.xsd diff --git a/src/XmlOcafResource/XmlOcaf_SmallTypes.xsd b/resources/XmlOcafResource/XmlOcaf_SmallTypes.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_SmallTypes.xsd rename to resources/XmlOcafResource/XmlOcaf_SmallTypes.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TDF.xsd b/resources/XmlOcafResource/XmlOcaf_TDF.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TDF.xsd rename to resources/XmlOcafResource/XmlOcaf_TDF.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TDataStd.xsd b/resources/XmlOcafResource/XmlOcaf_TDataStd.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TDataStd.xsd rename to resources/XmlOcafResource/XmlOcaf_TDataStd.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd b/resources/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd rename to resources/XmlOcafResource/XmlOcaf_TDataStd_Name.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TDocStd.xsd b/resources/XmlOcafResource/XmlOcaf_TDocStd.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TDocStd.xsd rename to resources/XmlOcafResource/XmlOcaf_TDocStd.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TFunction.xsd b/resources/XmlOcafResource/XmlOcaf_TFunction.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TFunction.xsd rename to resources/XmlOcafResource/XmlOcaf_TFunction.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TNaming.xsd b/resources/XmlOcafResource/XmlOcaf_TNaming.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TNaming.xsd rename to resources/XmlOcafResource/XmlOcaf_TNaming.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd b/resources/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd rename to resources/XmlOcafResource/XmlOcaf_TNaming_NamedShape.xsd diff --git a/src/XmlOcafResource/XmlOcaf_TPrsStd.xsd b/resources/XmlOcafResource/XmlOcaf_TPrsStd.xsd similarity index 100% rename from src/XmlOcafResource/XmlOcaf_TPrsStd.xsd rename to resources/XmlOcafResource/XmlOcaf_TPrsStd.xsd diff --git a/src/XmlOcafResource/XmlXcaf.xsd b/resources/XmlOcafResource/XmlXcaf.xsd similarity index 100% rename from src/XmlOcafResource/XmlXcaf.xsd rename to resources/XmlOcafResource/XmlXcaf.xsd diff --git a/src/BOPAlgo/BOPAlgo_BOPAlgo_msg.pxx b/src/BOPAlgo/BOPAlgo_BOPAlgo_msg.pxx index 31ac69b956..3e37abe49d 100644 --- a/src/BOPAlgo/BOPAlgo_BOPAlgo_msg.pxx +++ b/src/BOPAlgo/BOPAlgo_BOPAlgo_msg.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/BOPAlgo/BOPAlgo.msg +// clang-format off +// This file has been automatically generated from resource file resources/BOPAlgo/BOPAlgo.msg static const char BOPAlgo_BOPAlgo_msg[] = "!!!!!!!!!! ----- Messages file for BOPAlgo package --------- !!!!!!!!!\n" @@ -78,8 +79,7 @@ static const char BOPAlgo_BOPAlgo_msg[] = "Building 2D curve of edge on face has failed\n" "\n" ".BOPAlgo_AlertAcquiredSelfIntersection\n" - "Some sub-shapes of some of the argument become connected through other shapes and the argument " - "became self-interfered\n" + "Some sub-shapes of some of the argument become connected through other shapes and the argument became self-interfered\n" "\n" ".BOPAlgo_AlertUnsupportedType\n" "Unsupported type of input shape\n" @@ -94,12 +94,10 @@ static const char BOPAlgo_BOPAlgo_msg[] = "The Feature Removal algorithm has failed\n" "\n" ".BOPAlgo_AlertSolidBuilderUnusedFaces\n" - "Some of the faces passed to the Solid Builder algorithm have not been classified and not used " - "for solids creation\n" + "Some of the faces passed to the Solid Builder algorithm have not been classified and not used for solids creation\n" "\n" ".BOPAlgo_AlertFaceBuilderUnusedEdges\n" - "Some of the edges passed to the Face Builder algorithm have not been classified and not used " - "for faces creation\n" + "Some of the edges passed to the Face Builder algorithm have not been classified and not used for faces creation\n" "\n" ".BOPAlgo_AlertUnableToOrientTheShape\n" "Unable to orient the shape correctly\n" @@ -133,3 +131,5 @@ static const char BOPAlgo_BOPAlgo_msg[] = "\n" ".BOPAlgo_AlertUnableToMakeClosedEdgeOnFace\n" "Unable to make closed edge on face.\n"; + +// clang-format on diff --git a/src/BOPAlgo/FILES b/src/BOPAlgo/FILES index f00444d4f4..f8cf11de6f 100644 --- a/src/BOPAlgo/FILES +++ b/src/BOPAlgo/FILES @@ -77,5 +77,4 @@ BOPAlgo_GlueEnum.hxx BOPAlgo_Splitter.hxx BOPAlgo_Splitter.cxx BOPAlgo_Alerts.hxx -BOPAlgo.msg BOPAlgo_BOPAlgo_msg.pxx diff --git a/src/SHMessage/FILES b/src/SHMessage/FILES index d3fcbe42bd..4133b1e93c 100755 --- a/src/SHMessage/FILES +++ b/src/SHMessage/FILES @@ -1,3 +1 @@ -msgfile:::SHAPE.fr -msgfile:::SHAPE.us SHMessage_SHAPE_us.pxx diff --git a/src/SHMessage/SHMessage_SHAPE_fr.pxx b/src/SHMessage/SHMessage_SHAPE_fr.pxx new file mode 100644 index 0000000000..448ae43aa7 --- /dev/null +++ b/src/SHMessage/SHMessage_SHAPE_fr.pxx @@ -0,0 +1,273 @@ +// clang-format off +// This file has been automatically generated from resource file resources/SHMessage/SHAPE.fr + +static const char SHMessage_SHAPE_fr[] = + "! Message file for Shape Healing\n" + "\n" + "\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for shape names\n" + "!\n" + ".Name.Shape.MSG0\n" + "!\n" + ".Name.Vertex.MSG0\n" + "!\n" + ".Name.Edge.MSG0\n" + "!\n" + ".Name.Wire.MSG0\n" + "!\n" + ".Name.Face.MSG0\n" + "!\n" + ".Name.Shell.MSG0\n" + "!\n" + ".Name.Solid.MSG0\n" + "!\n" + ".Name.CompSolid.MSG0\n" + "!\n" + ".Name.Compound.MSG0\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for sequence of operators\n" + "! \n" + ".SP.Sequence.Info.Seq\n" + "Sequence d'operateurs: %s\n" + "!\n" + ".SP.Sequence.Info.Operator\n" + "Operateur %d/%d: %s\n" + "!\n" + ".SP.Sequence.Error.NoOp\n" + "Error: Operator %s is not found\n" + "!\n" + ".SP.Sequence.Error.Except\n" + "Error: Operator %s failed with exception %s\n" + "!\n" + ".SP.Sequence.Warn.NoSeq\n" + "Warning: Shape Processing: sequence not defined for %s\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for printing results of shape processing\n" + "! \n" + ".PrResult.Print.MSG50\n" + " Shells:\n" + "!\n" + ".PrResult.Print.MSG55\n" + " Faces:\n" + "!\n" + ".PrResult.Print.MSG100\n" + "Mapping:\n" + "!\n" + ".PrResult.Print.MSG110\n" + " Le Resultat est un Shell : %d\n" + "!\n" + ".PrResult.Print.MSG115\n" + " Le Resultat est une Face : %d\n" + "!\n" + ".PrResult.Print.MSG150\n" + " Pas de Resultat : %d\n" + "!\n" + ".PrResult.Print.MSG200\n" + "Taux de Preparation:\n" + "!\n" + ".PrResult.Print.MSG205\n" + " Shells: %d pour cent\n" + "!\n" + ".PrResult.Print.MSG210\n" + " Faces : %d pour cent\n" + "!\n" + "!\n" + "! ==============================================================================\n" + "! Messages for Shape Healing\n" + "! \n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_Wire\n" + "! \n" + ".FixWire.FixDegenerated.MSG0\n" + "Detection d'Arete(s) degeneree(s)\n" + "!\n" + ".FixWire.FixDegenerated.MSG5\n" + "L'Arete n0 %d est degeneree\n" + "!\n" + ".FixWire.FixCurve3d.Removed\n" + "Incomplete edge (with no pcurves or 3d curve) removed\n" + "!\n" + ".FixAdvWire.FixSmall.MSG0\n" + "Petite(s) arete(s) supprimee(s)\n" + "! \n" + ".FixAdvWire.FixSmall.MSG5\n" + "L'arete n0 %d etait petite, supprimee\n" + "! \n" + ".FixAdvWire.FixIntersection.MSG0\n" + "Auto-intersection corrigee\n" + "!\n" + ".FixAdvWire.FixIntersection.MSG5\n" + "L'arete etait auto-intersectante, corrigee\n" + "!\n" + ".FixAdvWire.FixIntersection.MSG10\n" + "Les aretes s'intersectent, corrigees\n" + "!\n" + ".FixAdvWire.FixLacking.MSG0\n" + "Insertion d'arete(s) manquante(s)\n" + "!\n" + ".FixAdvWire.FixLacking.MSG5\n" + "Arete n0 %d manquante, inseree\n" + "!\n" + ".FixAdvWire..MSG0\n" + "!\n" + ".FixAdvWire..MSG5\n" + "!\n" + ".FixAdvWire..MSG10\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_Face\n" + "!\n" + ".FixAdvFace.FixMissingSeam.MSG0\n" + "Arete de couture manquante, ajoutee\n" + "!\n" + ".FixAdvFace.FixSmallAreaWire.MSG0\n" + "Contour d'aire nulle, supprime\n" + "!\n" + ".FixAdvFace.FixOrientation.MSG0\n" + "Face creee avec bords naturels\n" + "!\n" + ".FixAdvFace.FixOrientation.MSG5\n" + "Contour sur face inverse\n" + "!\n" + ".FixAdvFace.FixOrientation.MSG11\n" + "Impossible d'orienter le contour\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_Wireframe\n" + "! \n" + ".FixWireframe.FixSmallEdges.MSG0\n" + "Small edge removed\n" + "!\n" + ".FixWireframe.FixSmallEdges.MSG1\n" + "Small wire removed\n" + "!\n" + ".FixWireframe.FixSmallEdges.MSG2\n" + "Small face removed\n" + "!\n" + ".FixWireframe.FixFixWireGaps.MSG0\n" + "Gaps in a wire fixed\n" + "!\n" + "!\n" + ".Fix.SplitCommonVertex.MSG0\n" + "Wires with common vertex fixed\n" + "!\n" + "!\n" + ".FixAdvShell.FixOrientation.MSG20\n" + "Impossible d'orienter les faces dans le shell, creation de plusieurs shells\n" + "!\n" + ".FixAdvShell.FixOrientation.MSG30\n" + "Shell avec connexions incorrectes, divise en plusieurs parties\n" + "!\n" + ".FixAdvSolid.FixShell.MSG10\n" + "Impossible de creer un Solide a partir d'un shell ouvert\n" + "!\n" + ".FixAdvSolid.FixOrientation.MSG20\n" + "L'Orientation du/des shell(s) dans le solida ete corrigee\n" + "!\n" + ".FixAdvSolid.FixOrientation.MSG30\n" + "Solide avec connexions incorrectes, divise en plusieurs parties\n" + "!\n" + ".FixAdvFace.FixLoopWire.MSG0\n" + "Wire was split on several wires\n" + "!\n" + ".FixAdvFace..MSG5\n" + "!\n" + ".FixAdvFace..MSG10\n" + "!\n" + ".FixEdge.SameParameter.MSG0\n" + "Not same parameter edge fixed\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_FixSmallFace\n" + "!\n" + ".FixAdvFace.FixSpotFace.MSG0\n" + "Spot face removed\n" + "!\n" + ".FixAdvFace.FixStripFace.MSG0\n" + "Strip face removed\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_FixSmallSolid\n" + "!\n" + ".ShapeFix.FixSmallSolid.MSG0\n" + "Small solid removed\n" + "!\n" + ".ShapeFix.FixSmallSolid.MSG1\n" + "Small solid merged with other\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeFix_Shell\n" + "!\n" + ".FixAdvShell.FixOrientation.MSG0\n" + "Faces mal orientees dans le shell, corrigees\n" + "!\n" + ".FixAdvShell.FixOrientation.MSG5\n" + "Faces mal orientees dans le shell, non corrigees\n" + "!\n" + ".FixAdvShell.FixClosedFlag.MSG0\n" + "Shell has incorrect flag isClosed\n" + "!\n" + ".FixAdvShell..MSG5\n" + "!\n" + ".FixAdvShell..MSG10\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeUpgrade\n" + "!\n" + ".ShapeDivide.FaceDivide.MSG0\n" + "Face divided\n" + "!\n" + ".ShapeDivide.WireDivide.MSG0\n" + "Wire divided\n" + "!\n" + ".ShapeDivide.EdgeDivide.MSG0\n" + "Edge divided\n" + "!\n" + ".ShapeDivide.FaceConvertToBezier.MSG0\n" + "Face converted to Bezier\n" + "!\n" + ".ShapeDivide.WireConvertToBezier.MSG0\n" + "Wire converted to Bezier\n" + "!\n" + ".ShapeDivide.EdgeConvertToBezier.MSG0\n" + "Edge converted to Bezier\n" + "!\n" + "! ------------------------------------------------------------------------------\n" + "! Messages for ShapeCustom\n" + "!\n" + ".BSplineRestriction.NewSurface.MSG0\n" + "Face converted to BSpline\n" + "!\n" + ".BSplineRestriction.NewSurface.MSG1\n" + "BSpline Face re-approximated\n" + "!\n" + ".BSplineRestriction.NewCurve.MSG0\n" + "Edge converted to BSpline\n" + "!\n" + ".BSplineRestriction.NewCurve.MSG1\n" + "BSpline Edge re-approximated\n" + "!\n" + "!\n" + ".ConvertToBSpline.NewSurface.MSG0\n" + "Face converted to BSpline\n" + "!\n" + ".ConvertToBSpline.NewCurve.MSG0\n" + "Edge converted to BSpline\n" + "!\n" + "!\n" + ".ConvertToRevolution.NewSurface.MSG0\n" + "Face converted to surface of revolution\n" + "!\n" + "!\n" + ".DirectModification.NewSurface.MSG0\n" + "Direction of Face of revolution corrected\n" + "!\n" + "!\n" + ".SweptToElementary.NewSurface.MSG0\n" + "Swept Face converted to elementary\n" + "!\n"; + +// clang-format on diff --git a/src/SHMessage/SHMessage_SHAPE_us.pxx b/src/SHMessage/SHMessage_SHAPE_us.pxx index d3deb0348a..014d9abacb 100644 --- a/src/SHMessage/SHMessage_SHAPE_us.pxx +++ b/src/SHMessage/SHMessage_SHAPE_us.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/SHMessage/SHAPE.us +// clang-format off +// This file has been automatically generated from resource file resources/SHMessage/SHAPE.us static const char SHMessage_SHAPE_us[] = "\n" @@ -268,3 +269,5 @@ static const char SHMessage_SHAPE_us[] = ".SweptToElementary.NewSurface.MSG0\n" "Swept Face converted to elementary\n" "!\n"; + +// clang-format on diff --git a/src/Shaders/FILES b/src/Shaders/FILES index f509a23877..fbdb38b7c3 100644 --- a/src/Shaders/FILES +++ b/src/Shaders/FILES @@ -1,30 +1,3 @@ -srcinc:::Declarations.glsl -srcinc:::DeclarationsImpl.glsl -srcinc:::LightShadow.glsl -srcinc:::PBRCookTorrance.glsl -srcinc:::PBRDirectionalLight.glsl -srcinc:::PBRDistribution.glsl -srcinc:::PBREnvBaking.fs -srcinc:::PBREnvBaking.vs -srcinc:::PBRFresnel.glsl -srcinc:::PBRGeometry.glsl -srcinc:::PBRIllumination.glsl -srcinc:::PBRPointLight.glsl -srcinc:::PBRSpotLight.glsl -srcinc:::PhongShading.fs -srcinc:::PhongShading.vs -srcinc:::PhongDirectionalLight.glsl -srcinc:::PhongPointLight.glsl -srcinc:::PhongSpotLight.glsl -srcinc:::PointLightAttenuation.glsl -srcinc:::Display.fs -srcinc:::RaytraceBase.fs -srcinc:::RaytraceRender.fs -srcinc:::PathtraceBase.fs -srcinc:::RaytraceBase.vs -srcinc:::RaytraceSmooth.fs -srcinc:::TangentSpaceNormal.glsl -srcinc:::SkydomBackground.fs Shaders_Declarations_glsl.pxx Shaders_DeclarationsImpl_glsl.pxx Shaders_LightShadow_glsl.pxx diff --git a/src/Shaders/Shaders_DeclarationsImpl_glsl.pxx b/src/Shaders/Shaders_DeclarationsImpl_glsl.pxx index 8535af8016..744d1bc0af 100644 --- a/src/Shaders/Shaders_DeclarationsImpl_glsl.pxx +++ b/src/Shaders/Shaders_DeclarationsImpl_glsl.pxx @@ -1,9 +1,9 @@ -// This file has been automatically generated from resource file src/Shaders/DeclarationsImpl.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/DeclarationsImpl.glsl static const char Shaders_DeclarationsImpl_glsl[] = "\n" - "//! @file DeclarationsImpl.glsl includes implementation of common functions and properties " - "accessors\n" + "//! @file DeclarationsImpl.glsl includes implementation of common functions and properties accessors\n" "#if defined(FRAGMENT_SHADER)\n" "\n" "#if defined(OCC_DEPTH_PEEL_OIT)\n" @@ -16,9 +16,7 @@ static const char Shaders_DeclarationsImpl_glsl[] = " ivec2 aFragCoord = ivec2 (gl_FragCoord.xy);\n" " vec2 aLastDepth = texelFetch (occDepthPeelingDepth, aFragCoord, 0).rg;\n" " occPeelFrontColor = texelFetch (occDepthPeelingFrontColor, aFragCoord, 0);\n" - // clang-format off " occPeelDepth.rg = vec2 (THE_DEPTH_CLEAR_VALUE); // depth value always increases, so that MAX blend equation can be used\n" - // clang-format on " occPeelBackColor = vec4 (0.0); // back color is blend after each peeling pass\n" "\n" " float aNearDepth = -aLastDepth.x;\n" @@ -48,8 +46,7 @@ static const char Shaders_DeclarationsImpl_glsl[] = " if (theColor.a < occAlphaCutoff) discard;\n" "#endif\n" "#if defined(OCC_WRITE_WEIGHT_OIT_COVERAGE)\n" - " float aWeight = theColor.a * clamp (1e+2 * pow (1.0 - gl_FragCoord.z * occOitDepthFactor, " - "3.0), 1e-2, 1e+2);\n" + " float aWeight = theColor.a * clamp (1e+2 * pow (1.0 - gl_FragCoord.z * occOitDepthFactor, 3.0), 1e-2, 1e+2);\n" " occFragCoverage.r = theColor.a * aWeight;\n" " occFragColor = vec4 (theColor.rgb * theColor.a * aWeight, theColor.a);\n" "#elif defined(OCC_DEPTH_PEEL_OIT)\n" @@ -72,10 +69,8 @@ static const char Shaders_DeclarationsImpl_glsl[] = "\n" "#if defined(THE_MAX_LIGHTS) && (THE_MAX_LIGHTS > 0)\n" "// arrays of light sources\n" - // clang-format off "uniform vec4 occLightSources[THE_MAX_LIGHTS * 4]; //!< packed light sources parameters\n" "uniform THE_PREC_ENUM int occLightSourcesTypes[THE_MAX_LIGHTS]; //!< packed light sources types\n" - // clang-format on "#endif\n" "\n" "#if defined(THE_IS_PBR)\n" @@ -84,8 +79,7 @@ static const char Shaders_DeclarationsImpl_glsl[] = " vec3 aSHCoeffs[9];\n" " for (int i = 0; i < 9; ++i)\n" " {\n" - " aSHCoeffs[i] = occTexture2D (occDiffIBLMapSHCoeffs, vec2 ((float(i) + 0.5) / 9.0, " - "0.0)).rgb;\n" + " aSHCoeffs[i] = occTexture2D (occDiffIBLMapSHCoeffs, vec2 ((float(i) + 0.5) / 9.0, 0.0)).rgb;\n" " }\n" " return aSHCoeffs[0]\n" "\n" @@ -107,31 +101,20 @@ static const char Shaders_DeclarationsImpl_glsl[] = "uniform vec4 occPbrMaterial[3 * 2];\n" "\n" "#define MIN_ROUGHNESS 0.01\n" - "float occRoughness (in float theNormalizedRoughness) { return theNormalizedRoughness * (1.0 - " - "MIN_ROUGHNESS) + MIN_ROUGHNESS; }\n" - "vec4 occPBRMaterial_Color(in bool theIsFront) { return theIsFront ? occPbrMaterial[0] " - ": occPbrMaterial[3]; }\n" - "vec3 occPBRMaterial_Emission(in bool theIsFront) { return theIsFront ? occPbrMaterial[1].rgb " - ": occPbrMaterial[4].rgb; }\n" - "float occPBRMaterial_IOR(in bool theIsFront) { return theIsFront ? occPbrMaterial[1].w " - ": occPbrMaterial[4].w; }\n" - "float occPBRMaterial_Metallic(in bool theIsFront) { return theIsFront ? occPbrMaterial[2].b " - ": occPbrMaterial[5].b; }\n" - "float occPBRMaterial_NormalizedRoughness(in bool theIsFront) { return theIsFront ? " - "occPbrMaterial[2].g : occPbrMaterial[5].g; }\n" + "float occRoughness (in float theNormalizedRoughness) { return theNormalizedRoughness * (1.0 - MIN_ROUGHNESS) + MIN_ROUGHNESS; }\n" + "vec4 occPBRMaterial_Color(in bool theIsFront) { return theIsFront ? occPbrMaterial[0] : occPbrMaterial[3]; }\n" + "vec3 occPBRMaterial_Emission(in bool theIsFront) { return theIsFront ? occPbrMaterial[1].rgb : occPbrMaterial[4].rgb; }\n" + "float occPBRMaterial_IOR(in bool theIsFront) { return theIsFront ? occPbrMaterial[1].w : occPbrMaterial[4].w; }\n" + "float occPBRMaterial_Metallic(in bool theIsFront) { return theIsFront ? occPbrMaterial[2].b : occPbrMaterial[5].b; }\n" + "float occPBRMaterial_NormalizedRoughness(in bool theIsFront) { return theIsFront ? occPbrMaterial[2].g : occPbrMaterial[5].g; }\n" "#else\n" "uniform vec4 occCommonMaterial[4 * 2];\n" "\n" - "vec4 occMaterial_Diffuse(in bool theIsFront) { return theIsFront ? occCommonMaterial[0] " - ": occCommonMaterial[4]; }\n" - "vec3 occMaterial_Emission(in bool theIsFront) { return theIsFront ? occCommonMaterial[1].rgb " - ": occCommonMaterial[5].rgb; }\n" - "vec3 occMaterial_Specular(in bool theIsFront) { return theIsFront ? occCommonMaterial[2].rgb " - ": occCommonMaterial[6].rgb; }\n" - "float occMaterial_Shininess(in bool theIsFront) { return theIsFront ? occCommonMaterial[2].a " - ": occCommonMaterial[6].a; }\n" - "vec3 occMaterial_Ambient(in bool theIsFront) { return theIsFront ? occCommonMaterial[3].rgb " - ": occCommonMaterial[7].rgb; }\n" + "vec4 occMaterial_Diffuse(in bool theIsFront) { return theIsFront ? occCommonMaterial[0] : occCommonMaterial[4]; }\n" + "vec3 occMaterial_Emission(in bool theIsFront) { return theIsFront ? occCommonMaterial[1].rgb : occCommonMaterial[5].rgb; }\n" + "vec3 occMaterial_Specular(in bool theIsFront) { return theIsFront ? occCommonMaterial[2].rgb : occCommonMaterial[6].rgb; }\n" + "float occMaterial_Shininess(in bool theIsFront) { return theIsFront ? occCommonMaterial[2].a : occCommonMaterial[6].a; }\n" + "vec3 occMaterial_Ambient(in bool theIsFront) { return theIsFront ? occCommonMaterial[3].rgb : occCommonMaterial[7].rgb; }\n" "#endif\n" "\n" "// 2D texture coordinates transformation\n" @@ -140,3 +123,5 @@ static const char Shaders_DeclarationsImpl_glsl[] = "float occTextureTrsf_RotationSin(void) { return occTexTrsf2d[1].x; }\n" "float occTextureTrsf_RotationCos(void) { return occTexTrsf2d[1].y; }\n" "//! @endfile DeclarationsImpl.glsl\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_Declarations_glsl.pxx b/src/Shaders/Shaders_Declarations_glsl.pxx index efcc9e19d3..5c1a015e8a 100644 --- a/src/Shaders/Shaders_Declarations_glsl.pxx +++ b/src/Shaders/Shaders_Declarations_glsl.pxx @@ -1,21 +1,19 @@ -// This file has been automatically generated from resource file src/Shaders/Declarations.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/Declarations.glsl static const char Shaders_Declarations_glsl[] = "\n" - "//! @file Declarations.glsl includes definition of common uniform variables in OCCT GLSL " - "programs\n" + "//! @file Declarations.glsl includes definition of common uniform variables in OCCT GLSL programs\n" "//! @def THE_MAX_LIGHTS\n" "//! Specifies the length of array of lights, which is 8 by default. Defined by Shader Manager.\n" "// #define THE_MAX_LIGHTS 8\n" "\n" "//! @def THE_MAX_CLIP_PLANES\n" - "//! Specifies the length of array of clipping planes, which is 8 by default. Defined by Shader " - "Manager.\n" + "//! Specifies the length of array of clipping planes, which is 8 by default. Defined by Shader Manager.\n" "// #define THE_MAX_CLIP_PLANES 8\n" "\n" "//! @def THE_NB_FRAG_OUTPUTS\n" - "//! Specifies the length of array of Fragment Shader outputs, which is 1 by default. Defined by " - "Shader Manager.\n" + "//! Specifies the length of array of Fragment Shader outputs, which is 1 by default. Defined by Shader Manager.\n" "// #define THE_NB_FRAG_OUTPUTS 1\n" "\n" "// compatibility macros\n" @@ -132,7 +130,6 @@ static const char Shaders_Declarations_glsl[] = "uniform mat4 occProjectionMatrixTranspose; //!< Transpose of the projection matrix\n" "uniform mat4 occModelWorldMatrixTranspose; //!< Transpose of the model-world matrix\n" "\n" - // clang-format off "uniform mat4 occWorldViewMatrixInverseTranspose; //!< Transpose of the inverse of the world-view matrix\n" "uniform mat4 occProjectionMatrixInverseTranspose; //!< Transpose of the inverse of the projection matrix\n" "uniform mat4 occModelWorldMatrixInverseTranspose; //!< Transpose of the inverse of the model-world matrix\n" @@ -144,7 +141,6 @@ static const char Shaders_Declarations_glsl[] = "uniform int occNbSpecIBLLevels; //!< Number of mipmap levels used in occSpecIBLMap to store different roughness values maps\n" "\n" "vec3 occDiffIBLMap (in vec3 theNormal); //!< Unpacks spherical harmonics coefficients to diffuse IBL map's values\n" - // clang-format on "#endif\n" "\n" "// light type enumeration (same as Graphic3d_TypeOfLightSource)\n" @@ -208,9 +204,7 @@ static const char Shaders_Declarations_glsl[] = "// Front/back material properties accessors\n" "vec4 occPBRMaterial_Color(in bool theIsFront); //!< Base color of PBR material\n" "float occPBRMaterial_Metallic(in bool theIsFront); //!< Metallic coefficient\n" - // clang-format off "float occPBRMaterial_NormalizedRoughness(in bool theIsFront); //!< Normalized roughness coefficient\n" - // clang-format on "vec3 occPBRMaterial_Emission(in bool theIsFront); //!< Light intensity emitted by material\n" "float occPBRMaterial_IOR(in bool theIsFront); //!< Index of refraction\n" "#define occMaterial_Emission occPBRMaterial_Emission\n" @@ -228,36 +222,30 @@ static const char Shaders_Declarations_glsl[] = "#define occActiveSampler occSampler0 //!< alias for backward compatibility\n" "#define occSamplerBaseColor occSampler0 //!< alias to a base color texture\n" "uniform sampler2D occSampler0; //!< current active sampler;\n" - "#endif //! occSampler1, occSampler2,... should be defined in " - "GLSL program body for multitexturing\n" + "#endif //! occSampler1, occSampler2,... should be defined in GLSL program body for multitexturing\n" "\n" "#if defined(THE_HAS_TEXTURE_COLOR) && defined(FRAGMENT_SHADER)\n" - "#define occMaterialBaseColor(theIsFront, theTexCoord) (occMaterial_Color(theIsFront) * " - "occTexture2D(occSamplerBaseColor, theTexCoord))\n" + "#define occMaterialBaseColor(theIsFront, theTexCoord) (occMaterial_Color(theIsFront) * occTexture2D(occSamplerBaseColor, theTexCoord))\n" "#else\n" "#define occMaterialBaseColor(theIsFront, theTexCoord) occMaterial_Color(theIsFront)\n" "#endif\n" "\n" "#if defined(THE_HAS_TEXTURE_OCCLUSION) && defined(FRAGMENT_SHADER)\n" "uniform sampler2D occSamplerOcclusion; //!< R occlusion texture sampler\n" - "#define occMaterialOcclusion(theColor, theTexCoord) theColor *= " - "occTexture2D(occSamplerOcclusion, theTexCoord).r;\n" + "#define occMaterialOcclusion(theColor, theTexCoord) theColor *= occTexture2D(occSamplerOcclusion, theTexCoord).r;\n" "#else\n" "#define occMaterialOcclusion(theColor, theTexCoord)\n" "#endif\n" "\n" "#if defined(THE_HAS_TEXTURE_EMISSIVE) && defined(FRAGMENT_SHADER)\n" "uniform sampler2D occSamplerEmissive; //!< RGB emissive texture sampler\n" - "#define occMaterialEmission(theIsFront, theTexCoord) (occMaterial_Emission(theIsFront) * " - "occTexture2D(occSamplerEmissive, theTexCoord).rgb)\n" + "#define occMaterialEmission(theIsFront, theTexCoord) (occMaterial_Emission(theIsFront) * occTexture2D(occSamplerEmissive, theTexCoord).rgb)\n" "#else\n" "#define occMaterialEmission(theIsFront, theTexCoord) occMaterial_Emission(theIsFront)\n" "#endif\n" "\n" "#if defined(THE_HAS_TEXTURE_NORMAL) && defined(FRAGMENT_SHADER)\n" - // clang-format off "uniform sampler2D occSamplerNormal; //!< XYZ normal texture sampler with W==0 indicating no texture\n" - // clang-format on "#define occTextureNormal(theTexCoord) occTexture2D(occSamplerNormal, theTexCoord)\n" "#else\n" "#define occTextureNormal(theTexCoord) vec4(0.0) // no normal map\n" @@ -265,18 +253,13 @@ static const char Shaders_Declarations_glsl[] = "\n" "#if defined(THE_HAS_TEXTURE_METALROUGHNESS) && defined(FRAGMENT_SHADER)\n" "uniform sampler2D occSamplerMetallicRoughness; //!< BG metallic-roughness texture sampler\n" - "#define occMaterialRoughness(theIsFront, theTexCoord) " - "(occPBRMaterial_NormalizedRoughness(theIsFront) * occTexture2D(occSamplerMetallicRoughness, " - "theTexCoord).g)\n" - "#define occMaterialMetallic(theIsFront, theTexCoord) (occPBRMaterial_Metallic(theIsFront) * " - "occTexture2D(occSamplerMetallicRoughness, theTexCoord).b)\n" + "#define occMaterialRoughness(theIsFront, theTexCoord) (occPBRMaterial_NormalizedRoughness(theIsFront) * occTexture2D(occSamplerMetallicRoughness, theTexCoord).g)\n" + "#define occMaterialMetallic(theIsFront, theTexCoord) (occPBRMaterial_Metallic(theIsFront) * occTexture2D(occSamplerMetallicRoughness, theTexCoord).b)\n" "#else\n" - "#define occMaterialRoughness(theIsFront, theTexCoord) " - "occPBRMaterial_NormalizedRoughness(theIsFront)\n" + "#define occMaterialRoughness(theIsFront, theTexCoord) occPBRMaterial_NormalizedRoughness(theIsFront)\n" "#define occMaterialMetallic(theIsFront, theTexCoord) occPBRMaterial_Metallic(theIsFront)\n" "#endif\n" "\n" - // clang-format off "uniform vec4 occColor; //!< color value (in case of disabled lighting)\n" "uniform THE_PREC_ENUM int occDistinguishingMode; //!< Are front and back faces distinguished?\n" "uniform THE_PREC_ENUM int occTextureEnable; //!< Is texture enabled?\n" @@ -292,7 +275,8 @@ static const char Shaders_Declarations_glsl[] = "#if defined(THE_MAX_CLIP_PLANES) && (THE_MAX_CLIP_PLANES > 0)\n" "uniform vec4 occClipPlaneEquations[THE_MAX_CLIP_PLANES];\n" "uniform THE_PREC_ENUM int occClipPlaneChains[THE_MAX_CLIP_PLANES]; //! Indicating the number of planes in the Chain\n" - // clang-format on "uniform THE_PREC_ENUM int occClipPlaneCount; //!< Total number of clip planes\n" "#endif\n" "//! @endfile Declarations.glsl\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_Display_fs.pxx b/src/Shaders/Shaders_Display_fs.pxx index 9621b79a6e..7e3fa3e975 100644 --- a/src/Shaders/Shaders_Display_fs.pxx +++ b/src/Shaders/Shaders_Display_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/Display.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/Display.fs static const char Shaders_Display_fs[] = "#ifdef ADAPTIVE_SAMPLING\n" @@ -59,8 +60,7 @@ static const char Shaders_Display_fs[] = "{\n" " vec4 aPackColor = vec4 (theColor.rgb, theWhitePoint);\n" " vec4 aFilmicCurve = 1.425f * aPackColor + vec4 (0.05f);\n" - " vec4 aResultColor = (aPackColor * aFilmicCurve + vec4 (0.004f)) / (aPackColor * (aFilmicCurve " - "+ vec4 (0.55f)) + vec4 (0.0491f)) - vec4 (0.0821f);\n" + " vec4 aResultColor = (aPackColor * aFilmicCurve + vec4 (0.004f)) / (aPackColor * (aFilmicCurve + vec4 (0.55f)) + vec4 (0.0491f)) - vec4 (0.0821f);\n" " return vec4 (aResultColor.rgb / aResultColor.www, 1.0);\n" "}\n" "\n" @@ -121,8 +121,7 @@ static const char Shaders_Display_fs[] = " // accumulate visual error to current block; estimated error is written only\n" " // after the first 40 samples and path length has reached 10 bounces or more\n" " imageAtomicAdd (uVarianceImage, aPixel / uTileSize,\n" - " int (mix (uVarianceScaleFactor, anError * uVarianceScaleFactor, aColor.w > " - "40.f)));\n" + " int (mix (uVarianceScaleFactor, anError * uVarianceScaleFactor, aColor.w > 40.f)));\n" "\n" " if (uDebugAdaptive == 0) // normal rendering\n" " {\n" @@ -134,8 +133,7 @@ static const char Shaders_Display_fs[] = "#ifdef GL_ARB_shader_image_size\n" " aRatio = vec2 (imageSize (uRenderImage)) / vec2 (3.f * 512.f, 2.f * 512.f);\n" "#endif\n" - " aColor = vec4 (0.5f * aColor.rgb * aSampleWeight + vec3 (0.f, sqrt (aRatio.x * aRatio.y) * " - "aColor.w / uAccumFrames * 0.35f, 0.f), 1.0);\n" + " aColor = vec4 (0.5f * aColor.rgb * aSampleWeight + vec3 (0.f, sqrt (aRatio.x * aRatio.y) * aColor.w / uAccumFrames * 0.35f, 0.f), 1.0);\n" " }\n" "\n" "#endif // ADAPTIVE_SAMPLING\n" @@ -161,3 +159,5 @@ static const char Shaders_Display_fs[] = "\n" "#endif\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_LightShadow_glsl.pxx b/src/Shaders/Shaders_LightShadow_glsl.pxx index e895957bee..4eb79324c3 100644 --- a/src/Shaders/Shaders_LightShadow_glsl.pxx +++ b/src/Shaders/Shaders_LightShadow_glsl.pxx @@ -1,19 +1,15 @@ -// This file has been automatically generated from resource file src/Shaders/LightShadow.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/LightShadow.glsl static const char Shaders_LightShadow_glsl[] = "#if (__VERSION__ >= 120)\n" "//! Coefficients for gathering close samples for antialiasing.\n" - "//! Use only with decent OpenGL (array constants cannot be initialized with GLSL 1.1 / GLSL ES " - "1.1)\n" + "//! Use only with decent OpenGL (array constants cannot be initialized with GLSL 1.1 / GLSL ES 1.1)\n" "const vec2 occPoissonDisk16[16] = vec2[](\n" - " vec2(-0.94201624,-0.39906216), vec2( 0.94558609,-0.76890725), vec2(-0.09418410,-0.92938870), " - "vec2( 0.34495938, 0.29387760),\n" - " vec2(-0.91588581, 0.45771432), vec2(-0.81544232,-0.87912464), vec2(-0.38277543, 0.27676845), " - "vec2( 0.97484398, 0.75648379),\n" - " vec2( 0.44323325,-0.97511554), vec2( 0.53742981,-0.47373420), vec2(-0.26496911,-0.41893023), " - "vec2( 0.79197514, 0.19090188),\n" - " vec2(-0.24188840, 0.99706507), vec2(-0.81409955, 0.91437590), vec2( 0.19984126, 0.78641367), " - "vec2( 0.14383161,-0.14100790)\n" + " vec2(-0.94201624,-0.39906216), vec2( 0.94558609,-0.76890725), vec2(-0.09418410,-0.92938870), vec2( 0.34495938, 0.29387760),\n" + " vec2(-0.91588581, 0.45771432), vec2(-0.81544232,-0.87912464), vec2(-0.38277543, 0.27676845), vec2( 0.97484398, 0.75648379),\n" + " vec2( 0.44323325,-0.97511554), vec2( 0.53742981,-0.47373420), vec2(-0.26496911,-0.41893023), vec2( 0.79197514, 0.19090188),\n" + " vec2(-0.24188840, 0.99706507), vec2(-0.81409955, 0.91437590), vec2( 0.19984126, 0.78641367), vec2( 0.14383161,-0.14100790)\n" ");\n" "#endif\n" "\n" @@ -39,14 +35,12 @@ static const char Shaders_LightShadow_glsl[] = " }\n" "\n" " vec2 aTexelSize = vec2 (occShadowMapSizeBias.x);\n" - " float aBias = max (occShadowMapSizeBias.y * (1.0 - dot (theNormal, aLightDir)), " - "occShadowMapSizeBias.y * 0.1);\n" + " float aBias = max (occShadowMapSizeBias.y * (1.0 - dot (theNormal, aLightDir)), occShadowMapSizeBias.y * 0.1);\n" "#if (__VERSION__ >= 120)\n" " float aShadow = 0.0;\n" " for (int aPosIter = 0; aPosIter < 16; ++aPosIter)\n" " {\n" - " float aClosestDepth = occTexture2D (theShadow, aProjCoords.xy + occPoissonDisk16[aPosIter] " - "* aTexelSize).r;\n" + " float aClosestDepth = occTexture2D (theShadow, aProjCoords.xy + occPoissonDisk16[aPosIter] * aTexelSize).r;\n" " aShadow += (aCurrentDepth - aBias) > aClosestDepth ? 1.0 : 0.0;\n" " }\n" " return 1.0 - aShadow / 16.0;\n" @@ -56,3 +50,5 @@ static const char Shaders_LightShadow_glsl[] = " return 1.0 - aShadow;\n" "#endif\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRCookTorrance_glsl.pxx b/src/Shaders/Shaders_PBRCookTorrance_glsl.pxx index c2c8f88b21..2d407611ff 100644 --- a/src/Shaders/Shaders_PBRCookTorrance_glsl.pxx +++ b/src/Shaders/Shaders_PBRCookTorrance_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRCookTorrance.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRCookTorrance.glsl static const char Shaders_PBRCookTorrance_glsl[] = "//! Calculates Cook-Torrance BRDF.\n" @@ -21,3 +22,5 @@ static const char Shaders_PBRCookTorrance_glsl[] = " aCookTorrance /= 4.0;\n" " return aCookTorrance;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRDirectionalLight_glsl.pxx b/src/Shaders/Shaders_PBRDirectionalLight_glsl.pxx index b0d3276a1f..087037367a 100644 --- a/src/Shaders/Shaders_PBRDirectionalLight_glsl.pxx +++ b/src/Shaders/Shaders_PBRDirectionalLight_glsl.pxx @@ -1,5 +1,5 @@ -// This file has been automatically generated from resource file -// src/Shaders/PBRDirectionalLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRDirectionalLight.glsl static const char Shaders_PBRDirectionalLight_glsl[] = "//! Function computes contribution of directional light source\n" @@ -22,3 +22,5 @@ static const char Shaders_PBRDirectionalLight_glsl[] = " occLight_Specular (theId),\n" " occLight_Intensity(theId)) * theShadow;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRDistribution_glsl.pxx b/src/Shaders/Shaders_PBRDistribution_glsl.pxx index 5c9e1bdb4e..4b248c7fbf 100644 --- a/src/Shaders/Shaders_PBRDistribution_glsl.pxx +++ b/src/Shaders/Shaders_PBRDistribution_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRDistribution.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRDistribution.glsl static const char Shaders_PBRDistribution_glsl[] = "//! Calculates micro facet normals distribution.\n" @@ -6,8 +7,9 @@ static const char Shaders_PBRDistribution_glsl[] = " in float theRoughness)\n" "{\n" " float aDistribution = theRoughness * theRoughness;\n" - " aDistribution = aDistribution / (theCosH * theCosH * (aDistribution * aDistribution - 1.0) + " - "1.0);\n" + " aDistribution = aDistribution / (theCosH * theCosH * (aDistribution * aDistribution - 1.0) + 1.0);\n" " aDistribution = INV_PI * aDistribution * aDistribution;\n" " return aDistribution;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBREnvBaking_fs.pxx b/src/Shaders/Shaders_PBREnvBaking_fs.pxx index 6de306b016..4b9d0aa1d8 100644 --- a/src/Shaders/Shaders_PBREnvBaking_fs.pxx +++ b/src/Shaders/Shaders_PBREnvBaking_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBREnvBaking.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBREnvBaking.fs static const char Shaders_PBREnvBaking_fs[] = "THE_SHADER_IN vec3 ViewDirection; //!< direction of fetching from environment cubemap\n" @@ -16,10 +17,8 @@ static const char Shaders_PBREnvBaking_fs[] = "#endif\n" "\n" "#ifdef THE_TO_BAKE_SPECULAR\n" - // clang-format off "uniform int uCurrentLevel; //!< current level of specular IBL map (ignored in case of diffuse map's processing)\n" "uniform float uEnvSolidAngleSource; //!< source solid angle sample computed from one edge's size of source environment map's zero mipmap level\n" - // clang-format on "#endif\n" "\n" "//! Returns coordinates of point theNumber from Hammersley point set having size theSize.\n" @@ -41,8 +40,7 @@ static const char Shaders_PBREnvBaking_fs[] = " return vec2(float(theNumber) / float(theSize), aVanDerCorput);\n" "}\n" "\n" - "//! This function does importance sampling on hemisphere surface using GGX normal distribution " - "function\n" + "//! This function does importance sampling on hemisphere surface using GGX normal distribution function\n" "//! in tangent space (positive z axis is surface normal direction).\n" "vec3 importanceSample (in vec2 theHammersleyPoint,\n" " in float theRoughness)\n" @@ -50,8 +48,7 @@ static const char Shaders_PBREnvBaking_fs[] = " float aPhi = PI_2 * theHammersleyPoint.x;\n" " theRoughness *= theRoughness;\n" " theRoughness *= theRoughness;\n" - " float aCosTheta = sqrt((1.0 - theHammersleyPoint.y) / (1.0 + (theRoughness - 1.0) * " - "theHammersleyPoint.y));\n" + " float aCosTheta = sqrt((1.0 - theHammersleyPoint.y) / (1.0 + (theRoughness - 1.0) * theHammersleyPoint.y));\n" " float aSinTheta = sqrt(1.0 - aCosTheta * aCosTheta);\n" " return vec3(aSinTheta * cos(aPhi),\n" " aSinTheta * sin(aPhi),\n" @@ -69,8 +66,7 @@ static const char Shaders_PBREnvBaking_fs[] = " aCosTheta);\n" "}\n" "\n" - "//! Transforms resulted sampled direction from tangent space to world space considering the " - "surface normal.\n" + "//! Transforms resulted sampled direction from tangent space to world space considering the surface normal.\n" "vec3 fromTangentSpace (in vec3 theVector,\n" " in vec3 theNormal)\n" "{\n" @@ -184,10 +180,8 @@ static const char Shaders_PBREnvBaking_fs[] = " float aNdotL = dot (aLight, theNormal);\n" " if (aNdotL > 0.0)\n" " {\n" - " float aSolidAngleSample = 1.0 / (float(theSize) * (occPBRDistribution (aHdotV, " - "theRoughness) * 0.25 + 0.0001) + 0.0001);\n" - " float aLod = (theRoughness == 0.0) ? 0.0 : 0.5 * log2 (aSolidAngleSample / " - "uEnvSolidAngleSource);\n" + " float aSolidAngleSample = 1.0 / (float(theSize) * (occPBRDistribution (aHdotV, theRoughness) * 0.25 + 0.0001) + 0.0001);\n" + " float aLod = (theRoughness == 0.0) ? 0.0 : 0.5 * log2 (aSolidAngleSample / uEnvSolidAngleSource);\n" " return vec4 (occTextureCubeLod (uEnvMap, aLight, aLod).rgb * aNdotL, aNdotL);\n" " }\n" " return vec4 (0.0);\n" @@ -225,8 +219,7 @@ static const char Shaders_PBREnvBaking_fs[] = " int aFixedDiv1 = aFixedPrec / 256;\n" " int aFixedDiv2 = aFixedDiv1 / 256;\n" " int aFixedDiv3 = aFixedDiv2 / 256;\n" - " vec4 aPacked = vec4(float(aFixedPrec), float(aFixedDiv1), float(aFixedDiv2), " - "float(aFixedDiv3));\n" + " vec4 aPacked = vec4(float(aFixedPrec), float(aFixedDiv1), float(aFixedDiv2), float(aFixedDiv3));\n" " aRes = fract (aPacked * (1.0 / 256.0));\n" "#endif\n" " occFragColor = aRes;\n" @@ -235,3 +228,5 @@ static const char Shaders_PBREnvBaking_fs[] = " occFragColor = vec4 (bakeSpecularMap (aViewDirection, aRoughness), 1.0);\n" "#endif\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBREnvBaking_vs.pxx b/src/Shaders/Shaders_PBREnvBaking_vs.pxx index 1c004a5fc7..fc19e3f20e 100644 --- a/src/Shaders/Shaders_PBREnvBaking_vs.pxx +++ b/src/Shaders/Shaders_PBREnvBaking_vs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBREnvBaking.vs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBREnvBaking.vs static const char Shaders_PBREnvBaking_vs[] = "THE_SHADER_OUT vec3 ViewDirection; //!< direction of fetching from environment cubemap\n" @@ -56,3 +57,5 @@ static const char Shaders_PBREnvBaking_vs[] = " ViewDirection = cubemapVectorTransform (aDir, uYCoeff, uZCoeff);\n" " gl_Position = vec4 (occVertex.xy, 0.0, 1.0);\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRFresnel_glsl.pxx b/src/Shaders/Shaders_PBRFresnel_glsl.pxx index 3612829607..65c6507ac1 100644 --- a/src/Shaders/Shaders_PBRFresnel_glsl.pxx +++ b/src/Shaders/Shaders_PBRFresnel_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRFresnel.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRFresnel.glsl static const char Shaders_PBRFresnel_glsl[] = "//! Functions to calculate fresnel coefficient and approximate zero fresnel value.\n" @@ -37,3 +38,5 @@ static const char Shaders_PBRFresnel_glsl[] = " theCosV *= theCosV * theCosV * theCosV * theCosV;\n" " return f0 + (max(vec3(1.0 - theRoughness), f0) - f0) * theCosV;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRGeometry_glsl.pxx b/src/Shaders/Shaders_PBRGeometry_glsl.pxx index 7ade3af473..0846abce1c 100644 --- a/src/Shaders/Shaders_PBRGeometry_glsl.pxx +++ b/src/Shaders/Shaders_PBRGeometry_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRGeometry.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRGeometry.glsl static const char Shaders_PBRGeometry_glsl[] = "//! Calculates geometry factor for Cook-Torrance BRDF.\n" @@ -14,3 +15,5 @@ static const char Shaders_PBRGeometry_glsl[] = " g2 /= theCosL * (1.0 - k) + k;\n" " return g1 * g2;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRIllumination_glsl.pxx b/src/Shaders/Shaders_PBRIllumination_glsl.pxx index c71c63ad45..1e273a2c8a 100644 --- a/src/Shaders/Shaders_PBRIllumination_glsl.pxx +++ b/src/Shaders/Shaders_PBRIllumination_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRIllumination.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRIllumination.glsl static const char Shaders_PBRIllumination_glsl[] = "//! Calculates direct illumination using Cook-Torrance BRDF.\n" @@ -27,6 +28,7 @@ static const char Shaders_PBRIllumination_glsl[] = " aDiffuse *= INV_PI;\n" " aDiffuse *= theBaseColor.rgb;\n" " aDiffuse = mix (vec3(0.0), aDiffuse, theBaseColor.a);\n" - " return (aDiffuse + aSpecular) * theLightColor * theLightIntensity * max(0.0, dot(theLight, " - "theNormal));\n" + " return (aDiffuse + aSpecular) * theLightColor * theLightIntensity * max(0.0, dot(theLight, theNormal));\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRPointLight_glsl.pxx b/src/Shaders/Shaders_PBRPointLight_glsl.pxx index d08f5908e8..a76cf24cc6 100644 --- a/src/Shaders/Shaders_PBRPointLight_glsl.pxx +++ b/src/Shaders/Shaders_PBRPointLight_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRPointLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRPointLight.glsl static const char Shaders_PBRPointLight_glsl[] = "//! Function computes contribution of isotropic point light source\n" @@ -28,3 +29,5 @@ static const char Shaders_PBRPointLight_glsl[] = " occLight_Specular (theId),\n" " occLight_Intensity(theId) * anAtten);\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PBRSpotLight_glsl.pxx b/src/Shaders/Shaders_PBRSpotLight_glsl.pxx index 10fc224c51..d933cf266f 100644 --- a/src/Shaders/Shaders_PBRSpotLight_glsl.pxx +++ b/src/Shaders/Shaders_PBRSpotLight_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PBRSpotLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PBRSpotLight.glsl static const char Shaders_PBRSpotLight_glsl[] = "//! Function computes contribution of spotlight source\n" @@ -35,11 +36,9 @@ static const char Shaders_PBRSpotLight_glsl[] = " if ((1.0 - aRelativeAngle) <= anExponent)\n" " {\n" " float anAngularAttenuationOffset = cos(0.5 * occLight_SpotCutOff(theId));\n" - " float anAngularAttenuationScale = 1.0 / max(0.001, cos(0.5 * occLight_SpotCutOff(theId) * " - "(1.0 - anExponent)) - anAngularAttenuationOffset);\n" + " float anAngularAttenuationScale = 1.0 / max(0.001, cos(0.5 * occLight_SpotCutOff(theId) * (1.0 - anExponent)) - anAngularAttenuationOffset);\n" " anAngularAttenuationOffset *= -anAngularAttenuationScale;\n" - " float anAngularAttenuantion = clamp(aCosA * anAngularAttenuationScale + " - "anAngularAttenuationOffset, 0.0, 1.0);\n" + " float anAngularAttenuantion = clamp(aCosA * anAngularAttenuationScale + anAngularAttenuationOffset, 0.0, 1.0);\n" " anAtten *= anAngularAttenuantion * anAngularAttenuantion;\n" " }\n" " theNormal = theIsFront ? theNormal : -theNormal;\n" @@ -48,3 +47,5 @@ static const char Shaders_PBRSpotLight_glsl[] = " occLight_Specular(theId),\n" " occLight_Intensity(theId) * anAtten) * theShadow;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PathtraceBase_fs.pxx b/src/Shaders/Shaders_PathtraceBase_fs.pxx index 27324abaf2..349965dc11 100644 --- a/src/Shaders/Shaders_PathtraceBase_fs.pxx +++ b/src/Shaders/Shaders_PathtraceBase_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PathtraceBase.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PathtraceBase.fs static const char Shaders_PathtraceBase_fs[] = "#ifdef _MSC_VER\n" @@ -110,8 +111,7 @@ static const char Shaders_PathtraceBase_fs[] = "//=======================================================================\n" "float convolve (in vec3 theVector, in vec3 theFactor)\n" "{\n" - " return dot (theVector, theFactor) * (1.f / max (theFactor.x + theFactor.y + theFactor.z, " - "1e-15f));\n" + " return dot (theVector, theFactor) * (1.f / max (theFactor.x + theFactor.y + theFactor.z, 1e-15f));\n" "}\n" "\n" "//=======================================================================\n" @@ -291,8 +291,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function : EvalBlinnReflection\n" "// purpose : Evaluates Blinn glossy BRDF, with cos(N, PSI)\n" "//=======================================================================\n" - "vec3 EvalBlinnReflection (in vec3 theWi, in vec3 theWo, in vec3 theFresnel, in float " - "theRoughness)\n" + "vec3 EvalBlinnReflection (in vec3 theWi, in vec3 theWo, in vec3 theFresnel, in float theRoughness)\n" "{\n" " // calculate the reflection half-vec\n" " vec3 aH = normalize (theWi + theWo);\n" @@ -327,16 +326,14 @@ static const char Shaders_PathtraceBase_fs[] = "\n" " if (theBSDF.Ks.w > FLT_EPSILON)\n" " {\n" - " aBxDF += theBSDF.Ks.rgb * EvalBlinnReflection (theWi, theWo, theBSDF.FresnelBase.rgb, " - "theBSDF.Ks.w);\n" + " aBxDF += theBSDF.Ks.rgb * EvalBlinnReflection (theWi, theWo, theBSDF.FresnelBase.rgb, theBSDF.Ks.w);\n" " }\n" "\n" " aBxDF *= UNIT - fresnelMedia (theWo.z, theBSDF.FresnelCoat);\n" "\n" " if (theBSDF.Kc.w > FLT_EPSILON)\n" " {\n" - " aBxDF += theBSDF.Kc.rgb * EvalBlinnReflection (theWi, theWo, theBSDF.FresnelCoat, " - "theBSDF.Kc.w);\n" + " aBxDF += theBSDF.Kc.rgb * EvalBlinnReflection (theWi, theWo, theBSDF.FresnelCoat, theBSDF.Kc.w);\n" " }\n" "\n" " return aBxDF;\n" @@ -380,8 +377,7 @@ static const char Shaders_PathtraceBase_fs[] = "// terms would be complex, and it is the D term that accounts\n" "// for most of the variation.\n" "//=======================================================================\n" - "vec3 SampleGlossyBlinnReflection (in vec3 theWo, out vec3 theWi, in vec3 theFresnel, in float " - "theRoughness, inout float thePDF)\n" + "vec3 SampleGlossyBlinnReflection (in vec3 theWo, out vec3 theWi, in vec3 theFresnel, in float theRoughness, inout float thePDF)\n" "{\n" " float aKsi1 = RandFloat();\n" " float aKsi2 = RandFloat();\n" @@ -463,20 +459,16 @@ static const char Shaders_PathtraceBase_fs[] = "\n" " if (theBSDF.Kc.w > FLT_EPSILON)\n" " {\n" - " float aPower = max (2.f / (theBSDF.Kc.w * theBSDF.Kc.w) - 2.f, 0.f); // roughness --> " - "exponent\n" + " float aPower = max (2.f / (theBSDF.Kc.w * theBSDF.Kc.w) - 2.f, 0.f); // roughness --> exponent\n" "\n" - " aPDF += aPc * (aPower + 2.f) * (0.25f / M_2_PI) * pow (abs (aH.z), aPower + 1.f) / dot " - "(theWi, aH);\n" + " aPDF += aPc * (aPower + 2.f) * (0.25f / M_2_PI) * pow (abs (aH.z), aPower + 1.f) / dot (theWi, aH);\n" " }\n" "\n" " if (theBSDF.Ks.w > FLT_EPSILON)\n" " {\n" - " float aPower = max (2.f / (theBSDF.Ks.w * theBSDF.Ks.w) - 2.f, 0.f); // roughness --> " - "exponent\n" + " float aPower = max (2.f / (theBSDF.Ks.w * theBSDF.Ks.w) - 2.f, 0.f); // roughness --> exponent\n" "\n" - " aPDF += aPs * (aPower + 2.f) * (0.25f / M_2_PI) * pow (abs (aH.z), aPower + 1.f) / dot " - "(theWi, aH);\n" + " aPDF += aPs * (aPower + 2.f) * (0.25f / M_2_PI) * pow (abs (aH.z), aPower + 1.f) / dot (theWi, aH);\n" " }\n" " }\n" "\n" @@ -490,8 +482,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function : SampleBsdfLayered\n" "// purpose : Samples specified composite material (BSDF)\n" "//=======================================================================\n" - "float SampleBsdfLayered (in SBSDF theBSDF, in vec3 theWo, out vec3 theWi, inout vec3 theWeight, " - "inout bool theInside)\n" + "float SampleBsdfLayered (in SBSDF theBSDF, in vec3 theWo, out vec3 theWi, inout vec3 theWeight, inout bool theInside)\n" "{\n" " // NOTE: OCCT uses two-layer material model. We have base diffuse, glossy, or transmissive\n" " // layer, covered by one glossy/specular coat. In the current model, the layers themselves\n" @@ -538,8 +529,7 @@ static const char Shaders_PathtraceBase_fs[] = " }\n" " else\n" " {\n" - " theWeight *= SampleGlossyBlinnReflection (theWo, theWi, theBSDF.FresnelCoat, " - "theBSDF.Kc.w, aPDF);\n" + " theWeight *= SampleGlossyBlinnReflection (theWo, theWi, theBSDF.FresnelCoat, theBSDF.Kc.w, aPDF);\n" " }\n" "\n" " aPDF = mix (aPDF, MAXFLOAT, theBSDF.Kc.w < FLT_EPSILON);\n" @@ -568,8 +558,7 @@ static const char Shaders_PathtraceBase_fs[] = " }\n" " else\n" " {\n" - " theWeight *= SampleGlossyBlinnReflection (theWo, theWi, theBSDF.FresnelBase.rgb, " - "theBSDF.Ks.w, aPDF);\n" + " theWeight *= SampleGlossyBlinnReflection (theWo, theWi, theBSDF.FresnelBase.rgb, theBSDF.Ks.w, aPDF);\n" " }\n" "\n" " aPDF = mix (aPDF, MAXFLOAT, theBSDF.Ks.w < FLT_EPSILON);\n" @@ -599,8 +588,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function : SampleLight\n" "// purpose : General sampling function for directional and point lights\n" "//=======================================================================\n" - "vec3 SampleLight (in vec3 theToLight, inout float theDistance, in bool isInfinite, in float " - "theSmoothness, inout float thePDF)\n" + "vec3 SampleLight (in vec3 theToLight, inout float theDistance, in bool isInfinite, in float theSmoothness, inout float thePDF)\n" "{\n" " SLocalSpace aSpace = buildLocalSpace (theToLight * (1.f / theDistance));\n" "\n" @@ -628,8 +616,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function : HandlePointLight\n" "// purpose :\n" "//=======================================================================\n" - "float HandlePointLight (in vec3 theInput, in vec3 theToLight, in float theRadius, in float " - "theDistance, inout float thePDF)\n" + "float HandlePointLight (in vec3 theInput, in vec3 theToLight, in float theRadius, in float theDistance, inout float thePDF)\n" "{\n" " float aCosMax = inversesqrt (1.f + theRadius * theRadius / (theDistance * theDistance));\n" "\n" @@ -644,8 +631,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function : HandleDistantLight\n" "// purpose :\n" "//=======================================================================\n" - "float HandleDistantLight (in vec3 theInput, in vec3 theToLight, in float theCosMax, inout float " - "thePDF)\n" + "float HandleDistantLight (in vec3 theInput, in vec3 theToLight, in float theCosMax, inout float thePDF)\n" "{\n" " float aVisibility = step (theCosMax, dot (theInput, theToLight));\n" "\n" @@ -658,8 +644,7 @@ static const char Shaders_PathtraceBase_fs[] = "// function: IntersectLight\n" "// purpose : Checks intersections with light sources\n" "// =======================================================================\n" - "vec3 IntersectLight (in SRay theRay, in int theDepth, in float theHitDistance, out float " - "thePDF)\n" + "vec3 IntersectLight (in SRay theRay, in int theDepth, in float theHitDistance, out float thePDF)\n" "{\n" " vec3 aTotalRadiance = ZERO;\n" " thePDF = 0.f; // PDF of sampling light sources\n" @@ -710,8 +695,7 @@ static const char Shaders_PathtraceBase_fs[] = " {\n" " vec2 aPixel = uEyeSize * (vPixel - vec2 (0.5)) * 2.0;\n" " vec2 anAperturePnt = sampleUniformDisk() * uApertureRadius;\n" - " vec3 aLocalDir = normalize (vec3 (aPixel * uFocalPlaneDist - anAperturePnt, " - "uFocalPlaneDist));\n" + " vec3 aLocalDir = normalize (vec3 (aPixel * uFocalPlaneDist - anAperturePnt, uFocalPlaneDist));\n" " vec3 aDirect = uEyeView * aLocalDir.z +\n" " uEyeSide * aLocalDir.x +\n" " uEyeVert * aLocalDir.y;\n" @@ -774,8 +758,7 @@ static const char Shaders_PathtraceBase_fs[] = "\n" "//=======================================================================\n" "// function : NormalAdaptation\n" - "// purpose : Adapt smooth normal (which may be different from geometry normal) in order to " - "avoid black areas in render\n" + "// purpose : Adapt smooth normal (which may be different from geometry normal) in order to avoid black areas in render\n" "//=======================================================================\n" "bool NormalAdaptation (in vec3 theView, in vec3 theGeometryNormal, inout vec3 theSmoothNormal)\n" "{\n" @@ -784,8 +767,7 @@ static const char Shaders_PathtraceBase_fs[] = " float aCos = dot(theGeometryNormal, theSmoothNormal);\n" " if (aCos < aMinCos)\n" " {\n" - " theSmoothNormal = aMinCos * theGeometryNormal + normalize(theSmoothNormal - aCos * " - "theGeometryNormal) * sqrt(1.0 - aMinCos * aMinCos);\n" + " theSmoothNormal = aMinCos * theGeometryNormal + normalize(theSmoothNormal - aCos * theGeometryNormal) * sqrt(1.0 - aMinCos * aMinCos);\n" " return true;\n" " }\n" " return false;\n" @@ -845,8 +827,7 @@ static const char Shaders_PathtraceBase_fs[] = " #ifdef THE_ZERO_TO_ONE_DEPTH\n" " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE);\n" " #else\n" - " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE) * " - "0.5f + 0.5f;\n" + " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE) * 0.5f + 0.5f;\n" " #endif\n" " }\n" "\n" @@ -859,10 +840,8 @@ static const char Shaders_PathtraceBase_fs[] = " aBSDF.Kt = texelFetch (uRaytraceMaterialTexture, MATERIAL_KT (aTriangle.TriIndex.w));\n" "\n" " // fetch Fresnel reflectance for both layers\n" - " aBSDF.FresnelCoat = texelFetch (uRaytraceMaterialTexture, MATERIAL_FRESNEL_COAT " - "(aTriangle.TriIndex.w)).xyz;\n" - " aBSDF.FresnelBase = texelFetch (uRaytraceMaterialTexture, MATERIAL_FRESNEL_BASE " - "(aTriangle.TriIndex.w));\n" + " aBSDF.FresnelCoat = texelFetch (uRaytraceMaterialTexture, MATERIAL_FRESNEL_COAT (aTriangle.TriIndex.w)).xyz;\n" + " aBSDF.FresnelBase = texelFetch (uRaytraceMaterialTexture, MATERIAL_FRESNEL_BASE (aTriangle.TriIndex.w));\n" "\n" " vec4 anLE = texelFetch (uRaytraceMaterialTexture, MATERIAL_LE (aTriangle.TriIndex.w));\n" "\n" @@ -877,34 +856,28 @@ static const char Shaders_PathtraceBase_fs[] = " {\n" " vec2 aUVs[3];\n" " vec4 aTexCoord = vec4 (SmoothUV (aHit.UV, aTriangle.TriIndex, aUVs), 0.f, 1.f);\n" - " vec4 aTrsfRow1 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS1 " - "(aTriangle.TriIndex.w));\n" - " vec4 aTrsfRow2 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS2 " - "(aTriangle.TriIndex.w));\n" + " vec4 aTrsfRow1 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS1 (aTriangle.TriIndex.w));\n" + " vec4 aTrsfRow2 = texelFetch (uRaytraceMaterialTexture, MATERIAL_TRS2 (aTriangle.TriIndex.w));\n" " aTexCoord.st = vec2 (dot (aTrsfRow1, aTexCoord),\n" " dot (aTrsfRow2, aTexCoord));\n" "\n" " if (anLE.w >= 0.0)\n" " {\n" - " anLE.rgb *= textureLod (sampler2D (uTextureSamplers[int (anLE.w)]), aTexCoord.st, " - "0.0).rgb;\n" + " anLE.rgb *= textureLod (sampler2D (uTextureSamplers[int (anLE.w)]), aTexCoord.st, 0.0).rgb;\n" " }\n" " if (aBSDF.Kt.w >= 0.0)\n" " {\n" - " vec2 aTexMetRough = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kt.w)]), " - "aTexCoord.st, 0.0).bg;\n" + " vec2 aTexMetRough = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kt.w)]), aTexCoord.st, 0.0).bg;\n" " float aPbrMetal = aTexMetRough.x;\n" " float aPbrRough2 = aTexMetRough.y * aTexMetRough.y;\n" " aBSDF.Ks.a *= aPbrRough2;\n" - " // when using metal-roughness texture, global metalness of material (encoded in " - "FresnelBase) is expected to be 1.0 so that Kd will be 0.0\n" + " // when using metal-roughness texture, global metalness of material (encoded in FresnelBase) is expected to be 1.0 so that Kd will be 0.0\n" " aBSDF.Kd.rgb = aBSDF.FresnelBase.rgb * (1.0 - aPbrMetal);\n" " aBSDF.FresnelBase.rgb *= aPbrMetal;\n" " }\n" " if (aBSDF.Kd.w >= 0.0)\n" " {\n" - " vec4 aTexColor = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), " - "aTexCoord.st, 0.0);\n" + " vec4 aTexColor = textureLod (sampler2D (uTextureSamplers[int (aBSDF.Kd.w)]), aTexCoord.st, 0.0);\n" " vec3 aDiff = aTexColor.rgb * aTexColor.a;\n" " aBSDF.Kd.rgb *= aDiff;\n" " aBSDF.FresnelBase.rgb *= aDiff;\n" @@ -923,13 +896,10 @@ static const char Shaders_PathtraceBase_fs[] = " aUVs[i] = vec2 (dot (aTrsfRow1, vec4(aUVs[i], 0.0, 1.0)),\n" " dot (aTrsfRow2, vec4(aUVs[i], 0.0, 1.0)));\n" " }\n" - " vec3 aMapNormalValue = textureLod (sampler2D (uTextureSamplers[int " - "(aBSDF.FresnelBase.w)]), aTexCoord.st, 0.0).xyz;\n" + " vec3 aMapNormalValue = textureLod (sampler2D (uTextureSamplers[int (aBSDF.FresnelBase.w)]), aTexCoord.st, 0.0).xyz;\n" " mat2 aDeltaUVMatrix = mat2 (aUVs[1] - aUVs[0], aUVs[1] - aUVs[2]);\n" - " mat2x3 aDeltaVectorMatrix = mat2x3 (aTriangle.Points[1] - aTriangle.Points[0], " - "aTriangle.Points[1] - aTriangle.Points[2]);\n" - " aNormal = TangentSpaceNormal (aDeltaUVMatrix, aDeltaVectorMatrix, aMapNormalValue, " - "aNormal, true);\n" + " mat2x3 aDeltaVectorMatrix = mat2x3 (aTriangle.Points[1] - aTriangle.Points[0], aTriangle.Points[1] - aTriangle.Points[2]);\n" + " aNormal = TangentSpaceNormal (aDeltaUVMatrix, aDeltaVectorMatrix, aMapNormalValue, aNormal, true);\n" " }\n" " #endif\n" " }\n" @@ -956,18 +926,15 @@ static const char Shaders_PathtraceBase_fs[] = " aLight.w == 0.f /* is infinite */, aParam.w /* max cos or radius */, aExpPDF);\n" "\n" " aImpPDF = BsdfPdfLayered (aBSDF,\n" - " toLocalSpace (-theRay.Direct, aSpace), toLocalSpace (aLight.xyz, aSpace), " - "aThroughput);\n" + " toLocalSpace (-theRay.Direct, aSpace), toLocalSpace (aLight.xyz, aSpace), aThroughput);\n" "\n" " // MIS weight including division by explicit PDF\n" - " float aMIS = (aExpPDF == MAXFLOAT) ? 1.f : aExpPDF / (aExpPDF * aExpPDF + aImpPDF * " - "aImpPDF);\n" + " float aMIS = (aExpPDF == MAXFLOAT) ? 1.f : aExpPDF / (aExpPDF * aExpPDF + aImpPDF * aImpPDF);\n" "\n" " vec3 aContrib = aMIS * aParam.rgb /* Le */ * EvalBsdfLayered (\n" " aBSDF, toLocalSpace (aLight.xyz, aSpace), toLocalSpace (-theRay.Direct, aSpace));\n" "\n" - " if (any (greaterThan (aContrib, MIN_CONTRIBUTION))) // check if light source is " - "important\n" + " if (any (greaterThan (aContrib, MIN_CONTRIBUTION))) // check if light source is important\n" " {\n" " SRay aShadow = SRay (theRay.Origin + aLight.xyz * uSceneEpsilon, aLight.xyz);\n" "\n" @@ -986,8 +953,7 @@ static const char Shaders_PathtraceBase_fs[] = "\n" " if (aInMedium) // handle attenuation\n" " {\n" - " vec4 aScattering = texelFetch (uRaytraceMaterialTexture, MATERIAL_ABSORPT_BASE " - "(aTriangle.TriIndex.w));\n" + " vec4 aScattering = texelFetch (uRaytraceMaterialTexture, MATERIAL_ABSORPT_BASE (aTriangle.TriIndex.w));\n" "\n" " aThroughput *= exp (-aHit.Time * aScattering.w * (UNIT - aScattering.rgb));\n" " }\n" @@ -1018,8 +984,7 @@ static const char Shaders_PathtraceBase_fs[] = " anInput = normalize (fromLocalSpace (anInput, aSpace));\n" "\n" " theRay = SRay (theRay.Origin + anInput * uSceneEpsilon +\n" - " aHit.Normal * mix (-uSceneEpsilon, uSceneEpsilon, step (0.f, dot (aHit.Normal, " - "anInput))), anInput);\n" + " aHit.Normal * mix (-uSceneEpsilon, uSceneEpsilon, step (0.f, dot (aHit.Normal, anInput))), anInput);\n" "\n" " theInverse = InverseDirection (anInput);\n" " }\n" @@ -1030,3 +995,5 @@ static const char Shaders_PathtraceBase_fs[] = "}\n" "\n" "#endif\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PhongDirectionalLight_glsl.pxx b/src/Shaders/Shaders_PhongDirectionalLight_glsl.pxx index 966912c45a..849011b4af 100644 --- a/src/Shaders/Shaders_PhongDirectionalLight_glsl.pxx +++ b/src/Shaders/Shaders_PhongDirectionalLight_glsl.pxx @@ -1,5 +1,5 @@ -// This file has been automatically generated from resource file -// src/Shaders/PhongDirectionalLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PhongDirectionalLight.glsl static const char Shaders_PhongDirectionalLight_glsl[] = "//! Function computes contribution of directional light source\n" @@ -31,3 +31,5 @@ static const char Shaders_PhongDirectionalLight_glsl[] = " Diffuse += occLight_Diffuse (theId) * aNdotL * theShadow;\n" " Specular += occLight_Specular (theId) * aSpecl * theShadow;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PhongPointLight_glsl.pxx b/src/Shaders/Shaders_PhongPointLight_glsl.pxx index 70c6fc362a..992abb1120 100644 --- a/src/Shaders/Shaders_PhongPointLight_glsl.pxx +++ b/src/Shaders/Shaders_PhongPointLight_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PhongPointLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PhongPointLight.glsl static const char Shaders_PhongPointLight_glsl[] = "//! Function computes contribution of isotropic point light source\n" @@ -18,8 +19,7 @@ static const char Shaders_PhongPointLight_glsl[] = "\n" " float aDist = length (aLight);\n" " float aRange = occLight_Range (theId);\n" - " float anAtten = occPointLightAttenuation (aDist, aRange, occLight_LinearAttenuation (theId), " - "occLight_ConstAttenuation (theId));\n" + " float anAtten = occPointLightAttenuation (aDist, aRange, occLight_LinearAttenuation (theId), occLight_ConstAttenuation (theId));\n" " if (anAtten <= 0.0) return;\n" " aLight /= aDist;\n" "\n" @@ -38,3 +38,5 @@ static const char Shaders_PhongPointLight_glsl[] = " Diffuse += occLight_Diffuse (theId) * aNdotL * anAtten;\n" " Specular += occLight_Specular(theId) * aSpecl * anAtten;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PhongShading_fs.pxx b/src/Shaders/Shaders_PhongShading_fs.pxx new file mode 100644 index 0000000000..b08dc38a70 --- /dev/null +++ b/src/Shaders/Shaders_PhongShading_fs.pxx @@ -0,0 +1,197 @@ +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PhongShading.fs + +static const char Shaders_PhongShading_fs[] = + "// Created on: 2013-10-10\n" + "// Created by: Denis BOGOLEPOV\n" + "// Copyright (c) 2013-2014 OPEN CASCADE SAS\n" + "//\n" + "// This file is part of Open CASCADE Technology software library.\n" + "//\n" + "// This library is free software; you can redistribute it and/or modify it under\n" + "// the terms of the GNU Lesser General Public License version 2.1 as published\n" + "// by the Free Software Foundation, with special exception defined in the file\n" + "// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT\n" + "// distribution for complete text of the license and disclaimer of any warranty.\n" + "//\n" + "// Alternatively, this file may be used under the terms of Open CASCADE\n" + "// commercial license or contractual agreement.\n" + "\n" + "varying vec3 View; //!< Direction to the viewer\n" + "varying vec3 Normal; //!< Vertex normal in view space\n" + "varying vec4 Position; //!< Vertex position in view space.\n" + "varying vec4 PositionWorld; //!< Vertex position in world space\n" + "\n" + "vec3 Ambient; //!< Ambient contribution of light sources\n" + "vec3 Diffuse; //!< Diffuse contribution of light sources\n" + "vec3 Specular; //!< Specular contribution of light sources\n" + "\n" + "//! Computes contribution of isotropic point light source\n" + "void pointLight (in int theId,\n" + " in vec3 theNormal,\n" + " in vec3 theView,\n" + " in vec3 thePoint)\n" + "{\n" + " vec3 aLight = occLight_Position (theId).xyz;\n" + " if (!occLight_IsHeadlight (theId))\n" + " {\n" + " aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));\n" + " }\n" + " aLight -= thePoint;\n" + "\n" + " float aDist = length (aLight);\n" + " aLight = aLight * (1.0 / aDist);\n" + "\n" + " float anAtten = 1.0 / (occLight_ConstAttenuation (theId)\n" + " + occLight_LinearAttenuation (theId) * aDist);\n" + "\n" + " vec3 aHalf = normalize (aLight + theView);\n" + "\n" + " vec3 aFaceSideNormal = gl_FrontFacing ? theNormal : -theNormal;\n" + " float aNdotL = max (0.0, dot (aFaceSideNormal, aLight));\n" + " float aNdotH = max (0.0, dot (aFaceSideNormal, aHalf ));\n" + "\n" + " float aSpecl = 0.0;\n" + " if (aNdotL > 0.0)\n" + " {\n" + " aSpecl = pow (aNdotH, occMaterial_Shininess (gl_FrontFacing));\n" + " }\n" + "\n" + " Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;\n" + " Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;\n" + "}\n" + "\n" + "//! Computes contribution of spotlight source\n" + "void spotLight (in int theId,\n" + " in vec3 theNormal,\n" + " in vec3 theView,\n" + " in vec3 thePoint)\n" + "{\n" + " vec3 aLight = occLight_Position (theId).xyz;\n" + " vec3 aSpotDir = occLight_SpotDirection (theId).xyz;\n" + " if (!occLight_IsHeadlight (theId))\n" + " {\n" + " aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));\n" + " aSpotDir = vec3 (occWorldViewMatrix * vec4 (aSpotDir, 0.0));\n" + " }\n" + " aLight -= thePoint;\n" + "\n" + " float aDist = length (aLight);\n" + " aLight = aLight * (1.0 / aDist);\n" + "\n" + " aSpotDir = normalize (aSpotDir);\n" + "\n" + " // light cone\n" + " float aCosA = dot (aSpotDir, -aLight);\n" + " if (aCosA >= 1.0 || aCosA < cos (occLight_SpotCutOff (theId)))\n" + " {\n" + " return;\n" + " }\n" + "\n" + " float anExponent = occLight_SpotExponent (theId);\n" + " float anAtten = 1.0 / (occLight_ConstAttenuation (theId)\n" + " + occLight_LinearAttenuation (theId) * aDist);\n" + " if (anExponent > 0.0)\n" + " {\n" + " anAtten *= pow (aCosA, anExponent * 128.0);\n" + " }\n" + "\n" + " vec3 aHalf = normalize (aLight + theView);\n" + "\n" + " vec3 aFaceSideNormal = gl_FrontFacing ? theNormal : -theNormal;\n" + " float aNdotL = max (0.0, dot (aFaceSideNormal, aLight));\n" + " float aNdotH = max (0.0, dot (aFaceSideNormal, aHalf ));\n" + "\n" + " float aSpecl = 0.0;\n" + " if (aNdotL > 0.0)\n" + " {\n" + " aSpecl = pow (aNdotH, occMaterial_Shininess (gl_FrontFacing));\n" + " }\n" + "\n" + " Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;\n" + " Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;\n" + "}\n" + "\n" + "//! Computes contribution of directional light source\n" + "void directionalLight (in int theId,\n" + " in vec3 theNormal,\n" + " in vec3 theView)\n" + "{\n" + " vec3 aLight = normalize (occLight_Position (theId).xyz);\n" + " if (!occLight_IsHeadlight (theId))\n" + " {\n" + " aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));\n" + " }\n" + "\n" + " vec3 aHalf = normalize (aLight + theView);\n" + "\n" + " vec3 aFaceSideNormal = gl_FrontFacing ? theNormal : -theNormal;\n" + " float aNdotL = max (0.0, dot (aFaceSideNormal, aLight));\n" + " float aNdotH = max (0.0, dot (aFaceSideNormal, aHalf ));\n" + "\n" + " float aSpecl = 0.0;\n" + " if (aNdotL > 0.0)\n" + " {\n" + " aSpecl = pow (aNdotH, occMaterial_Shininess (gl_FrontFacing));\n" + " }\n" + "\n" + " Diffuse += occLight_Diffuse (theId).rgb * aNdotL;\n" + " Specular += occLight_Specular (theId).rgb * aSpecl;\n" + "}\n" + "\n" + "//! Computes illumination from light sources\n" + "vec4 computeLighting (in vec3 theNormal,\n" + " in vec3 theView,\n" + " in vec4 thePoint)\n" + "{\n" + " // Clear the light intensity accumulators\n" + " Ambient = occLightAmbient.rgb;\n" + " Diffuse = vec3 (0.0);\n" + " Specular = vec3 (0.0);\n" + " vec3 aPoint = thePoint.xyz / thePoint.w;\n" + " for (int anIndex = 0; anIndex < occLightSourcesCount; ++anIndex)\n" + " {\n" + " int aType = occLight_Type (anIndex);\n" + " if (aType == OccLightType_Direct)\n" + " {\n" + " directionalLight (anIndex, theNormal, theView);\n" + " }\n" + " else if (aType == OccLightType_Point)\n" + " {\n" + " pointLight (anIndex, theNormal, theView, aPoint);\n" + " }\n" + " else if (aType == OccLightType_Spot)\n" + " {\n" + " spotLight (anIndex, theNormal, theView, aPoint);\n" + " }\n" + " }\n" + "\n" + " vec3 aMatAmbient = occMaterial_Ambient (gl_FrontFacing);\n" + " vec4 aMatDiffuse = occMaterial_Diffuse (gl_FrontFacing);\n" + " vec3 aMatSpecular = occMaterial_Specular(gl_FrontFacing);\n" + " vec3 aMatEmission = occMaterial_Emission(gl_FrontFacing);\n" + " vec3 aColor = Ambient * aMatAmbient.rgb\n" + " + Diffuse * aMatDiffuse.rgb\n" + " + Specular * aMatSpecular.rgb\n" + " + aMatEmission.rgb;\n" + " return vec4 (aColor, aMatDiffuse.a);\n" + "}\n" + "\n" + "//! Entry point to the Fragment Shader\n" + "void main()\n" + "{\n" + " // process clipping planes\n" + " for (int anIndex = 0; anIndex < occClipPlaneCount; ++anIndex)\n" + " {\n" + " vec4 aClipEquation = occClipPlaneEquations[anIndex];\n" + " if (dot (aClipEquation.xyz, PositionWorld.xyz / PositionWorld.w) + aClipEquation.w < 0.0)\n" + " {\n" + " discard;\n" + " }\n" + " }\n" + "\n" + " vec4 aColor = computeLighting (normalize (Normal), normalize (View), Position);\n" + " occSetFragColor (aColor);\n" + "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PhongShading_vs.pxx b/src/Shaders/Shaders_PhongShading_vs.pxx new file mode 100644 index 0000000000..fcae9f9a9d --- /dev/null +++ b/src/Shaders/Shaders_PhongShading_vs.pxx @@ -0,0 +1,49 @@ +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PhongShading.vs + +static const char Shaders_PhongShading_vs[] = + "// Created on: 2013-10-10\n" + "// Created by: Denis BOGOLEPOV\n" + "// Copyright (c) 2013-2014 OPEN CASCADE SAS\n" + "//\n" + "// This file is part of Open CASCADE Technology software library.\n" + "//\n" + "// This library is free software; you can redistribute it and/or modify it under\n" + "// the terms of the GNU Lesser General Public License version 2.1 as published\n" + "// by the Free Software Foundation, with special exception defined in the file\n" + "// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT\n" + "// distribution for complete text of the license and disclaimer of any warranty.\n" + "//\n" + "// Alternatively, this file may be used under the terms of Open CASCADE\n" + "// commercial license or contractual agreement.\n" + "\n" + "varying vec3 View; //!< Direction to the viewer\n" + "varying vec3 Normal; //!< Vertex normal in view space\n" + "varying vec4 Position; //!< Vertex position in view space\n" + "varying vec4 PositionWorld; //!< Vertex position in world space\n" + "\n" + "//! Computes the normal in view space\n" + "vec3 TransformNormal (in vec3 theNormal)\n" + "{\n" + " vec4 aResult = occWorldViewMatrixInverseTranspose\n" + " * occModelWorldMatrixInverseTranspose\n" + " * vec4 (theNormal, 0.0);\n" + " return normalize (aResult.xyz);\n" + "}\n" + "\n" + "//! Entry point to the Vertex Shader\n" + "void main()\n" + "{\n" + " PositionWorld = occModelWorldMatrix * occVertex;\n" + " Position = occWorldViewMatrix * PositionWorld;\n" + " Normal = TransformNormal (occNormal);\n" + "\n" + " // Note: The specified view vector is absolutely correct only for the orthogonal projection.\n" + " // For perspective projection it will be approximate, but it is in good agreement with the OpenGL calculations.\n" + " View = vec3 (0.0, 0.0, 1.0);\n" + "\n" + " // Do fixed functionality vertex transform\n" + " gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;\n" + "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PhongSpotLight_glsl.pxx b/src/Shaders/Shaders_PhongSpotLight_glsl.pxx index cb0b6a3ab9..2888ea1de3 100644 --- a/src/Shaders/Shaders_PhongSpotLight_glsl.pxx +++ b/src/Shaders/Shaders_PhongSpotLight_glsl.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/PhongSpotLight.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PhongSpotLight.glsl static const char Shaders_PhongSpotLight_glsl[] = "//! Function computes contribution of spotlight source\n" @@ -20,8 +21,7 @@ static const char Shaders_PhongSpotLight_glsl[] = "\n" " float aDist = length (aLight);\n" " float aRange = occLight_Range (theId);\n" - " float anAtten = occPointLightAttenuation (aDist, aRange, occLight_LinearAttenuation (theId), " - "occLight_ConstAttenuation (theId));\n" + " float anAtten = occPointLightAttenuation (aDist, aRange, occLight_LinearAttenuation (theId), occLight_ConstAttenuation (theId));\n" " if (anAtten <= 0.0) return;\n" " aLight /= aDist;\n" "\n" @@ -54,3 +54,5 @@ static const char Shaders_PhongSpotLight_glsl[] = " Diffuse += occLight_Diffuse (theId) * aNdotL * anAtten * theShadow;\n" " Specular += occLight_Specular(theId) * aSpecl * anAtten * theShadow;\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_PointLightAttenuation_glsl.pxx b/src/Shaders/Shaders_PointLightAttenuation_glsl.pxx index 1b5600d3f2..a431557647 100644 --- a/src/Shaders/Shaders_PointLightAttenuation_glsl.pxx +++ b/src/Shaders/Shaders_PointLightAttenuation_glsl.pxx @@ -1,5 +1,5 @@ -// This file has been automatically generated from resource file -// src/Shaders/PointLightAttenuation.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/PointLightAttenuation.glsl static const char Shaders_PointLightAttenuation_glsl[] = "//! Returns point light source attenuation factor\n" @@ -18,8 +18,7 @@ static const char Shaders_PointLightAttenuation_glsl[] = " return -1.0;\n" "}\n" "\n" - "//! Returns point light source attenuation factor with quadratic attenuation in case of zero " - "range.\n" + "//! Returns point light source attenuation factor with quadratic attenuation in case of zero range.\n" "float occPointLightAttenuation (in float theDistance, in float theRange)\n" "{\n" " if (theRange == 0.0)\n" @@ -29,10 +28,8 @@ static const char Shaders_PointLightAttenuation_glsl[] = " return occRangedPointLightAttenuation (theDistance, theRange);\n" "}\n" "\n" - "//! Returns point light source attenuation factor with linear attenuation in case of zero " - "range.\n" - "float occPointLightAttenuation (in float theDistance, in float theRange, in float " - "theLinearAttenuation, in float theConstAttenuation)\n" + "//! Returns point light source attenuation factor with linear attenuation in case of zero range.\n" + "float occPointLightAttenuation (in float theDistance, in float theRange, in float theLinearAttenuation, in float theConstAttenuation)\n" "{\n" " if (theRange == 0.0)\n" " {\n" @@ -40,3 +37,5 @@ static const char Shaders_PointLightAttenuation_glsl[] = " }\n" " return occRangedPointLightAttenuation (theDistance, theRange);\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_RaytraceBase_fs.pxx b/src/Shaders/Shaders_RaytraceBase_fs.pxx index d7b735dc9c..783392cf2d 100644 --- a/src/Shaders/Shaders_RaytraceBase_fs.pxx +++ b/src/Shaders/Shaders_RaytraceBase_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/RaytraceBase.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/RaytraceBase.fs static const char Shaders_RaytraceBase_fs[] = "#ifdef ADAPTIVE_SAMPLING\n" @@ -221,8 +222,7 @@ static const char Shaders_RaytraceBase_fs[] = "// =======================================================================\n" "void SeedRand (in int theSeed, in int theSizeX, in int theRadius)\n" "{\n" - " RandState = uint (int (gl_FragCoord.y) / theRadius * theSizeX + int (gl_FragCoord.x) / " - "theRadius + theSeed);\n" + " RandState = uint (int (gl_FragCoord.y) / theRadius * theSizeX + int (gl_FragCoord.x) / theRadius + theSeed);\n" "\n" " RandState = (RandState + 0x479ab41du) + (RandState << 8);\n" " RandState = (RandState ^ 0xe4aa10ceu) ^ (RandState >> 5);\n" @@ -434,8 +434,7 @@ static const char Shaders_RaytraceBase_fs[] = " dot (theVect, aEdge1),\n" " dot (theVect, aEdge0)) * (1.f / dot (theNorm, theRay.Direct));\n" "\n" - " theUVT.x = any (lessThan (theUVT, ZERO)) || (theUVT.y + theUVT.z) > 1.f ? MAXFLOAT : " - "theUVT.x;\n" + " theUVT.x = any (lessThan (theUVT, ZERO)) || (theUVT.y + theUVT.z) > 1.f ? MAXFLOAT : theUVT.x;\n" "}\n" "\n" "#define EMPTY_ROOT ivec4(0)\n" @@ -507,8 +506,7 @@ static const char Shaders_RaytraceBase_fs[] = "// function : SceneNearestHit\n" "// purpose : Finds intersection with nearest scene triangle\n" "// =======================================================================\n" - "STriangle SceneNearestHit (in SRay theRay, in vec3 theInverse, inout SIntersect theHit, out int " - "theTrsfId)\n" + "STriangle SceneNearestHit (in SRay theRay, in vec3 theInverse, inout SIntersect theHit, out int theTrsfId)\n" "{\n" " STriangle aTriangle = STriangle (INVALID_HIT, vec3[](vec3(0.0), vec3(0.0), vec3(0.0)));\n" "\n" @@ -533,22 +531,14 @@ static const char Shaders_RaytraceBase_fs[] = "\n" " vec3 aRayOriginInverse = -aSubTree.TrsfRay.Origin * aSubTree.Inverse;\n" "\n" - " vec3 aNodeMin0 = texelFetch (uSceneMinPointTexture, aData.y + 0).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin1 = texelFetch (uSceneMinPointTexture, aData.y + 1).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin2 = texelFetch (uSceneMinPointTexture, aData.y + min (2, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin3 = texelFetch (uSceneMinPointTexture, aData.y + min (3, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax0 = texelFetch (uSceneMaxPointTexture, aData.y + 0).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax1 = texelFetch (uSceneMaxPointTexture, aData.y + 1).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax2 = texelFetch (uSceneMaxPointTexture, aData.y + min (2, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax3 = texelFetch (uSceneMaxPointTexture, aData.y + min (3, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin0 = texelFetch (uSceneMinPointTexture, aData.y + 0).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin1 = texelFetch (uSceneMinPointTexture, aData.y + 1).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin2 = texelFetch (uSceneMinPointTexture, aData.y + min (2, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin3 = texelFetch (uSceneMinPointTexture, aData.y + min (3, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax0 = texelFetch (uSceneMaxPointTexture, aData.y + 0).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax1 = texelFetch (uSceneMaxPointTexture, aData.y + 1).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax2 = texelFetch (uSceneMaxPointTexture, aData.y + min (2, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax3 = texelFetch (uSceneMaxPointTexture, aData.y + min (3, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" "\n" " vec3 aTimeMax = max (aNodeMin0, aNodeMax0);\n" " vec3 aTimeMin = min (aNodeMin0, aNodeMax0);\n" @@ -556,8 +546,7 @@ static const char Shaders_RaytraceBase_fs[] = " float aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " float aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.x = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= " - "0.f) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.x = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin1, aNodeMax1);\n" " aTimeMin = min (aNodeMin1, aNodeMax1);\n" @@ -565,8 +554,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.y = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= " - "0.f) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.y = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin2, aNodeMax2);\n" " aTimeMin = min (aNodeMin2, aNodeMax2);\n" @@ -574,8 +562,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.z = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f " - "&& aData.z > 1) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.z = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f && aData.z > 1) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin3, aNodeMax3);\n" " aTimeMin = min (aNodeMin3, aNodeMax3);\n" @@ -583,8 +570,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.w = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f " - "&& aData.z > 2) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.w = (aTimeEnter <= aTimeLeave && aTimeEnter <= theHit.Time && aTimeLeave >= 0.f && aData.z > 2) ? aTimeEnter : MAXFLOAT;\n" "\n" " ivec4 aChildren = ivec4 (0, 1, 2, 3);\n" "\n" @@ -632,15 +618,11 @@ static const char Shaders_RaytraceBase_fs[] = " ivec4 aTriIndex = texelFetch (uGeometryTriangTexture, anIdx + TRG_OFFSET (aSubTree));\n" " vec3 aPoints[3];\n" "\n" - " aPoints[0] = texelFetch (uGeometryVertexTexture, aTriIndex.x += VRT_OFFSET " - "(aSubTree)).xyz;\n" - " aPoints[1] = texelFetch (uGeometryVertexTexture, aTriIndex.y += VRT_OFFSET " - "(aSubTree)).xyz;\n" - " aPoints[2] = texelFetch (uGeometryVertexTexture, aTriIndex.z += VRT_OFFSET " - "(aSubTree)).xyz;\n" + " aPoints[0] = texelFetch (uGeometryVertexTexture, aTriIndex.x += VRT_OFFSET (aSubTree)).xyz;\n" + " aPoints[1] = texelFetch (uGeometryVertexTexture, aTriIndex.y += VRT_OFFSET (aSubTree)).xyz;\n" + " aPoints[2] = texelFetch (uGeometryVertexTexture, aTriIndex.z += VRT_OFFSET (aSubTree)).xyz;\n" "\n" - " IntersectTriangle (aSubTree.TrsfRay, aPoints[0], aPoints[1], aPoints[2], aTimeUV, " - "aNormal);\n" + " IntersectTriangle (aSubTree.TrsfRay, aPoints[0], aPoints[1], aPoints[2], aTimeUV, aNormal);\n" "\n" " if (aTimeUV.x < theHit.Time)\n" " {\n" @@ -727,22 +709,14 @@ static const char Shaders_RaytraceBase_fs[] = "\n" " vec3 aRayOriginInverse = -aSubTree.TrsfRay.Origin * aSubTree.Inverse;\n" "\n" - " vec3 aNodeMin0 = texelFetch (uSceneMinPointTexture, aData.y + 0).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin1 = texelFetch (uSceneMinPointTexture, aData.y + 1).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin2 = texelFetch (uSceneMinPointTexture, aData.y + min (2, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMin3 = texelFetch (uSceneMinPointTexture, aData.y + min (3, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax0 = texelFetch (uSceneMaxPointTexture, aData.y + 0).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax1 = texelFetch (uSceneMaxPointTexture, aData.y + 1).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax2 = texelFetch (uSceneMaxPointTexture, aData.y + min (2, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" - " vec3 aNodeMax3 = texelFetch (uSceneMaxPointTexture, aData.y + min (3, aData.z)).xyz * " - "aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin0 = texelFetch (uSceneMinPointTexture, aData.y + 0).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin1 = texelFetch (uSceneMinPointTexture, aData.y + 1).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin2 = texelFetch (uSceneMinPointTexture, aData.y + min (2, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMin3 = texelFetch (uSceneMinPointTexture, aData.y + min (3, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax0 = texelFetch (uSceneMaxPointTexture, aData.y + 0).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax1 = texelFetch (uSceneMaxPointTexture, aData.y + 1).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax2 = texelFetch (uSceneMaxPointTexture, aData.y + min (2, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" + " vec3 aNodeMax3 = texelFetch (uSceneMaxPointTexture, aData.y + min (3, aData.z)).xyz * aSubTree.Inverse + aRayOriginInverse;\n" "\n" " vec3 aTimeMax = max (aNodeMin0, aNodeMax0);\n" " vec3 aTimeMin = min (aNodeMin0, aNodeMax0);\n" @@ -750,8 +724,7 @@ static const char Shaders_RaytraceBase_fs[] = " float aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " float aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.x = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= " - "0.f) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.x = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin1, aNodeMax1);\n" " aTimeMin = min (aNodeMin1, aNodeMax1);\n" @@ -759,8 +732,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.y = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= " - "0.f) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.y = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin2, aNodeMax2);\n" " aTimeMin = min (aNodeMin2, aNodeMax2);\n" @@ -768,8 +740,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.z = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f " - "&& aData.z > 1) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.z = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f && aData.z > 1) ? aTimeEnter : MAXFLOAT;\n" "\n" " aTimeMax = max (aNodeMin3, aNodeMax3);\n" " aTimeMin = min (aNodeMin3, aNodeMax3);\n" @@ -777,8 +748,7 @@ static const char Shaders_RaytraceBase_fs[] = " aTimeLeave = min (aTimeMax.x, min (aTimeMax.y, aTimeMax.z));\n" " aTimeEnter = max (aTimeMin.x, max (aTimeMin.y, aTimeMin.z));\n" "\n" - " aHitTimes.w = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f " - "&& aData.z > 2) ? aTimeEnter : MAXFLOAT;\n" + " aHitTimes.w = (aTimeEnter <= aTimeLeave && aTimeEnter <= theDistance && aTimeLeave >= 0.f && aData.z > 2) ? aTimeEnter : MAXFLOAT;\n" "\n" " ivec4 aChildren = ivec4 (0, 1, 2, 3);\n" "\n" @@ -825,20 +795,16 @@ static const char Shaders_RaytraceBase_fs[] = " {\n" " ivec4 aTriangle = texelFetch (uGeometryTriangTexture, anIdx + TRG_OFFSET (aSubTree));\n" "\n" - " vec3 aPoint0 = texelFetch (uGeometryVertexTexture, aTriangle.x += VRT_OFFSET " - "(aSubTree)).xyz;\n" - " vec3 aPoint1 = texelFetch (uGeometryVertexTexture, aTriangle.y += VRT_OFFSET " - "(aSubTree)).xyz;\n" - " vec3 aPoint2 = texelFetch (uGeometryVertexTexture, aTriangle.z += VRT_OFFSET " - "(aSubTree)).xyz;\n" + " vec3 aPoint0 = texelFetch (uGeometryVertexTexture, aTriangle.x += VRT_OFFSET (aSubTree)).xyz;\n" + " vec3 aPoint1 = texelFetch (uGeometryVertexTexture, aTriangle.y += VRT_OFFSET (aSubTree)).xyz;\n" + " vec3 aPoint2 = texelFetch (uGeometryVertexTexture, aTriangle.z += VRT_OFFSET (aSubTree)).xyz;\n" "\n" " IntersectTriangle (aSubTree.TrsfRay, aPoint0, aPoint1, aPoint2, aTimeUV, aNormal);\n" "\n" "#ifdef TRANSPARENT_SHADOWS\n" " if (aTimeUV.x < theDistance)\n" " {\n" - " aFactor *= 1.f - texelFetch (uRaytraceMaterialTexture, MATERIAL_TRAN " - "(aTriangle.w)).x;\n" + " aFactor *= 1.f - texelFetch (uRaytraceMaterialTexture, MATERIAL_TRAN (aTriangle.w)).x;\n" " }\n" "#else\n" " if (aTimeUV.x < theDistance)\n" @@ -878,8 +844,7 @@ static const char Shaders_RaytraceBase_fs[] = " aInvTransf2,\n" " aInvTransf3);\n" "\n" - " aSubTree.Inverse = mix (-UNIT, UNIT, step (ZERO, aSubTree.TrsfRay.Direct)) / max (abs " - "(aSubTree.TrsfRay.Direct), SMALL);\n" + " aSubTree.Inverse = mix (-UNIT, UNIT, step (ZERO, aSubTree.TrsfRay.Direct)) / max (abs (aSubTree.TrsfRay.Direct), SMALL);\n" "\n" " aNode = BVH_OFFSET (aSubTree); // go to sub-root node\n" "\n" @@ -1079,8 +1044,7 @@ static const char Shaders_RaytraceBase_fs[] = " {\n" " vec2 aPixel = uEyeSize * (vPixel - vec2 (0.5)) * 2.0;\n" " vec2 anAperturePnt = sampleUniformDisk() * uApertureRadius;\n" - " vec3 aLocalDir = normalize (vec3 (aPixel * uFocalPlaneDist - anAperturePnt, " - "uFocalPlaneDist));\n" + " vec3 aLocalDir = normalize (vec3 (aPixel * uFocalPlaneDist - anAperturePnt, uFocalPlaneDist));\n" " vec3 aDirect = uEyeView * aLocalDir.z +\n" " uEyeSide * aLocalDir.x +\n" " uEyeVert * aLocalDir.y;\n" @@ -1125,8 +1089,7 @@ static const char Shaders_RaytraceBase_fs[] = " #ifdef THE_ZERO_TO_ONE_DEPTH\n" " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE);\n" " #else\n" - " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE) * " - "0.5f + 0.5f;\n" + " aRaytraceDepth = (aNDCPoint.z / aNDCPoint.w + aPolygonOffset * POLYGON_OFFSET_SCALE) * 0.5f + 0.5f;\n" " #endif\n" " }\n" "\n" @@ -1275,3 +1238,5 @@ static const char Shaders_RaytraceBase_fs[] = " aWeight.w);\n" "}\n" "#endif\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_RaytraceBase_vs.pxx b/src/Shaders/Shaders_RaytraceBase_vs.pxx index 55b49338b8..bbbf228b44 100644 --- a/src/Shaders/Shaders_RaytraceBase_vs.pxx +++ b/src/Shaders/Shaders_RaytraceBase_vs.pxx @@ -1,14 +1,18 @@ -// This file has been automatically generated from resource file src/Shaders/RaytraceBase.vs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/RaytraceBase.vs -static const char Shaders_RaytraceBase_vs[] = "in vec4 occVertex;\n" - "\n" - "//! Normalized pixel coordinates.\n" - "out vec2 vPixel;\n" - "\n" - "void main (void)\n" - "{\n" - " vPixel = vec2 ((occVertex.x + 1.f) * 0.5f,\n" - " (occVertex.y + 1.f) * 0.5f);\n" - "\n" - " gl_Position = occVertex;\n" - "}\n"; +static const char Shaders_RaytraceBase_vs[] = + "in vec4 occVertex;\n" + "\n" + "//! Normalized pixel coordinates.\n" + "out vec2 vPixel;\n" + "\n" + "void main (void)\n" + "{\n" + " vPixel = vec2 ((occVertex.x + 1.f) * 0.5f,\n" + " (occVertex.y + 1.f) * 0.5f);\n" + "\n" + " gl_Position = occVertex;\n" + "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_RaytraceRender_fs.pxx b/src/Shaders/Shaders_RaytraceRender_fs.pxx index cd334c67fa..d627cfc242 100644 --- a/src/Shaders/Shaders_RaytraceRender_fs.pxx +++ b/src/Shaders/Shaders_RaytraceRender_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/RaytraceRender.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/RaytraceRender.fs static const char Shaders_RaytraceRender_fs[] = "out vec4 OutColor;\n" @@ -135,3 +136,5 @@ static const char Shaders_RaytraceRender_fs[] = "\n" "#endif // PATH_TRACING\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_RaytraceSmooth_fs.pxx b/src/Shaders/Shaders_RaytraceSmooth_fs.pxx index 8674f05622..7f6ac119ae 100644 --- a/src/Shaders/Shaders_RaytraceSmooth_fs.pxx +++ b/src/Shaders/Shaders_RaytraceSmooth_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/RaytraceSmooth.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/RaytraceSmooth.fs static const char Shaders_RaytraceSmooth_fs[] = "//! Input ray-traced image.\n" @@ -74,11 +75,12 @@ static const char Shaders_RaytraceSmooth_fs[] = " aRay.Direct.y < 0.f ? -aInvDirect.y : aInvDirect.y,\n" " aRay.Direct.z < 0.f ? -aInvDirect.z : aInvDirect.z);\n" "\n" - " aColor = mix (aClr0, clamp (Radiance (aRay, aInvDirect), 0.0, 1.0), 1.0 / " - "float(uSamples));\n" + " aColor = mix (aClr0, clamp (Radiance (aRay, aInvDirect), 0.0, 1.0), 1.0 / float(uSamples));\n" " }\n" "\n" " OutColor = aColor;\n" "\n" "#endif\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_SkydomBackground_fs.pxx b/src/Shaders/Shaders_SkydomBackground_fs.pxx index 2f7e5ba4db..b28bfe1de9 100644 --- a/src/Shaders/Shaders_SkydomBackground_fs.pxx +++ b/src/Shaders/Shaders_SkydomBackground_fs.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/Shaders/SkydomBackground.fs +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/SkydomBackground.fs static const char Shaders_SkydomBackground_fs[] = "// Constants\n" @@ -10,7 +11,6 @@ static const char Shaders_SkydomBackground_fs[] = "const float THE_G2 = THE_G * THE_G;\n" "const float THE_HR = 8000.0; // Thickness of the atmosphere\n" "const float THE_HM = 1000.0; // Same as above but for Mie\n" - // clang-format off "const vec3 THE_BETA_R = vec3 (5.8e-6, 13.5e-6, 33.1e-6); // Reyleigh scattering normal earth\n" "const vec3 THE_BETA_M = vec3 (21e-6); // Normal Mie scattering\n" "\n" @@ -20,7 +20,6 @@ static const char Shaders_SkydomBackground_fs[] = "const float THE_HorizonWidth = 0.002;\n" "const int THE_NbSamples = 8;\n" "const int THE_NbSamplesLight = 8; // integral sampling rate (might highly hit performance)\n" - // clang-format on "const float THE_SunPower = 5.0;\n" "const float THE_StarTreshold = 0.98;\n" "\n" @@ -303,3 +302,5 @@ static const char Shaders_SkydomBackground_fs[] = "\n" " occFragColor = computeIncidentLight (normalize (aRayDirection), anUv, uTime);\n" "}\n"; + +// clang-format on diff --git a/src/Shaders/Shaders_TangentSpaceNormal_glsl.pxx b/src/Shaders/Shaders_TangentSpaceNormal_glsl.pxx index ecb58aa4b8..da39526fa8 100644 --- a/src/Shaders/Shaders_TangentSpaceNormal_glsl.pxx +++ b/src/Shaders/Shaders_TangentSpaceNormal_glsl.pxx @@ -1,8 +1,8 @@ -// This file has been automatically generated from resource file src/Shaders/TangentSpaceNormal.glsl +// clang-format off +// This file has been automatically generated from resource file resources/Shaders/TangentSpaceNormal.glsl static const char Shaders_TangentSpaceNormal_glsl[] = - "//! Calculates transformation from tangent space and apply it to value from normal map to get " - "normal in object space\n" + "//! Calculates transformation from tangent space and apply it to value from normal map to get normal in object space\n" "vec3 TangentSpaceNormal (in mat2 theDeltaUVMatrix,\n" " in mat2x3 theDeltaVectorMatrix,\n" " in vec3 theNormalMapValue,\n" @@ -11,14 +11,13 @@ static const char Shaders_TangentSpaceNormal_glsl[] = "{\n" " theNormalMapValue = normalize(theNormalMapValue * 2.0 - vec3(1.0));\n" " // Inverse matrix\n" - " theDeltaUVMatrix = mat2 (theDeltaUVMatrix[1][1], -theDeltaUVMatrix[0][1], " - "-theDeltaUVMatrix[1][0], theDeltaUVMatrix[0][0]);\n" + " theDeltaUVMatrix = mat2 (theDeltaUVMatrix[1][1], -theDeltaUVMatrix[0][1], -theDeltaUVMatrix[1][0], theDeltaUVMatrix[0][0]);\n" " theDeltaVectorMatrix = theDeltaVectorMatrix * theDeltaUVMatrix;\n" " // Gram-Schmidt orthogonalization\n" - " theDeltaVectorMatrix[1] = normalize(theDeltaVectorMatrix[1] - dot(theNormal, " - "theDeltaVectorMatrix[1]) * theNormal);\n" + " theDeltaVectorMatrix[1] = normalize(theDeltaVectorMatrix[1] - dot(theNormal, theDeltaVectorMatrix[1]) * theNormal);\n" " theDeltaVectorMatrix[0] = cross(theDeltaVectorMatrix[1], theNormal);\n" " float aDirection = theIsInverse ? -1.0 : 1.0;\n" - " return mat3 (aDirection * theDeltaVectorMatrix[0], aDirection * theDeltaVectorMatrix[1], " - "theNormal) * theNormalMapValue;\n" + " return mat3 (aDirection * theDeltaVectorMatrix[0], aDirection * theDeltaVectorMatrix[1], theNormal) * theNormalMapValue;\n" "}\n"; + +// clang-format on diff --git a/src/TObj/FILES b/src/TObj/FILES index f6f9f643e6..fa2c25ee38 100755 --- a/src/TObj/FILES +++ b/src/TObj/FILES @@ -1,4 +1,3 @@ -TObj.msg TObj_Application.cxx TObj_Application.hxx TObj_Assistant.cxx diff --git a/src/TObj/TObj_TObj_msg.pxx b/src/TObj/TObj_TObj_msg.pxx index 1d23bff2cb..66914ed437 100644 --- a/src/TObj/TObj_TObj_msg.pxx +++ b/src/TObj/TObj_TObj_msg.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/TObj/TObj.msg +// clang-format off +// This file has been automatically generated from resource file resources/TObj/TObj.msg static const char TObj_TObj_msg[] = "!!!!!!!!!! ----- Messages file for TObj packages --------- !!!!!!!!!\n" @@ -86,3 +87,5 @@ static const char TObj_TObj_msg[] = "\n" ".TObj_M_NoWriteAccess\n" " Cannot write the file %s, check permissions\n"; + +// clang-format on diff --git a/src/Textures/FILES b/src/Textures/FILES index e1ffb54fe8..138c70c21c 100755 --- a/src/Textures/FILES +++ b/src/Textures/FILES @@ -1,32 +1 @@ -icon:::1d_elevation.rgb -icon:::2d_alienskin.rgb -icon:::2d_aluminum.rgb -icon:::2d_blue_rock.rgb -icon:::2d_bluewhite_paper.rgb -icon:::2d_brushed.rgb -icon:::2d_bubbles.rgb -icon:::2d_bumps.rgb -icon:::2d_cast.rgb -icon:::2d_chipbd.rgb -icon:::2d_clouds.rgb -icon:::2d_flesh.rgb -icon:::2d_floor.rgb -icon:::2d_galvnisd.rgb -icon:::2d_grass.rgb -icon:::2d_knurl.rgb -icon:::2d_maple.rgb -icon:::2d_marble.rgb -icon:::2d_MatraDatavision.rgb -icon:::2d_mottled.rgb -icon:::2d_rain.rgb -icon:::2d_rock.rgb -icon:::2d_chess.rgba -icon:::env_clouds.rgb -icon:::env_cv.rgb -icon:::env_lines.rgb -icon:::env_medit.rgb -icon:::env_pearl.rgb -icon:::env_road.rgb -icon:::env_sky1.rgb -icon:::env_sky2.rgb Textures_EnvLUT.pxx diff --git a/src/UnitsAPI/FILES b/src/UnitsAPI/FILES index b17a136111..14d32dd40f 100755 --- a/src/UnitsAPI/FILES +++ b/src/UnitsAPI/FILES @@ -1,7 +1,3 @@ -CurrentUnits -MDTVBaseUnits -MDTVCurrentUnits -Units.dat UnitsAPI.cxx UnitsAPI.hxx UnitsAPI_SystemUnits.hxx diff --git a/src/UnitsAPI/UnitsAPI_Units_dat.pxx b/src/UnitsAPI/UnitsAPI_Units_dat.pxx index 600d49b59f..dbb81af97b 100644 --- a/src/UnitsAPI/UnitsAPI_Units_dat.pxx +++ b/src/UnitsAPI/UnitsAPI_Units_dat.pxx @@ -1,903 +1,487 @@ -// This file has been automatically generated from resource file src/UnitsAPI/Units.dat +// clang-format off +// This file has been automatically generated from resource file resources/UnitsAPI/Units.dat static const char UnitsAPI_Units_dat[] = - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "DIMENSIONLESS 0 0 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "DIMENSIONLESS 0 0 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "no unit K 1.\n" - "percent % 0.01 " - " K\n" + "percent % 0.01 K\n" "\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MASS 1 0 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MASS 1 0 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "gram g .001\n" - "metric carat ct .2 " - " g\n" - "quintal q 100 " - " kg\n" - "tonne t 1000 " - " kg\n" + "metric carat ct .2 g\n" + "quintal q 100 kg\n" + "tonne t 1000 kg\n" "\n" - "grain gr " - ".06479891 g\n" - "apothecaries'dram (U.S.) dram_ap " - "3.88793E-03 kg\n" - "apothecaries'ounce oz_apoth(U.K.) " - "3.11035E-02 kg\n" + "grain gr .06479891 g\n" + "apothecaries'dram (U.S.) dram_ap 3.88793E-03 kg\n" + "apothecaries'ounce oz_apoth(U.K.) 3.11035E-02 kg\n" " oz_ap(U.S.)\n" - "ounce oz 437.5 " - " gr\n" - "pound lb 16 " - " oz\n" - "cental cental 100 " - " lb\n" - "short hundredweight sh.cwt 100 " - " lb\n" - "hundredweight cwt 112 " - " lb\n" - "short ton sh.ton 2000 " - " lb\n" - "ton ton 2240 " - " lb\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LENGTH 0 1 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "ounce oz 437.5 gr\n" + "pound lb 16 oz\n" + "cental cental 100 lb\n" + "short hundredweight sh.cwt 100 lb\n" + "hundredweight cwt 112 lb\n" + "short ton sh.ton 2000 lb\n" + "ton ton 2240 lb\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LENGTH 0 1 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "meter m\n" - "angstrom \xC5 " - "1.E-10 m\n" + "angstrom \xC5 1.E-10 m\n" " angstrom\n" - "brasse brasse 1.8288 " - " m\n" - "arpent (Quebec) arpent_longueur 58.47131 " - " m\n" - "micron \xB5 10000 " - " \xC5\n" + "brasse brasse 1.8288 m\n" + "arpent (Quebec) arpent_longueur 58.47131 m\n" + "micron \xB5 10000 \xC5\n" " micron\n" "\n" - "mille mille 1852 " - " m\n" - "light year Al " - "9.46053E+15 m\n" + "mille mille 1852 m\n" + "light year Al 9.46053E+15 m\n" "\n" - "inch in. 0.0254 " - " m\n" + "inch in. 0.0254 m\n" " in\n" - "caliber caliber 1 " - " in.\n" - "foot ft. 12 " - " in\n" + "caliber caliber 1 in.\n" + "foot ft. 12 in\n" " ft\n" "\n" - "yard yd. 3 " - " ft.\n" + "yard yd. 3 ft.\n" " yd\n" "\n" - "statute mile stat.mile 1760 " - " yd.\n" - "nautical mile naut.mile 1852 " - " m\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "TIME 0 0 1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "statute mile stat.mile 1760 yd.\n" + "nautical mile naut.mile 1852 m\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "TIME 0 0 1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "second of time s\n" - "minute of time min 60 " - " s\n" + "minute of time min 60 s\n" " mn\n" "\n" - "hour h 60 " - " min\n" - "day j 24 " - " h\n" - "year y 365.25 " - " j\n" - "sidereal year a_side " - "3.155815E+07 s\n" - "tropical year a_trop " - "3.155693E+07 s\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC CURRENT 0 0 0 1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "ampere A " - " \n" - "biot Bi 10 " - " A \n" - "gilbert gilbert (10/4*\xB6) " - " A\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "THERMODYNAMIC TEMPERATURE 0 0 0 0 1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "hour h 60 min\n" + "day j 24 h\n" + "year y 365.25 j\n" + "sidereal year a_side 3.155815E+07 s\n" + "tropical year a_trop 3.155693E+07 s\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC CURRENT 0 0 0 1 0 0 0 0 0\n" + "....................................................................................................................................\n" + "ampere A \n" + "biot Bi 10 A \n" + "gilbert gilbert (10/4*\xB6) A\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "THERMODYNAMIC TEMPERATURE 0 0 0 0 1 0 0 0 0\n" + "....................................................................................................................................\n" "Kelvin degree of temperature \260K\n" " deg.K\n" "\n" - "Celsius degree of temperature \260C [273.15] " - " \260K\n" + "Celsius degree of temperature \260C [273.15] \260K\n" " deg.C\n" "\n" - "Rankine degree of temperature \260R (5/9) " - " \260K\n" + "Rankine degree of temperature \260R (5/9) \260K\n" " deg.R\n" "\n" - "Fahrenheit degree of temperature \260F [(1379/3)] " - " \260R\n" + "Fahrenheit degree of temperature \260F [(1379/3)] \260R\n" " deg.F\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "AMOUNT OF SUBSTANCE 0 0 0 0 0 " - " 1 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "AMOUNT OF SUBSTANCE 0 0 0 0 0 1 0 0 0\n" + "....................................................................................................................................\n" "mole mol\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LUMINOUS INTENSITY 0 0 0 0 0 " - " 0 1 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LUMINOUS INTENSITY 0 0 0 0 0 0 1 0 0\n" + "....................................................................................................................................\n" "candela cd\n" - "bougie nouvelle bougie_nouvelle 1 " - " cd\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "PLANE ANGLE 0 0 0 0 0 " - " 0 0 1 0\n" - "................................................................................................" - "....................................\n" + "bougie nouvelle bougie_nouvelle 1 cd\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "PLANE ANGLE 0 0 0 0 0 0 0 1 0\n" + "....................................................................................................................................\n" "radian rad\n" "second of angle \"\n" - "minute of angle ' 60 " - " \"\n" + "minute of angle ' 60 \"\n" "\n" - "degre of angle \xB0 60 " - " '\n" + "degre of angle \xB0 60 '\n" " deg\n" "\n" - "right angle L 90 " - " \xB0\n" - "revolution tr 360 " - " \xB0\n" - " (2*\xB6) " - " rad\n" - "grade gra 54 " - " '\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "SOLID ANGLE 0 0 0 0 0 " - " 0 0 0 1\n" - "................................................................................................" - "....................................\n" + "right angle L 90 \xB0\n" + "revolution tr 360 \xB0\n" + " (2*\xB6) rad\n" + "grade gra 54 '\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "SOLID ANGLE 0 0 0 0 0 0 0 0 1\n" + "....................................................................................................................................\n" "steradian sr\n" - "spat sp (4*\xB6) " - " sr\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "AREA 0 2 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "barn b 1.E-28 " - " m\xB2\n" - "are a 100 " - " m\xB2\n" - "arpent (Quebec) arpent_superficie 3418.894 " - " m\xB2\n" - "acre acre 4840 " - " sq.yd. \n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "VOLUME 0 3 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "liter l .001 " - " m\xB3\n" - "stere of wood st 1 " - " m\xB3\n" + "spat sp (4*\xB6) sr\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "AREA 0 2 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "barn b 1.E-28 m\xB2\n" + "are a 100 m\xB2\n" + "arpent (Quebec) arpent_superficie 3418.894 m\xB2\n" + "acre acre 4840 sq.yd. \n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "VOLUME 0 3 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "liter l .001 m\xB3\n" + "stere of wood st 1 m\xB3\n" "\n" - "liquid pint (U.S.) liq.pt. 28.87429 " - " cu.in.\n" - "liquid quart (U.S.) liq.quart(U.S.) 2 " - " liq.pt.\n" - "dry quart (U.S.) dry_quart(U.S.) 67.1989 " - " cu.in.\n" - "gallon (U.S.) gal(U.S.) 4 " - " liq.quart(U.S.) \n" - "bushel (U.S.) bu(U.S.) 1.244430 " - " cu.ft.\n" - "fluid ounce (U.S.) fl.oz(U.S.) 29.5729 " - " cm\xB3\n" - "baril (U.S.) baril(U.S.) 42 " - " gal(U.S.)\n" - "barrel (U.S.) barrel(U.S.) .158987 " - " m\xB3\n" + "liquid pint (U.S.) liq.pt. 28.87429 cu.in.\n" + "liquid quart (U.S.) liq.quart(U.S.) 2 liq.pt.\n" + "dry quart (U.S.) dry_quart(U.S.) 67.1989 cu.in.\n" + "gallon (U.S.) gal(U.S.) 4 liq.quart(U.S.) \n" + "bushel (U.S.) bu(U.S.) 1.244430 cu.ft.\n" + "fluid ounce (U.S.) fl.oz(U.S.) 29.5729 cm\xB3\n" + "baril (U.S.) baril(U.S.) 42 gal(U.S.)\n" + "barrel (U.S.) barrel(U.S.) .158987 m\xB3\n" "\n" - "dry barrel (U.S.) bbl .115627 " - " m\xB3\n" + "dry barrel (U.S.) bbl .115627 m\xB3\n" "\n" - "pint (U.K.) pt. 34.67636 " - " cu.in.\n" + "pint (U.K.) pt. 34.67636 cu.in.\n" " pt\n" "\n" - "quart (U.K.) quart(U.K.) 2 " - " pt.\n" - "gallon (U.K.) gal(U.K.) 4 " - " quart(U.K.)\n" - "bushel (U.K.) bu(U.K.) 1.284315 " - " cu.ft.\n" - "fluid ounce (U.K.) fl.oz(U.K.) 28.4122 " - " cm\xB3\n" - "baril (U.K.) baril(U.K.) 36 " - " gal(U.K.)\n" + "quart (U.K.) quart(U.K.) 2 pt.\n" + "gallon (U.K.) gal(U.K.) 4 quart(U.K.)\n" + "bushel (U.K.) bu(U.K.) 1.284315 cu.ft.\n" + "fluid ounce (U.K.) fl.oz(U.K.) 28.4122 cm\xB3\n" + "baril (U.K.) baril(U.K.) 36 gal(U.K.)\n" "\n" - "board foot board_foot 2.36E-03 " - " m\xB3\n" - "registered ton regis.ton 100 " - " cu.ft.\n" - "shipping ton shipp.ton 40 " - " cu.ft.\n" - "tonneau tonneau 1 " - " regis.ton\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "INERTIA 0 4 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "board foot board_foot 2.36E-03 m\xB3\n" + "registered ton regis.ton 100 cu.ft.\n" + "shipping ton shipp.ton 40 cu.ft.\n" + "tonneau tonneau 1 regis.ton\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "INERTIA 0 4 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "\n" "\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ANGULAR SPEED 0 0 -1 0 0 " - " 0 0 1 0\n" - "................................................................................................" - "....................................\n" - "revolution per minute r.p.m. 1 " - " tr/min\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "SPEED 0 1 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "knot(U.K.) kn 1 " - " naut.mile/h\n" - "mile per hour m.p.h. 1 " - " stat.mile/h\n" - "noeud noeud 1 " - " mille/h\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ACCELERATION 0 1 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "gal Gal .01 " - " m/s\xB2\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "FREQUENCY 0 0 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ANGULAR SPEED 0 0 -1 0 0 0 0 1 0\n" + "....................................................................................................................................\n" + "revolution per minute r.p.m. 1 tr/min\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "SPEED 0 1 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "knot(U.K.) kn 1 naut.mile/h\n" + "mile per hour m.p.h. 1 stat.mile/h\n" + "noeud noeud 1 mille/h\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ACCELERATION 0 1 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "gal Gal .01 m/s\xB2\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "FREQUENCY 0 0 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "hertz Hz \n" - "baud baud 1 " - " Hz\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ACTIVITY (OF A RADIONUCLEIDE) 0 0 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "baud baud 1 Hz\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ACTIVITY (OF A RADIONUCLEIDE) 0 0 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "becquerel Be\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "VOLUMIC MASS 1 -3 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MASS FLOW 1 0 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "VOLUME FLOW 0 3 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "CONSUMPTION 0 2 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "VOLUMIC MASS 1 -3 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MASS FLOW 1 0 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "VOLUME FLOW 0 3 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "CONSUMPTION 0 2 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "litre aux 100 kilometers l/100km\n" - "mile per gallon (U.S.) m.p.g.(U.S.) 235.2 " - " l/100km\n" - "mile per gallon (U.K.) m.p.g.(U.K.) 282.5 " - " l/100km\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "QUANTITY OF MOVEMENT 1 1 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "KINETIC MOMENT 1 2 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOMENT OF INERTIA 1 2 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "FORCE 1 1 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "mile per gallon (U.S.) m.p.g.(U.S.) 235.2 l/100km\n" + "mile per gallon (U.K.) m.p.g.(U.K.) 282.5 l/100km\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "QUANTITY OF MOVEMENT 1 1 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "KINETIC MOMENT 1 2 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOMENT OF INERTIA 1 2 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "FORCE 1 1 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "newton N\n" - "dyne dyn 1.E-05 " - " N\n" - "gram-force gf " - ".00980665 N\n" - "poundal pdl 0.138255 " - " N\n" - "pound-force lbf 4.44822 " - " N\n" - "sthene sn 1000 " - " N\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOMENT OF A FORCE 1 2 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LINEIC FORCE 1 0 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "PRESSURE 1 -1 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "dyne dyn 1.E-05 N\n" + "gram-force gf .00980665 N\n" + "poundal pdl 0.138255 N\n" + "pound-force lbf 4.44822 N\n" + "sthene sn 1000 N\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOMENT OF A FORCE 1 2 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LINEIC FORCE 1 0 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "PRESSURE 1 -1 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "pascal Pa\n" - "athmosphere atm 101325 " - " Pa\n" - "athmosphere technique at 98066.5 " - " Pa\n" - "bar bar 100000 " - " Pa\n" - "barye barye 0.1 " - " Pa\n" - "millimeter of water mm_CE 9.80665 " - " Pa\n" - "millimeter of mercury mm_Hg 133.322 " - " Pa\n" - "pieze pz 1000 " - " Pa\n" - "inch of water in.H\xB2O 249.089 " - " Pa\n" - "foot of water ft.H\xB2O 2989 " - " Pa\n" - "inch of mercury in.Hg 3386.39 " - " Pa\n" - "pound force per square inch psi " - "0.0689476 bar\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "DYNAMIC VISCOSITY 1 -1 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "poise Po 1 " - " g/cm/s\n" - "poiseuille Pl 10 " - " Po\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "KINETIC VISCOSITY 0 2 -1 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "stoke St .00001 " - " m\xB2/s\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "TENSION SUPERFICIELLE 1 0 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC POTENTIAL 1 2 -3 -1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "athmosphere atm 101325 Pa\n" + "athmosphere technique at 98066.5 Pa\n" + "bar bar 100000 Pa\n" + "barye barye 0.1 Pa\n" + "millimeter of water mm_CE 9.80665 Pa\n" + "millimeter of mercury mm_Hg 133.322 Pa\n" + "pieze pz 1000 Pa\n" + "inch of water in.H\xB2O 249.089 Pa\n" + "foot of water ft.H\xB2O 2989 Pa\n" + "inch of mercury in.Hg 3386.39 Pa\n" + "pound force per square inch psi 0.0689476 bar\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "DYNAMIC VISCOSITY 1 -1 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "poise Po 1 g/cm/s\n" + "poiseuille Pl 10 Po\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "KINETIC VISCOSITY 0 2 -1 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "stoke St .00001 m\xB2/s\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "TENSION SUPERFICIELLE 1 0 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC POTENTIAL 1 2 -3 -1 0 0 0 0 0\n" + "....................................................................................................................................\n" "volt V\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ENERGY 1 2 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ENERGY 1 2 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "joule J\n" - "electron-volt eV 1.59E-19 " - " J\n" - "erg erg 1.E-07 " - " J\n" - "calorie (International) IT cal 4.1868 " - " J\n" - "calorie (15 celsius degrees) cal_15 4.1855 " - " J\n" - "calorie (thermochimie) calorie(thermochimie) 4.184 " - " J\n" - "thermie th 1000000 " - " cal\n" + "electron-volt eV 1.59E-19 J\n" + "erg erg 1.E-07 J\n" + "calorie (International) IT cal 4.1868 J\n" + "calorie (15 celsius degrees) cal_15 4.1855 J\n" + "calorie (thermochimie) calorie(thermochimie) 4.184 J\n" + "thermie th 1000000 cal\n" "\n" - "horse-power-hour HP-h 2684500 " - " J\n" - "british thermal unit (International Table) Btu 1055.056 " - " J\n" - "british thermal unit (moyenne) Btu_a 1055.87 " - " J\n" - "british thermal unit (thermochimie) Btu_c 1054.35 " - " J\n" - "british thermal unit (Btu-39F) Btu_39 1059.67 " - " J\n" - "british thermal unit (Btu-60F) Btu_60 1054.68 " - " J\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "POWER 1 2 -3 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "horse-power-hour HP-h 2684500 J\n" + "british thermal unit (International Table) Btu 1055.056 J\n" + "british thermal unit (moyenne) Btu_a 1055.87 J\n" + "british thermal unit (thermochimie) Btu_c 1054.35 J\n" + "british thermal unit (Btu-39F) Btu_39 1059.67 J\n" + "british thermal unit (Btu-60F) Btu_60 1054.68 J\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "POWER 1 2 -3 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "watt W\n" - "cheval-vapeur ch 735.5 " - " W\n" - "poncelet poncelet 100 " - " kgfm/s\n" - "var var 1 " - " V.A \n" + "cheval-vapeur ch 735.5 W\n" + "poncelet poncelet 100 kgfm/s\n" + "var var 1 V.A \n" "\n" - "horse-power HP 1.025 " - " ch\n" - "ton of refrigeration ton_of_ref. 3516 " - " W\n" - "british commercial ton of refrigeration brit.comm.ton_of_ref. 3883 " - " W\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LINEIC POWER 1 1 -3 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "SURFACIC POWER 1 0 -3 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "VOLUMIC POWER 1 -1 -3 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "COEFFICIENT OF LINEAR INFLATION 0 0 0 0 -1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "THERMICAL CONDUCTIVITY 1 1 -3 0 -1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "THERMICAL CONVECTIVITY 1 0 -3 0 -1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "THERMICAL MASSIC CAPACITY 0 2 -2 0 -1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ENTROPY 1 2 -2 0 -1 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ENTHALPY 1 2 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LUMINOUS FLUX 0 0 0 0 0 " - " 0 1 0 1\n" - "................................................................................................" - "....................................\n" + "horse-power HP 1.025 ch\n" + "ton of refrigeration ton_of_ref. 3516 W\n" + "british commercial ton of refrigeration brit.comm.ton_of_ref. 3883 W\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LINEIC POWER 1 1 -3 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "SURFACIC POWER 1 0 -3 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "VOLUMIC POWER 1 -1 -3 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "COEFFICIENT OF LINEAR INFLATION 0 0 0 0 -1 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "THERMICAL CONDUCTIVITY 1 1 -3 0 -1 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "THERMICAL CONVECTIVITY 1 0 -3 0 -1 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "THERMICAL MASSIC CAPACITY 0 2 -2 0 -1 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ENTROPY 1 2 -2 0 -1 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ENTHALPY 1 2 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LUMINOUS FLUX 0 0 0 0 0 0 1 0 1\n" + "....................................................................................................................................\n" "lumen Lu\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LUMINANCE 0 -2 0 0 0 " - " 0 1 0 0\n" - "................................................................................................" - "....................................\n" - "stilb sb 1.E+04 " - " cd/m\xB2\n" - "apostilb asb 0.318 " - " cd/m\xB2\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "EXITANCE 0 -2 0 0 0 " - " 0 1 0 1\n" - "................................................................................................" - "....................................\n" - "lux lx " - " \n" - "phot ph 1.E+04 " - " lx\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LUMINOUS EXPOSITION 0 -2 1 0 0 " - " 0 1 0 1\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "LUMINOUS EFFICACITY -1 -2 3 0 0 " - " 0 1 0 1\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC CHARGE 0 0 1 1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LUMINANCE 0 -2 0 0 0 0 1 0 0\n" + "....................................................................................................................................\n" + "stilb sb 1.E+04 cd/m\xB2\n" + "apostilb asb 0.318 cd/m\xB2\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "EXITANCE 0 -2 0 0 0 0 1 0 1\n" + "....................................................................................................................................\n" + "lux lx \n" + "phot ph 1.E+04 lx\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LUMINOUS EXPOSITION 0 -2 1 0 0 0 1 0 1\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "LUMINOUS EFFICACITY -1 -2 3 0 0 0 1 0 1\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC CHARGE 0 0 1 1 0 0 0 0 0\n" + "....................................................................................................................................\n" "coulomb C\n" - "ampere-hour Ah 3.6E+03 " - " C\n" - "franklin Fr " - "333.563E-12 C\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC FIELD 1 1 -3 -1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC CAPACITANCE -1 -2 4 2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "ampere-hour Ah 3.6E+03 C\n" + "franklin Fr 333.563E-12 C\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC FIELD 1 1 -3 -1 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC CAPACITANCE -1 -2 4 2 0 0 0 0 0\n" + "....................................................................................................................................\n" "farad F\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MAGNETIC FIELD 0 -1 0 1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "oersted oersted (1000/4*\xB6) " - " A/m\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MAGNETIC FLUX 1 2 -2 -1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MAGNETIC FLUX DENSITY 1 0 -2 -1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MAGNETIC FIELD 0 -1 0 1 0 0 0 0 0\n" + "....................................................................................................................................\n" + "oersted oersted (1000/4*\xB6) A/m\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MAGNETIC FLUX 1 2 -2 -1 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MAGNETIC FLUX DENSITY 1 0 -2 -1 0 0 0 0 0\n" + "....................................................................................................................................\n" "tesla T\n" - "gauss Gs 1.E-04 " - " T\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "FLUX OF MAGNETIC INDUCTION 1 2 -2 -1 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "gauss Gs 1.E-04 T\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "FLUX OF MAGNETIC INDUCTION 1 2 -2 -1 0 0 0 0 0\n" + "....................................................................................................................................\n" "weber Wb\n" - "maxwell Mx 1.E-08 " - " Wb\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "INDUCTANCE 1 2 -2 -2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "maxwell Mx 1.E-08 Wb\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "INDUCTANCE 1 2 -2 -2 0 0 0 0 0\n" + "....................................................................................................................................\n" "henry H\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "RELUCTANCE -1 -2 2 2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC RESISTANCE 1 2 -3 -2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "RELUCTANCE -1 -2 2 2 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC RESISTANCE 1 2 -3 -2 0 0 0 0 0\n" + "....................................................................................................................................\n" "ohm O\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ELECTRIC CONDUCTANCE -1 -2 3 2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "siemens S " - " \n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "RESISTIVITY 1 3 -3 -2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "CONDUCTIVITY -1 -3 3 2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOLAR MASS 1 0 0 0 0 " - " -1 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOLAR VOLUME 0 3 0 0 0 " - " -1 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "CONCENTRATION 1 -3 0 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOLAR CONCENTRATION 0 -3 0 0 0 " - " 1 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "MOLARITY -1 0 0 0 0 " - " 1 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ACOUSTIC INTENSITY 0 1 0 -2 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ELECTRIC CONDUCTANCE -1 -2 3 2 0 0 0 0 0\n" + "....................................................................................................................................\n" + "siemens S \n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "RESISTIVITY 1 3 -3 -2 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "CONDUCTIVITY -1 -3 3 2 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOLAR MASS 1 0 0 0 0 -1 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOLAR VOLUME 0 3 0 0 0 -1 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "CONCENTRATION 1 -3 0 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOLAR CONCENTRATION 0 -3 0 0 0 1 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "MOLARITY -1 0 0 0 0 1 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ACOUSTIC INTENSITY 0 1 0 -2 0 0 0 0 0\n" + "....................................................................................................................................\n" "bel B\n" - "neper Np 0.869 " - " B\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ABSORBED DOSE 0 2 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "neper Np 0.869 B\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ABSORBED DOSE 0 2 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "gray Gr\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "DOSE EQUIVALENT 0 2 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "DOSE EQUIVALENT 0 2 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" "sievert Si\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ROTATION ACCELERATION 0 0 -2 0 0 " - " 0 0 1 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "TRANSLATION STIFFNESS 1 0 -2 0 0 " - " 0 0 0 0\n" - "................................................................................................" - "....................................\n" - "................................................................................................" - "....................................\n" - " M L T I K " - " N J P S\n" - "ROTATION STIFFNESS 1 2 -2 0 0 " - " 0 0 -1 0\n" - "................................................................................................" - "....................................\n"; + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ROTATION ACCELERATION 0 0 -2 0 0 0 0 1 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "TRANSLATION STIFFNESS 1 0 -2 0 0 0 0 0 0\n" + "....................................................................................................................................\n" + "....................................................................................................................................\n" + " M L T I K N J P S\n" + "ROTATION STIFFNESS 1 2 -2 0 0 0 0 -1 0\n" + "....................................................................................................................................\n"; + +// clang-format on diff --git a/src/XSMessage/FILES b/src/XSMessage/FILES index 774685fa9b..904004a80e 100755 --- a/src/XSMessage/FILES +++ b/src/XSMessage/FILES @@ -1,3 +1 @@ -msgfile:::XSTEP.fr -msgfile:::XSTEP.us XSMessage_XSTEP_us.pxx diff --git a/src/XSMessage/XSMessage_XSTEP_fr.pxx b/src/XSMessage/XSMessage_XSTEP_fr.pxx new file mode 100644 index 0000000000..6ec91384ab --- /dev/null +++ b/src/XSMessage/XSMessage_XSTEP_fr.pxx @@ -0,0 +1,1032 @@ +// clang-format off +// This file has been automatically generated from resource file resources/XSMessage/XSTEP.fr + +static const char XSMessage_XSTEP_fr[] = + "!LOADING PHASE\n" + ".XSTEP_1\n" + " Debut du chargement en memoire du fichier IGES.\n" + "!\n" + ".XSTEP_2\n" + " Erreur d'ouverture du fichier IGES.\n" + "!\n" + ".XSTEP_3\n" + " Raison : Le fichier n'existe pas.\n" + "!\n" + ".XSTEP_4\n" + " Raison : Espace memoire insuffisant.\n" + "!\n" + ".XSTEP_5\n" + " Raison : Ce fichier est protege en lecture.\n" + "!\n" + ".XSTEP_6\n" + " Raison : Trop de fichiers ouverts.\n" + "!\n" + ".XSTEP_7\n" + " Raison : Inconnue.\n" + "!\n" + ".XSTEP_8\n" + " Fin du chargement du fichier IGES (Temps ecoule : %s).\n" + "\n" + "!\n" + ".XSTEP_9\n" + "Debut de lecture du fichier IGES.\n" + "!\n" + ".XSTEP_10\n" + "Fin de lecture du fichier IGES.\n" + "!\n" + ".XSTEP_11\n" + " Erreur interne pendant la lecture de l'entete : le processus continue.\n" + "!\n" + ".XSTEP_12\n" + "Entete et contenu du fichier IGES ont ete charges.\n" + "!\n" + ".XSTEP_13\n" + " Erreur interne durant la lecture de l'entite %d.\n" + "!\n" + ".XSTEP_14\n" + " Erreur interne durant la lecture de l'entite %d parametre %d.\n" + "!\n" + ".XSTEP_15\n" + " Nombre total d'entites chargees : %d.\n" + "!\n" + ".XSTEP_16\n" + " Debut du chargement du modele.\n" + "!\n" + ".XSTEP_17\n" + " Fin du chargement du modele.\n" + "!\n" + ".XSTEP_18\n" + " Erreur de syntaxe dans le fichier IGES a la ligne %d de la section %s.\n" + "!\n" + ".XSTEP_19\n" + " Erreur de syntaxe dans le fichier IGES a la ligne %d de la section %s (numero de ligne peut etre incorrecte).\n" + "!\n" + ".XSTEP_20\n" + " Il n'y a pas de Terminate Section : le processus continue.\n" + "!\n" + ".XSTEP_21\n" + "Nombre d'entites nulles ignorees : %d.\n" + "!\n" + ".XSTEP_22\n" + " Entite inconnue %s.\n" + "!\n" + ".XSTEP_23\n" + " Entite recuperee %s.\n" + "!\n" + ".XSTEP_24\n" + "Resume : %d entites inconnues.\n" + "!\n" + ".XSTEP_25\n" + " Nombre de fails pendant le chargement en memoire : %d.\n" + "!\n" + ".XSTEP_26\n" + " Nombre de warnings pendant le chargement en memoire : %d.\n" + "!\n" + ".XSTEP_27\n" + " Directory Entry : Il n'y a pas de parametre. le transfer continue.\n" + "!\n" + ".XSTEP_28\n" + " Directory Entry : Le parametre 1 (Type de l'entite) est incorrect.\n" + "!\n" + ".XSTEP_29\n" + " Directory Entry : Le champ 4 (Line Font Pattern) est incorrect (Un pointeur non nul ou un entier entre 0 et 5 est attendu).\n" + "!\n" + ".XSTEP_30\n" + " Directory Entry : Le champ 5 (Level) est incorrect (Un pointeur ou un entier non nul est attendu).\n" + "!\n" + ".XSTEP_31\n" + " Directory Entry : Le champ 6 (View) est incorrect (Un pointeur non nul est attendu).\n" + "!\n" + ".XSTEP_32\n" + ": Directory Entry : Le champ 7 (Transformation Matrix) est incorrect (Un pointeur non nul est attendu).\n" + "!\n" + ".XSTEP_33\n" + " Entity %s, Type %d : Directory Entry : Le champ 8 (Label Display Associativity) est incorrect (Un pointeur non nul est attendu).\n" + "!\n" + ".XSTEP_34\n" + " Directory Entry : Le champ 13 (Color Number) est incorrect (Un pointeur non nul ou un entier entre 0 et 8 est attendu).\n" + "!\n" + ".XSTEP_35\n" + " Entite nulle %s.\n" + "!\n" + ".XSTEP_36\n" + " Entite inconnue %s.\n" + "!\n" + ".XSTEP_37\n" + " La liste d'associativites est incorrecte.\n" + "!\n" + ".XSTEP_38\n" + " La liste de proprietes est incorrecte.\n" + "! ANALYSIS PHASE\n" + ".XSTEP_39\n" + " Global Section : Nombre de parametres invalides (%d ou %d parametres attendus).\n" + "!\n" + ".XSTEP_40\n" + " Global Section (Parametres 1 et 2) : Parameter Delimiter Character et Record Delimiter Character doivent etre differents.\n" + "!\n" + ".XSTEP_41\n" + " Global Section (Parametre 2) : Le parametre Record Delimiter Character est invalide. Caractere Virgule pris par defaut.\n" + "!\n" + ".XSTEP_42\n" + " Global Section (Parametre 2) : Le parametre Record Delimiter Character est invalide. Caractere Point Virgule pris par defaut.\n" + "!\n" + ".XSTEP_43\n" + " Global Section (Parametre 8) : Le parametre Single Precision Magnitude est invalide (Entier Positif attendu). Valeur 38 prise pas defaut.\n" + "!\n" + ".XSTEP_44\n" + " Global Section (Parametre 9) : Le parametre Single Precision Significance est invalide (Entier Positif attendu). Valeur 6 prise pas defaut.\n" + "!\n" + ".XSTEP_45\n" + " Global Section (Parametre 10) : Le parametre Double Precision Magnitude est invalide (Entier Positif attendu). Valeur 308 prise pas defaut.\n" + "!\n" + ".XSTEP_46\n" + " Global Section (Parametre 11) : Le parametre Double Precision Significance est invalide (Entier Positif attendu). Valeur 15 prise pas defaut.\n" + "!\n" + ".XSTEP_47\n" + " Global Section (Parametre 13) : Le parametre Model Space Scale est invalide (Positif attendu). Valeur 1.0 prise pas defaut.\n" + "!\n" + ".XSTEP_48\n" + " Global Section (Parametre 14) : Le parametre Unit Flag est invalide (Entier entre 1 et 11 attendu). Valeur 2 prise pas defaut : Millimeters.\n" + "!\n" + ".XSTEP_49\n" + " Global Section (Parametre 15) : Le parametre Unit Name n'est pas traite.Valeur 2 prise pas defaut : Millimeters.\n" + "!\n" + ".XSTEP_50\n" + " Global Section (Parametre 15) : Le parametre Unit Name n'est pas defini, ignore.\n" + "!\n" + ".XSTEP_51\n" + " Global Section (Parametre 14 et 15) : Le parametre Unit Flag ne correspond pas au parametre Unit Name : Unit Name ignore.\n" + "!\n" + ".XSTEP_52\n" + " Global Section i)(Parametre 19) : Le parametre Minimum Resolution est invalide (Reel Positif attendu). Valeur 0.0 prise pas defaut.\n" + "!\n" + ".XSTEP_53\n" + " Global Section (Parametre 23) : Le parametre Version Flag est invalide (Entier entre 1 et 11 attendu). Valeur 3 prise pas defaut : Version 2.0.\n" + "!\n" + ".XSTEP_54\n" + " Global Section (Parametre 24) : Le parametre Drafting Standard Flag est invalide (Entier entre 0 et 7 attendu). Valeur 0 prise pas defaut : No standard.\n" + "!\n" + ".XSTEP_55\n" + " Global Section (Parametre 25) : Le parametre Last change Date n'est pas defini.\n" + "!\n" + ".XSTEP_56\n" + " Global Section (Parametre 18) : Le parametre Date n'est pas defini.\n" + "!\n" + ".XSTEP_57\n" + " Global Section (Parametre %d) : Format de date invalide.\n" + "!\n" + ".XSTEP_58\n" + " Directory Entry (Champ 1) : Le champ Entity Type Number est invalide \n" + "!\n" + ".XSTEP_59\n" + " Directory Entry (Champ 3) : Le champ Structure est indefini.\n" + "!\n" + ".XSTEP_60\n" + " Directory Entry (Champ 4) : Le champ Line Font Pattern est invalide (Pointeur ou Entier entre 0 et 5 attendu). Valeur 0 prise par defaut.\n" + "!\n" + ".XSTEP_61\n" + " Directory Entry (Champ 5) : Le champ Level est invalide (Pointeur ou Entier attendu). Valeur 0 prise par defaut.\n" + "!\n" + ".XSTEP_62\n" + " Directory Entry (Champ 6) : Le champ View est invalide (Pointeur ou Zero attendu). Valeur 0 prise par defaut.\n" + "!\n" + ".XSTEP_63\n" + " Directory Entry (Champ 7): Le champ Transformation Matrix est invalide (Pointeur ou Zero attendu). Valeur 0 prise par defaut.\n" + "!\n" + ".XSTEP_64\n" + " Directory Entry (Champ 8): Le champ Label Display Entity est invalide (Pointeur ou Zero attendu). Valeur 0 prise par defaut.\n" + "!\n" + ".XSTEP_65\n" + " Directory Entry (Champ 9) : Le champ Blank Status est invalide (Entier attendu : 0 ou 1). \n" + "!\n" + ".XSTEP_66\n" + " Directory Entry (Champ 9) : Le champ Subordinate Entity Switch est invalide (Entier entre 0 et 3 attendu). \n" + "!\n" + ".XSTEP_67\n" + " Directory Entry (Champ 9) : Le champ Entity Use Flag est invalide (Entier entre 0 et 6 attendu). \n" + "!\n" + ".XSTEP_68\n" + " Directory Entry (Champ 9) : Le champ Hierarchy est invalide (Entier entre 0 et 2 attendu).\n" + "!\n" + ".XSTEP_69\n" + " Directory Entry (Champ 12) : Le champ Line Weight Number n'est pas defini. \n" + "!\n" + ".XSTEP_70\n" + " Directory Entry (Champ 13) : Le champ Color Number est invalide (Pointeur ou Entier entre 0 et 8 attendu). \n" + "!\n" + ".XSTEP_71\n" + " Directory Entry (Champ 15) : Le champ Form Number est invalide.\n" + "!\n" + ".XSTEP_72\n" + " Directory Entry (Champ 19): Le champ Entity Subscript Number est invalide (Entier attendu).\n" + "!Type 116\n" + ".XSTEP_73\n" + " Parameter Data : Le parametre %d (Coordinate of Point) est invalide (Reel attendu).\n" + "!Type 116\n" + ".XSTEP_74\n" + " Parameter Data : Le parametre %d (Display Symbol) est invalide (Entite Subfigure Definition, Type 308 attendue).\n" + "!Type 100\n" + ".XSTEP_75\n" + " Parameter Data : Le parametre 1 ( ZT displacement of Arc) est invalide (Reel attendu).\n" + "!Type 100\n" + ".XSTEP_76\n" + " Parameter Data : Le parametre %d (Arc Center ) est invalide (Reel attendu).\n" + "!Type 100\n" + ".XSTEP_77\n" + " Parameter Data : Le parametre %d (Start Point) est invalide (Reel attendu).\n" + "!Type 100\n" + ".XSTEP_78\n" + " Parameter Data : Le parametre %d (Terminate Point) est invalide (Reel attendu).\n" + "!Type 102\n" + ".XSTEP_79\n" + " Parameter Data : Le parametre 1 (Number of Entities) est invalide :%d (Entier Positif attendu).\n" + "!Type 102\n" + ".XSTEP_80\n" + " Parameter Data : Certains pointeurs de liste d'entites sont nuls ou negatifs : ignores (Entites Point, Connect Point ou Paramerterized Curve attendues).\n" + "!Type 104\n" + ".XSTEP_81\n" + " Parameter Data : Le parametre %d (Conic Coefficient) est invalide (Reel attendu).\n" + "!Type 104\n" + ".XSTEP_82\n" + " Parameter Data : Le parametre 7 (Coordinate of Plane) est invalide (Reel attendu).\n" + "!Type 104\n" + ".XSTEP_83\n" + " Parameter Data : Le parametre %d (Starting Point) est invalide (Reel attendu).\n" + "!Type 104\n" + ".XSTEP_84\n" + " Parameter Data : Le parametre %d (Terminate Point) est invalide (Reel attendu).\n" + "!Type 106\n" + ".XSTEP_85\n" + " Parameter Data : Le parametre 1 (Interpretation Flag) est invalide (Entier attendu : %d).\n" + "!Type 106\n" + ".XSTEP_86\n" + " Parameter Data : Le parametre 2 (Number of n-tuples) est invalide (Entier Positif attendu).\n" + "!Type 106\n" + ".XSTEP_87\n" + " Parameter Data : Le parametre 3 (Common Z Displacement) est invalide (Reel attendu).\n" + "!Type 106\n" + ".XSTEP_88\n" + " Parameter Data : Tous les parametres Data Point ne sont pas de type Reel.\n" + "!Type 110\n" + ".XSTEP_89\n" + " Parameter Data : Le parametre %d (Starting Point) est invalide (Reel attendu).\n" + "!Type 110\n" + ".XSTEP_90\n" + " Parameter Data : Le parametre %d (Terminate Point) est invalide (Reel attendu).\n" + "!Type 112\n" + ".XSTEP_91\n" + " Parameter Data : Le parametre 1 (Spline Type) est invalide (Entier entre 1 et 6 attendu).\n" + "!Type 112\n" + ".XSTEP_92\n" + " Parameter Data : Le parametre 2 (Degree of Continuity) est invalide (Entier attendu).\n" + "!Type 112\n" + ".XSTEP_93\n" + " Parameter Data : Le parametre 3 (Number of Dimensions) est invalide (Entier attendu : 2 ou 3).\n" + "!Type 112\n" + ".XSTEP_94\n" + " Parameter Data : Le parametre 4 (Number of Segments) est invalide (Entier Positif attendu).\n" + "!Type 112\n" + ".XSTEP_95\n" + " Parameter Data : Tous les parametres Break Point ne sont pas de type Reel.\n" + "!Type 112\n" + ".XSTEP_96\n" + " Parameter Data : L'entite est plane mais les parametres BZ, CZ. DZ ne sont pas nuls\n" + "!Type 126\n" + ".XSTEP_97\n" + " Parameter Data : Le parametre %d (Upper Index of Sum) est invalide (Entier Positif attendu).\n" + "!Type 126\n" + ".XSTEP_98\n" + " Parameter Data : Le parametre %d (Degree of Basis Functions) est invalide (Entier attendu) : Valeur 0 prise par defaut.\n" + "!Type 126\n" + ".XSTEP_99\n" + " Parameter Data : Le parametre %d (Planar/Non Planar Flag) est invalide (Booleen attendu).\n" + "!Type 126\n" + ".XSTEP_100\n" + " Parameter Data : Le parametre %d (Open/Closed Flag) est invalide (Booleen attendu).\n" + "!Type 126\n" + ".XSTEP_101\n" + " Parameter Data : Le parametre %d (Rational/Polynomial Flag) est invalide (Booleen attendu).\n" + "!Type 126\n" + ".XSTEP_102\n" + " Parameter Data : Le parametre %d (NonPeriodic/Periodic Flag) est invalide (Booleen attendu).\n" + "!Type 126\n" + ".XSTEP_103\n" + " Parameter Data : Tous les parametres Knot Sequence ne sont pas de type Reel.\n" + "!Type 126\n" + ".XSTEP_104\n" + " Parameter Data : Tous les parametres Weight ne sont pas de type Reel Positif.\n" + "!Type 126\n" + ".XSTEP_105\n" + " Parameter Data : Le parametre %d (Control Point) est invalide (Reel attendu).\n" + "!Type 126\n" + ".XSTEP_106\n" + " Parameter Data : Le parametre %d (Starting Value) est invalide (Reel attendu).\n" + "!Type 126\n" + ".XSTEP_107\n" + " Parameter Data : Le parametre %d (Ending Value) est invalide (Reel attendu).\n" + "!Type 126\n" + ".XSTEP_108\n" + " Parameter Data : Le parametre %d (Unit Normal) est invalide (Reel attendu).\n" + "!Type 126\n" + ".XSTEP_109\n" + " Parameter Data : Le parametre %d (Unit Normal) n'est pas defini pour une courbe plane.\n" + "!Type 130\n" + ".XSTEP_110\n" + " Parameter Data : Le parametre 1 (Curve Entity to be offset) est invalide (Entite Curve attendue). \n" + "!Type 130\n" + ".XSTEP_111\n" + " Parameter Data : Le parametre 2 (Offset Distance Flag) est invalide (Entier entre 1 et 3 attendu).\n" + "!Type 130\n" + ".XSTEP_112\n" + " Parameter Data : Le parametre 3 (Curve Entity whose coordinate describes the offset) est invalide (Entite Curve attendue). \n" + "!Type 130\n" + ".XSTEP_113\n" + " Parameter Data : Le parametre 4 (Particular Coordinate) est invalide (Entier attendu).\n" + "!Type 130\n" + ".XSTEP_114\n" + " Parameter Data : Le parametre 5 (Tapered Offset Type Flag) est invalide (Entier attendu).\n" + "!Type 130\n" + ".XSTEP_115\n" + " Parameter Data : Le parametre 6 (First Offset distance) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_116\n" + " Parameter Data : Le parametre 7 (Arc Length of Fisrt Offset Distance) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_117\n" + " Parameter Data : Le parametre 8 (Second Offset Distance) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_118\n" + " Parameter Data : Le parametre 9 (Arc Length of Second Offset Distance) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_119\n" + " Parameter Data : Le parametre 13 (Offset Curve Starting Parameter Value) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_120\n" + " Parameter Data : Le parametre 14 (Offset Curve Ending Parameter Value) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_121\n" + " Parameter Data : Le parametre %d (Unit Vector Normal to plane) est invalide (Reel attendu).\n" + "!Type 130\n" + ".XSTEP_122\n" + " Parameter Data : Le parametre 1 (Type of Bounded Surface Representation) est invalide (Entier attendu : 0 ou 1 ).\n" + "!Type 141\n" + ".XSTEP_123\n" + " Parameter Data : Le parametre 2 (Trimming Curves Representation) est invalide (Entier entre 0 et 3 attendu).\n" + "!Type 141\n" + ".XSTEP_124\n" + " Parameter Data : Le parametre 3 (Untrimmed Surface) est invalide (Entite Untrimmed Surface attendue). \n" + "!Type 141\n" + ".XSTEP_125\n" + " Parameter Data : Surface %d non parametrique (parametre 3).\n" + "!Type 141\n" + ".XSTEP_126\n" + " Parameter Data : Le parametre 4 (Number of Curves est invalide (Positif attendu).\n" + "!Type 141\n" + ".XSTEP_127\n" + " Parameter Data : Le parametre 5 (Model Space Curve) est invalide (Entite Curve attendue). \n" + "!Type 141\n" + ".XSTEP_128\n" + " Parameter Data : Le parametre 6 (Orientation Flag) est invalide (Entier attendu : 1 ou 2).\n" + "!Type 141\n" + ".XSTEP_129\n" + " Parameter Data : Le parametre 7 (Number of Associated Parameter Space Curves) est invalide (Entier attendu : 0).\n" + "!Type 141\n" + ".XSTEP_130\n" + " Parameter Data : Certains pointeurs de la liste d'entites Parameter Space Curve sont nuls ou negatifs : ignores (Entites Curve attendues).\n" + "!Type 142\n" + ".XSTEP_131\n" + " Parameter Data : Le parametre 2 (Surface on which the curve lies) est invalide (Entite Surface attendue).\n" + "!Type 142\n" + ".XSTEP_132\n" + " Parameter Data : Le parametre 3 (Curve 2D) est invalide (Entite Curve attendue).\n" + "!Type 142\n" + ".XSTEP_133\n" + " Parameter Data : Le parametre 4 (Curve 3D) est invalide (Entite Curve attendue).\n" + "!Type 142\n" + ".XSTEP_134\n" + " Parameter Data : Les pointeurs sur les courbes 2D et sont nuls (parameter 3 et 4) (Entites Curve attendues).\n" + "!Type 108\n" + ".XSTEP_135\n" + " Parameter Data : Le parametre %d (Coefficient Of Plane) est invalide (Reel attendu).\n" + "!Type 108\n" + ".XSTEP_136\n" + " Parameter Data : Le parametre 5 (Closed Curve) est invalide (Entite Curve attendue).\n" + "!Type 108\n" + ".XSTEP_137\n" + " Parameter Data : Le parametre 5 est invalide (Pointeur nul attendu lorsque le champ Form Number est 0).\n" + "!Type 108\n" + ".XSTEP_138\n" + " Parameter Data : Le parametre 9 (DisplaySymbol Size) est invalide (Reel attendu).\n" + "!Type 108\n" + ".XSTEP_139\n" + " Parameter Data : Le parametre %d (Coordinate of Display Symbol) est invalide (Reel attendu).\n" + "!Type 114\n" + ".XSTEP_140\n" + " Parameter Data : Le parametre 1 (Spline Boundary Type) est invalide (Entier entre 1 et 6 attendu).\n" + "!Type 114\n" + ".XSTEP_141\n" + " Parameter Data : Le parametre 3 (Number of U Segments) est invalide (Entier Positif attendu).\n" + "!Type 114\n" + ".XSTEP_142\n" + " Parameter Data : Le parametre 4 (Number of V Segments) est invalide (Entier Positif attendu).\n" + "!Type 114\n" + ".XSTEP_143\n" + " Parameter Data : Tous les parametres Breakpoint in U ne sont de type Reel.\n" + "!Type 114\n" + ".XSTEP_144\n" + " Parameter Data : Tous les parametres Breakpoint in V ne sont pas de type Reel.\n" + "!Type 114\n" + ".XSTEP_145\n" + " Parameter Data : Tous les parametres %s Coefficient of Patch ne sont pas de type Reel.\n" + "!Type 114\n" + ".XSTEP_146\n" + " Parameter Data : Le parametre %d (Last Z Coefficient of Patch) est invalide (Reel attendu).\n" + "!Type 114\n" + ".XSTEP_147\n" + " Parameter Data : Le nombre de parametres %c Coefficient of Patch est invalide (Entier attendu : 16).\n" + "!Type 118\n" + ".XSTEP_148\n" + " Parameter Data : Le parametre 1 (First Curve) est invalide (Entite Curve attendue).\n" + "!Type 118\n" + ".XSTEP_149\n" + " Parameter Data : Le parametre 2 (Second Curve) est invalide (Entite Curve attendue).\n" + "!Type 118\n" + ".XSTEP_150\n" + " Parameter Data : Le parametre 3 (Direction Flag) est invalide (Entier 0 ou 1 attendu).\n" + "!Type 118\n" + ".XSTEP_151\n" + " Parameter Data : Le parametre 4 (Developable Surface Flag) est invalide (Entier 0 ou 1 attendu).\n" + "!Type 120\n" + ".XSTEP_152\n" + " Parameter Data : Le parametre 1 (Axis of Revolution) est invalide (Entite attendue).\n" + "!Type 120\n" + ".XSTEP_153\n" + " Parameter Data : Le parametre 2 (Generatrix Entity) est invalide (Entite attendue).\n" + "!Type 120\n" + ".XSTEP_154\n" + " Parameter Data : Le parametre 3 (Start Angle) est invalide (Reel attendu).\n" + "!Type 120\n" + ".XSTEP_155\n" + " Parameter Data : Le parametre 4 (Terminate Angle est invalide (Reel attendu).\n" + "!Type 122\n" + ".XSTEP_156\n" + " Parameter Data : Le parametre 1 (Generatrix Entity) est invalide (Entite Curve attendue).\n" + "!Type 122\n" + ".XSTEP_157\n" + " Parameter Data : Le parametre %d (Coordinate of the Terminate Point) est invalide (Reel attendu).\n" + "!Type 128\n" + ".XSTEP_158\n" + " Parameter Data : Valeur supplementaire invalide (Reel attendu).\n" + "!Type 128\n" + ".XSTEP_159\n" + " Parameter Data : Valeur Reelle supplementaire : ignoree.\n" + "!Type 128\n" + ".XSTEP_160\n" + " Parameter Data : Invalid Number of First Knots sequence (Nombre attendu : %d).\n" + "!Type 128\n" + ".XSTEP_161\n" + " Parameter Data : Invalid Number of Second Knots Sequence (Nombre attendu : %d).\n" + "!Type 140\n" + ".XSTEP_162\n" + " Parameter Data : Le parametre %d (Coordinate of Offset Indicator) est invalide (Reel attendu).\n" + "!Type 140\n" + ".XSTEP_163\n" + " Parameter Data : Le parametre 4 (Offset Distance) est invalide (Reel attendu).\n" + "!Type 140\n" + ".XSTEP_164\n" + " Parameter Data : Le parametre 5 (Surface Entity to be offset) est invalide (Entite Surface attendue).\n" + "!Type 143\n" + ".XSTEP_165\n" + " Parameter Data : Le parametre 1 (Bounded Surface Representation Type) est invalide (Entier 0 ou 1 attendu).\n" + "!Type 143\n" + ".XSTEP_166\n" + " Parameter Data : Le parametre 2(Surface Entity to be Bounded) est invalide (Entite Surface attendue).\n" + "!Type 143\n" + ".XSTEP_167\n" + " Parameter Data : Le parametre 3 (Number of Boundary Entities) est invalide (Entier Positif attendu).\n" + "!Type 143\n" + ".XSTEP_168\n" + " Parameter Data : Le parametre %d (Boundary Entity) est invalide (Entite Boundary, Type 141 attendue).\n" + "!Type 144\n" + ".XSTEP_169\n" + " Parameter Data : Le parametre 1 (Surface to be trimmed) est invalide (Entite Surface attendue).\n" + "!Type 144\n" + ".XSTEP_170\n" + " Parameter Data : Le parametre 2 (Outer Boundary Type) est invalide (Entier 0 ou 1 attendu).\n" + "!Type 144\n" + ".XSTEP_171\n" + " Parameter Data : Le parametre 3 ( Number of Inner Boundary Closed Curves) est invalide (Entier Positif attendu).\n" + "!Type 144\n" + ".XSTEP_172\n" + " Parameter Data : Le parametre 4 (Outer Boundary) est invalide (Entite Curve on a Parametric Surface, Type 142 attendue).\n" + "!Type 144\n" + ".XSTEP_173\n" + " Parameter Data : Le parametre %d (Inner Boundary) est invalide (Entite Curve on a Parametric Surface, Type 142 attendue).\n" + "!Type 190\n" + ".XSTEP_174\n" + " Parameter Data : Le parametre 1 (Point on the Surface) est invalide (Entite Point, Type 116 attendue).\n" + "!Type 190\n" + ".XSTEP_175\n" + " Parameter Data : Le parametre 2 (Surface Normal Direction) est invalide (Entite Direction attendue).\n" + "!Type 190\n" + ".XSTEP_176\n" + " Parameter Data : Le parametre 3 (Reference Direction) est invalide (Entite Direction attendue).\n" + "!Type 190\n" + ".XSTEP_177\n" + " Parameter Data : Le parametre 3 est invalide (Pointeur nul attendu lorsque le champ Form Number est 1).\n" + "!Type 186\n" + ".XSTEP_178\n" + " Parameter Data : Le parametre 1 (Shell) est invalide (Entite Closed Shell, Type 514, Form 1 attendue).\n" + "!Type 186\n" + ".XSTEP_179\n" + " Parameter Data : Le parametre %d (Void Shell) est invalide (Entite Closed Shell, Type 514, Form 1 attendue).\n" + "!Type 186\n" + ".XSTEP_180\n" + " Parameter Data : Le parametre %d (Orientation Flag) est invalide (Booleen attendu).\n" + "!Type 186\n" + ".XSTEP_181\n" + " Parameter Data : Le parametre 3 (Number of Void Shells) est invalide (Entier Positif attendu).\n" + "!Type 502\n" + ".XSTEP_182\n" + " Parameter Data : Le parametre 1 (Number of Vertex Tuples) est invalide (Entier Positif attendu).\n" + "!Type 502\n" + ".XSTEP_183\n" + " Parameter Data : Le parametre % (Coordinate of Vertex) est invalide (Reel attendu).\n" + "!Type 504\n" + ".XSTEP_184\n" + " Parameter Data : Le parametre 1 (Number of Edge Tuples) est invalide (Entier Positif attendu).\n" + "!Type 504\n" + ".XSTEP_185\n" + " Parameter Data : Le parametre 2 (Model Space Curve) est invalide (Entite Curve attendue).\n" + "!Type 504\n" + ".XSTEP_186\n" + " Parameter Data : Le parametre %d (Start Vertex Index) est invalide (Entier attendu).\n" + "!Type 504\n" + ".XSTEP_187\n" + " Parameter Data : Le parametre %d (Terminate Vertex Index) est invalide (Entier attendu).\n" + "!Type 504\n" + ".XSTEP_188\n" + " Parameter Data : Le parametre %d (Start Vertex List Entity) est invalide (Entite Vertex List, Type 502 attendue).\n" + "!Type 504\n" + ".XSTEP_189\n" + " Parameter Data : Le parametre %d (Terminate Vertex List Entity) est invalide (Entite Vertex List, Type 502 attendue).!T\n" + "!Type 508\n" + ".XSTEP_190\n" + " Parameter Data : Le parametre %d (Edge Type) est invalide (Entier 0 ou 1 attendu).\n" + "!Type 508\n" + ".XSTEP_191\n" + " Parameter Data : Le parametre %d (List Index) est invalide (Entier attendu).\n" + "!Type 508\n" + ".XSTEP_192\n" + " Parameter Data : Le parametre %d (Number of Parameter Curves) est invalide (Entier Positif attendu).\n" + "!Type 508\n" + ".XSTEP_193\n" + " Parameter Data : Le parametre % Vertex or Edge List Entity) est invalide (Entite Vertex List ou Edge List Entity, Type 502 ou 504 attendue).\n" + "!Type 508\n" + ".XSTEP_194\n" + " Parameter Data : Le parametre % (Parameter Space Curve) est invalide (Entite Curve attendue).\n" + "!Type 508\n" + ".XSTEP_195\n" + " Parameter Data : Le parametre %d (Isoparametric Flag) est invalide (Booleen attendu).\n" + "!Type 510\n" + ".XSTEP_196\n" + " Parameter Data : Le parametre 1 (Surface) est invalide (Entite Surface attendue).\n" + "!Type 510\n" + ".XSTEP_197\n" + " Parameter Data : Le parametre 2 (Number of Loops) est invalide (Entier Positif attendu).\n" + "!Type 510\n" + ".XSTEP_198\n" + " Parameter Data : Le parametre 3 (Outer Loop flag) est invalide (Booleen attendu).\n" + "!Type 510\n" + ".XSTEP_199\n" + " Parameter Data : Le parametre %d (Loop of the Face) est invalide (Entite Loop, Type 508 attendue).\n" + "!Type 514\n" + ".XSTEP_200\n" + " Parameter Data : Le parametre 1 (Number of Faces) est invalide (Entier Positif attendu).\n" + "!Type 514\n" + ".XSTEP_201\n" + " Parameter Data : Le parametre 2 (Face) est invalide (Entite Face, Type 510 attendue).\n" + "!Type 402, Form 1 ou 7\n" + ".XSTEP_202\n" + " Form %d : Parameter Data : Le parametre 1 (Number of Entries) est invalide (Entier attendu).\n" + "!Type 402, Form 1 ou 7\n" + ".XSTEP_203\n" + " Form %d : Parameter Data : Certains pointeurs de la liste d'entites sont nuls ou negatifs : ignores (Entites attendues).\n" + "!Type 402\n" + ".XSTEP_204\n" + " Form 9 : Parameter Data : Le parametre 1 (Number of Parent Entity) est invalide (Entier attendu : 1).\n" + "!Type 402\n" + ".XSTEP_205\n" + " Form 9 : Parameter Data : Le parametre 2 (Number of children) est invalide (Entier Positif attendu).\n" + "!Type 402\n" + ".XSTEP_206\n" + " Form 9 : Parameter Data : Le parametre 3 (Parent Entity) est invalide (Entite attendue).\n" + "!Type 402\n" + ".XSTEP_207\n" + " Form 9 : Parameter Data : Certains pointeurs de la liste d'entites filles sont nuls ou negatifs (Entites attendues).\n" + "!Type 308\n" + ".XSTEP_208\n" + " Parameter Data : Le parametre 1 (Depth of Subfigure) est invalide (Entier attendu).\n" + "!Type 308\n" + ".XSTEP_209\n" + " Parameter Data : Le parametre 2 (Subfigure Name) est invalide (Chaine au format Hollerith attendue).\n" + "!Type 308\n" + ".XSTEP_210\n" + " Parameter Data : Le parametre 3 (Number of Entities) est invalide (Entie Positif attendu).\n" + "!Type 308\n" + ".XSTEP_211\n" + " Parameter Data : Certains pointeurs de la liste d'entites associees sont nuls ou negatifs : ignores (Entites attendues).\n" + "!Type 408\n" + ".XSTEP_212\n" + " Parameter Data : Le parametre 1 (Subfigure definition entity) est invalide (Entite Subfigure Definition Entity, Type 308 attendue).\n" + "!Type 408\n" + ".XSTEP_213\n" + " Parameter Data : Le parametre %d (Translation data) est invalide (Reel attendu).\n" + "!Type 408\n" + ".XSTEP_214\n" + " Parameter Data : Le parametre 5 (Scale Factor) est invalide (Reel attendu). Valeur 1.0 prise par defaut.\n" + "!Type 124\n" + ".XSTEP_215\n" + " Parameter Data : Tous les elements de la matrice ne sont pas de type Reel.\n" + "!ADDED MESSAGES\n" + ".XSTEP_246\n" + " Parameter Data : le parametre 4 (Number of segments) est inferieur a 1.\n" + "!\n" + "!\n" + "! DCE 6/11/98 Add in Load phase\n" + "!\n" + ".XSTEP_276\n" + "Parameter Data : le parametre 1 (Curve creation mode) est invalide \n" + "!\n" + ".XSTEP_277\n" + "Parameter Data : le parametre 5 (Representation preference) est invalide (entier attendu).\n" + "!\n" + ".XSTEP_278\n" + "Exception durant le chargement de l'entite %s\n" + "!\n" + "!\n" + "!\n" + "! ===================================================================\n" + "!\n" + "!\n" + "!\n" + "! New translation messages ( S3767 )\n" + "!\n" + ".IGES_1000\n" + " L'Entite %s n'a pas ete chargee en memoire\n" + "!\n" + ".IGES_1005\n" + "Erreur logicielle : transfert d'entite impossible.\n" + "!\n" + "!.IGES_1006 the same as 1015\n" + "! exception raising during the transfer.\n" + "!\n" + ".IGES_1001\n" + "Form %d : Type d'entite non implemente : conversion impossible.\n" + "!\n" + ".IGES_1010\n" + " Le TopoDS_Shape resultat n'a pas le meme parametrage 2D et 3D.\n" + "!\n" + ".IGES_1015\n" + " Erreur logicielle : conversion interrompue.\n" + "!\n" + ".IGES_1020\n" + " Parameter data : le pointeur %d de la liste d'entite associees est nul ou negatif: ignore.\n" + "!\n" + ".IGES_1025\n" + " Erreur de conversion sur l'entite %d : entite ignoree.\n" + "!\n" + ".IGES_1030\n" + " Forme %d: Erreur de conversion sur l'entite IGES %d : entite ignoree.\n" + "!\n" + ".IGES_1035\n" + " La matrice de transformation est invalide : non appliquee.\n" + "!\n" + ".IGES_1036\n" + " Erreur logicielle : entite ignoree.\n" + "!\n" + ".IGES_1040\n" + " Parameter data : le pointeur %d de la liste d'entites est nul ou de type invalide : ignore.\n" + "!\n" + ".IGES_1045\n" + " Deux entites consecutives sont identiques (rang :%d) : une seule est convertie.\n" + "!\n" + ".IGES_1050\n" + " La courbe %dD a ete inversee.\n" + "!\n" + ".IGES_1051\n" + " Toutes le courbes %dD avant le rang %d ont ete inversees.\n" + "!\n" + ".IGES_1055\n" + " La courbe %dD de rang %d etait legerement deconnectee : reparee.\n" + "!\n" + ".IGES_1060\n" + " La courbe %dD de rang %d est trop deconnectee : reparee.\n" + "!\n" + ".IGES_1061\n" + " La surface est converti en TopoDS_Shell pour des problemes de continuite : entite ignoree.\n" + "!\n" + ".IGES_1062\n" + " Le cas des CurveOnSurface sur Composite Surface n'est pas implemente : la representation 3D est retournee.\n" + "!\n" + ".IGES_1066\n" + " Erreur de conversion sur la surface support de la courbe.\n" + "!\n" + ".IGES_1070\n" + " Les representations sont inconstante dans le fichier : Recomputation from %dD.\n" + "!\n" + ".IGES_1090\n" + " La courbe s'auto-intersectait : reparee.\n" + "!\n" + ".IGES_1095\n" + " Les representations 2D et 3D des courbes sont invalides : entite ignoree.\n" + "!\n" + ".IGES_1100\n" + " parameter data : le parametre 2 (Offset Distance Flag) est different de 1 : cas non implemente.\n" + "!\n" + ".IGES_1105\n" + " Le parametre de fin est hors de la courbe : entite ignoree.\n" + "!\n" + ".IGES_1110\n" + " Erreur de transfert sur la courbe de base : entite ignoree.\n" + "!\n" + ".IGES_1115\n" + " Courbe de continuite C0, ne peut etre decoupee en Geom_SplineCurve C1 plus petite que Precision::Confusion().\n" + "!\n" + ".IGES_1120\n" + " Courbe de continuite C0, a ete decoupe en Geom_BSplineCurve continue C1.\n" + "!\n" + ".IGES_1125\n" + " Parameter data : le parametre 1 (Type of Bounded Surface Representation) vaut 0 : cas non implemente. \n" + "!\n" + ".IGES_1130\n" + " Boundary sur Composite Surface : cas non implemente. \n" + "!\n" + ".IGES_1135\n" + " La representation %dD de la courbe n'est pas definie : calculee a partir de la representation %dD.\n" + "! 2D curve representation is not defined : computed from 3D curve representation.\n" + "!\n" + ".IGES_1140\n" + " Erreur pendant la conversion de la courbe 3D : recalcul a partir de la courbe 2D.\n" + "!\n" + ".IGES_1145\n" + " Erreur pendant la conversion de la courbe %dD : recalcul a partir de la representation %dD.\n" + "! error during 2D curve transfer : recomputed from 3D.\n" + "!\n" + ".IGES_1150\n" + " %s trop deconnecte :recalcul a partir de la representation %dD.\n" + "! 2D TopoDS_Wire too disconnected :recomputed from 3D.\n" + "!\n" + ".IGES_1155\n" + " Parameter data : (parametres 1 to 6) les coefficients ne satisfont pas a l'equation d'une conique.\n" + "!\n" + ".IGES_1156\n" + " La conversion de %s %s a echoue : Entite ignoree.\n" + "! (type IGES) (DE:Number) transfer failed : Entity skipped.\n" + "!\n" + ".IGES_1160\n" + " Parameter data (Parametres 8 to 11) : Les coordonnees de debut et de fin de l'arc sont les memes : entite non bornee.\n" + "!\n" + ".IGES_1165 \n" + " La transformation n'est pas plane : non appliquee.\n" + "!\n" + ".IGES_1170\n" + "L'equation polynomiale est incorrecte.\n" + "!\n" + ".IGES_1175\n" + " Erreur pendant la creation des points de controle.\n" + "!\n" + ".IGES_1180\n" + " Parameter data : le parametre 1 (Spline Type >3) : cas non implemente.\n" + "!\n" + ".IGES_1190\n" + " Parameter data : le parametre 2 (Degree of basis functions ) est plus petit que 0 ou plus grand que maxdegree : conversion interrompue.\n" + "!\n" + ".IGES_1195\n" + " Parameter data : nombre incorrect de points de controle (au moins deux points sont requis).\n" + "!\n" + ".IGES_1200\n" + " Erreur de conversion : %s multiplicite initiale > degre %s +1.\n" + "!\n" + ".IGES_1201\n" + " Erreur de conversion : %s multiplicite finale > degre %s +1.\n" + "!\n" + ".IGES_1210\n" + " La somme des %s multiplicites n'est pas egale a la somme (nombre de poles + %s degre +1).\n" + "!\n" + ".IGES_1215\n" + " Parameter data : des parametres de poids ne sont pas reels positifs : entite ignoree.\n" + "!\n" + ".IGES_1220\n" + " La %s BSpline rationelle est en fait polynomiale.\n" + "!\n" + ".IGES_1221\n" + " La surface est fait periodique.\n" + "!\n" + ".IGES_1225\n" + " Les points de depart et d'arrivee sont les memes.\n" + "!\n" + "! 1230 is the same as 1195\n" + "!\n" + ".IGES_1235\n" + " La courbe est trop courte pour etre convertie : entite ignoree.\n" + "!\n" + ".IGES_1240\n" + " Vecteur inutile pour cette forme : ignore.\n" + "!\n" + ".IGES_1250\n" + " La Geom_Surface resultante est continue C0.\n" + "!\n" + ".IGES_1255\n" + " Le reglage a echoue : entite ignoree.\n" + "!\n" + ".IGES_1265\n" + " La surface de base n'est pas continue C0 : construction de l'offset surface impossible.\n" + "!\n" + ".IGES_1266\n" + " La surface de base est continue C0 et ne peut pas etre corrigee en continue C1.\n" + "!\n" + ".IGES_1267\n" + " La surface de base est continue C0 mais a ete corrigee en continue C1.\n" + "!\n" + ".IGES_1270\n" + " La surface de base est continue C0 et a ete convertie en TopoDS_Shell : seule la premiere face sera decalee.\n" + "!\n" + ".IGES_1275\n" + " Model Space Representation 0 cas no implemente : le resultat est la surface de base.\n" + "!\n" + ".IGES_1280\n" + " Direction invalide: entite ignoree.\n" + "!\n" + ".IGES_1285\n" + " Parameter data : le pointeur %d de la liste d'entite fille est nul ou negatif : ignore.\n" + "!\n" + ".IGES_1295\n" + " Le trou %d et le plan ne sont pas coplanaires.\n" + "!\n" + ".IGES_1300\n" + " La courbe contour est invalide : le plan n'est pas borne.\n" + "!\n" + ".IGES_1305\n" + " Parameter data : parametre 3 or 4 (nombre de segments) est inferieur a 1.\n" + "!\n" + ".IGES_1306\n" + " Type invalide pour la courbe numero %d.\n" + " \n" + ".IGES_1310\n" + " Parameter data : le parametre 3 or 4 (degree of basis function) est inferieur a 1 ou superieur a max degree.\n" + "!\n" + ".IGES_1325\n" + " Item %d of EdgeList cannot be represented by single edge (non-continuous or composite curve).\n" + "!\n" + ".IGES_1345\n" + " Parameter data : le parametre %d (parameter space curve) est incorrect.\n" + "!\n" + ".IGES_1360\n" + " Le TopoDS_Shell resultat n'est pas ferme.\n" + "!\n" + ".IGES_1365\n" + " Numero d'edge invalide %d.\n" + "!\n" + ".IGES_1370\n" + " Arete de couture manquante, ajoutee\n" + "!\n" + ".IGES_1371\n" + " TopoDS_Face creee avec bords naturels\n" + "!\n" + ".IGES_1372\n" + " Un ou plusieurs TopoDS_Wire(s) sur TopoDS_Face inverse(s)\n" + "!\n" + ".IGES_1373\n" + " Knots are not in ascending order\n" + "!\n" + ".IGES_1374\n" + " Difference between weights is too big.\n" + "!\n" + "!\n" + "!\n" + "!\n" + "! Trace File messages \n" + ".IGES_2000\n" + "Diagnostics sur la conversion du fichier IGES : %s\n" + "!\n" + ".IGES_2005\n" + "Niveau de trace : %d\n" + "\n" + "!\n" + ".IGES_2010\n" + "Debut de l'analyse du fichier IGES.\n" + "!\n" + ".IGES_2015\n" + "Nombre de warning pendant l'analyse : %d.\n" + "!\n" + ".IGES_2020\n" + "Nombre de fail pendant l'analyse : %d.\n" + "!\n" + ".IGES_2025\n" + "Fin de l'analyse du fichier (Temps ecoule : %s).\n" + "\n" + "!\n" + ".IGES_2030\n" + "Debut de la conversion de donnees.\n" + "!\n" + ".IGES_2031\n" + "Le fichier n'a pas ete charge en memoire.\n" + "\n" + "!\n" + ".IGES_2032\n" + "L'entite IGES %d n'existe pas.\n" + "\n" + "!\n" + ".IGES_2035\n" + "read.precision.mode : %d\n" + "!\n" + ".IGES_2040\n" + "read.precision.val : %f\n" + "!\n" + ".IGES_2045\n" + "read.iges.bspline.continuity : %d\n" + "!\n" + ".IGES_2050\n" + "read.surfacecurve.mode : %d\n" + "\n" + "!\n" + ".IGES_2055\n" + "Nombre de warnings pendant la conversion : %d.\n" + "!\n" + ".IGES_2060\n" + "Nombre de fails pendant la conversion : %d\n" + "!\n" + ".IGES_2065\n" + "Fin de la conversion des donnees (Temps ecoule : %s).\n" + "!\n" + ".IGES_2070\n" + "Conversion de l'entite IGES DE:%d Type:%d\n" + "!\n" + ".IGES_2075\n" + "\n" + "Resultat : %s.\n" + "!\n" + ".IGES_2076\n" + "Pas de TopoDS_Shape resultat.\n" + "\n" + "!Messages pour TPSTAT.\n" + ".IGES_3000\n" + "********************************************************************************\n" + ".IGES_3005\n" + "Statistiques generale de conversion :\n" + "!\n" + ".IGES_3010\n" + " Nombre d'entites IGES selectionnees : %d\n" + "!\n" + ".IGES_3011\n" + " Nombre d'entites IGES racines : %d\n" + "!\n" + ".IGES_3015\n" + " Nombre de Shapes CasCade produites : %d\n" + "!\n" + ".IGES_3020\n" + " Nombre de warnings : %d\n" + "!\n" + ".IGES_3025\n" + " Nombre de fails : %d\n" + "!\n" + ".IGES_3030\n" + "Nombre W/F Type Forme Message affecte\n" + "------ --- ---- ----- ---------------\n" + "!\n" + ".IGES_3035\n" + "Sur les entites IGES (DE) :\n" + "!\n" + ".IGES_3040\n" + "Compte des shapes CasCade resultat \n" + "\n" + "!\n" + ".IGES_3045\n" + "\n" + "Nombre Shapes CasCade\n" + "------ --------------\n" + "!\n" + ".IGES_3050\n" + "Mapping de toutes les entites IGES\n" + ".IGES_3055\n" + "\n" + "Type Forme Nombre Shapes CasCade\n" + "---- ----- ------ --------------\n" + "!\n" + "!\n" + "!\n" + "!\n" + "! Debug messages\n" + ".IGES_10005\n" + "Little edge removed\n" + ".IGES_10010\n" + "Degenerated edge detected\n" + ".IGES_10015\n" + "Small lacking edge inserted\n" + "!\n" + "!\n" + ".IGES_10020\n" + " Null area wire was detected, wire skipped.\n"; + +// clang-format on diff --git a/src/XSMessage/XSMessage_XSTEP_us.pxx b/src/XSMessage/XSMessage_XSTEP_us.pxx index 7b68059265..dbff675364 100644 --- a/src/XSMessage/XSMessage_XSTEP_us.pxx +++ b/src/XSMessage/XSMessage_XSTEP_us.pxx @@ -1,4 +1,5 @@ -// This file has been automatically generated from resource file src/XSMessage/XSTEP.us +// clang-format off +// This file has been automatically generated from resource file resources/XSMessage/XSTEP.us static const char XSMessage_XSTEP_us[] = "!LOADING PHASE\n" @@ -88,28 +89,22 @@ static const char XSMessage_XSTEP_us[] = " Directory Entry : parameter 1 (entity type) is incorrect.\n" "!\n" ".XSTEP_29\n" - " Directory Entry : Field 4 (Line Font Pattern) is incorrect (Non null pointer or Integer " - "between 0 and 5 was expected).\n" + " Directory Entry : Field 4 (Line Font Pattern) is incorrect (Non null pointer or Integer between 0 and 5 was expected).\n" "!\n" ".XSTEP_30\n" - " Directory Entry : Field 5 (Level) isincorrect (Not null pointer or not null Integer was " - "expected).\n" + " Directory Entry : Field 5 (Level) isincorrect (Not null pointer or not null Integer was expected).\n" "!\n" ".XSTEP_31\n" - " Directory Entry : Field 6 (View) is incorrect (Not null pointer or Integer Zero was " - "expected).\n" + " Directory Entry : Field 6 (View) is incorrect (Not null pointer or Integer Zero was expected).\n" "!\n" ".XSTEP_32\n" - " Directory Entry : Field 7 (Transformation Matrix) is incorrect (Not null pointer or Integer " - "Zero was expected).\n" + " Directory Entry : Field 7 (Transformation Matrix) is incorrect (Not null pointer or Integer Zero was expected).\n" "!\n" ".XSTEP_33\n" - " Directory Entry : Field 8 (Label Display Associativity) is incorrect (Not null pointer or " - "Integer Zero was expected).\n" + " Directory Entry : Field 8 (Label Display Associativity) is incorrect (Not null pointer or Integer Zero was expected).\n" "!\n" ".XSTEP_34\n" - " Directory Entry : Field 13 (Color Number) is incorrect (Not null pointer or Integer between 0 " - "and 8 was expected).\n" + " Directory Entry : Field 13 (Color Number) is incorrect (Not null pointer or Integer between 0 and 8 was expected).\n" "!\n" ".XSTEP_35\n" " Null entity %s.\n" @@ -127,63 +122,49 @@ static const char XSMessage_XSTEP_us[] = "Global Section : Incorrect number of parameters (%d or %d parameters were expected).\n" "!\n" ".XSTEP_40\n" - "Global Section (Parameters 1 and 2) : Parameter Delimiter Character and Record Delimiter " - "Character must not have the same value.\n" + "Global Section (Parameters 1 and 2) : Parameter Delimiter Character and Record Delimiter Character must not have the same value.\n" "!\n" ".XSTEP_41\n" - "Global Section (Parameter 2) : Parameter Delimiter Character is incorrect. Default character " - "comma taken.\n" + "Global Section (Parameter 2) : Parameter Delimiter Character is incorrect. Default character comma taken.\n" "!\n" ".XSTEP_42\n" - "Global Section (Parameter 2) : Character Record Delimiter parameter is incorrect. Default " - "character Semicolon taken.\n" + "Global Section (Parameter 2) : Character Record Delimiter parameter is incorrect. Default character Semicolon taken.\n" "!\n" ".XSTEP_43\n" - "Global Section (Parameter 8) : Single Precision Magnitude parameter is incorrect (Expected " - "positive Integer). Default value 38 taken.\n" + "Global Section (Parameter 8) : Single Precision Magnitude parameter is incorrect (Expected positive Integer). Default value 38 taken.\n" "!\n" ".XSTEP_44\n" - "Global Section (Parameter 9) : Single Precision Significance parameter is incorrect (Expected " - "positive Integer). Default value 6 taken.\n" + "Global Section (Parameter 9) : Single Precision Significance parameter is incorrect (Expected positive Integer). Default value 6 taken.\n" "!\n" ".XSTEP_45\n" - "Global Section (Parameter 10) : Double Precision Magnitude parameter is incorrect (Expected " - "positive Integer). Default value 308 taken.\n" + "Global Section (Parameter 10) : Double Precision Magnitude parameter is incorrect (Expected positive Integer). Default value 308 taken.\n" "!\n" ".XSTEP_46\n" - "Global Section (Parameter 11) : Double Precision Significance parameter is incorrect (Expected " - "positive Integer). Default value 15 taken.\n" + "Global Section (Parameter 11) : Double Precision Significance parameter is incorrect (Expected positive Integer). Default value 15 taken.\n" "!\n" ".XSTEP_47\n" - "Global Section (Parameter 13) : Model Space Scale parameter is incorrect (Expected positive " - "Real). Default value 1.0 taken.\n" + "Global Section (Parameter 13) : Model Space Scale parameter is incorrect (Expected positive Real). Default value 1.0 taken.\n" "!\n" ".XSTEP_48\n" - "Global Section (Parameter 14) : Unit Flag parameter is incorrect (Integer between 1 et 11 was " - "expected). Default value 2 taken : Millimeters.\n" + "Global Section (Parameter 14) : Unit Flag parameter is incorrect (Integer between 1 et 11 was expected). Default value 2 taken : Millimeters.\n" "!\n" ".XSTEP_49\n" - "Global Section (Parameter 15): Unit Name parameter is not recognized. Default value 2 taken : " - "Millimeters.srl\n" + "Global Section (Parameter 15): Unit Name parameter is not recognized. Default value 2 taken : Millimeters.srl\n" "!\n" ".XSTEP_50\n" "Global Section (Parameter 15) : Unit Name parameter is undefined : Unit Name ignored.\n" "!\n" ".XSTEP_51\n" - "Global Section (Parameter 14 and 15) : Unit Flag parameter does not correspond to Unit Name " - "parameter : Unit Name ignored.\n" + "Global Section (Parameter 14 and 15) : Unit Flag parameter does not correspond to Unit Name parameter : Unit Name ignored.\n" "!\n" ".XSTEP_52\n" "Global Section (Parameter 19) : (Expected positive Real). Default value 0.0 taken.\n" "!\n" ".XSTEP_53\n" - "Global Section (Parameter 23) : Version Flag parameter is incorrect (Integer between 1 et 11 " - "was expected. Default value 3 taken : Version 2.0.\n" + "Global Section (Parameter 23) : Version Flag parameter is incorrect (Integer between 1 et 11 was expected. Default value 3 taken : Version 2.0.\n" "!\n" ".XSTEP_54\n" - "Global Section (Parameter 24) : Drafting Standard Flag parameter is incorrect (Integer between " - "0 et 7). Default value 3 taken : No standard.Global Section (Parameter 25) : Last change Date " - "parameter was undefined.\n" + "Global Section (Parameter 24) : Drafting Standard Flag parameter is incorrect (Integer between 0 et 7). Default value 3 taken : No standard.Global Section (Parameter 25) : Last change Date parameter was undefined.\n" "!\n" ".XSTEP_55\n" "Global Section (Parameter 25) : Last Change Date parameter is undefined.\n" @@ -201,60 +182,49 @@ static const char XSMessage_XSTEP_us[] = " Directory Entry (Field 3) : Structure field is undefined.\n" "!\n" ".XSTEP_60\n" - " Directory Entry (Field 4) : Line Font Pattern field is incorrect (Pointer or Integer between 0 " - "and 5 was expected). Default value 0 taken.\n" + " Directory Entry (Field 4) : Line Font Pattern field is incorrect (Pointer or Integer between 0 and 5 was expected). Default value 0 taken.\n" "!\n" ".XSTEP_61\n" - " Directory Entry (Field 5) : Level field is incorrect (Pointer or Integer were expected). " - "Default value 0 taken.\n" + " Directory Entry (Field 5) : Level field is incorrect (Pointer or Integer were expected). Default value 0 taken.\n" "!\n" ".XSTEP_62\n" - " Directory Entry (Field 6) : View field is incorrect (Pointer or Zero were expected). Default " - "value 0 taken.\n" + " Directory Entry (Field 6) : View field is incorrect (Pointer or Zero were expected). Default value 0 taken.\n" "!\n" ".XSTEP_63\n" - " Directory Entry (Field 7): Transformation Matrix field is incorrect (Pointer or Zero were " - "expected). Default value 0 taken.\n" + " Directory Entry (Field 7): Transformation Matrix field is incorrect (Pointer or Zero were expected). Default value 0 taken.\n" "!\n" ".XSTEP_64\n" - " Directory Entry (Field 8): Label Display entity field is incorrect (Pointer or Zero were " - "expected). Default value 0 taken.\n" + " Directory Entry (Field 8): Label Display entity field is incorrect (Pointer or Zero were expected). Default value 0 taken.\n" "!\n" ".XSTEP_65\n" " Directory Entry (Field 9) : Blank Status field is incorrect (Expected Integer : 0 or 1). \n" "!\n" ".XSTEP_66\n" - " Directory Entry (Field 9) : Subordinate entity Switch field is incorrect (Integer between 0 " - "and 3 was expected). \n" + " Directory Entry (Field 9) : Subordinate entity Switch field is incorrect (Integer between 0 and 3 was expected). \n" "!\n" ".XSTEP_67\n" - " Directory Entry (Field 9) : entity Use Flag is incorrect (Integer between 0 and 6 was " - "expected). \n" + " Directory Entry (Field 9) : entity Use Flag is incorrect (Integer between 0 and 6 was expected). \n" "!\n" ".XSTEP_68\n" - " Directory Entry (Field 9) : Hierarchy field is incorrect (Integer between 0 and 2 was " - "expected). \n" + " Directory Entry (Field 9) : Hierarchy field is incorrect (Integer between 0 and 2 was expected). \n" "!\n" ".XSTEP_69\n" " Directory Entry (Field 12) : Line Weight Number is undefined.\n" "!\n" ".XSTEP_70\n" - " Directory Entry (Field 13) : Color Number field is incorrect (Pointer or Integer between 0 and " - "8 was expected).\n" + " Directory Entry (Field 13) : Color Number field is incorrect (Pointer or Integer between 0 and 8 was expected).\n" "!\n" ".XSTEP_71\n" " Directory Entry (Field 15) : Form Number field is incorrect.\n" "!\n" ".XSTEP_72\n" - " Directory Entry (Field 19): entity Subscript Number field is incorrect (Integer was " - "expected).\n" + " Directory Entry (Field 19): entity Subscript Number field is incorrect (Integer was expected).\n" "!Type 116\n" ".XSTEP_73\n" "Parameter Data : parameter %d (Coordinate of Point) is incorrect (Real was expected).\n" "!Type 116\n" ".XSTEP_74\n" - "Parameter Data : parameter %d (Display Symbol) is incorrect (Subfigure Definition entity, Type " - "308 was expected).\n" + "Parameter Data : parameter %d (Display Symbol) is incorrect (Subfigure Definition entity, Type 308 was expected).\n" "!Type 100\n" ".XSTEP_75\n" "Parameter Data : parameter 1 (ZT displacement of Arc) is incorrect (Real was expected).\n" @@ -269,12 +239,10 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (Terminate Point) is incorrect (Real was expected).\n" "!Type 102\n" ".XSTEP_79\n" - "Parameter Data : parameter 1 (Number of Entities) is incorrect : %d (Expected positive " - "Integer).\n" + "Parameter Data : parameter 1 (Number of Entities) is incorrect : %d (Expected positive Integer).\n" "!Type 102\n" ".XSTEP_80\n" - "Parameter Data : Some pointers in entity list are null or negative : ignored (Point, Connect " - "Point or Parameterized Curve Entities were expected).\n" + "Parameter Data : Some pointers in entity list are null or negative : ignored (Point, Connect Point or Parameterized Curve Entities were expected).\n" "!Type 104\n" ".XSTEP_81\n" "Parameter Data : parameter %d (Conic Coefficient) is incorrect (Real was expected).\n" @@ -307,12 +275,10 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (Terminate Point) is incorrect (Real was expected).\n" "!Type 112\n" ".XSTEP_91\n" - "Parameter Data : parameter 1 (Spline Type) is incorrect (Integer between 1 and 6 was " - "expected).\n" + "Parameter Data : parameter 1 (Spline Type) is incorrect (Integer between 1 and 6 was expected).\n" "!Type 112\n" ".XSTEP_92\n" - "Parameter Data (Parameter 2) : parameter 2 (Degree of Continuity) is incorrect (Expected " - "Integer).\n" + "Parameter Data (Parameter 2) : parameter 2 (Degree of Continuity) is incorrect (Expected Integer).\n" "!Type 112\n" ".XSTEP_93\n" "Parameter Data : parameter 3 (Number of Dimensions) is incorrect (Expected Integer : 2 or 3).\n" @@ -330,8 +296,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (Upper Index of Sum) is incorrect (Expected positive Integer).\n" "!Type 126\n" ".XSTEP_98\n" - "Parameter Data : parameter %d (Degree of Basis Functions) is incorrect (Expected Integer) : " - "Default value 0 taken.\n" + "Parameter Data : parameter %d (Degree of Basis Functions) is incorrect (Expected Integer) : Default value 0 taken.\n" "!Type 126\n" ".XSTEP_99\n" "Parameter Data : parameter %d (Planar/Non Planar Flag) is incorrect (Expected Boolean).\n" @@ -367,16 +332,13 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (Unit Normal) is undefined for a planar curve.\n" "!Type 130\n" ".XSTEP_110\n" - "Parameter Data : parameter 1 (Curve entity to be offset) is incorrect (Curve entity was " - "expected).\n" + "Parameter Data : parameter 1 (Curve entity to be offset) is incorrect (Curve entity was expected).\n" "!Type 130\n" ".XSTEP_111\n" - "Parameter Data : parameter 2 (Offset Distance Flag) is incorrect (Integer between 1 and 3 was " - "expected).\n" + "Parameter Data : parameter 2 (Offset Distance Flag) is incorrect (Integer between 1 and 3 was expected).\n" "!Type 130\n" ".XSTEP_112\n" - "Parameter Data : parameter 3 (Curve entity whose coordinate describes offset) is incorrect " - "(Curve entity was expected).\n" + "Parameter Data : parameter 3 (Curve entity whose coordinate describes offset) is incorrect (Curve entity was expected).\n" "!Type 130\n" ".XSTEP_113\n" "Parameter Data : parameter 4 (Particular Coordinate) is incorrect (Expected Integer).\n" @@ -388,38 +350,31 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 6 (First Offset distance) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_116\n" - "Parameter Data : parameter 7 (Arc Length of First Offset Distance) is incorrect (Real was " - "expected).\n" + "Parameter Data : parameter 7 (Arc Length of First Offset Distance) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_117\n" "Parameter Data : parameter 8 (Second Offset Distance) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_118\n" - "Parameter Data : parameter 9 (Arc Length of Second Offset Distance) is incorrect (Real was " - "expected).\n" + "Parameter Data : parameter 9 (Arc Length of Second Offset Distance) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_119\n" - "Parameter Data : parameter 13 (Offset Curve Starting Parameter Value) is incorrect (Real was " - "expected).\n" + "Parameter Data : parameter 13 (Offset Curve Starting Parameter Value) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_120\n" - "Parameter Data : parameter 14 (Offset Curve Ending Parameter Value) is incorrect (Real was " - "expected).\n" + "Parameter Data : parameter 14 (Offset Curve Ending Parameter Value) is incorrect (Real was expected).\n" "!Type 130\n" ".XSTEP_121\n" "Parameter Data : parameter %d (Unit Vector Normal to plane) is incorrect (Real was expected).\n" "!Type 141\n" ".XSTEP_122\n" - "Parameter Data : parameter 1 (Type of Bounded Surface Representation) is incorrect (Expected " - "Integer : 0 or 1).\n" + "Parameter Data : parameter 1 (Type of Bounded Surface Representation) is incorrect (Expected Integer : 0 or 1).\n" "!Type 141\n" ".XSTEP_123\n" - "Parameter Data : parameter 2 (Trimming Curves Representation) is incorrect (Integer between 0 " - "and 3 was expected).\n" + "Parameter Data : parameter 2 (Trimming Curves Representation) is incorrect (Integer between 0 and 3 was expected).\n" "!Type 141\n" ".XSTEP_124\n" - "Parameter Data : parameter 3 (Untrimmed Surface) is incorrect (Untrimmed Surface entity was " - "expected).\n" + "Parameter Data : parameter 3 (Untrimmed Surface) is incorrect (Untrimmed Surface entity was expected).\n" "!Type 141\n" ".XSTEP_125\n" "Parameter Data : Not parametric Surface %d (parameter 3).\n" @@ -431,20 +386,16 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 5 (Model Space Curve) is incorrect (Curve entity was expected).\n" "!Type 141\n" ".XSTEP_128\n" - "Parameter Data (Parameter 6) : Orientation Flag parameter is incorrect (Expected Integer : 1 or " - "2).\n" + "Parameter Data (Parameter 6) : Orientation Flag parameter is incorrect (Expected Integer : 1 or 2).\n" "!Type 141\n" ".XSTEP_129\n" - "Parameter Data : parameter 7 (Number of Associated Parameter Space Curves) is incorrect " - "(Expected Integer : 0).\n" + "Parameter Data : parameter 7 (Number of Associated Parameter Space Curves) is incorrect (Expected Integer : 0).\n" "!Type 141\n" ".XSTEP_130\n" - "Parameter Data : Some pointers in Parameter Space Curve list are null or negative : ignored " - "(Curve Entities were expected).\n" + "Parameter Data : Some pointers in Parameter Space Curve list are null or negative : ignored (Curve Entities were expected).\n" "!Type 142\n" ".XSTEP_131\n" - "Parameter Data : parameter 2 (Surface on which the curve lies) is incorrect (Surface entity was " - "expected).\n" + "Parameter Data : parameter 2 (Surface on which the curve lies) is incorrect (Surface entity was expected).\n" "!Type 142\n" ".XSTEP_132\n" "Parameter Data : parameter 3 (Curve 2D) is incorrect (Curve entity was expected).\n" @@ -453,8 +404,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 4 (Curve 3D) is incorrect (Curve entity was expected).\n" "!Type 142\n" ".XSTEP_134\n" - "Parameter Data : pointers of Curve 2D and 3D are null (parameter 3 and 4) (Curve Entities were " - "expected).\n" + "Parameter Data : pointers of Curve 2D and 3D are null (parameter 3 and 4) (Curve Entities were expected).\n" "!Type 108\n" ".XSTEP_135\n" "Parameter Data : parameter %d (Coefficient Of Plane) is incorrect (Real was expected).\n" @@ -469,12 +419,10 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 9 (Display Symbol Size) is incorrect (Real was expected).\n" "!Type 108\n" ".XSTEP_139\n" - "Parameter Data : parameter %d (Coordinate of Display Symbol) is incorrect (Real was " - "expected).\n" + "Parameter Data : parameter %d (Coordinate of Display Symbol) is incorrect (Real was expected).\n" "!Type 114\n" ".XSTEP_140\n" - "Parameter Data : parameter 1 (Spline Boundary Type) is incorrect (Integer between 1 and 6 was " - "expected).\n" + "Parameter Data : parameter 1 (Spline Boundary Type) is incorrect (Integer between 1 and 6 was expected).\n" "!Type 114\n" ".XSTEP_141\n" "Parameter Data : parameter 3 (Number of U Segments) is incorrect (Expected positive Integer).\n" @@ -507,8 +455,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 3 (Direction Flag) is incorrect (Integer 0 or 1 was expected).\n" "!Type 118\n" ".XSTEP_151\n" - "Parameter Data : parameter 4 (Developable Surface Flag) is incorrect (Integer 0 or 1 was " - "expected).\n" + "Parameter Data : parameter 4 (Developable Surface Flag) is incorrect (Integer 0 or 1 was expected).\n" "!Type 120\n" ".XSTEP_152\n" "Parameter Data : parameter 1 (Axis of Revolution) is incorrect.\n" @@ -550,8 +497,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 5 (Surface entity to be offset) is incorrect.\n" "!Type 143\n" ".XSTEP_165\n" - "Parameter Data : parameter 1 (Bounded Surface Representation type) is incorrect (Integer 0 or 1 " - "was expected).\n" + "Parameter Data : parameter 1 (Bounded Surface Representation type) is incorrect (Integer 0 or 1 was expected).\n" "!Type 143\n" ".XSTEP_166\n" "Parameter Data : parameter 2 (Surface entity to be bounded) is incorrect.\n" @@ -569,39 +515,31 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 2 (Outer Boundary type) is incorrect (Integer 0 or 1 was expected).\n" "!Type 144\n" ".XSTEP_171\n" - "Parameter Data : parameter 3 (Number of Inner Boundary Closed Curves) is incorrect (Expected " - "positive Integer).\n" + "Parameter Data : parameter 3 (Number of Inner Boundary Closed Curves) is incorrect (Expected positive Integer).\n" "!Type 144\n" ".XSTEP_172\n" - "Parameter Data : parameter 4 (Outer Boundary) is incorrect (Curve on a Parametric Surface " - "entity, Type 142 was expected).\n" + "Parameter Data : parameter 4 (Outer Boundary) is incorrect (Curve on a Parametric Surface entity, Type 142 was expected).\n" "!Type 144\n" ".XSTEP_173\n" - "Parameter Data : parameter %d (Inner Boundary) is incorrect (Curve on a Parametric Surface " - "entity, Type 142 was expected).\n" + "Parameter Data : parameter %d (Inner Boundary) is incorrect (Curve on a Parametric Surface entity, Type 142 was expected).\n" "!Type 190\n" ".XSTEP_174\n" - "Parameter Data : parameter 1 (Point on Surface) is incorrect (Point entity, Type 116 was " - "expected).\n" + "Parameter Data : parameter 1 (Point on Surface) is incorrect (Point entity, Type 116 was expected).\n" "!Type 190\n" ".XSTEP_175\n" - "Parameter Data : parameter 2 ( Surface Normal Direction) is incorrect (Direction entity was " - "expected).\n" + "Parameter Data : parameter 2 ( Surface Normal Direction) is incorrect (Direction entity was expected).\n" "!Type 190\n" ".XSTEP_176\n" - "Parameter Data : parameter 3 (Reference Direction) is incorrect (Direction entity was " - "expected).\n" + "Parameter Data : parameter 3 (Reference Direction) is incorrect (Direction entity was expected).\n" "!Type 190\n" ".XSTEP_177\n" "Parameter Data : parameter 3 (Null pointer was expected when Form Number field is 1).\n" "!Type 186\n" ".XSTEP_178\n" - "Parameter Data : parameter 1 (Shell) is incorrect (Closed Shell entity, Type 514, Form 1 was " - "expected).\n" + "Parameter Data : parameter 1 (Shell) is incorrect (Closed Shell entity, Type 514, Form 1 was expected).\n" "!Type 186\n" ".XSTEP_179\n" - "Parameter Data : parameter %d (Void Shell) is incorrect (Closed Shell entity, Type 514, Form 1 " - "was expected).\n" + "Parameter Data : parameter %d (Void Shell) is incorrect (Closed Shell entity, Type 514, Form 1 was expected).\n" "!Type 186\n" ".XSTEP_180\n" "Parameter Data : parameter %d (Orientation Flag) is incorrect (Expected Boolean).\n" @@ -610,8 +548,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 3 (Number of Void Shells) is incorrect (Expected positive Integer)\n" "!Type 502\n" ".XSTEP_182\n" - "Parameter Data : parameter 1 (Number of Vertex Tuples) is incorrect (Expected positive " - "Integer).\n" + "Parameter Data : parameter 1 (Number of Vertex Tuples) is incorrect (Expected positive Integer).\n" "!Type 502\n" ".XSTEP_183\n" "Parameter Data : parameter %d (Coordinate of Vertex) is incorrect (Real was expected).\n" @@ -629,12 +566,10 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (Terminate Vertex Index) is incorrect (Expected Integer).\n" "!Type 504\n" ".XSTEP_188\n" - " Parameter Data : parameter %d (Start Vertex List entity) is incorrect (Vertex List entity, " - "Type 502 was expected).\n" + " Parameter Data : parameter %d (Start Vertex List entity) is incorrect (Vertex List entity, Type 502 was expected).\n" "!Type 504\n" ".XSTEP_189\n" - " Parameter Data : parameter %d (Terminate Vertex List entity) is incorrect (Vertex List entity, " - "Type 502 was expected).\n" + " Parameter Data : parameter %d (Terminate Vertex List entity) is incorrect (Vertex List entity, Type 502 was expected).\n" "!Type 508\n" ".XSTEP_190\n" "Parameter Da ta : parameter %d (Edge Type) is incorrect (Integer 0 or 1 was expected).\n" @@ -643,16 +578,13 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter %d (List Index) is incorrect (Expected Integer).\n" "!Type 508\n" ".XSTEP_192\n" - "Parameter Data : parameter %d (Number of Parameter Curves) is incorrect (Expected positive " - "Integer).\n" + "Parameter Data : parameter %d (Number of Parameter Curves) is incorrect (Expected positive Integer).\n" "!Type 508\n" ".XSTEP_193\n" - "Parameter Data : parameter %d (Vertex or Edge List entity) is incorrect (Vertex List or Edge " - "List entity, Type 502 or 504 was expected).\n" + "Parameter Data : parameter %d (Vertex or Edge List entity) is incorrect (Vertex List or Edge List entity, Type 502 or 504 was expected).\n" "!Type 508\n" ".XSTEP_194\n" - "Parameter Data : parameter %d (Parameter Space Curve) is incorrect (Curve entity was " - "expected).\n" + "Parameter Data : parameter %d (Parameter Space Curve) is incorrect (Curve entity was expected).\n" "!Type 508\n" ".XSTEP_195\n" "Parameter Data : parameter %d (Isoparametric Flag) is incorrect (Expected Boolean).\n" @@ -667,8 +599,7 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 3 (Outer Loop flag) is incorrect (Expected Boolean).\n" "!Type 510\n" ".XSTEP_199\n" - "Parameter Data : parameter %d (Loop of the Face) is incorrect (Loop entity, Type 508 was " - "expected).\n" + "Parameter Data : parameter %d (Loop of the Face) is incorrect (Loop entity, Type 508 was expected).\n" "!Type 514\n" ".XSTEP_200\n" "Parameter Data : parameter 1 (Number of Faces) is incorrect (Expected positive Integer).\n" @@ -677,52 +608,43 @@ static const char XSMessage_XSTEP_us[] = "Parameter Data : parameter 2 (Face) is incorrect (Face entity, Type 510 was expected).\n" "!Type 402, Form 1 or 7\n" ".XSTEP_202\n" - "Form %d : Parameter Data : parameter 1 (Number of Entries) is incorrect (expected positive " - "integer).\n" + "Form %d : Parameter Data : parameter 1 (Number of Entries) is incorrect (expected positive integer).\n" "!Type 402, Form 1 or 7\n" ".XSTEP_203\n" - "Form %d : Parameter Data : some pointers of entity list are null or negative : ignored " - "(Entities were expected).\n" + "Form %d : Parameter Data : some pointers of entity list are null or negative : ignored (Entities were expected).\n" "!Type 402\n" ".XSTEP_204\n" - "Form 9 : Parameter Data : parameter 1 (Number of Parent entity) is incorrect (Expected Integer " - ": 1).\n" + "Form 9 : Parameter Data : parameter 1 (Number of Parent entity) is incorrect (Expected Integer : 1).\n" "!Type 402\n" ".XSTEP_205\n" - "Form 9 : Parameter Data : parameter 2 (Number of Children) is incorrect (expected positive " - "integer).\n" + "Form 9 : Parameter Data : parameter 2 (Number of Children) is incorrect (expected positive integer).\n" "!Type 402\n" ".XSTEP_206\n" "Form 9 : Parameter Data : parameter 3 (Parent entity) is incorrect (entity expected).\n" "!Type 402\n" ".XSTEP_207\n" - "Form 9 : Parameter Data : some pointers in Child Entity List are null or negative : ignored " - "(Entities were expected).\n" + "Form 9 : Parameter Data : some pointers in Child Entity List are null or negative : ignored (Entities were expected).\n" "!Type 308\n" ".XSTEP_208\n" "Parameter Data : parameter 1 (Depth of Subfigure) is incorrect (Expected Integer).\n" "!Type 308\n" ".XSTEP_209\n" - "Parameter Data : parameter 2 (Subfigure Name) is incorrect : %s (Expected String in hollerith " - "Form).\n" + "Parameter Data : parameter 2 (Subfigure Name) is incorrect : %s (Expected String in hollerith Form).\n" "!Type 308\n" ".XSTEP_210\n" "Parameter Data : parameter 3 (Number of Entities) is incorrect (Expected positive Integer).\n" "!Type 308\n" ".XSTEP_211\n" - "Parameter Data : Some pointers of Associated entity List are null or negative : ignored " - "(Entities were expected).\n" + "Parameter Data : Some pointers of Associated entity List are null or negative : ignored (Entities were expected).\n" "!Type 408\n" ".XSTEP_212\n" - "Parameter Data : parameter 1 (Subfigure definition entity) is incorrect (Subfigure definition " - "entity, Type 308 expected).\n" + "Parameter Data : parameter 1 (Subfigure definition entity) is incorrect (Subfigure definition entity, Type 308 expected).\n" "!Type 408\n" ".XSTEP_213\n" "Parameter Data : parameter %d (Translation data) is incorrect (Real was expected).\n" "!Type 408\n" ".XSTEP_214\n" - "Parameter Data : parameter 5 (Scale Factor) is incorrect (Real was expected). Default value " - "1.0 taken.\n" + "Parameter Data : parameter 5 (Scale Factor) is incorrect (Real was expected). Default value 1.0 taken.\n" "!Type 124\n" ".XSTEP_215\n" "Parameter Data : not all parameters are of Real type.\n" @@ -830,15 +752,13 @@ static const char XSMessage_XSTEP_us[] = " Transfer error on basic curve : entity skipped.\n" "!\n" ".IGES_1115\n" - " With C0 continuity can not be split into Geom_BSplineCurve C1 lower than " - "Precision::Confusion().\n" + " With C0 continuity can not be split into Geom_BSplineCurve C1 lower than Precision::Confusion().\n" "!\n" ".IGES_1120\n" " With C0 continuity was split into C1 continuity Geom_BSplineCurve.\n" "!\n" ".IGES_1125\n" - " Parameter data : parameter 1 (Type of Bounded Surface Representation = 0) : case not " - "implemented. \n" + " Parameter data : parameter 1 (Type of Bounded Surface Representation = 0) : case not implemented. \n" "!\n" ".IGES_1130\n" " Boundary on Composite Surface : case not implemented.\n" @@ -866,8 +786,7 @@ static const char XSMessage_XSTEP_us[] = "! (type IGES) (DE:Number) transfer failed : entity skipped.\n" "!\n" ".IGES_1160\n" - " Parameter data (Parameters 8 to 11) : start and terminate coordinates of arc are the same : " - "entity not trimmed.\n" + " Parameter data (Parameters 8 to 11) : start and terminate coordinates of arc are the same : entity not trimmed.\n" "!\n" ".IGES_1165 \n" " Transformation is not planar : not applied.\n" @@ -882,8 +801,7 @@ static const char XSMessage_XSTEP_us[] = " Parameter data : parameter 1 (Spline Type >3) : case not implemented.\n" "!\n" ".IGES_1190\n" - " Parameter data : parameter 2 (Degree of basis functions) is lower than 0 or greater than max " - "degree : transfer interrupted.\n" + " Parameter data : parameter 2 (Degree of basis functions) is lower than 0 or greater than max degree : transfer interrupted.\n" "!\n" ".IGES_1195\n" " Parameter data : incorrect number of control points (2 or more are required).\n" @@ -933,8 +851,7 @@ static const char XSMessage_XSTEP_us[] = " Basis surface is C0-continuous but was corrected to C1-continuous.\n" "!\n" ".IGES_1270\n" - " Basis surface is C0-continuous and is transferred into a TopoDS_Shell. Only first face was " - "offsetted.\n" + " Basis surface is C0-continuous and is transferred into a TopoDS_Shell. Only first face was offsetted.\n" "!\n" ".IGES_1275\n" " Model Space Representation 0 case not implemented : result is a basis surface.\n" @@ -958,8 +875,7 @@ static const char XSMessage_XSTEP_us[] = " Improper type for underlying curve number %d.\n" " \n" ".IGES_1310\n" - " Parameter data : parameter 3 or 4 (degree of basis function) is less than one or greater than " - "maximum degree.\n" + " Parameter data : parameter 3 or 4 (degree of basis function) is less than one or greater than maximum degree.\n" "!\n" ".IGES_1325\n" " Item %d of EdgeList cannot be represented by single edge (non-continuous or composite curve).\n" @@ -1109,3 +1025,5 @@ static const char XSMessage_XSTEP_us[] = "!\n" ".IGES_10020\n" " Null area wire was detected, wire skipped.\n"; + +// clang-format on