Page MenuHome
Differential D92 Diff 274 source/blender/collada/MeshImporter.cpp

Changeset View

Standalone View

View Options

source/blender/collada/MeshImporter.cpp

Context not available.
} }
UVDataWrapper::UVDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vdata) MVDataWrapper::MVDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vdata)
{ {
} }
Context not available.
} }
#endif #endif
void UVDataWrapper::getUV(int uv_index, float *uv) void MVDataWrapper::getUV(int uv_index, float *uv)
{ {
int stride = mVData->getStride(0); int stride = mVData->getStride(0);
if (stride == 0) stride = 2; if (stride == 0) stride = 2;
Context not available.
fprintf(stderr, "MeshImporter.getUV(): unknown data type\n"); fprintf(stderr, "MeshImporter.getUV(): unknown data type\n");
} }
} }
void MVDataWrapper::getvcol(int v_index, MLoopCol *mloopcol)
{
int stride = mVData->getStride(0);
if(stride == 0) stride =3;
switch (mVData->getType()) {
case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
{
COLLADAFW::ArrayPrimitiveType<float> *values = mVData->getFloatValues();
if (values->empty()) return;
mloopcol->r = FTOCHAR((*values)[v_index * stride]);
mloopcol->g = FTOCHAR((*values)[v_index * stride + 1]);
mloopcol->b = FTOCHAR((*values)[v_index * stride + 2]);
}
break;
case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
{
COLLADAFW::ArrayPrimitiveType<double> *values = mVData->getDoubleValues();
if (values->empty()) return;
mloopcol->r = FTOCHAR((*values)[v_index * stride]);
mloopcol->g = FTOCHAR((*values)[v_index * stride + 1]);
mloopcol->b = FTOCHAR((*values)[v_index * stride + 2]);
}
break;
case COLLADAFW::MeshVertexData::DATA_TYPE_UNKNOWN:
default:
fprintf(stderr, "MeshImporter.getvcol(): unknown data type\n");
gaiaclaryUnsubmitted
Not Done
Inline Actions

If the mVData->getType() can be converted into a meaningful string, then wouldn't it be more user friendly to write:


case COLLADAFW::MeshVertexData::DATA_TYPE_UNKNOWN:
fprintf(stderr, "MeshImporter.getvcol(): unknown data type\n");
default:
fprintf(stderr, "MeshImporter.getvcol(): unsupported data type %s\n", mVData->getType());

If there is no good way to create a meaningful datatype string, then imho you could remove line 201

gaiaclary: If the mVData->getType() can be converted into a meaningful string, then wouldn't it be more…
}
}
MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce) : unitconverter(unitconv), scene(sce), armature_importer(arm) { MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce) : unitconverter(unitconv), scene(sce), armature_importer(arm) {
} }
Context not available.
} }
} }
void MeshImporter::set_face_uv(MLoopUV *mloopuv, UVDataWrapper &uvs, void MeshImporter::set_vcol(MLoopCol *mlc, MVDataWrapper &vob, int loop_index, COLLADAFW::IndexList &index_list, int count)
{
COLLADAFW::UIntValuesArray& indices =index_list.getIndices();
int index;
for(index = 0; index < count; index++,mlc++)
{
int v_index = indices[index+loop_index];
vob.getvcol(v_index,mlc);
}
}
void MeshImporter::set_face_uv(MLoopUV *mloopuv, MVDataWrapper &uvs,
int start_index, COLLADAFW::IndexList& index_list, int count) int start_index, COLLADAFW::IndexList& index_list, int count)
{ {
// per face vertex indices, this means for quad we have 4 indices, not 8 // per face vertex indices, this means for quad we have 4 indices, not 8
Context not available.
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
#endif #endif
bool MeshImporter::has_vcolor(COLLADAFW::MeshPrimitive *mp)
{
bool hasvcolor = false;
if(mp->hasColorIndices())
hasvcolor = true;
return hasvcolor;
}
bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh) // checks if mesh has supported primitive types: lines, polylist, triangles, triangle_fans bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh) // checks if mesh has supported primitive types: lines, polylist, triangles, triangle_fans
{ {
Context not available.
me->mtpoly = (MTexPoly *)CustomData_get_layer_n(&me->pdata, CD_MTEXPOLY, 0); me->mtpoly = (MTexPoly *)CustomData_get_layer_n(&me->pdata, CD_MTEXPOLY, 0);
me->mloopuv = (MLoopUV *) CustomData_get_layer_n(&me->ldata, CD_MLOOPUV, 0); me->mloopuv = (MLoopUV *) CustomData_get_layer_n(&me->ldata, CD_MLOOPUV, 0);
} }
CustomData_add_layer(&me->ldata,CD_MLOOPCOL,CD_DEFAULT,NULL,me->totloop);
me->mloopcol = (MLoopCol *) CustomData_get_layer(&me->ldata,CD_MLOOPCOL);
gaiaclaryUnsubmitted
Not Done
Inline Actions

From where do we know that the mesh has vertex colors ? Isn't this unnecessary to do when no vcols are available ?

gaiaclary: From where do we know that the mesh has vertex colors ? Isn't this unnecessary to do when no…
} }
} }
Context not available.
allocate_poly_data(collada_mesh, me); allocate_poly_data(collada_mesh, me);
gaiaclaryUnsubmitted
Not Done
Inline Actions

Below this line something odd seems to happen with the whitespaces. In order to get an easier comparison, would it be possible to fix this ? (Probably just replace whitespaces by tabs ?)

gaiaclary: Below this line something odd seems to happen with the whitespaces. In order to get an easier…
UVDataWrapper uvs(collada_mesh->getUVCoords()); MVDataWrapper uvs(collada_mesh->getUVCoords());
MVDataWrapper vcol(collada_mesh->getColors());
gaiaclaryUnsubmitted
Not Done
Inline Actions

What happens if the mesh has no uvs or no vcols ?

gaiaclary: What happens if the mesh has no uvs or no vcols ?
MPoly *mpoly = me->mpoly; MPoly *mpoly = me->mpoly;
MLoop *mloop = me->mloop; MLoop *mloop = me->mloop;
Context not available.
COLLADAFW::MeshPrimitiveArray& prim_arr = collada_mesh->getMeshPrimitives(); COLLADAFW::MeshPrimitiveArray& prim_arr = collada_mesh->getMeshPrimitives();
COLLADAFW::MeshVertexData& nor = collada_mesh->getNormals(); COLLADAFW::MeshVertexData& nor = collada_mesh->getNormals();
MLoopCol *mloopcol = (MLoopCol *)CustomData_get_layer(&me->ldata,CD_MLOOPCOL);
for (i = 0; i < prim_arr.getCount(); i++) { for (i = 0; i < prim_arr.getCount(); i++) {
COLLADAFW::MeshPrimitive *mp = prim_arr[i]; COLLADAFW::MeshPrimitive *mp = prim_arr[i];
Context not available.
bool mp_has_normals = primitive_has_useable_normals(mp); bool mp_has_normals = primitive_has_useable_normals(mp);
bool mp_has_faces = primitive_has_faces(mp); bool mp_has_faces = primitive_has_faces(mp);
bool mp_has_vcolor = has_vcolor(mp);
gaiaclaryUnsubmitted
Not Done
Inline Actions

not needed imho (see below)

gaiaclary: not needed imho (see below)
int collada_meshtype = mp->getPrimitiveType(); int collada_meshtype = mp->getPrimitiveType();
// since we cannot set mpoly->mat_nr here, we store a portion of me->mpoly in Primitive // since we cannot set mpoly->mat_nr here, we store a portion of me->mpoly in Primitive
Primitive prim = {mpoly, 0}; Primitive prim = {mpoly, 0};
COLLADAFW::IndexListArray& index_list_array = mp->getUVCoordIndicesArray(); COLLADAFW::IndexListArray& index_list_array = mp->getUVCoordIndicesArray();
COLLADAFW::IndexListArray& index_list_array_vcolor =mp->getColorIndicesArray();
gaiaclaryUnsubmitted
Not Done
Inline Actions

Could this be moved just before line 691 ?

gaiaclary: Could this be moved just before line 691 ?
// If MeshPrimitive is TRIANGLE_FANS we split it into triangles // If MeshPrimitive is TRIANGLE_FANS we split it into triangles
// The first trifan vertex will be the first vertex in every triangle // The first trifan vertex will be the first vertex in every triangle
Context not available.
mpoly->flag |= ME_SMOOTH; mpoly->flag |= ME_SMOOTH;
normal_indices++; normal_indices++;
} }
mpoly++; mpoly++;
mloop += 3; mloop += 3;
Context not available.
if (!is_flat_face(normal_indices, nor, vcount)) if (!is_flat_face(normal_indices, nor, vcount))
mpoly->flag |= ME_SMOOTH; mpoly->flag |= ME_SMOOTH;
} }
if(mp_has_vcolor)
gaiaclaryUnsubmitted
Not Done
Inline Actions

if (has_vcolor(mp)) ...

gaiaclary: if (has_vcolor(mp)) ...
{
for(unsigned int vcolor_index = 0 ; vcolor_index < index_list_array_vcolor.getCount();vcolor_index++)
{
MLoopCol *mlc = mloopcol+mpoly->loopstart;
set_vcol(mlc, vcol, start_index, *index_list_array_vcolor[vcolor_index],vcount);
}
}
mpoly++; mpoly++;
mloop += vcount; mloop += vcount;
Context not available.