[Bf-blender-cvs] [7cfd8f77c10] usd-importer-T81257-merge: USD Import: removed commented out code.
makowalski
noreply at git.blender.org
Thu Mar 11 01:16:39 CET 2021
Commit: 7cfd8f77c1074da8d5eed4dc6c757d0e3fdb39f5
Author: makowalski
Date: Wed Mar 10 19:09:40 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB7cfd8f77c1074da8d5eed4dc6c757d0e3fdb39f5
USD Import: removed commented out code.
===================================================================
M source/blender/editors/io/io_usd.c
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_geom.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_prim.cc
M source/blender/io/usd/intern/usd_reader_prim.h
===================================================================
diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c
index 582e14e04a9..c2f7013675b 100644
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@ -430,9 +430,6 @@ static void wm_usd_import_draw(bContext *UNUSED(C), wmOperator *op)
row = uiLayoutRow(box, false);
uiItemR(row, ptr, "light_intensity_scale", 0, NULL, ICON_NONE);
- // row = uiLayoutRow(box, false);
- // uiItemR(row, ptr, "prim_path_mask", 0, NULL, ICON_NONE);
-
uiLayout *prim_path_mask_box = uiLayoutBox(box);
row = uiLayoutRow(prim_path_mask_box, false);
uiItemL(row, IFACE_("Prim Path Mask:"), ICON_NONE);
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index f456242cdb0..e75f0b013bf 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -576,11 +576,8 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
// Set up the stage for animated data.
if (data->params.set_frame_range) {
- // archive->stage()->SetTimeCodesPerSecond(FPS);
scene->r.sfra = archive->stage()->GetStartTimeCode();
scene->r.efra = archive->stage()->GetEndTimeCode();
- // archive->usd_stage->SetStartTimeCode(scene->r.sfra);
- // usd_stage->SetEndTimeCode(scene->r.efra);
}
*data->progress = 0.15f;
@@ -770,8 +767,6 @@ bool USD_import(struct bContext *C,
/* Using new here since MEM_* funcs do not call ctor to properly initialize
* data. */
ImportJobData *job = new ImportJobData();
- // USD::ImportJobData *job = static_cast<USD::ImportJobData
- // *>(MEM_mallocN(sizeof(USD::ImportJobData), "ImportJobData"));
job->bmain = CTX_data_main(C);
job->scene = CTX_data_scene(C);
job->view_layer = CTX_data_view_layer(C);
@@ -834,12 +829,6 @@ static USDPrimReader *get_usd_reader(CacheReader *reader, Object *ob, const char
return NULL;
}
- /*const ObjectHeader &header = iobject.getHeader();
- if (!usd_reader->accepts_object_type(header, ob, err_str)) {*/
- /* err_str is set by acceptsObjectType() */
- /*return NULL;
-}*/
-
return usd_reader;
}
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 23b196ff6cf..b31c5e7f8b7 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -80,6 +80,7 @@ void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
cam_prim.GetHorizontalApertureAttr().Get(&horAp, motionSampleTime);
bcam->lens = val.Get<float>();
+ // TODO(makowalski)
// bcam->sensor_x = 0.0f;
// bcam->sensor_y = 0.0f;
bcam->shiftx = verApOffset.Get<float>();
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index bd4394c9192..8ca6047ed42 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -66,7 +66,6 @@ void USDGeomReader::createObject(Main *bmain, double motionSampleTime)
bool USDGeomReader::valid() const
{
return true;
- // return m_schema.valid();
}
bool USDGeomReader::topology_changed(Mesh *existing_mesh, double motionSampleTime)
@@ -97,7 +96,6 @@ void USDGeomReader::addCacheModifier()
mcmd->cache_file = m_settings->cache_file;
id_us_plus(&mcmd->cache_file->id);
mcmd->read_flag = m_import_params.global_read_flag;
- // mcmd->vel_fac = m_settings->vel_scale;
BLI_strncpy(mcmd->object_path, m_prim.GetPath().GetString().c_str(), FILE_MAX);
}
@@ -106,6 +104,4 @@ void USDGeomReader::addSubdivModifier()
{
ModifierData *md = BKE_modifier_new(eModifierType_Subsurf);
BLI_addtail(&m_object->modifiers, md);
-
- // SubsurfModifierData *subd = reinterpret_cast<SubsurfModifierData *>(md);
}
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 45b3796dc29..bb50ffd96a7 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -202,14 +202,6 @@ void USDMeshReader::createObject(Main *bmain, double motionSampleTime)
m_object = BKE_object_add_only_object(bmain, OB_MESH, m_name.c_str());
m_object->data = mesh;
-
- /*
- if (m_settings->validate_meshes) {
- BKE_mesh_validate(mesh, false, false);
- }
-
- readFaceSetsSample(bmain, mesh, sample_sel);
- */
}
void USDMeshReader::readObjectData(Main *bmain, double motionSampleTime)
@@ -731,32 +723,9 @@ void USDMeshReader::read_mesh_sample(const std::string &iobject_full_name,
{
pxr::UsdAttribute normalsAttr = mesh_prim.GetNormalsAttr();
- /*pxr::UsdAttribute faceVertCountsAttr = mesh_prim.GetFaceVertexCountsAttr();
- pxr::UsdAttribute faceVertIndicesAttr = mesh_prim.GetFaceVertexIndicesAttr();*/
-
std::vector<pxr::UsdGeomPrimvar> primvars = mesh_prim.GetPrimvars();
- /*pxr::UsdAttribute pointsAttr = mesh_prim.GetPointsAttr();*/
pxr::UsdAttribute subdivSchemeAttr = mesh_prim.GetSubdivisionSchemeAttr();
- /*pxr::VtIntArray face_indices;
- faceVertIndicesAttr.Get(&face_indices, motionSampleTime);
- pxr::VtIntArray face_counts;
- faceVertIndicesAttr.Get(&face_counts, motionSampleTime);
- pxr::VtVec3fArray positions;
- pointsAttr.Get(&positions, motionSampleTime);*/
-
- /*get_weight_and_index(config, schema.getTimeSampling(), schema.getNumSamples());
-
- if (config.weight != 0.0f) {
- Alembic::AbcGeom::IPolyMeshSchema::Sample ceil_sample;
- schema.get(ceil_sample, Alembic::Abc::ISampleSelector(config.ceil_index));
- abc_mesh_data.ceil_positions = ceil_sample.getPositions();
- }
-
- if ((settings->read_flag & MOD_MESHSEQ_READ_UV) != 0) {
- read_uvs_params(config, abc_mesh_data, schema.getUVsParam(), selector);
- }*/
-
// Note that for new meshes we always want to read verts and polys,
// regradless of the value of the read_flag, to avoid a crash downstream
// in code that expect this data to be there.
@@ -873,10 +842,6 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
{
mesh_prim = pxr::UsdGeomMesh::Get(m_stage, m_prim.GetPath());
- // pxr::UsdAttribute normalsAttr = mesh_prim.GetNormalsAttr();
- // pxr::UsdAttribute faceVertCountsAttr = mesh_prim.GetFaceVertexCountsAttr();
- // pxr::UsdAttribute faceVertIndicesAttr = mesh_prim.GetFaceVertexIndicesAttr();
-
mesh_prim.GetOrientationAttr().Get(&m_orientation);
if (m_orientation == pxr::UsdGeomTokens->leftHanded)
m_isLeftHanded = true;
@@ -901,16 +866,6 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
}
}
- // pxr::UsdAttribute pointsAttr = mesh_prim.GetPointsAttr();
- // pxr::UsdAttribute subdivSchemeAttr = mesh_prim.GetSubdivisionSchemeAttr();
-
- // pxr::VtIntArray face_indices;
- // faceVertIndicesAttr.Get(&face_indices, motionSampleTime);
- // pxr::VtIntArray face_counts;
- // faceVertCountsAttr.Get(&face_counts, motionSampleTime);
- // pxr::VtVec3fArray positions;
- // pointsAttr.Get(&positions, motionSampleTime);
-
Mesh *active_mesh = existing_mesh;
bool new_mesh = false;
@@ -928,24 +883,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
void *cd_ptr = add_customdata_cb(active_mesh, token.GetText(), CD_MLOOPUV);
active_mesh->mloopuv = static_cast<MLoopUV *>(cd_ptr);
}
-
- // settings.read_flag |= MOD_MESHSEQ_READ_ALL;
- }
- // else {
- /* If the face count changed (e.g. by triangulation), only read points.
- * This prevents crash from T49813.
- * TODO(kevin): perhaps find a better way to do this? */
- /*if (face_counts.size() != existing_mesh->totpoly ||
- face_indices.size() != existing_mesh->totloop) {
- //settings.read_flag = MOD_MESHSEQ_READ_VERT;
- std::cout << "Mismatch vert counts\n";
- if (err_str) {
- *err_str =
- "Topology has changed, perhaps by triangulating the"
- " mesh. Only vertices will be read!";
- }
}
-}*/
read_mesh_sample(m_prim.GetPath().GetString().c_str(),
&settings,
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 298542c66dc..8a4fc16c618 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -88,8 +88,6 @@ void USDPrimReader::createObject(Main *bmain, double motionSampleTime)
void USDPrimReader::readObjectData(Main *bmain, double motionSampleTime)
{
- // m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_prim_path.c_str());
- // m_object->data = NULL;
}
void USDPrimReader::addCacheModifier()
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index 74ba68171fe..5534458f7cc 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -98,7 +98,6 @@ class USDPrimReader {
int m_refcount;
public:
- // USDPrimReader(pxr::UsdPrim* prim, ImportSettings &settings);
USDPrimReader(pxr::UsdStageRefPtr stage,
const pxr::UsdPrim &object,
const USDImportParams &import_params,
@@ -140,100 +139,4 @@ class USDPrimReader {
}
};
-// template<typename Schema> static bool has_animations(Schema &schema, ImportSettings *settings)
-// {
-// return settings->is_sequence || !schema.isConstant();
-// }
-
-// class USDObjectReader {
-// protected:
-// std::string m_name;
-// std::string m_object_name;
-// std::string m_data_name;
-// Object *m_object;
-// pxr::UsdPrim m_iobject;
-
-// ImportSettings *m_settings;
-
-// chrono_t m_min_time;
-// chrono_t m_max_time;
-
-// /* Use reference counting since the same reader may be used by multiple
-// * modifiers and/or constraints. */
-// int m_refcount;
-
-// bool m_inherits_xform;
-
-// public:
-// USDObjectReader *parent_reader;
-
-// public:
-// explicit USDObjectReader(const pxr::UsdPrim &object, ImportSettings &settings);
-
-// virtual ~USDObjectReader();
-
-// const Alembic::USD::IObject &iobject() const;
-
-// typedef std::vector<USDObjectReader *> ptr_vector;
-
-// /**
-// * Returns the transform of thi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list