|
From: <kin...@us...> - 2004-02-10 04:45:42
|
Update of /cvsroot/teem/teem/src/limn/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16344/test Modified Files: off2eps.c soid.c Log Message: final testing Index: off2eps.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/test/off2eps.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** off2eps.c 9 Feb 2004 23:47:32 -0000 1.3 --- off2eps.c 10 Feb 2004 04:42:19 -0000 1.4 *************** *** 112,115 **** --- 112,120 ---- airMopError(mop); return 1; } + if (describe) { + fprintf(stdout, "----------------- POST-READ -----------------\n"); + limnObjectDescribe(stdout, obj); + fprintf(stdout, "----------------- POST-READ -----------------\n"); + } win = limnWindowNew(limnDevicePS); win->ps.lineWidth[limnEdgeTypeBackFacet] = edgeWidth[0]; *************** *** 137,141 **** --- 142,148 ---- if (describe) { + fprintf(stdout, "----------------- POST-RENDER -----------------\n"); limnObjectDescribe(stdout, obj); + fprintf(stdout, "----------------- POST-RENDER -----------------\n"); } Index: soid.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/test/soid.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** soid.c 9 Feb 2004 22:48:01 -0000 1.7 --- soid.c 10 Feb 2004 04:42:19 -0000 1.8 *************** *** 58,62 **** airArray *mop; limnObject *obj; ! limnLook *look; int lookIdx; limnPart *part; int partIdx; int res, axis, sphere; --- 58,62 ---- airArray *mop; limnObject *obj; ! limnLook *look; int lookRod, lookSoid; limnPart *part; int partIdx; int res, axis, sphere; *************** *** 93,103 **** airMopAdd(mop, obj, (airMopper)limnObjectNix, airMopAlways); ! /* create limnLooks for ellipsoid (#0) and for rods (#1) */ ! lookIdx = airArrayIncrLen(obj->lookArr, 2); ! look = obj->look + lookIdx + 0; ELL_4V_SET(look->rgba, 1, 1, 1, 1); ELL_3V_SET(look->kads, 0.2, 0.8, 0); look->spow = 0; ! look = obj->look + lookIdx + 1; ELL_4V_SET(look->rgba, 0, 0, 0, 1); ELL_3V_SET(look->kads, 1, 0, 0); --- 93,104 ---- airMopAdd(mop, obj, (airMopper)limnObjectNix, airMopAlways); ! /* create limnLooks for ellipsoid and for rods */ ! lookSoid = limnObjectLookAdd(obj); ! look = obj->look + lookSoid; ELL_4V_SET(look->rgba, 1, 1, 1, 1); ELL_3V_SET(look->kads, 0.2, 0.8, 0); look->spow = 0; ! lookRod = limnObjectLookAdd(obj); ! look = obj->look + lookRod; ELL_4V_SET(look->rgba, 0, 0, 0, 1); ELL_3V_SET(look->kads, 1, 0, 0); *************** *** 129,135 **** if (sphere) { ! partIdx = limnObjectPolarSphereAdd(obj, 0, 0, 2*res, res); } else { ! partIdx = limnObjectPolarSuperquadAdd(obj, 0, axis, qA, qB, 2*res, res); } part = obj->part + partIdx; --- 130,138 ---- if (sphere) { ! partIdx = limnObjectPolarSphereAdd(obj, lookSoid, ! 0, 2*res, res); } else { ! partIdx = limnObjectPolarSuperquadAdd(obj, lookSoid, ! axis, qA, qB, 2*res, res); } part = obj->part + partIdx; *************** *** 142,146 **** if (rad) { ! partIdx = limnObjectCylinderAdd(obj, 1, 0, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, (1-eval[0])/2, rad, rad); --- 145,149 ---- if (rad) { ! partIdx = limnObjectCylinderAdd(obj, lookRod, 0, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, (1-eval[0])/2, rad, rad); *************** *** 150,154 **** limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, 1, 0, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, (1-eval[0])/2, rad, rad); --- 153,157 ---- limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, lookRod, 0, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, (1-eval[0])/2, rad, rad); *************** *** 158,162 **** limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, 1, 1, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, (1-eval[1])/2, rad); --- 161,165 ---- limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, lookRod, 1, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, (1-eval[1])/2, rad); *************** *** 166,170 **** limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, 1, 1, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, (1-eval[1])/2, rad); --- 169,173 ---- limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, lookRod, 1, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, (1-eval[1])/2, rad); *************** *** 174,178 **** limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, 1, 2, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, rad, (1-eval[2])/2); --- 177,181 ---- limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, lookRod, 2, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, rad, (1-eval[2])/2); *************** *** 182,186 **** limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, 1, 2, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, rad, (1-eval[2])/2); --- 185,189 ---- limnObjectPartTransform(obj, partIdx, matA); ! partIdx = limnObjectCylinderAdd(obj, lookRod, 2, res); ELL_4M_IDENTITY_SET(matA); ELL_4M_SCALE_SET(matB, rad, rad, (1-eval[2])/2); |