Changeset 78 for java/main/src/main/java/com/framsticks/model/MechPart.java

Timestamp:

01/09/13 00:09:10 (11 years ago)

Author:

psniegowski

Message:

Add f0 parsing and f0->Model transformation.

File:

• java/main/src/main/java/com/framsticks/model/MechPart.java (modified) (1 diff)

java/main/src/main/java/com/framsticks/model/MechPart.java

@@ -6 +6 @@
 /*
  */
-public class MechPart {
-
-        /** x, y, z */
-        public final Point3d position = new Point3d();
-
-        /** m */
-        public Double mass = 0.0;
-
-        /** s */
-        public Double size = 0.0;
+public class MechPart extends BasePart {
 
         /** vol */
         public Double volume = 0.0;
-
-        /** fr */
-        public Double friction = 0.0;
-
-        /** vx, vy, vz */
-        public final Point3d velocity = new Point3d();
-
-    /** oxx, oxy, oxz, oyx, oyy, oyz, ozx, ozy, ozz*/
-    public final Orientation orientation = new Orientation();
-
-        public Double getX() { return position.x; }
-        public void setX(Double x) { position.x = x; }
-
-        public Double getY() { return position.y; }
-        public void setY(Double y) { position.y = y; }
-
-        public Double getZ() { return position.z; }
-        public void setZ(Double z) { position.z = z; }
-
-        public Double getM() { return mass; }
-        public void setM(Double m) { mass = m; }
-
-        public Double getS() { return size; }
-        public void setS(Double s) { size = s; }
-
         public Double getVol() { return volume; }
         public void setVol(Double vol) { volume = vol; }
 
-        public Double getFr() { return friction; }
-        public void setFr(Double fr) { friction = fr; }
+        /** vx, vy, vz*/
+        public double vx, vy, vz;
 
-        public Double getVx() { return velocity.x; }
-        public void setVx(Double vx) { velocity.x = vx; }
+        public Point3d getVelocity() { return new Point3d(vx, vy, vz); }
+        public void setVelocity(Point3d v) { vx = v.x; vy = v.y; vz = v.z; }
 
-        public Double getVy() { return velocity.y; }
-        public void setVy(Double vy) { velocity.y = vy; }
+    public double oxx, oxy, oxz, oyx, oyy, oyz, ozx, ozy, ozz;
 
-        public Double getVz() { return velocity.z; }
-        public void setVz(Double vz) { velocity.z = vz; }
+        public Orientation getOrientation() { return new Orientation(new Point3d(oxx, oxy, oxz), new Point3d(oyx, oyy, oyz), new Point3d(ozx, ozy, ozz)); }
 
-        public Double getOxx() { return orientation.x.x; }
-        public void setOxx(Double oxx) { orientation.x.x = oxx; }
-
-        public Double getOxy() { return orientation.x.y; }
-        public void setOxy(Double oxy) { orientation.x.y = oxy; }
-
-        public Double getOxz() { return orientation.x.z; }
-        public void setOxz(Double oxz) { orientation.x.z = oxz; }
-
-        public Double getOyx() { return orientation.y.x; }
-        public void setOyx(Double oyx) { orientation.y.x = oyx; }
-
-        public Double getOyy() { return orientation.y.y; }
-        public void setOyy(Double oyy) { orientation.y.y = oyy; }
-
-        public Double getOyz() { return orientation.y.z; }
-        public void setOyz(Double oyz) { orientation.y.z = oyz; }
-
-        public Double getOzx() { return orientation.z.x; }
-        public void setOzx(Double ozx) { orientation.z.x = ozx; }
-
-        public Double getOzy() { return orientation.z.y; }
-        public void setOzy(Double ozy) { orientation.z.y = ozy; }
-
-        public Double getOzz() { return orientation.z.z; }
-        public void setOzz(Double ozz) { orientation.z.z = ozz; }
+        public void setOrientation(Orientation o) {
+                oxx = o.x.x;
+                oxy = o.x.y;
+                oxz = o.x.z;
+                oyx = o.y.x;
+                oyy = o.y.y;
+                oyz = o.y.z;
+                ozx = o.z.x;
+                ozy = o.z.y;
+                ozz = o.z.z;
+        }
 
 }