Commit: be9323a4f54ecd4e7c1ddf3271994a9d9d6c5d7d
Author: Kévin Dietrich
Date: Wed Apr 6 13:23:50 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBbe9323a4f54ecd4e7c1ddf3271994a9d9d6c5d7d
Cleanup: remove some unused/outdated code.
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_hair.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/abc_nurbs.h
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_shape.cc
M source/blender/alembic/intern/alembic_capi.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc
b/source/blender/alembic/intern/abc_camera.cc
index f155326..0af3139 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -39,7 +39,7 @@ extern "C" {
#include "WM_types.h"
}
-AbcCameraWriter::AbcCameraWriter(Scene *sce, Object *obj, RenderData *r,
+AbcCameraWriter::AbcCameraWriter(Scene *sce, Object *obj,
AbcTransformWriter *parent,
Alembic::Util::uint32_t timeSampling,
AbcExportOptions &opts)
@@ -115,7 +115,7 @@ bool AbcCameraReader::valid() const
return m_schema.valid();
}
-void AbcCameraReader::readObjectData(Main *bmain, Scene *scene, float time,
Object *parent)
+void AbcCameraReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain,
"abc_camera"));
@@ -158,12 +158,4 @@ void AbcCameraReader::readObjectData(Main *bmain, Scene
*scene, float time, Obje
m_object = BKE_object_add(bmain, scene, OB_CAMERA,
m_object_name.c_str());
m_object->data = bcam;
-
- if (parent) {
- m_object->parent = parent;
-
- DAG_id_tag_update(&m_object->id, OB_RECALC_OB);
- DAG_relations_tag_update(bmain);
- WM_main_add_notifier(NC_OBJECT | ND_PARENT, m_object);
- }
}
diff --git a/source/blender/alembic/intern/abc_camera.h
b/source/blender/alembic/intern/abc_camera.h
index 72a48b5..7f0e374 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -35,8 +35,7 @@ class AbcCameraWriter : public AbcShapeWriter {
Alembic::AbcGeom::OFloatProperty m_eye_separation;
public:
- AbcCameraWriter(Scene *sce, Object *obj,
- RenderData *r, AbcTransformWriter *parent,
+ AbcCameraWriter(Scene *sce, Object *obj, AbcTransformWriter *parent,
Alembic::Util::uint32_t timeSampling,
AbcExportOptions &opts);
@@ -52,7 +51,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time, Object
*parent);
+ void readObjectData(Main *bmain, Scene *scene, float time);
};
#endif /* __ABC_CAMERA_WRITER_H__ */
diff --git a/source/blender/alembic/intern/abc_exporter.cc
b/source/blender/alembic/intern/abc_exporter.cc
index 6179ac3..2a5e611 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -461,45 +461,42 @@ void AbcExporter::createShapeWriter(Object *ob, Object
*dupliObParent)
if (enable_geo) {
Mesh *me = static_cast<Mesh *>(ob->data);
- if (!me || me->totvert == 0)
+ if (!me || me->totvert == 0) {
return;
+ }
m_shapes.push_back(new AbcMeshWriter(m_scene,
ob, xform, m_shape_sampling_index, m_options));
m_shapes.back()->setRotateMatrix(true);
}
- }
- break;
+ break;
+ }
case OB_SURF:
{
if (enable_geo) {
Curve *cu = static_cast<Curve *>(ob->data);
- if (!cu)
+ if (!cu) {
return;
+ }
+
m_shapes.push_back(new AbcNurbsWriter(m_scene,
ob, xform, m_shape_sampling_index, m_options));
m_shapes.back()->setRotateMatrix(true);
}
- }
- break;
+ break;
+ }
case OB_CAMERA:
{
Camera *cam = static_cast<Camera *>(ob->data);
if (cam->type == CAM_PERSP) {
- m_shapes.push_back(new AbcCameraWriter(m_scene,
ob, &(m_scene->r), xform, m_shape_sampling_index, m_options));
+ m_shapes.push_back(new AbcCameraWriter(m_scene,
ob, xform, m_shape_sampling_index, m_options));
}
- }
- break;
- default:
- {
- //std::cout << "Create Shape: " << getObjectName(ob) <<
"Shape, parent = " << getObjectName(ob) << "\n";
- //mShapes.push_back(new AlembicObjectWriter(ob,
xform->alembicXform()));
+ break;
}
}
-
}
AbcTransformWriter *AbcExporter::getXForm(const std::string &name)
diff --git a/source/blender/alembic/intern/abc_hair.cc
b/source/blender/alembic/intern/abc_hair.cc
index 1c760c8..c03685b 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -34,9 +34,12 @@ extern "C" {
#include "BKE_particle.h"
}
-AbcHairWriter::AbcHairWriter(Scene *sce, Object *obj, AbcTransformWriter
*parent,
- Alembic::Util::uint32_t timeSampling,
- AbcExportOptions &opts, ParticleSystem
*psys)
+AbcHairWriter::AbcHairWriter(Scene *sce,
+ Object *obj,
+ AbcTransformWriter *parent,
+ Alembic::Util::uint32_t timeSampling,
+ AbcExportOptions &opts,
+ ParticleSystem *psys)
: AbcShapeWriter(sce, obj, parent, timeSampling, opts)
{
std::string name = getObjectName(m_object);
diff --git a/source/blender/alembic/intern/abc_mesh.cc
b/source/blender/alembic/intern/abc_mesh.cc
index e668e73..4cf67f6 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -49,8 +49,10 @@ extern "C" {
#include "WM_types.h"
}
-AbcMeshWriter::AbcMeshWriter(Scene *sce, Object *obj,
- AbcTransformWriter *parent,
Alembic::Util::uint32_t timeSampling,
+AbcMeshWriter::AbcMeshWriter(Scene *sce,
+ Object *obj,
+ AbcTransformWriter *parent,
+ Alembic::Util::uint32_t timeSampling,
AbcExportOptions &opts)
: AbcShapeWriter(sce, obj, parent, timeSampling, opts)
{
@@ -1051,7 +1053,7 @@ bool AbcMeshReader::valid() const
return m_schema.valid();
}
-void AbcMeshReader::readObjectData(Main *bmain, Scene *scene, float time,
Object *parent)
+void AbcMeshReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Mesh *blender_mesh = BKE_mesh_add(bmain, m_data_name.c_str());
diff --git a/source/blender/alembic/intern/abc_mesh.h
b/source/blender/alembic/intern/abc_mesh.h
index 95d2397..b844ab7 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -108,7 +108,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time, Object
*parent);
+ void readObjectData(Main *bmain, Scene *scene, float time);
};
#endif /* __ABC_MESH_WRITER_H__ */
diff --git a/source/blender/alembic/intern/abc_nurbs.cc
b/source/blender/alembic/intern/abc_nurbs.cc
index 23b81e0..4bb1310 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -42,15 +42,19 @@ extern "C" {
#include "WM_types.h"
}
-AbcNurbsWriter::AbcNurbsWriter(Scene *sce, Object *obj, AbcTransformWriter
*parent,
-
Alembic::Util::uint32_t timeSampling,
-
AbcExportOptions& opts) : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
+AbcNurbsWriter::AbcNurbsWriter(Scene *sce,
+ Object *obj,
+ AbcTransformWriter *parent,
+ Alembic::Util::uint32_t timeSampling,
+ AbcExportOptions& opts)
+ : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
{
m_is_animated = isAnimated();
// if the object is static, use the default static time sampling
- if (!m_is_animated)
+ if (!m_is_animated) {
timeSampling = 0;
+ }
Curve *curve = static_cast<Curve *>(m_object->data);
size_t numNurbs = BLI_listbase_count(&curve->nurb);
@@ -69,19 +73,13 @@ AbcNurbsWriter::AbcNurbsWriter(Scene *sce, Object *obj,
AbcTransformWriter *pare
}
AbcNurbsWriter::~AbcNurbsWriter()
-{
-
-}
+{}
bool AbcNurbsWriter::isAnimated() const
{
- // check if object has shape keys
+ /* check if object has shape keys */
Curve *cu = static_cast<Curve *>(m_object->data);
-
- if (cu->key)
- return true;
-
- return false;
+ return (cu->key != NULL);
}
static
@@ -99,6 +97,7 @@ void recompute_pnts_cyclic(const BPoint *bps, const int
num_u, const int num_v,
pnts.resize(new_u);
for (int u = 0; u < new_u; ++u) {
pnts[u].resize(new_v);
+
for (int v = 0; v < new_v; ++v) {
const BPoint& bp = bps[u + (v * new_u)];
pnts[u][v] = Imath::Vec4<float>(bp.vec[0], bp.vec[1],
bp.vec[2], bp.vec[3]);
@@ -115,7 +114,6 @@ void recompute_pnts_cyclic(const BPoint *bps, const int
num_u, const int num_v,
posWeight.push_back(pnt.z);
}
}
-
}
void AbcNurbsWriter::do_write()
@@ -187,11 +185,6 @@ void AbcNurbsWriter::do_write()
}
}
-void AbcNurbsWriter::writeNurbs()
-{
-
-}
-
/* ****************************** nurbs reader ******************************
*/
AbcNurbsReader::AbcNurbsReader(const Alembic::Abc::IObject &object, int
from_forward, int from_up)
@@ -210,7 +203,7 @@ bool AbcNurbsReader::valid() const
return m_schemas[0].first.valid();
}
-void AbcNurbsReader::readObjectData(Main *bmain, Scene *scene, float time,
Object *parent)
+void AbcNurbsReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Curve *cu = static_cast<Curve *>(BKE_curve_add(bmain, "abc_curve",
OB_SURF));
@@ -301,14 +294,6 @@ void AbcNurbsReader::readObjectData(Main *bmain, Scene
*scene, float time, Objec
m_object = BKE_object_add(bmain, scene, OB_CURVE,
m_object_name.c_str());
m_object->data = cu;
-
- if (parent) {
- m_object->parent = parent;
-
- DAG_id_tag_update(&m_object->id, OB_RECALC_OB);
- DAG_relations_tag_update(bmain);
- WM_main_add_notifier(NC_OBJECT | ND_PARENT, m_object);
- }
}
void AbcNurbsReader::getNurbsPatches(const Alembic::Abc::IObject &obj)
diff --git a/source/blender/alembic/intern/abc_nurbs.h
b/source/blender/alembic/intern/abc_nurbs.h
index f8bbf69..d57f029 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -37,8 +37,6 @@ private:
virtual void do_write();
bool isAnimated() const;
-
- void writeNurbs();
};
class AbcNurbsReader : public AbcObjectReader {
@@ -49,7 +47,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time, Object
*parent);
+ void readObjectData(Main *bmain, Scene *scene, float time);
private:
void getNurbsPatches(const Alembic:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
