Cleanup: Make io/usd/intern headers fully Cpp ones.

This code was actually already full Cpp, so it's essentially a massive
filenames cleanup.
This commit is contained in:
Bastien Montagne
2024-02-05 19:02:00 +01:00
parent c2ef2daa2c
commit 21e2dfc6b4
74 changed files with 161 additions and 161 deletions

View File

@@ -121,42 +121,42 @@ set(SRC
usd.h
usd.hh
intern/usd_armature_utils.h
intern/usd_asset_utils.h
intern/usd_blend_shape_utils.h
intern/usd_exporter_context.h
intern/usd_hash_types.h
intern/usd_hierarchy_iterator.h
intern/usd_hook.h
intern/usd_writer_abstract.h
intern/usd_writer_armature.h
intern/usd_writer_camera.h
intern/usd_writer_curves.h
intern/usd_writer_hair.h
intern/usd_writer_light.h
intern/usd_writer_material.h
intern/usd_writer_mesh.h
intern/usd_writer_metaball.h
intern/usd_writer_transform.h
intern/usd_writer_volume.h
intern/usd_armature_utils.hh
intern/usd_asset_utils.hh
intern/usd_blend_shape_utils.hh
intern/usd_exporter_context.hh
intern/usd_hash_types.hh
intern/usd_hierarchy_iterator.hh
intern/usd_hook.hh
intern/usd_writer_abstract.hh
intern/usd_writer_armature.hh
intern/usd_writer_camera.hh
intern/usd_writer_curves.hh
intern/usd_writer_hair.hh
intern/usd_writer_light.hh
intern/usd_writer_material.hh
intern/usd_writer_mesh.hh
intern/usd_writer_metaball.hh
intern/usd_writer_transform.hh
intern/usd_writer_volume.hh
intern/usd_reader_camera.h
intern/usd_reader_curve.h
intern/usd_reader_geom.h
intern/usd_reader_instance.h
intern/usd_reader_light.h
intern/usd_reader_material.h
intern/usd_reader_mesh.h
intern/usd_reader_nurbs.h
intern/usd_reader_prim.h
intern/usd_reader_shape.h
intern/usd_reader_skeleton.h
intern/usd_reader_stage.h
intern/usd_reader_volume.h
intern/usd_reader_xform.h
intern/usd_reader_pointinstancer.h
intern/usd_skel_convert.h
intern/usd_skel_root_utils.h
intern/usd_reader_camera.hh
intern/usd_reader_curve.hh
intern/usd_reader_geom.hh
intern/usd_reader_instance.hh
intern/usd_reader_light.hh
intern/usd_reader_material.hh
intern/usd_reader_mesh.hh
intern/usd_reader_nurbs.hh
intern/usd_reader_prim.hh
intern/usd_reader_shape.hh
intern/usd_reader_skeleton.hh
intern/usd_reader_stage.hh
intern/usd_reader_volume.hh
intern/usd_reader_xform.hh
intern/usd_reader_pointinstancer.hh
intern/usd_skel_convert.hh
intern/usd_skel_root_utils.hh
)
if(WITH_HYDRA)
@@ -236,7 +236,7 @@ blender_add_lib(bf_io_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_dependencies(bf_io_usd bf_rna)
if(COMMAND target_precompile_headers)
target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.h)
target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.hh)
endif()
if(WITH_GTESTS)
@@ -245,7 +245,7 @@ if(WITH_GTESTS)
tests/usd_export_test.cc
tests/usd_stage_creation_test.cc
tests/usd_usdz_export_test.cc
intern/usd_writer_material.h
intern/usd_writer_material.hh
)
if(USD_IMAGING_HEADERS)
list(APPEND TEST_SRC tests/usd_imaging_test.cc)

View File

@@ -33,8 +33,8 @@
#include "hydra_scene_delegate.h"
#include "image.h"
#include "intern/usd_exporter_context.h"
#include "intern/usd_writer_material.h"
#include "intern/usd_exporter_context.hh"
#include "intern/usd_writer_material.hh"
#ifdef WITH_MATERIALX
# include "shader/materialx/node_parser.h"

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_armature_utils.h"
#include "usd_armature_utils.hh"
#include "BKE_armature.hh"
#include "BKE_modifier.hh"

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_asset_utils.h"
#include "usd_asset_utils.hh"
#include <pxr/usd/ar/asset.h>
#include <pxr/usd/ar/packageUtils.h>

View File

@@ -2,8 +2,8 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_blend_shape_utils.h"
#include "usd_skel_convert.h"
#include "usd_blend_shape_utils.hh"
#include "usd_skel_convert.hh"
#include "usd.h"

View File

@@ -7,8 +7,8 @@
#include "IO_subdiv_disabler.hh"
#include "usd.h"
#include "usd.hh"
#include "usd_hierarchy_iterator.h"
#include "usd_hook.h"
#include "usd_hierarchy_iterator.hh"
#include "usd_hook.hh"
#include <pxr/base/plug/registry.h>
#include <pxr/base/tf/token.h>

View File

@@ -4,11 +4,11 @@
#include "IO_types.hh"
#include "usd.h"
#include "usd_hierarchy_iterator.h"
#include "usd_hook.h"
#include "usd_reader_geom.h"
#include "usd_reader_prim.h"
#include "usd_reader_stage.h"
#include "usd_hierarchy_iterator.hh"
#include "usd_hook.hh"
#include "usd_reader_geom.hh"
#include "usd_reader_prim.hh"
#include "usd_reader_stage.hh"
#include "BKE_appdir.hh"
#include "BKE_blender_version.h"

View File

@@ -3,21 +3,21 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd.h"
#include "usd_armature_utils.h"
#include "usd_blend_shape_utils.h"
#include "usd_hierarchy_iterator.h"
#include "usd_skel_convert.h"
#include "usd_skel_root_utils.h"
#include "usd_writer_abstract.h"
#include "usd_writer_armature.h"
#include "usd_writer_camera.h"
#include "usd_writer_curves.h"
#include "usd_writer_hair.h"
#include "usd_writer_light.h"
#include "usd_writer_mesh.h"
#include "usd_writer_metaball.h"
#include "usd_writer_transform.h"
#include "usd_writer_volume.h"
#include "usd_armature_utils.hh"
#include "usd_blend_shape_utils.hh"
#include "usd_hierarchy_iterator.hh"
#include "usd_skel_convert.hh"
#include "usd_skel_root_utils.hh"
#include "usd_writer_abstract.hh"
#include "usd_writer_armature.hh"
#include "usd_writer_camera.hh"
#include "usd_writer_curves.hh"
#include "usd_writer_hair.hh"
#include "usd_writer_light.hh"
#include "usd_writer_mesh.hh"
#include "usd_writer_metaball.hh"
#include "usd_writer_transform.hh"
#include "usd_writer_volume.hh"
#include <memory>
#include <string>

View File

@@ -5,8 +5,8 @@
#include "IO_abstract_hierarchy_iterator.h"
#include "usd.h"
#include "usd_exporter_context.h"
#include "usd_skel_convert.h"
#include "usd_exporter_context.hh"
#include "usd_skel_convert.hh"
#include <string>

View File

@@ -4,7 +4,7 @@
#include "usd.h"
#include "usd_hook.h"
#include "usd_hook.hh"
#include <boost/python/call_method.hpp>
#include <boost/python/class.hpp>

View File

@@ -5,7 +5,7 @@
*
* Adapted from the Blender Alembic importer implementation. */
#include "usd_reader_camera.h"
#include "usd_reader_camera.hh"
#include "DNA_camera_types.h"
#include "DNA_object_types.h"

View File

@@ -8,7 +8,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
namespace blender::io::usd {

View File

@@ -4,7 +4,7 @@
* Adapted from the Blender Alembic importer implementation. Copyright 2016 Kévin Dietrich.
* Modifications Copyright 2021 Tangent Animation. All rights reserved. */
#include "usd_reader_curve.h"
#include "usd_reader_curve.hh"
#include "BKE_curve.hh"
#include "BKE_mesh.hh"

View File

@@ -6,7 +6,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_geom.h"
#include "usd_reader_geom.hh"
#include "pxr/usd/usdGeom/basisCurves.h"

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_geom.h"
#include "usd_reader_geom.hh"
#include "BKE_lib_id.hh"
#include "BKE_modifier.hh"

View File

@@ -4,7 +4,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
struct Mesh;

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_instance.h"
#include "usd_reader_instance.hh"
#include "BKE_lib_id.hh"
#include "BKE_object.hh"

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
#include <pxr/usd/usdGeom/xform.h>

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_light.h"
#include "usd_reader_light.hh"
#include "BLI_math_rotation.h"

View File

@@ -4,7 +4,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
namespace blender::io::usd {

View File

@@ -2,9 +2,9 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_material.h"
#include "usd_reader_material.hh"
#include "usd_asset_utils.h"
#include "usd_asset_utils.hh"
#include "BKE_appdir.hh"
#include "BKE_image.h"

View File

@@ -5,10 +5,10 @@
* Modifications Copyright 2021 Tangent Animation and
* NVIDIA Corporation. All rights reserved. */
#include "usd_reader_mesh.h"
#include "usd_hash_types.h"
#include "usd_reader_material.h"
#include "usd_skel_convert.h"
#include "usd_reader_mesh.hh"
#include "usd_hash_types.hh"
#include "usd_reader_material.hh"
#include "usd_skel_convert.hh"
#include "BKE_attribute.hh"
#include "BKE_customdata.hh"

View File

@@ -9,7 +9,7 @@
#include "BLI_span.hh"
#include "usd.h"
#include "usd_reader_geom.h"
#include "usd_reader_geom.hh"
#include "pxr/usd/usdGeom/mesh.h"

View File

@@ -5,7 +5,7 @@
*
* Adapted from the Blender Alembic importer implementation. */
#include "usd_reader_nurbs.h"
#include "usd_reader_nurbs.hh"
#include "BKE_curve.hh"
#include "BKE_mesh.hh"

View File

@@ -8,7 +8,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_geom.h"
#include "usd_reader_geom.hh"
#include "pxr/usd/usdGeom/nurbsCurves.h"

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_pointinstancer.h"
#include "usd_reader_pointinstancer.hh"
#include "BKE_attribute.hh"
#include "BKE_lib_id.hh"

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
struct Collection;

View File

@@ -5,7 +5,7 @@
*
* Adapted from the Blender Alembic importer implementation. */
#include "usd_reader_prim.h"
#include "usd_reader_prim.hh"
#include "BLI_utildefines.h"

View File

@@ -14,7 +14,7 @@
#include "WM_api.hh"
#include "usd_reader_shape.h"
#include "usd_reader_shape.hh"
#include <pxr/usd/usdGeom/capsule.h>
#include <pxr/usd/usdGeom/cone.h>

View File

@@ -5,8 +5,8 @@
#pragma once
#include "usd.h"
#include "usd_reader_geom.h"
#include "usd_reader_xform.h"
#include "usd_reader_geom.hh"
#include "usd_reader_xform.hh"
#include <pxr/usd/usdGeom/gprim.h>
struct Mesh;

View File

@@ -2,8 +2,8 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_skeleton.h"
#include "usd_skel_convert.h"
#include "usd_reader_skeleton.hh"
#include "usd_skel_convert.hh"
#include "BKE_armature.hh"
#include "BKE_idprop.h"

View File

@@ -4,7 +4,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
#include <pxr/usd/usdSkel/skeleton.h>

View File

@@ -2,20 +2,20 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_stage.h"
#include "usd_reader_camera.h"
#include "usd_reader_curve.h"
#include "usd_reader_instance.h"
#include "usd_reader_light.h"
#include "usd_reader_material.h"
#include "usd_reader_mesh.h"
#include "usd_reader_nurbs.h"
#include "usd_reader_pointinstancer.h"
#include "usd_reader_prim.h"
#include "usd_reader_shape.h"
#include "usd_reader_skeleton.h"
#include "usd_reader_volume.h"
#include "usd_reader_xform.h"
#include "usd_reader_stage.hh"
#include "usd_reader_camera.hh"
#include "usd_reader_curve.hh"
#include "usd_reader_instance.hh"
#include "usd_reader_light.hh"
#include "usd_reader_material.hh"
#include "usd_reader_mesh.hh"
#include "usd_reader_nurbs.hh"
#include "usd_reader_pointinstancer.hh"
#include "usd_reader_prim.hh"
#include "usd_reader_shape.hh"
#include "usd_reader_skeleton.hh"
#include "usd_reader_volume.hh"
#include "usd_reader_xform.hh"
#include <pxr/pxr.h>
#include <pxr/usd/usd/primRange.h>

View File

@@ -10,8 +10,8 @@ struct Main;
#include "BLI_set.hh"
#include "usd.h"
#include "usd_hash_types.h"
#include "usd_reader_prim.h"
#include "usd_hash_types.hh"
#include "usd_reader_prim.hh"
#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/imageable.h>

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_reader_volume.h"
#include "usd_reader_volume.hh"
#include "BLI_string.h"

View File

@@ -4,7 +4,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
#include "pxr/usd/usdVol/volume.h"

View File

@@ -5,7 +5,7 @@
*
* Adapted from the Blender Alembic importer implementation. */
#include "usd_reader_xform.h"
#include "usd_reader_xform.hh"
#include "BKE_constraint.h"
#include "BKE_lib_id.hh"

View File

@@ -8,7 +8,7 @@
#pragma once
#include "usd.h"
#include "usd_reader_prim.h"
#include "usd_reader_prim.hh"
namespace blender::io::usd {

View File

@@ -2,12 +2,12 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_skel_convert.h"
#include "usd_skel_convert.hh"
#include "usd.h"
#include "usd_armature_utils.h"
#include "usd_blend_shape_utils.h"
#include "usd_hash_types.h"
#include "usd_armature_utils.hh"
#include "usd_blend_shape_utils.hh"
#include "usd_hash_types.hh"
#include <pxr/usd/sdf/namespaceEdit.h>
#include <pxr/usd/usdGeom/primvarsAPI.h>

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_skel_root_utils.h"
#include "usd_skel_root_utils.hh"
#include <pxr/usd/usd/primRange.h>
#include <pxr/usd/usdGeom/xform.h>

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_abstract.h"
#include "usd_writer_material.h"
#include "usd_writer_abstract.hh"
#include "usd_writer_material.hh"
#include <pxr/base/tf/stringUtils.h>
#include <pxr/usd/usdGeom/bboxCache.h>

View File

@@ -4,7 +4,7 @@
#pragma once
#include "IO_abstract_hierarchy_iterator.h"
#include "usd_exporter_context.h"
#include "usd_exporter_context.hh"
#include <pxr/usd/sdf/path.h>
#include <pxr/usd/usd/stage.h>

View File

@@ -2,10 +2,10 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_armature.h"
#include "usd_armature_utils.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_transform.h"
#include "usd_writer_armature.hh"
#include "usd_armature_utils.hh"
#include "usd_hierarchy_iterator.hh"
#include "usd_writer_transform.hh"
#include "BKE_action.h"
#include "BKE_armature.hh"

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
#include "BLI_map.hh"

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_camera.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_camera.hh"
#include "usd_hierarchy_iterator.hh"
#include <pxr/usd/usdGeom/camera.h>
#include <pxr/usd/usdGeom/tokens.h>

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
namespace blender::io::usd {

View File

@@ -11,8 +11,8 @@
#include <pxr/usd/usdShade/material.h>
#include <pxr/usd/usdShade/materialBindingAPI.h>
#include "usd_hierarchy_iterator.h"
#include "usd_writer_curves.h"
#include "usd_hierarchy_iterator.hh"
#include "usd_writer_curves.hh"
#include "BKE_attribute.hh"
#include "BKE_curve_legacy_convert.hh"

View File

@@ -6,7 +6,7 @@
#include <memory>
#include "DNA_curves_types.h"
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
#include <pxr/usd/usdGeom/basisCurves.h>

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_hair.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_hair.hh"
#include "usd_hierarchy_iterator.hh"
#include <pxr/usd/usdGeom/basisCurves.h>
#include <pxr/usd/usdGeom/tokens.h>

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
namespace blender::io::usd {

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_light.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_light.hh"
#include "usd_hierarchy_iterator.hh"
#include <pxr/usd/usdLux/diskLight.h>
#include <pxr/usd/usdLux/distantLight.h>

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
namespace blender::io::usd {

View File

@@ -2,11 +2,11 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_material.h"
#include "usd_writer_material.hh"
#include "usd.h"
#include "usd_exporter_context.h"
#include "usd_hook.h"
#include "usd_exporter_context.hh"
#include "usd_hook.hh"
#include "BKE_image.h"
#include "BKE_image_format.h"

View File

@@ -1,13 +1,13 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_mesh.h"
#include "usd_writer_mesh.hh"
#include "usd_armature_utils.h"
#include "usd_blend_shape_utils.h"
#include "usd_hierarchy_iterator.h"
#include "usd_skel_convert.h"
#include "usd_writer_armature.h"
#include "usd_armature_utils.hh"
#include "usd_blend_shape_utils.hh"
#include "usd_hierarchy_iterator.hh"
#include "usd_skel_convert.hh"
#include "usd_writer_armature.hh"
#include <pxr/usd/usdGeom/bboxCache.h>
#include <pxr/usd/usdGeom/mesh.h>

View File

@@ -4,7 +4,7 @@
#pragma once
#include "DNA_modifier_types.h"
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
#include "BLI_map.hh"

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2020 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_metaball.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_metaball.hh"
#include "usd_hierarchy_iterator.hh"
#include <pxr/usd/usdGeom/mesh.h>
#include <pxr/usd/usdShade/material.h>

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_mesh.h"
#include "usd_writer_mesh.hh"
namespace blender::io::usd {

View File

@@ -1,8 +1,8 @@
/* SPDX-FileCopyrightText: 2019 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_transform.h"
#include "usd_hierarchy_iterator.h"
#include "usd_writer_transform.hh"
#include "usd_hierarchy_iterator.hh"
#include <pxr/base/gf/matrix4f.h>
#include <pxr/usd/usdGeom/xform.h>

View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
#include <pxr/usd/usdGeom/xform.h>

View File

@@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "usd_writer_volume.h"
#include "usd_writer_volume.hh"
#include <pxr/base/tf/pathUtils.h>
#include <pxr/usd/usdVol/openVDBAsset.h>
@@ -22,7 +22,7 @@
#include "WM_api.hh"
#include "usd_hierarchy_iterator.h"
#include "usd_hierarchy_iterator.hh"
namespace blender::io::usd {

View File

@@ -6,7 +6,7 @@
#include <optional>
#include "BLI_math_vector_types.hh"
#include "usd_writer_abstract.h"
#include "usd_writer_abstract.hh"
struct Volume;

View File

@@ -37,7 +37,7 @@
#include "WM_api.hh"
#include "usd.h"
#include "usd_writer_material.h"
#include "usd_writer_material.hh"
namespace blender::io::usd {