Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/vload.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.data/vload.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/vload.c

@@ -6 +6 @@
   int kapa, type;
   char *name;
-  double dx, dy, size, angle;
+  double dx, dy, angle;
   KiiOverlay *overlay;
   Vector *vecx, *vecy;
@@ -82 +82 @@
     overlay[i].type = type;
     overlay[i].text = NULL;
-    overlay[i].x = vecx[0].elements[i]+0.5;
-    overlay[i].y = vecy[0].elements[i]+0.5;
+    overlay[i].x = (vecx[0].type == OPIHI_FLT) ? vecx[0].elements.Flt[i] : vecx[0].elements.Int[i];
+    overlay[i].y = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
+    overlay[i].x += 0.5;
+    overlay[i].y += 0.5;
     overlay[i].dx = dx;
     overlay[i].dy = dy;