Skip to content

Commit ea2f249

Browse files
committed
Remove MotionPrimitive
This is yet another class that doesn't play any part in Gaffer's scene representation.
1 parent 73191c9 commit ea2f249

File tree

12 files changed

+3
-605
lines changed

12 files changed

+3
-605
lines changed

Changes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Breaking Changes
1515
- Renderable : Removed `render()` method.
1616
- CoordinateSystem : Removed transform.
1717
- Font : Removed `meshGroup()` method.
18-
- Options, Group, Transform, MatrixTransform, MatrixMotionTransform, AttributeState, Light : Removed.
18+
- Options, Group, Transform, MatrixTransform, MatrixMotionTransform, AttributeState, Light, MotionPrimitive : Removed.
1919
- CurveExtrudeOp, IDXReader : Removed.
2020
- PreWorldRenderable : Removed. All derived classes now derive directly from Renderable.
2121
- Renderer, AttributeBlock, EditBlock, MotionBlock, TransformBlock, WorldBlock : Removed.

include/IECoreScene/MotionPrimitive.h

Lines changed: 0 additions & 92 deletions
This file was deleted.

include/IECoreScene/TypeIds.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum TypeId
5151
PrimitiveOpTypeId = 108008,
5252
ParticleReaderTypeId = 108009,
5353
ParticleWriterTypeId = 108010,
54-
MotionPrimitiveTypeId = 108011,
54+
MotionPrimitiveTypeId = 108011, // Obsolete, available for reuse
5555
TransformTypeId = 108012, // Obsolete, available for reuse
5656
MatrixTransformTypeId = 108013, // Obsolete, available for reuse
5757
MotionTransformTypeId = 108014, // Obsolete, available for reuse
@@ -71,7 +71,7 @@ enum TypeId
7171
MatrixTransformParameterTypeId = 108028, // Obsolete, available for reuse
7272
VisibleRenderableParameterTypeId = 108029,
7373
GroupParameterTypeId = 108030, // Obsolete, available for reuse
74-
MotionPrimitiveParameterTypeId = 108031,
74+
MotionPrimitiveParameterTypeId = 108031, // Obsolete, available for reuse
7575
PrimitiveParameterTypeId = 108032,
7676
MeshPrimitiveParameterTypeId = 108033,
7777
PointsPrimitiveParameterTypeId = 108034,

include/IECoreScene/TypedPrimitiveParameter.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,16 @@
4040
namespace IECoreScene
4141
{
4242

43-
IE_CORE_FORWARDDECLARE( MotionPrimitive )
4443
IE_CORE_FORWARDDECLARE( Primitive )
4544
IE_CORE_FORWARDDECLARE( MeshPrimitive )
4645
IE_CORE_FORWARDDECLARE( CurvesPrimitive )
4746
IE_CORE_FORWARDDECLARE( PointsPrimitive )
4847

49-
typedef IECore::TypedObjectParameter<MotionPrimitive> MotionPrimitiveParameter;
5048
typedef IECore::TypedObjectParameter<Primitive> PrimitiveParameter;
5149
typedef IECore::TypedObjectParameter<MeshPrimitive> MeshPrimitiveParameter;
5250
typedef IECore::TypedObjectParameter<CurvesPrimitive> CurvesPrimitiveParameter;
5351
typedef IECore::TypedObjectParameter<PointsPrimitive> PointsPrimitiveParameter;
5452

55-
IE_CORE_DECLAREPTR( MotionPrimitiveParameter );
5653
IE_CORE_DECLAREPTR( PrimitiveParameter );
5754
IE_CORE_DECLAREPTR( MeshPrimitiveParameter );
5855
IE_CORE_DECLAREPTR( CurvesPrimitiveParameter );

src/IECoreScene/MotionPrimitive.cpp

Lines changed: 0 additions & 204 deletions
This file was deleted.

src/IECoreScene/TypedPrimitiveParameter.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
#include "IECoreScene/CurvesPrimitive.h"
3838
#include "IECoreScene/MeshPrimitive.h"
39-
#include "IECoreScene/MotionPrimitive.h"
4039
#include "IECoreScene/PointsPrimitive.h"
4140
#include "IECoreScene/Primitive.h"
4241

@@ -45,13 +44,11 @@
4544
namespace IECore
4645
{
4746

48-
IECORE_RUNTIMETYPED_DEFINETEMPLATESPECIALISATION( IECoreScene::MotionPrimitiveParameter, IECoreScene::MotionPrimitiveParameterTypeId );
4947
IECORE_RUNTIMETYPED_DEFINETEMPLATESPECIALISATION( IECoreScene::PrimitiveParameter, IECoreScene::PrimitiveParameterTypeId );
5048
IECORE_RUNTIMETYPED_DEFINETEMPLATESPECIALISATION( IECoreScene::MeshPrimitiveParameter, IECoreScene::MeshPrimitiveParameterTypeId );
5149
IECORE_RUNTIMETYPED_DEFINETEMPLATESPECIALISATION( IECoreScene::CurvesPrimitiveParameter, IECoreScene::CurvesPrimitiveParameterTypeId );
5250
IECORE_RUNTIMETYPED_DEFINETEMPLATESPECIALISATION( IECoreScene::PointsPrimitiveParameter, IECoreScene::PointsPrimitiveParameterTypeId );
5351

54-
template class TypedObjectParameter<IECoreScene::MotionPrimitive>;
5552
template class TypedObjectParameter<IECoreScene::Primitive>;
5653
template class TypedObjectParameter<IECoreScene::MeshPrimitive>;
5754
template class TypedObjectParameter<IECoreScene::CurvesPrimitive>;

src/IECoreScene/bindings/IECoreScene.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
#include "MeshPrimitiveShrinkWrapOpBinding.h"
6363
#include "MeshVertexReorderOpBinding.h"
6464
#include "MixSmoothSkinningWeightsOpBinding.h"
65-
#include "MotionPrimitiveBinding.h"
6665
#include "NParticleReaderBinding.h"
6766
#include "NURBSPrimitiveBinding.h"
6867
#include "NormalizeSmoothSkinningWeightsOpBinding.h"
@@ -128,7 +127,6 @@ BOOST_PYTHON_MODULE(_IECoreScene)
128127
bindShaderNetworkAlgo();
129128
bindPrimitiveOp();
130129
bindMeshPrimitive();
131-
bindMotionPrimitive();
132130
bindCamera();
133131
bindNURBSPrimitive();
134132
bindMeshPrimitiveBuilder();

0 commit comments

Comments
 (0)