[Bf-blender-cvs] [0759e455413] usd-importer-T81257-merge: USD Import: snake case for function names.
makowalski
noreply at git.blender.org
Thu Mar 11 06:26:14 CET 2021
Commit: 0759e455413662d28278ed99cc25908830e72314
Author: makowalski
Date: Wed Mar 10 21:54:17 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB0759e455413662d28278ed99cc25908830e72314
USD Import: snake case for function names.
As part of code cleanup, now using snake case consistently
for class member function names, to match the convention
used in the USD exporter code.
===================================================================
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_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_instance.cc
M source/blender/io/usd/intern/usd_reader_instance.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_stage.cc
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
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index e75f0b013bf..78ad13b9d88 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -602,8 +602,8 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
}
/* TODO(makowalski): Here and below, should we call
- * readObjectData() with the actual time? */
- reader->readObjectData(data->bmain, 0.0);
+ * read_object_data() with the actual time? */
+ reader->read_object_data(data->bmain, 0.0);
Object *ob = reader->object();
@@ -625,7 +625,7 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
Object *ob = (*iter)->object();
USDPrimReader *reader = (*iter);
- reader->readObjectData(data->bmain, 0.0);
+ reader->read_object_data(data->bmain, 0.0);
USDPrimReader *parent = (*iter)->parent();
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 24adb509413..dc6a1082053 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -48,7 +48,7 @@ extern "C" {
namespace blender::io::usd {
-void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
+void USDCameraReader::create_object(Main *bmain, double motionSampleTime)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_name.c_str()));
@@ -56,7 +56,7 @@ void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
m_object->data = bcam;
}
-void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDCameraReader::read_object_data(Main *bmain, double motionSampleTime)
{
Camera *bcam = (Camera *)m_object->data;
@@ -102,7 +102,7 @@ void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
bcam->ortho_scale = max_ff(verAp.Get<float>(), horAp.Get<float>());
}
- USDXformReader::readObjectData(bmain, motionSampleTime);
+ USDXformReader::read_object_data(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 29aacf79396..31d4db656a1 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.h
@@ -31,8 +31,8 @@ class USDCameraReader : public USDXformReader {
{
}
- void createObject(Main *bmain, double motionSampleTime) override;
- void readObjectData(Main *bmain, double motionSampleTime) override;
+ void create_object(Main *bmain, double motionSampleTime) override;
+ void read_object_data(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 5edc93df5ff..6516870b41f 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -59,7 +59,7 @@ extern "C" {
namespace blender::io::usd {
-void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
+void USDCurvesReader::create_object(Main *bmain, double motionSampleTime)
{
m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
@@ -71,16 +71,16 @@ void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
m_object->data = m_curve;
}
-void USDCurvesReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDCurvesReader::read_object_data(Main *bmain, double motionSampleTime)
{
Curve *cu = (Curve *)m_object->data;
read_curve_sample(cu, motionSampleTime);
if (curve_prim.GetPointsAttr().ValueMightBeTimeVarying()) {
- addCacheModifier();
+ add_cache_modifier();
}
- USDXformReader::readObjectData(bmain, motionSampleTime);
+ USDXformReader::read_object_data(bmain, motionSampleTime);
}
void USDCurvesReader::read_curve_sample(Curve *cu, double motionSampleTime)
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.h
index a68b6c1d3bc..c805e1b5188 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -35,8 +35,8 @@ class USDCurvesReader : public USDGeomReader {
{
}
- void createObject(Main *bmain, double motionSampleTime) override;
- void readObjectData(Main *bmain, double motionSampleTime) override;
+ void create_object(Main *bmain, double motionSampleTime) override;
+ void read_object_data(Main *bmain, double motionSampleTime) override;
void read_curve_sample(Curve *cu, double motionSampleTime);
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index d81a889905f..8ea3e725391 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -61,7 +61,7 @@ extern "C" {
namespace blender::io::usd {
-void USDGeomReader::createObject(Main *bmain, double motionSampleTime)
+void USDGeomReader::create_object(Main *bmain, double motionSampleTime)
{
}
@@ -75,7 +75,7 @@ bool USDGeomReader::topology_changed(Mesh *existing_mesh, double motionSampleTim
return true;
}
-void USDGeomReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDGeomReader::read_object_data(Main *bmain, double motionSampleTime)
{
}
@@ -88,7 +88,7 @@ Mesh *USDGeomReader::read_mesh(struct Mesh *existing_mesh,
return nullptr;
}
-void USDGeomReader::addCacheModifier()
+void USDGeomReader::add_cache_modifier()
{
ModifierData *md = BKE_modifier_new(eModifierType_MeshSequenceCache);
BLI_addtail(&m_object->modifiers, md);
@@ -102,7 +102,7 @@ void USDGeomReader::addCacheModifier()
BLI_strncpy(mcmd->object_path, m_prim.GetPath().GetString().c_str(), FILE_MAX);
}
-void USDGeomReader::addSubdivModifier()
+void USDGeomReader::add_subdiv_modifier()
{
ModifierData *md = BKE_modifier_new(eModifierType_Subsurf);
BLI_addtail(&m_object->modifiers, md);
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index ab83465bf75..01d7a4883dd 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -35,8 +35,8 @@ class USDGeomReader : public USDXformReader {
bool valid() const override;
- virtual void createObject(Main *bmain, double motionSampleTime) override;
- virtual void readObjectData(Main *bmain, double motionSampleTime) override;
+ virtual void create_object(Main *bmain, double motionSampleTime) override;
+ virtual void read_object_data(Main *bmain, double motionSampleTime) override;
virtual Mesh *read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
@@ -44,8 +44,8 @@ class USDGeomReader : public USDXformReader {
float vel_scale,
const char **err_str);
- void addCacheModifier() override;
- void addSubdivModifier();
+ void add_cache_modifier() override;
+ void add_subdiv_modifier();
bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
};
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index 60c09a61dc9..4aafd189492 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -39,7 +39,7 @@ bool USDInstanceReader::valid() const
return m_prim.IsValid() && m_prim.IsInstance();
}
-void USDInstanceReader::createObject(Main *bmain, double motionSampleTime)
+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;
diff --git a/source/blender/io/usd/intern/usd_reader_instance.h b/source/blender/io/usd/intern/usd_reader_instance.h
index 034ccd8a8dd..ab3cef3aa7b 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.h
+++ b/source/blender/io/usd/intern/usd_reader_instance.h
@@ -38,7 +38,7 @@ class USDInstanceReader : public USDXformReader {
bool valid() const override;
- void createObject(Main *bmain, double motionSampleTime) override;
+ void create_object(Main *bmain, double motionSampleTime) override;
void set_instance_collection(Collection *coll);
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index ff2d8dc2514..8a69849a7fe 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -58,7 +58,7 @@ extern "C" {
namespace blender::io::usd {
-void USDLightReader::createObject(Main *bmain, double motionSampleTime)
+void USDLightReader::create_object(Main *bmain, double motionSampleTime)
{
Light *blight = static_cast<Light *>(BKE_light_add(bmain, m_name.c_str()));
@@ -66,7 +66,7 @@ void USDLightReader::createObject(Main *bmain, double motionSampleTime)
m_object->data = blight;
}
-void USDLightReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDLightReader::read_object_data(Main *bmain, double motionSampleTime)
{
Light *blight = (Light *)m_object->data;
@@ -196,7 +196,7 @@ void USDLightReader::readObjectData(Main *bmain, double motionSampleTime)
break;
}
- USDXformReader::readObjectData(bmain, motionSampleTime);
+ USDXformReader::read_object_data(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 484133fd6fa..5f64e4b422b 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.h
@@ -31,9 +31,9 @@ class USDLightReader : public USDXformReader {
{
}
- void createObject(Main *bmain, double motionSampleTime) override;
+ void create_object(Main *bmain, double motionSampleTime) override;
- void readObjectData(Main *bmain, double motionSampleT
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list