[Bf-blender-cvs] [2270438] alembic_basic_io: Various cleanups:
Kévin Dietrich
noreply at git.blender.org
Fri Jun 3 13:30:00 CEST 2016
Commit: 22704382dd27525ee28f5bf76f28ea18fff8ca05
Author: Kévin Dietrich
Date: Fri Jun 3 12:04:56 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB22704382dd27525ee28f5bf76f28ea18fff8ca05
Various cleanups:
- move AbcEmptyReader to abc_transform.cc/h
- use pragmas for includes
- add separators in the code to help keeping things separated.
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_export_options.h
M source/blender/alembic/intern/abc_exporter.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
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_points.cc
M source/blender/alembic/intern/abc_points.h
M source/blender/alembic/intern/abc_shape.cc
M source/blender/alembic/intern/abc_shape.h
M source/blender/alembic/intern/abc_transform.cc
M source/blender/alembic/intern/abc_transform.h
M source/blender/alembic/intern/abc_util.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index f1645cd..1d532c6 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -51,6 +51,8 @@ using Alembic::AbcGeom::OFloatProperty;
using Alembic::AbcGeom::CameraSample;
using Alembic::AbcGeom::kWrapExisting;
+/* ************************************************************************** */
+
AbcCameraWriter::AbcCameraWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
@@ -111,7 +113,7 @@ void AbcCameraWriter::do_write()
m_camera_schema.set(m_camera_sample);
}
-/* ****************************** camera reader ***************************** */
+/* ************************************************************************** */
AbcCameraReader::AbcCameraReader(const Alembic::Abc::IObject &object, ImportSettings &settings)
: AbcObjectReader(object, settings)
diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h
index 866c6c3..5ed59de 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -20,11 +20,12 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __ABC_CAMERA_WRITER_H__
-#define __ABC_CAMERA_WRITER_H__
+#pragma once
#include "abc_shape.h"
+/* ************************************************************************** */
+
class AbcCameraWriter : public AbcShapeWriter {
Alembic::AbcGeom::OCameraSchema m_camera_schema;
Alembic::AbcGeom::CameraSample m_camera_sample;
@@ -43,6 +44,8 @@ private:
virtual void do_write();
};
+/* ************************************************************************** */
+
class AbcCameraReader : public AbcObjectReader {
Alembic::AbcGeom::ICameraSchema m_schema;
@@ -53,5 +56,3 @@ public:
void readObjectData(Main *bmain, Scene *scene, float time);
};
-
-#endif /* __ABC_CAMERA_WRITER_H__ */
diff --git a/source/blender/alembic/intern/abc_export_options.h b/source/blender/alembic/intern/abc_export_options.h
index ced2f53..1d9b699 100644
--- a/source/blender/alembic/intern/abc_export_options.h
+++ b/source/blender/alembic/intern/abc_export_options.h
@@ -20,8 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __ABC_EXPORT_OPTIONS_H__
-#define __ABC_EXPORT_OPTIONS_H__
+#pragma once
struct Object;
struct Scene;
@@ -66,5 +65,3 @@ struct ExportSettings {
Scene *scene;
};
-
-#endif /* __ABC_EXPORT_OPTIONS_H__ */
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 1bb126a..53078c5 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -20,8 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __ABC_EXPORTER_H__
-#define __ABC_EXPORTER_H__
+#pragma once
#include <map>
#include <vector>
@@ -73,5 +72,3 @@ private:
bool objectIsShape(Object *ob);
bool objectIsSmokeSim(Object *ob);
};
-
-#endif /* __ABC_EXPORTER_H__ */
diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc
index 1fd6de6..723a3dd 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -60,6 +60,8 @@ using Alembic::AbcGeom::OV2fGeomParam;
static const float nscale = 1.0f / 32767.0f;
+/* ************************************************************************** */
+
AbcHairWriter::AbcHairWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
@@ -295,6 +297,8 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm,
}
}
+/* ************************************************************************** */
+
AbcHairReader::AbcHairReader(const Alembic::Abc::IObject &object, ImportSettings &settings)
: AbcObjectReader(object, settings)
{
@@ -307,7 +311,6 @@ bool AbcHairReader::valid() const
return m_curves_schema.valid();
}
-
void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Curve *cu = BKE_curve_add(bmain, m_data_name.c_str(), OB_CURVE);
diff --git a/source/blender/alembic/intern/abc_hair.h b/source/blender/alembic/intern/abc_hair.h
index c475e0d..3470548 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -20,18 +20,17 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __ABC_HAIR_WRITER_H__
-#define __ABC_HAIR_WRITER_H__
+#pragma once
#include "abc_object.h"
#include "abc_shape.h"
-struct CustomDataLayer;
struct DerivedMesh;
-struct ModifierData;
struct ParticleSettings;
struct ParticleSystem;
+/* ************************************************************************** */
+
class AbcHairWriter : public AbcShapeWriter {
ParticleSystem *m_psys;
@@ -64,6 +63,8 @@ private:
std::vector<int32_t> &hvertices);
};
+/* ************************************************************************** */
+
class AbcHairReader : public AbcObjectReader {
Alembic::AbcGeom::ICurvesSchema m_curves_schema;
@@ -74,5 +75,3 @@ public:
void readObjectData(Main *bmain, Scene *scene, float time);
};
-
-#endif /* __ABC_HAIR_WRITER_H__ */
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 8092aff..c658c99 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -92,6 +92,8 @@ using Alembic::AbcGeom::kVertexScope;
using Alembic::AbcGeom::kWrapExisting;
using Alembic::AbcGeom::UInt32ArraySample;
+/* ************************************************************************** */
+
AbcMeshWriter::AbcMeshWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
@@ -456,8 +458,6 @@ void AbcMeshWriter::getPoints(DerivedMesh *dm, std::vector<float> &points)
points.push_back(verts[i].co[2]);
points.push_back(-verts[i].co[1]);
}
-
- calcBounds(points);
}
void AbcMeshWriter::getTopology(DerivedMesh *dm,
@@ -956,7 +956,7 @@ void AbcMeshWriter::getGeoGroups(
}
}
-/* ******************************* mesh reader ****************************** */
+/* ************************************************************************** */
/* Some helpers for mesh generation */
namespace utils {
@@ -1095,7 +1095,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string
} /* namespace utils */
-/* ****************************** AbcMeshReader ***************************** */
+/* ************************************************************************** */
AbcMeshReader::AbcMeshReader(const IObject &object, ImportSettings &settings, bool is_subd)
: AbcObjectReader(object, settings)
@@ -1243,7 +1243,7 @@ void AbcMeshReader::readFaceSetsSample(Main *bmain, Mesh *mesh, size_t poly_star
utils::assign_materials(bmain, m_object, mat_map);
}
-/* ********************************************************** */
+/* ************************************************************************** */
void read_mverts(MVert *mverts, const Alembic::AbcGeom::P3fArraySamplePtr &positions)
{
@@ -1287,19 +1287,3 @@ void read_mpolys(MPoly *mpolys, MLoop *mloops, MLoopUV *mloopuvs,
}
}
}
-
-/* ***************************** AbcEmptyReader ***************************** */
-
-AbcEmptyReader::AbcEmptyReader(const Alembic::Abc::IObject &object, ImportSettings &settings)
- : AbcObjectReader(object, settings)
-{}
-
-bool AbcEmptyReader::valid() const
-{
- return true; // TODO? m_schema.valid();
-}
-
-void AbcEmptyReader::readObjectData(Main *bmain, Scene *scene, float /*time*/)
-{
- m_object = BKE_object_add(bmain, scene, OB_EMPTY, m_object_name.c_str());
-}
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index 3588a30..58cd11c 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -20,8 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __ABC_MESH_WRITER_H__
-#define __ABC_MESH_WRITER_H__
+#pragma once
#include "abc_shape.h"
@@ -29,6 +28,8 @@ struct DerivedMesh;
struct Mesh;
struct ModifierData;
+/* ************************************************************************** */
+
class AbcMeshWriter : public AbcShapeWriter {
Alembic::AbcGeom::OPolyMeshSchema m_mesh_schema;
Alembic::AbcGeom::OPolyMeshSchema::Sample m_mesh_sample;
@@ -104,6 +105,8 @@ private:
void getVelocities(DerivedMesh *dm, std::vector<float> &vels);
};
+/* ************************************************************************** */
+
class AbcMeshReader : public AbcObjectReader {
Alembic::AbcGeom::IPolyMeshSchema m_schema;
Alembic::AbcGeom::ISubDSchema m_subd_schema;
@@ -127,7 +130,7 @@ private:
const Alembic::AbcGeom::P3fArraySamplePtr &positions);
};
-/* *********************************** */
+/* ************************************************************************** */
struct MLoop;
struct MLoopUV;
@@ -145,18 +148,3 @@ namespace utils {
void mesh_add_verts(struct Mesh *mesh, size_t len);
}
-
-/* *********************************** */
-
-class AbcEmptyReader : public AbcObjectReader {
- Alembic::AbcGeom::IXformSchema m_schema;
-
-public:
- AbcEmptyReader(const Alembic::Abc::IObject &object, ImportSettings &settings);
-
- bool valid() const;
-
- 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 fd97f4f..a58bd5c 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -62,6 +62,8 @@ using Alembic::AbcGeom::OCompoundProperty;
using Alembic::AbcGeom::ONuPatch;
using Alembic::AbcGeom::ONuPatchSchema;
+/* ************************************************************************** */
+
AbcNurbsWriter::AbcNurbsWriter(Scene *scene,
Object *ob,
AbcTr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list