Commit: 3dcc54983689b020d03e907101c044215bb75dec
Author: makowalski
Date: Thu Mar 11 00:19:11 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB3dcc54983689b020d03e907101c044215bb75dec
USD Import: naming convention fix.
To be consistent with the convention used in the USD exporter,
updated class member variables to consistently use snake case
and trailing underscores instead of the m_ prefix.
===================================================================
M source/blender/io/usd/intern/usd_capi.cc
M source/blender/io/usd/intern/usd_reader_camera.cc
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_instance.cc
M source/blender/io/usd/intern/usd_reader_light.cc
M source/blender/io/usd/intern/usd_reader_material.cc
M source/blender/io/usd/intern/usd_reader_material.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_stage.cc
M source/blender/io/usd/intern/usd_reader_stage.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
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi.cc
b/source/blender/io/usd/intern/usd_capi.cc
index 78ad13b9d88..ba0bc9bb886 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -163,7 +163,7 @@ static void set_instance_collection(
static void create_proto_collections(Main *bmain,
ViewLayer *view_layer,
Collection *parent_collection,
- const USDStageReader::ProtoReaderMap
&proto_readers,
+ const ProtoReaderMap &proto_readers,
const std::vector<USDPrimReader *>
&readers)
{
Collection *all_protos_collection = create_collection(bmain,
parent_collection, "prototypes");
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc
b/source/blender/io/usd/intern/usd_reader_camera.cc
index dc6a1082053..6c28763424f 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -50,17 +50,17 @@ namespace blender::io::usd {
void USDCameraReader::create_object(Main *bmain, double motionSampleTime)
{
- Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_name.c_str()));
+ Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, name_.c_str()));
- m_object = BKE_object_add_only_object(bmain, OB_CAMERA, m_name.c_str());
- m_object->data = bcam;
+ object_ = BKE_object_add_only_object(bmain, OB_CAMERA, name_.c_str());
+ object_->data = bcam;
}
void USDCameraReader::read_object_data(Main *bmain, double motionSampleTime)
{
- Camera *bcam = (Camera *)m_object->data;
+ Camera *bcam = (Camera *)object_->data;
- pxr::UsdGeomCamera cam_prim = pxr::UsdGeomCamera::Get(m_stage,
m_prim.GetPath());
+ pxr::UsdGeomCamera cam_prim = pxr::UsdGeomCamera::Get(stage_,
prim_.GetPath());
pxr::VtValue val;
cam_prim.GetFocalLengthAttr().Get(&val, motionSampleTime);
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc
b/source/blender/io/usd/intern/usd_reader_curve.cc
index 6516870b41f..f2572021b7e 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -61,22 +61,22 @@ namespace blender::io::usd {
void USDCurvesReader::create_object(Main *bmain, double motionSampleTime)
{
- m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
+ curve_ = BKE_curve_add(bmain, name_.c_str(), OB_CURVE);
- m_curve->flag |= CU_DEFORM_FILL | CU_3D;
- m_curve->actvert = CU_ACT_NONE;
- m_curve->resolu = 2;
+ curve_->flag |= CU_DEFORM_FILL | CU_3D;
+ curve_->actvert = CU_ACT_NONE;
+ curve_->resolu = 2;
- m_object = BKE_object_add_only_object(bmain, OB_CURVE, m_name.c_str());
- m_object->data = m_curve;
+ object_ = BKE_object_add_only_object(bmain, OB_CURVE, name_.c_str());
+ object_->data = curve_;
}
void USDCurvesReader::read_object_data(Main *bmain, double motionSampleTime)
{
- Curve *cu = (Curve *)m_object->data;
+ Curve *cu = (Curve *)object_->data;
read_curve_sample(cu, motionSampleTime);
- if (curve_prim.GetPointsAttr().ValueMightBeTimeVarying()) {
+ if (curve_prim_.GetPointsAttr().ValueMightBeTimeVarying()) {
add_cache_modifier();
}
@@ -85,11 +85,11 @@ void USDCurvesReader::read_object_data(Main *bmain, double
motionSampleTime)
void USDCurvesReader::read_curve_sample(Curve *cu, double motionSampleTime)
{
- curve_prim = pxr::UsdGeomBasisCurves::Get(m_stage, m_prim.GetPath());
+ curve_prim_ = pxr::UsdGeomBasisCurves::Get(stage_, prim_.GetPath());
- pxr::UsdAttribute widthsAttr = curve_prim.GetWidthsAttr();
- pxr::UsdAttribute vertexAttr = curve_prim.GetCurveVertexCountsAttr();
- pxr::UsdAttribute pointsAttr = curve_prim.GetPointsAttr();
+ pxr::UsdAttribute widthsAttr = curve_prim_.GetWidthsAttr();
+ pxr::UsdAttribute vertexAttr = curve_prim_.GetCurveVertexCountsAttr();
+ pxr::UsdAttribute pointsAttr = curve_prim_.GetPointsAttr();
pxr::VtIntArray usdCounts;
@@ -102,30 +102,30 @@ void USDCurvesReader::read_curve_sample(Curve *cu, double
motionSampleTime)
pxr::VtFloatArray usdWidths;
widthsAttr.Get(&usdWidths, motionSampleTime);
- pxr::UsdAttribute basisAttr = curve_prim.GetBasisAttr();
+ pxr::UsdAttribute basisAttr = curve_prim_.GetBasisAttr();
pxr::TfToken basis;
basisAttr.Get(&basis, motionSampleTime);
- pxr::UsdAttribute typeAttr = curve_prim.GetTypeAttr();
+ pxr::UsdAttribute typeAttr = curve_prim_.GetTypeAttr();
pxr::TfToken type;
typeAttr.Get(&type, motionSampleTime);
- pxr::UsdAttribute wrapAttr = curve_prim.GetWrapAttr();
+ pxr::UsdAttribute wrapAttr = curve_prim_.GetWrapAttr();
pxr::TfToken wrap;
wrapAttr.Get(&wrap, motionSampleTime);
pxr::VtVec3fArray usdNormals;
- curve_prim.GetNormalsAttr().Get(&usdNormals, motionSampleTime);
+ curve_prim_.GetNormalsAttr().Get(&usdNormals, motionSampleTime);
// If normals, extrude, else bevel
// Perhaps to be replaced by Blender/USD Schema
if (usdNormals.size() > 0) {
// Set extrusion to 1.0f;
- m_curve->ext1 = 1.0f;
+ curve_->ext1 = 1.0f;
}
else {
// Set bevel depth to 1.0f;
- m_curve->ext2 = 1.0f;
+ curve_->ext2 = 1.0f;
}
size_t idx = 0;
@@ -179,7 +179,7 @@ void USDCurvesReader::read_curve_sample(Curve *cu, double
motionSampleTime)
bp->f1 = SELECT;
bp->weight = weight;
- float radius = m_curve->width;
+ float radius = curve_->width;
if (idx < usdWidths.size())
radius = usdWidths[idx];
@@ -199,11 +199,11 @@ Mesh *USDCurvesReader::read_mesh(struct Mesh
*existing_mesh,
float vel_scale,
const char **err_str)
{
- pxr::UsdGeomCurves curve_prim = pxr::UsdGeomCurves::Get(m_stage,
m_prim.GetPath());
+ pxr::UsdGeomCurves curve_prim_ = pxr::UsdGeomCurves::Get(stage_,
prim_.GetPath());
- pxr::UsdAttribute widthsAttr = curve_prim.GetWidthsAttr();
- pxr::UsdAttribute vertexAttr = curve_prim.GetCurveVertexCountsAttr();
- pxr::UsdAttribute pointsAttr = curve_prim.GetPointsAttr();
+ pxr::UsdAttribute widthsAttr = curve_prim_.GetWidthsAttr();
+ pxr::UsdAttribute vertexAttr = curve_prim_.GetCurveVertexCountsAttr();
+ pxr::UsdAttribute pointsAttr = curve_prim_.GetPointsAttr();
pxr::VtIntArray usdCounts;
@@ -215,7 +215,7 @@ Mesh *USDCurvesReader::read_mesh(struct Mesh *existing_mesh,
int vertex_idx = 0;
int curve_idx;
- Curve *curve = static_cast<Curve *>(m_object->data);
+ Curve *curve = static_cast<Curve *>(object_->data);
const int curve_count = BLI_listbase_count(&curve->nurb);
bool same_topology = curve_count == num_subcurves;
@@ -263,7 +263,7 @@ Mesh *USDCurvesReader::read_mesh(struct Mesh *existing_mesh,
}
}
- return BKE_mesh_new_nomain_from_curve(m_object);
+ return BKE_mesh_new_nomain_from_curve(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 c805e1b5188..a74562e9f5a 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -25,6 +25,9 @@ struct Curve;
namespace blender::io::usd {
class USDCurvesReader : public USDGeomReader {
+ protected:
+ pxr::UsdGeomBasisCurves curve_prim_;
+ Curve *curve_;
public:
USDCurvesReader(pxr::UsdStageRefPtr stage,
@@ -45,10 +48,6 @@ class USDCurvesReader : public USDGeomReader {
int read_flag,
float vel_scale,
const char **err_str) override;
-
- protected:
- 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 8ea3e725391..ec131d4da95 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -91,21 +91,21 @@ Mesh *USDGeomReader::read_mesh(struct Mesh *existing_mesh,
void USDGeomReader::add_cache_modifier()
{
ModifierData *md = BKE_modifier_new(eModifierType_MeshSequenceCache);
- BLI_addtail(&m_object->modifiers, md);
+ BLI_addtail(&object_->modifiers, md);
MeshSeqCacheModifierData *mcmd = reinterpret_cast<MeshSeqCacheModifierData
*>(md);
- mcmd->cache_file = m_settings->cache_file;
+ mcmd->cache_file = settings_->cache_file;
id_us_plus(&mcmd->cache_file->id);
- mcmd->read_flag = m_import_params.global_read_flag;
+ mcmd->read_flag = import_params_.global_read_flag;
- BLI_strncpy(mcmd->object_path, m_prim.GetPath().GetString().c_str(),
FILE_MAX);
+ BLI_strncpy(mcmd->object_path, prim_.GetPath().GetString().c_str(),
FILE_MAX);
}
void USDGeomReader::add_subdiv_modifier()
{
ModifierData *md = BKE_modifier_new(eModifierType_Subsurf);
- BLI_addtail(&m_object->modifiers, md);
+ BLI_addtail(&object_->modifiers, md);
}
} // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc
b/source/blender/io/usd/intern/usd_reader_instance.cc
index 4aafd189492..23b9aba58b0 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -36,26 +36,26 @@ USDInstanceReader::USDInstanceReader(pxr::UsdStageRefPtr
stage,
bool USDInstanceReader::valid() const
{
- return m_prim.IsValid() && m_prim.IsInstance();
+ return prim_.IsValid() && prim_.IsInstance();
}
void USDInstanceReader::create_object(Main *bmain, double motionSampleTime)
{
- this->m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
- this->m_object->data = nullptr;
- this->m_object->transflag |= OB_DUPLICOLLECTION;
+ this->object_ = BKE_object_add_only_object(bmain, OB_EMPTY, name_.c_str());
+ this->object_->data = nullptr;
+ this->object_->transflag |= OB_DUPLICOLLECTION;
}
void USDInstanceReader::set_instance_collection(Collection *coll)
{
- if (this->m_object) {
- this->m_object->instance_collection = coll;
+ if (this->object_) {
+ this->object_->instance_collection = coll;
}
}
pxr::SdfPath USDInstanceReader::proto_path() const
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
