[cgma-dev] r2706 - in cgm/trunk/itaps: . SIDL SIDL/gserver
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Thu Mar 12 16:25:27 CDT 2009
Author: kraftche
Date: 2009-03-12 16:25:26 -0500 (Thu, 12 Mar 2009)
New Revision: 2706
Modified:
cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc
cgm/trunk/itaps/SIDL/iBase.sidl
cgm/trunk/itaps/SIDL/iGeom.sidl
cgm/trunk/itaps/iBase.h
cgm/trunk/itaps/iGeom.h
cgm/trunk/itaps/iGeom_CGMA.cc
Log:
iGeom changes
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc 2009-03-12 21:25:26 UTC (rev 2706)
@@ -2348,7 +2348,7 @@
iGeom_SIDL::GeomSidl_impl::getArrBoundBox (
/* in */ ::sidl::array<void*> gentity_handles,
/* in */ int32_t gentity_handles_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& min_corner,
/* inout */ int32_t& min_corner_size,
/* inout */ ::sidl::array<double>& max_corner,
@@ -2361,10 +2361,9 @@
CREATE_TEMP_ARRAY(double, max_corner);
CREATE_TEMP_ARRAY(double, min_corner);
- int order = storage_order;
iGeom_getArrBoundBox (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
- &order,
+ storage_order,
TEMP_ARRAY_INOUT(min_corner),
TEMP_ARRAY_INOUT(max_corner),
&igeomError);
@@ -2372,7 +2371,6 @@
ASSIGN_TYPED_ARRAY(double, min_corner);
ASSIGN_TYPED_ARRAY(double, max_corner);
- storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrBoundBox)
}
@@ -2406,7 +2404,7 @@
iGeom_SIDL::GeomSidl_impl::getVtxArrCoords (
/* in */ ::sidl::array<void*> gentity_handles,
/* in */ int32_t gentity_handles_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& coordinates,
/* inout */ int32_t& coordinates_size )
throw (
@@ -2416,16 +2414,14 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxArrCoords} (getVtxArrCoords method)
CREATE_TEMP_ARRAY(double, coordinates);
- int order = storage_order;
iGeom_getVtxArrCoords (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
- &order,
+ storage_order,
TEMP_ARRAY_INOUT(coordinates),
&igeomError);
PROCESS_ERROR;
ASSIGN_TYPED_ARRAY(double, coordinates);
- storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxArrCoords)
}
@@ -2442,7 +2438,7 @@
/* in */ double dir_z,
/* inout */ ::sidl::array<void*>& intersect_entity_handles,
/* inout */ int32_t& intersect_entity_handles_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* inout */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& intersect_coords,
/* inout */ int32_t& intersect_coords_size,
/* inout */ ::sidl::array<double>& param_coords,
@@ -2456,16 +2452,14 @@
CREATE_TEMP_ARRAY(double, intersect_coords);
CREATE_TEMP_ARRAY(double, param_coords);
- int storage_order_tmp;
iGeom_getPntRayIntsct (igeomInstance, x, y, z, dir_x, dir_y, dir_z,
TEMP_ARRAY_INOUT( intersect_entity_handles ),
- &storage_order_tmp,
+ storage_order,
TEMP_ARRAY_INOUT( intersect_coords ),
TEMP_ARRAY_INOUT( param_coords ),
&igeomError );
PROCESS_ERROR;
- storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
ASSIGN_TYPED_ARRAY(void*, intersect_entity_handles);
ASSIGN_TYPED_ARRAY(double, intersect_coords);
ASSIGN_TYPED_ARRAY(double, param_coords);
@@ -2499,7 +2493,6 @@
CREATE_TEMP_ARRAY(int32_t, offset);
CREATE_TEMP_ARRAY(double, intersect_coords);
CREATE_TEMP_ARRAY(double, param_coords);
- int order = storage_order;
iGeom_getPntArrRayIntsct (igeomInstance,
storage_order,
TEMP_ARRAY_IN( coords ),
@@ -2515,7 +2508,6 @@
ASSIGN_TYPED_ARRAY(int32_t, offset);
ASSIGN_TYPED_ARRAY(double, intersect_coords);
ASSIGN_TYPED_ARRAY(double, param_coords);
- storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getPntArrRayIntsct)
}
@@ -2891,7 +2883,7 @@
/* in */ int32_t entity_handles_size,
/* in */ ::sidl::array<double> u,
/* in */ int32_t u_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& on_coords,
/* inout */ int32_t& on_coords_size )
throw (
@@ -2900,15 +2892,13 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrUtoXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUtoXYZ} (getArrUtoXYZ method)
CREATE_TEMP_ARRAY(double, on_coords);
- int order = storage_order;
iGeom_getArrUtoXYZ (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
TEMP_TYPED_ARRAY_IN(double,u),
- &order,
+ storage_order,
TEMP_ARRAY_INOUT(on_coords),
&igeomError);
PROCESS_ERROR;
- storage_order = (::iBase::StorageOrder)order;
ASSIGN_TYPED_ARRAY(double, on_coords);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUtoXYZ)
}
@@ -2979,7 +2969,6 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoUV} (getArrXYZtoUV method)
CREATE_TEMP_ARRAY(double, uv);
- int order = storage_order;
iGeom_getArrXYZtoUV (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
storage_order,
@@ -2988,7 +2977,6 @@
&igeomError);
PROCESS_ERROR;
- storage_order = (::iBase::StorageOrder)order;
ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoUV)
}
@@ -3011,7 +2999,6 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoU} (getArrXYZtoU method)
CREATE_TEMP_ARRAY(double, u);
- int order = storage_order;
iGeom_getArrXYZtoU (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
storage_order,
@@ -3020,7 +3007,6 @@
&igeomError);
PROCESS_ERROR;
- storage_order = (::iBase::StorageOrder)order;
ASSIGN_TYPED_ARRAY(double, u);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoU)
}
@@ -3065,7 +3051,6 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoUVHint)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoUVHint} (getArrXYZtoUVHint method)
CREATE_TEMP_ARRAY(double, uv);
- int order = storage_order;
iGeom_getArrXYZtoUVHint (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
storage_order,
@@ -3073,8 +3058,6 @@
TEMP_ARRAY_INOUT(uv),
&igeomError);
PROCESS_ERROR;
-
- storage_order = (::iBase::StorageOrder)order;
ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoUVHint)
}
@@ -3134,7 +3117,7 @@
iGeom_SIDL::GeomSidl_impl::getArrUVRange (
/* in */ ::sidl::array<void*> gentity_handles,
/* in */ int32_t gentity_handles_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& uv_min,
/* inout */ int32_t& uv_min_size,
/* inout */ ::sidl::array<double>& uv_max,
@@ -3146,16 +3129,13 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUVRange} (getArrUVRange method)
CREATE_TEMP_ARRAY(double, uv_max);
CREATE_TEMP_ARRAY(double, uv_min);
- int order = storage_order;
iGeom_getArrUVRange (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
- &order,
+ storage_order,
TEMP_ARRAY_INOUT(uv_min),
TEMP_ARRAY_INOUT(uv_max),
&igeomError);
PROCESS_ERROR;
-
- storage_order = (::iBase::StorageOrder)order;
ASSIGN_TYPED_ARRAY(double, uv_max);
ASSIGN_TYPED_ARRAY(double, uv_min);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUVRange)
@@ -3272,7 +3252,7 @@
/* in */ int32_t face_handles_size,
/* in */ ::sidl::array<double> u_in,
/* in */ int32_t u_in_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& uv,
/* inout */ int32_t& uv_size )
throw (
@@ -3281,16 +3261,14 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrUtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUtoUV} (getArrUtoUV method)
CREATE_TEMP_ARRAY(double, uv);
- int storage_order_tmp;
iGeom_getArrUtoUV (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
TEMP_ARRAY_IN(u_in),
- &storage_order_tmp,
+ storage_order,
TEMP_ARRAY_INOUT(uv),
&igeomError);
PROCESS_ERROR;
- storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUtoUV)
}
@@ -3304,7 +3282,7 @@
/* in */ int32_t vertex_handles_size,
/* in */ ::sidl::array<void*> face_handles,
/* in */ int32_t face_handles_size,
- /* inout */ ::iBase::StorageOrder& storage_order,
+ /* in */ ::iBase::StorageOrder storage_order,
/* inout */ ::sidl::array<double>& uv,
/* inout */ int32_t& uv_size )
throw (
@@ -3313,15 +3291,13 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getVtxArrToUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxArrToUV} (getVtxArrToUV method)
CREATE_TEMP_ARRAY(double, uv);
- int storage_order_tmp;
iGeom_getVtxArrToUV (igeomInstance,
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,vertex_handles),
TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
- &storage_order_tmp,
+ storage_order,
TEMP_ARRAY_INOUT(uv),
&igeomError);
PROCESS_ERROR;
- storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxArrToUV)
}
Modified: cgm/trunk/itaps/SIDL/iBase.sidl
===================================================================
--- cgm/trunk/itaps/SIDL/iBase.sidl 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/SIDL/iBase.sidl 2009-03-12 21:25:26 UTC (rev 2706)
@@ -28,8 +28,7 @@
enum StorageOrder {
BLOCKED,
- INTERLEAVED,
- UNDETERMINED
+ INTERLEAVED
};
enum CreationStatus {
Modified: cgm/trunk/itaps/SIDL/iGeom.sidl
===================================================================
--- cgm/trunk/itaps/SIDL/iGeom.sidl 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/SIDL/iGeom.sidl 2009-03-12 21:25:26 UTC (rev 2706)
@@ -382,7 +382,7 @@
*/
void getArrBoundBox(in array<opaque> gentity_handles,
in int gentity_handles_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array <double> min_corner,
out int min_corner_size,
inout array <double> max_corner,
@@ -403,7 +403,7 @@
*/
void getVtxArrCoords(in array<opaque> gentity_handles,
in int gentity_handles_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array <double> coordinates,
out int coordinates_size)
throws iBase.Error;
@@ -413,7 +413,7 @@
in double dir_x, in double dir_y, in double dir_z,
inout array<opaque> intersect_entity_handles,
out int intersect_entity_handles_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array<double> intersect_coords,
out int intersect_coords_size,
inout array<double> param_coords,
@@ -593,7 +593,7 @@
in int entity_handles_size,
in array<double> u,
in int u_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array<double> on_coords,
out int on_coords_size
) throws iBase.Error;
@@ -669,7 +669,7 @@
*/
void getArrUVRange(in array<opaque> gentity_handles,
in int gentity_handles_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array <double> uv_min,
out int uv_min_size,
inout array <double> uv_max,
@@ -702,7 +702,7 @@
in array<opaque> face_handles,
in int face_handles_size,
in array<double> u_in, in int u_in_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array<double> uv, out int uv_size
) throws iBase.Error;
@@ -711,7 +711,7 @@
in int vertex_handles_size,
in array<opaque> face_handles,
in int face_handles_size,
- inout iBase.StorageOrder storage_order,
+ in iBase.StorageOrder storage_order,
inout array<double> uv, out int uv_size
) throws iBase.Error;
Modified: cgm/trunk/itaps/iBase.h
===================================================================
--- cgm/trunk/itaps/iBase.h 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/iBase.h 2009-03-12 21:25:26 UTC (rev 2706)
@@ -114,8 +114,7 @@
*/
enum iBase_StorageOrder {
iBase_BLOCKED,
- iBase_INTERLEAVED,
- iBase_UNDETERMINED
+ iBase_INTERLEAVED
};
/*==========================================================
Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/iGeom.h 2009-03-12 21:25:26 UTC (rev 2706)
@@ -906,7 +906,7 @@
void iGeom_getArrBoundBox( iGeom_Instance,
iBase_EntityHandle const* entity_handles,
int entity_handles_size,
- int* storage_order,
+ int storage_order,
double** min_corner,
int* min_corner_allocated,
int* min_corner_size,
@@ -943,8 +943,7 @@
* \param vertex_handles Array of geom vertex handles whose coordinates are
* being requested
* \param vertex_handles_size Number of vertices in vertex_handles array
- * \param storage_order Pointer to storage order requested/returned from
- * function
+ * \param storage_order Storage order requested for coordinate data
* \param *coords Pointer to array of coordinates returned from function
* \param *coords_allocated Pointer to allocated size of coords array
* \param *coords_size Pointer to occupied size of coords array
@@ -953,7 +952,7 @@
void iGeom_getVtxArrCoords( iGeom_Instance,
iBase_EntityHandle const* entity_handles,
int entity_handles_size,
- int* storage_order,
+ int storage_order,
double** coordinates,
int* coordinates_allocated,
int* coordinates_size,
@@ -990,7 +989,7 @@
iBase_EntityHandle** intersect_entity_handles,
int* intersect_entity_handles_allocated,
int* intersect_entity_hangles_size,
- int* storage_order,
+ int storage_order,
double** intersect_coords,
int* intersect_coords_allocated,
int* intersect_coords_size,
@@ -1279,7 +1278,7 @@
* with respect to implementation.
* \param entity_handles Entities being queried
* \param entity_handles_size Number of entities being queried
- * \param storage_order Storage order of uv coordinates input
+ * \param storage_order Storage order of uv coordinates input and xyz coordinate output
* \param uv Coordinates being queried
* \param uv_size Number of coordinates in array
* \param coordinates Coordinates of parametric positions
@@ -1322,7 +1321,7 @@
* with respect to implementation.
* \param entity_handles Entities being queried
* \param entity_handles_size Number of entities being queried
- * \param storage_order Storage order of uv coordinates input
+ * \param storage_order Storage order of resulting coordinates
* \param uv Coordinates being queried
* \param uv_size Number of coordinates in array
* \param coordinates Coordinates of parametric positions
@@ -1334,7 +1333,7 @@
int entity_handles_size,
double const* u,
int u_size,
- int* storage_order,
+ int storage_order,
double** on_coords,
int* on_coords_allocated,
int* on_coords_size,
@@ -1518,7 +1517,7 @@
void iGeom_getArrUVRange( iGeom_Instance,
iBase_EntityHandle const* entity_handles,
int entity_handles_size,
- int* storage_order,
+ int storage_order,
double** uv_min,
int* uv_min_allocated,
int* uv_min_size,
@@ -1612,7 +1611,7 @@
int face_handles_size,
double const* u_in,
int u_in_size,
- int* storage_order,
+ int storage_order,
double** uv,
int* uv_allocated,
int* uv_size,
@@ -1634,7 +1633,7 @@
int vertex_handles_size,
iBase_EntityHandle const* face_handles,
int face_handles_size,
- int* storage_order,
+ int storage_order,
double** uv,
int* uv_allocated,
int* uv_size,
Modified: cgm/trunk/itaps/iGeom_CGMA.cc
===================================================================
--- cgm/trunk/itaps/iGeom_CGMA.cc 2009-03-12 17:54:50 UTC (rev 2705)
+++ cgm/trunk/itaps/iGeom_CGMA.cc 2009-03-12 21:25:26 UTC (rev 2706)
@@ -2819,7 +2819,7 @@
iGeom_getArrBoundBox (iGeom_Instance instance,
/*in*/ const iBase_EntityHandle *gentity_handles,
int gentity_handles_size,
- /*inout*/ int* storage_order,
+ /*in*/ int storage_order,
/*out*/ double **min_corner,
int *min_corner_allocated,
int *min_corner_size,
@@ -2833,12 +2833,11 @@
CHECK_SIZE(*max_corner, double, 3*gentity_handles_size);
size_t step, init;
- if (*storage_order == iBase_BLOCKED) {
+ if (storage_order == iBase_BLOCKED) {
step = 1;
init = gentity_handles_size;
}
else {
- *storage_order = iBase_INTERLEAVED;
step = 3;
init = 1;
}
@@ -2899,7 +2898,7 @@
iGeom_getVtxArrCoords (iGeom_Instance instance,
/*in*/ const iBase_EntityHandle *gentity_handles,
int gentity_handles_size,
- /*inout*/ int* storage_order,
+ /*in*/ int storage_order,
/*out*/ double **coordinates,
int *coordinates_allocated,
int *coordinates_size,
@@ -2915,14 +2914,13 @@
double *x, *y, *z;
size_t step;
- if (*storage_order == iBase_BLOCKED) {
+ if (storage_order == iBase_BLOCKED) {
x = *coordinates;
y = x + gentity_handles_size;
z = y + gentity_handles_size;
step = 1;
}
else {
- *storage_order = iBase_INTERLEAVED;
x = *coordinates;
y = x + 1;
z = x + 2;
@@ -2961,7 +2959,7 @@
/*inout*/ iBase_EntityHandle **intersect_entity_handles,
int *intersect_entity_handles_allocated,
int *intersect_entity_handles_size,
- /*inout*/ int* storage_order,
+ /*in*/ int storage_order,
/*inout*/ double **intersect_coords,
int *intersect_coords_allocated,
int *intersect_coords_size,
@@ -2982,12 +2980,11 @@
CHECK_SIZE( *param_coords, double, ray_params.size() );
size_t init, step;
- if (*storage_order == iBase_BLOCKED) {
+ if (storage_order == iBase_BLOCKED) {
init = ray_params.size();
step = 1;
}
else {
- *storage_order = iBase_INTERLEAVED;
init = 1;
step = 3;
}
@@ -3965,7 +3962,7 @@
int gentity_handles_size,
/*in*/ const double *u,
int u_size,
- /*inout*/ int* storage_order,
+ /*in*/ int storage_order,
/*out*/ double **coordinates,
int *coordinates_allocated,
int *coordinates_size,
@@ -3997,13 +3994,12 @@
double *x, *y, *z;
u_iter = u;
x = *coordinates;
- if (*storage_order == iBase_BLOCKED) {
+ if (storage_order == iBase_BLOCKED) {
y = x + count;
z = y + count;
coord_step = 1;
}
else {
- *storage_order = iBase_INTERLEAVED;
y = x + 1;
z = x + 2;
coord_step = 3;
@@ -4380,7 +4376,7 @@
iGeom_getArrUVRange (iGeom_Instance instance,
/*in*/ iBase_EntityHandle const *gentity_handles,
int gentity_handles_size,
- /*in*/ int* storage_order,
+ /*in*/ int storage_order,
/*out*/ double **uv_min,
int *uv_min_allocated,
int *uv_min_size,
@@ -4393,12 +4389,11 @@
CHECK_SIZE(*uv_max, double, 2*gentity_handles_size);
size_t init, step;
- if (*storage_order == iBase_BLOCKED) {
+ if (storage_order == iBase_BLOCKED) {
init = gentity_handles_size;
step = 1;
}
else {
- *storage_order = iBase_INTERLEAVED;
init = 1;
step = 2;
}
@@ -4481,7 +4476,7 @@
int face_handles_size,
/*in*/ const double *in_u,
int in_u_size,
- /*inout*/ int *storage_order,
+ /*in*/ int storage_order,
/*inout*/ double **uv,
int *uv_allocated,
int *uv_size,
@@ -4507,7 +4502,7 @@
int vertex_handles_size,
/*in*/ iBase_EntityHandle const *face_handles,
int face_handles_size,
- /*inout*/ int *storage_order,
+ /*in*/ int storage_order,
/*inout*/ double **uv,
int *uv_allocated,
int *uv_size,
@@ -4726,7 +4721,7 @@
int* err)
{
iGeom_getArrUtoXYZ(instance, ARRAY_IN(gedge_handles),
- ARRAY_IN(parameters), &storage_order,
+ ARRAY_IN(parameters), storage_order,
ARRAY_INOUT(tangents), err);
if (iBase_SUCCESS == *err)
iGeom_getArrNrmlXYZ(instance, ARRAY_IN(gedge_handles), storage_order,
More information about the cgma-dev
mailing list