@@ -88,20 +88,20 @@ using VectorGrid = Vec3fGrid;
8888// / @name Lists of native Grid Types
8989// / @{
9090// / The floating point Grid types which OpenVDB will register by default.
91- using NativeFloatGridTypes = TypeList<FloatGrid, DoubleGrid>;
91+ using FloatGridTypes = TypeList<FloatGrid, DoubleGrid>;
9292// / The integer Grid types which OpenVDB will register by default.
93- using NativeIntegerGridTypes = TypeList<Int32Grid, Int64Grid>;
93+ using IntegerGridTypes = TypeList<Int32Grid, Int64Grid>;
9494// / The scalar Grid types which OpenVDB will register by default. This is a
9595// / combination of native floating point and integer grid types. Note that
9696// / this list does not include Bool or Mask Grids.
97- using NativeScalarGridTypes = NativeFloatGridTypes ::Append<NativeIntegerGridTypes >;
97+ using ScalarGridTypes = FloatGridTypes ::Append<IntegerGridTypes >;
9898// / The Vec3 Grid types which OpenVDB will register by default.
99- using NativeVec3GridTypes = TypeList<Vec3IGrid, Vec3SGrid, Vec3DGrid>;
99+ using Vec3GridTypes = TypeList<Vec3IGrid, Vec3SGrid, Vec3DGrid>;
100100
101101// / The Grid types which OpenVDB will register by default.
102- using NativeGridTypes =
103- NativeScalarGridTypes ::
104- Append<NativeVec3GridTypes >::
102+ using GridTypes =
103+ ScalarGridTypes ::
104+ Append<Vec3GridTypes >::
105105 Append<tools::PointIndexGrid>::
106106 // #define unfortunately required for one of the tests that removes this alias
107107#ifndef OPENVDB_DISABLE_POINT_DATA_TREE_ALIAS
@@ -114,15 +114,15 @@ using NativeGridTypes =
114114// / @name Lists of native TypedAttributeArray Types (for PointDataGrids)
115115// / @{
116116// / The floating point attribute array types which OpenVDB will register by default.
117- using NativeFloatAttributeTypes = TypeList<
117+ using FloatAttributeTypes = TypeList<
118118 points::TypedAttributeArray<float >,
119119 points::TypedAttributeArray<double >,
120120 points::TypedAttributeArray<float , points::TruncateCodec>,
121121 points::TypedAttributeArray<float , points::FixedPointCodec<true , points::UnitRange>>,
122122 points::TypedAttributeArray<float , points::FixedPointCodec<false , points::UnitRange>>
123123 >;
124124// / The integer attribute array types which OpenVDB will register by default.
125- using NativeIntegerAttributeTypes = TypeList<
125+ using IntegerAttributeTypes = TypeList<
126126 points::TypedAttributeArray<int8_t >,
127127 points::TypedAttributeArray<int16_t >,
128128 points::TypedAttributeArray<int32_t >,
@@ -131,10 +131,10 @@ using NativeIntegerAttributeTypes = TypeList<
131131// / The scalar attribute array types which OpenVDB will register by default.
132132// / This is a combination of native floating point and integer array types.
133133// / Note that this list does not include bool arrays.
134- using NativeScalarAttributeTypes =
135- NativeFloatAttributeTypes ::Append<NativeIntegerAttributeTypes >;
134+ using ScalarAttributeTypes =
135+ FloatAttributeTypes ::Append<IntegerAttributeTypes >;
136136// / The Vec3 attribute array types which OpenVDB will register by default.
137- using NativeVec3AttributeTypes = TypeList<
137+ using Vec3AttributeTypes = TypeList<
138138 points::TypedAttributeArray<math::Vec3<int32_t >>,
139139 points::TypedAttributeArray<math::Vec3<float >>,
140140 points::TypedAttributeArray<math::Vec3<double >>,
@@ -146,36 +146,36 @@ using NativeVec3AttributeTypes = TypeList<
146146 points::TypedAttributeArray<math::Vec3<float >, points::UnitVecCodec>
147147 >;
148148// / The Mat3 attribute array types which OpenVDB will register by default.
149- using NativeMat3AttributeTypes = TypeList<
149+ using Mat3AttributeTypes = TypeList<
150150 points::TypedAttributeArray<math::Mat3<float >>,
151151 points::TypedAttributeArray<math::Mat3<double >>
152152 >;
153153// / The Mat4 attribute array types which OpenVDB will register by default.
154- using NativeMat4AttributeTypes = TypeList<
154+ using Mat4AttributeTypes = TypeList<
155155 points::TypedAttributeArray<math::Mat4<float >>,
156156 points::TypedAttributeArray<math::Mat4<double >>
157157 >;
158158// / The Quat attribute array types which OpenVDB will register by default.
159- using NativeQuatAttributeTypes = TypeList<
159+ using QuatAttributeTypes = TypeList<
160160 points::TypedAttributeArray<math::Quat<float >>,
161161 points::TypedAttributeArray<math::Quat<double >>
162162 >;
163163
164164// / The attribute array types which OpenVDB will register by default.
165- using NativeAttributeTypes =
166- NativeScalarAttributeTypes ::
167- Append<NativeVec3AttributeTypes >::
168- Append<NativeMat3AttributeTypes >::
169- Append<NativeMat4AttributeTypes >::
170- Append<NativeQuatAttributeTypes >::
165+ using AttributeTypes =
166+ ScalarAttributeTypes ::
167+ Append<Vec3AttributeTypes >::
168+ Append<Mat3AttributeTypes >::
169+ Append<Mat4AttributeTypes >::
170+ Append<QuatAttributeTypes >::
171171 Append<points::GroupAttributeArray>::
172172 Append<points::StringAttributeArray>::
173173 Append<points::TypedAttributeArray<bool >>;
174174// / @}
175175
176176
177177// / The Map types which OpenVDB will register by default.
178- using NativeMapTypes = TypeList<
178+ using MapTypes = TypeList<
179179 math::AffineMap,
180180 math::UnitaryMap,
181181 math::ScaleMap,
@@ -187,7 +187,7 @@ using NativeMapTypes = TypeList<
187187
188188
189189// / The Metadata types which OpenVDB will register by default.
190- using NativeMetaTypes = TypeList<
190+ using MetaTypes = TypeList<
191191 BoolMetadata,
192192 DoubleMetadata,
193193 FloatMetadata,
0 commit comments