[Bf-blender-cvs] [a4f8e68] alembic_basic_io: Cleanup.
Kévin Dietrich
noreply at git.blender.org
Wed Apr 6 20:42:08 CEST 2016
Commit: a4f8e686bdd13fa3ef3f9fe85c80a20596935d46
Author: Kévin Dietrich
Date: Wed Apr 6 20:31:13 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBa4f8e686bdd13fa3ef3f9fe85c80a20596935d46
Cleanup.
===================================================================
M source/blender/alembic/ABC_alembic.h
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_hair.cc
M source/blender/alembic/intern/abc_hair.h
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
===================================================================
diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/alembic/ABC_alembic.h
index 30b8686..716d1c7 100644
--- a/source/blender/alembic/ABC_alembic.h
+++ b/source/blender/alembic/ABC_alembic.h
@@ -28,12 +28,6 @@ extern "C" {
#endif
struct bContext;
-struct Camera;
-struct Curve;
-struct DerivedMesh;
-struct Mesh;
-struct MVert;
-struct Object;
struct Scene;
#define BL_ABC_NO_ERR 0
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index 0a3e2fc..fb5366b 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -50,11 +50,12 @@ using Alembic::AbcGeom::OFloatProperty;
using Alembic::AbcGeom::CameraSample;
using Alembic::AbcGeom::kWrapExisting;
-AbcCameraWriter::AbcCameraWriter(Scene *sce, Object *obj,
+AbcCameraWriter::AbcCameraWriter(Scene *scene,
+ Object *ob,
AbcTransformWriter *parent,
uint32_t timeSampling,
AbcExportOptions &opts)
- : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
+ : AbcShapeWriter(scene, ob, parent, timeSampling, opts)
{
std::string name = get_object_name(m_object);
name.append("Shape");
diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h
index bb389e9..eb2c8ff 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -25,8 +25,6 @@
#include "abc_shape.h"
-class RenderData;
-
class AbcCameraWriter : public AbcShapeWriter {
Alembic::AbcGeom::OCameraSchema m_camera_schema;
Alembic::AbcGeom::CameraSample m_camera_sample;
@@ -35,7 +33,9 @@ class AbcCameraWriter : public AbcShapeWriter {
Alembic::AbcGeom::OFloatProperty m_eye_separation;
public:
- AbcCameraWriter(Scene *sce, Object *obj, AbcTransformWriter *parent,
+ AbcCameraWriter(Scene *scene,
+ Object *ob,
+ AbcTransformWriter *parent,
uint32_t timeSampling,
AbcExportOptions &opts);
diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc
index a489195..fec4a93 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -43,13 +43,13 @@ using Alembic::AbcGeom::OV2fGeomParam;
static const float nscale = 1.0f / 32767.0f;
-AbcHairWriter::AbcHairWriter(Scene *sce,
- Object *obj,
+AbcHairWriter::AbcHairWriter(Scene *scene,
+ Object *ob,
AbcTransformWriter *parent,
uint32_t timeSampling,
AbcExportOptions &opts,
ParticleSystem *psys)
- : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
+ : AbcShapeWriter(scene, ob, parent, timeSampling, opts)
{
std::string name = get_object_name(m_object);
name.append("Hair");
@@ -61,9 +61,6 @@ AbcHairWriter::AbcHairWriter(Scene *sce,
m_curves_schema = curves.getSchema();
}
-AbcHairWriter::~AbcHairWriter()
-{}
-
bool AbcHairWriter::isAnimated() const
{
return true;
diff --git a/source/blender/alembic/intern/abc_hair.h b/source/blender/alembic/intern/abc_hair.h
index 66db544..125da4a 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -39,10 +39,12 @@ class AbcHairWriter : public AbcShapeWriter {
Alembic::AbcGeom::OCurvesSchema::Sample m_curves_schema_sample;
public:
- AbcHairWriter(Scene *sce, Object *obj, AbcTransformWriter *parent,
- uint32_t timeSampling, AbcExportOptions &opts,
- ParticleSystem *psys);
- ~AbcHairWriter();
+ AbcHairWriter(Scene *scene,
+ Object *ob,
+ AbcTransformWriter *parent,
+ uint32_t timeSampling,
+ AbcExportOptions &opts,
+ ParticleSystem *psys);
private:
virtual void do_write();
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 18e8680..94f0ebc 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -86,12 +86,12 @@ using Alembic::AbcGeom::kVertexScope;
using Alembic::AbcGeom::kWrapExisting;
using Alembic::AbcGeom::UInt32ArraySample;
-AbcMeshWriter::AbcMeshWriter(Scene *sce,
- Object *obj,
+AbcMeshWriter::AbcMeshWriter(Scene *scene,
+ Object *ob,
AbcTransformWriter *parent,
uint32_t timeSampling,
AbcExportOptions &opts)
- : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
+ : AbcShapeWriter(scene, ob, parent, timeSampling, opts)
{
std::string name = get_object_name(m_object);
name.append("Shape");
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index 2c197cd..dd8aeb2 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -55,7 +55,12 @@ class AbcMeshWriter : public AbcShapeWriter {
Alembic::Abc::OArrayProperty m_velocity;
public:
- AbcMeshWriter(Scene *sce, Object *obj, AbcTransformWriter *parent, uint32_t timeSampling, AbcExportOptions &opts);
+ AbcMeshWriter(Scene *scene,
+ Object *ob,
+ AbcTransformWriter *parent,
+ uint32_t timeSampling,
+ AbcExportOptions &opts);
+
~AbcMeshWriter();
private:
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index 3917077..abc2218 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -62,12 +62,12 @@ using Alembic::AbcGeom::OCompoundProperty;
using Alembic::AbcGeom::ONuPatch;
using Alembic::AbcGeom::ONuPatchSchema;
-AbcNurbsWriter::AbcNurbsWriter(Scene *sce,
- Object *obj,
+AbcNurbsWriter::AbcNurbsWriter(Scene *scene,
+ Object *ob,
AbcTransformWriter *parent,
uint32_t timeSampling,
- AbcExportOptions& opts)
- : AbcShapeWriter(sce, obj, parent, timeSampling, opts)
+ AbcExportOptions &opts)
+ : AbcShapeWriter(scene, ob, parent, timeSampling, opts)
{
m_is_animated = isAnimated();
@@ -92,9 +92,6 @@ AbcNurbsWriter::AbcNurbsWriter(Scene *sce,
}
}
-AbcNurbsWriter::~AbcNurbsWriter()
-{}
-
bool AbcNurbsWriter::isAnimated() const
{
/* check if object has shape keys */
diff --git a/source/blender/alembic/intern/abc_nurbs.h b/source/blender/alembic/intern/abc_nurbs.h
index b47380d..cbb0a69 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -30,8 +30,11 @@ class AbcNurbsWriter : public AbcShapeWriter {
bool m_is_animated;
public:
- AbcNurbsWriter(Scene *sce, Object *obj, AbcTransformWriter *parent, uint32_t timeSampling, AbcExportOptions &opts);
- ~AbcNurbsWriter();
+ AbcNurbsWriter(Scene *scene,
+ Object *ob,
+ AbcTransformWriter *parent,
+ uint32_t timeSampling,
+ AbcExportOptions &opts);
private:
virtual void do_write();
More information about the Bf-blender-cvs
mailing list