[Bf-blender-cvs] [ca8fe889f21] usd-importer-T81257-merge: USD Import: added blender::io::usd namespace.
makowalski
noreply at git.blender.org
Thu Mar 11 03:22:58 CET 2021
Commit: ca8fe889f218044c9d23f152e5c69ab0c3adaaf2
Author: makowalski
Date: Wed Mar 10 21:15:30 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBca8fe889f218044c9d23f152e5c69ab0c3adaaf2
USD Import: added blender::io::usd namespace.
Added blender::io::usd namespace where it was missing, to
conform to the convention used in the USD exporter code.
===================================================================
M source/blender/io/usd/intern/usd_reader_camera.cc
M source/blender/io/usd/intern/usd_reader_camera.h
M source/blender/io/usd/intern/usd_reader_curve.cc
M source/blender/io/usd/intern/usd_reader_curve.h
M source/blender/io/usd/intern/usd_reader_geom.cc
M source/blender/io/usd/intern/usd_reader_geom.h
M source/blender/io/usd/intern/usd_reader_light.cc
M source/blender/io/usd/intern/usd_reader_light.h
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_mesh.h
M source/blender/io/usd/intern/usd_reader_nurbs.cc
M source/blender/io/usd/intern/usd_reader_nurbs.h
M source/blender/io/usd/intern/usd_reader_prim.cc
M source/blender/io/usd/intern/usd_reader_prim.h
M source/blender/io/usd/intern/usd_reader_volume.cc
M source/blender/io/usd/intern/usd_reader_volume.h
M source/blender/io/usd/intern/usd_reader_xform.cc
M source/blender/io/usd/intern/usd_reader_xform.h
M source/blender/io/usd/intern/usd_util.h
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index b31c5e7f8b7..24adb509413 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -46,6 +46,8 @@ extern "C" {
#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/camera.h>
+namespace blender::io::usd {
+
void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_name.c_str()));
@@ -102,3 +104,5 @@ void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
USDXformReader::readObjectData(bmain, motionSampleTime);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.h
index 93a381c5ee8..29aacf79396 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.h
@@ -18,6 +18,8 @@
#include "usd.h"
#include "usd_reader_xform.h"
+namespace blender::io::usd {
+
class USDCameraReader : public USDXformReader {
public:
@@ -32,3 +34,5 @@ class USDCameraReader : public USDXformReader {
void createObject(Main *bmain, double motionSampleTime) override;
void readObjectData(Main *bmain, double motionSampleTime) override;
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 084e7fa2eba..5edc93df5ff 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -57,6 +57,8 @@ extern "C" {
#include <pxr/usd/usdGeom/basisCurves.h>
#include <pxr/usd/usdGeom/curves.h>
+namespace blender::io::usd {
+
void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
{
m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
@@ -263,3 +265,5 @@ Mesh *USDCurvesReader::read_mesh(struct Mesh *existing_mesh,
return BKE_mesh_new_nomain_from_curve(m_object);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.h
index cf57677d416..a68b6c1d3bc 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -22,6 +22,8 @@
struct Curve;
+namespace blender::io::usd {
+
class USDCurvesReader : public USDGeomReader {
public:
@@ -48,3 +50,5 @@ class USDCurvesReader : public USDGeomReader {
pxr::UsdGeomBasisCurves curve_prim;
Curve *m_curve;
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index 8ca6047ed42..d81a889905f 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -59,6 +59,8 @@ extern "C" {
#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/mesh.h>
+namespace blender::io::usd {
+
void USDGeomReader::createObject(Main *bmain, double motionSampleTime)
{
}
@@ -105,3 +107,5 @@ void USDGeomReader::addSubdivModifier()
ModifierData *md = BKE_modifier_new(eModifierType_Subsurf);
BLI_addtail(&m_object->modifiers, md);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index fef7aca88ee..ab83465bf75 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -20,6 +20,8 @@
struct Mesh;
+namespace blender::io::usd {
+
class USDGeomReader : public USDXformReader {
public:
@@ -47,3 +49,5 @@ class USDGeomReader : public USDXformReader {
bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index 3817c91684c..ff2d8dc2514 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -56,6 +56,8 @@ extern "C" {
#include <iostream>
+namespace blender::io::usd {
+
void USDLightReader::createObject(Main *bmain, double motionSampleTime)
{
Light *blight = static_cast<Light *>(BKE_light_add(bmain, m_name.c_str()));
@@ -196,3 +198,5 @@ void USDLightReader::readObjectData(Main *bmain, double motionSampleTime)
USDXformReader::readObjectData(bmain, motionSampleTime);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_light.h b/source/blender/io/usd/intern/usd_reader_light.h
index 58ce48d5928..484133fd6fa 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.h
@@ -18,6 +18,8 @@
#include "usd.h"
#include "usd_reader_xform.h"
+namespace blender::io::usd {
+
class USDLightReader : public USDXformReader {
public:
@@ -33,3 +35,5 @@ class USDLightReader : public USDXformReader {
void readObjectData(Main *bmain, double motionSampleTime) override;
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index bb50ffd96a7..15a1a3747e0 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -183,6 +183,8 @@ static void *add_customdata_cb(Mesh *mesh, const char *name, int data_type)
return cd_ptr;
}
+namespace blender::io::usd {
+
USDMeshReader::USDMeshReader(pxr::UsdStageRefPtr stage,
const pxr::UsdPrim &object,
const USDImportParams &import_params,
@@ -905,3 +907,5 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
return active_mesh;
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index 35f486b9904..aca63cd2fa2 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -19,7 +19,9 @@
#include "usd.h"
#include "usd_reader_geom.h"
-typedef float f3Data[3];
+struct MPoly;
+
+namespace blender::io::usd {
class USDMeshReader : public USDGeomReader {
@@ -90,3 +92,5 @@ class USDMeshReader : public USDGeomReader {
// implemented. Note this will break if face or positions vary...
bool m_isInitialLoad;
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index d03227ebf8c..e9e244fa4f6 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -74,6 +74,8 @@ static bool set_knots(const pxr::VtDoubleArray &knots, float *&nu_knots)
return true;
}
+namespace blender::io::usd {
+
void USDNurbsReader::createObject(Main *bmain, double motionSampleTime)
{
m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
@@ -268,3 +270,5 @@ Mesh *USDNurbsReader::read_mesh(struct Mesh *existing_mesh,
return BKE_mesh_new_nomain_from_curve(m_object);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h b/source/blender/io/usd/intern/usd_reader_nurbs.h
index c86860d0929..b38c3090e4d 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.h
@@ -22,6 +22,8 @@
struct Curve;
+namespace blender::io::usd {
+
class USDNurbsReader : public USDGeomReader {
public:
@@ -48,3 +50,5 @@ class USDNurbsReader : public USDGeomReader {
pxr::UsdGeomNurbsCurves curve_prim;
Curve *m_curve;
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 8a4fc16c618..e0b484aef90 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -36,6 +36,8 @@ extern "C" {
#include "WM_types.h"
}
+namespace blender::io::usd {
+
USDPrimReader::USDPrimReader(pxr::UsdStageRefPtr stage,
const pxr::UsdPrim &object,
const USDImportParams &import_params,
@@ -109,3 +111,5 @@ void USDPrimReader::decref()
m_refcount--;
BLI_assert(m_refcount >= 0);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index c60a63f15d1..b78f9dbad2a 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -34,6 +34,8 @@ struct Main;
struct Mesh;
struct Object;
+namespace blender::io::usd {
+
struct ImportSettings {
bool do_convert_mat;
float conversion_mat[4][4];
@@ -132,3 +134,5 @@ class USDPrimReader {
return m_prim_path;
}
};
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_volume.cc b/source/blender/io/usd/intern/usd_reader_volume.cc
index 2292d2e913a..a4fc9010008 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.cc
+++ b/source/blender/io/usd/intern/usd_reader_volume.cc
@@ -54,6 +54,8 @@ extern "C" {
#include <iostream>
+namespace blender::io::usd {
+
void USDVolumeReader::createObject(Main *bmain, double motionSampleTime)
{
Volume *volume = (Volume *)BKE_volume_add(bmain, m_name.c_str());
@@ -121,3 +123,5 @@ void USDVolumeReader::readObjectData(Main *bmain, double motionSampleTime)
USDXformReader::readObjectData(bmain, motionSampleTime);
}
+
+} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_volume.h b/source/blender/io/usd/intern/usd_reader_volume.h
index ea2af08b825..18ca3deaf51 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.h
+++ b/source/blender/io/usd/intern/usd_reader_volume.h
@@ -20,6 +20,8 @@
#include "pxr/usd/usdVol/volume.h"
+namespace blender::io::usd {
+
class USDVolumeReader : public USDXformReader {
public:
@@ -36,3 +38,5 @@ class USDVolumeReader : public USDXformReader {
pxr::UsdVolVo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list