[Backup]NyARToolkit for Java

[nyartoolkit-and/nyartoolkit-and.git] / src / jp / nyatla / nyartoolkit / core / transmat / NyARTransMatResult.java

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
index 9486227..f8ee00d 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
@@ -31,76 +31,16 @@
  */\r
 package jp.nyatla.nyartoolkit.core.transmat;\r
 \r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
+\r
+import jp.nyatla.nyartoolkit.core.types.matrix.*;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 \r
 /**\r
  * NyARTransMat戻り値専用のNyARMat\r
  * \r
  */\r
-public class NyARTransMatResult extends NyARMat\r
+public class NyARTransMatResult extends NyARDoubleMatrix34\r
 {\r
-       private boolean has_value = false;\r
-\r
-       public NyARTransMatResult()\r
-       {\r
-               super(3, 4);\r
-       }\r
-\r
-       /**\r
-        * この関数は使えません。\r
-        * \r
-        * @param i_row\r
-        * @param i_clm\r
-        * @throws NyARException\r
-        */\r
-       public NyARTransMatResult(int i_row, int i_clm) throws NyARException\r
-       {\r
-               super();// ここで例外発生\r
-       }\r
-\r
-       /**\r
-        * パラメータで変換行列を更新します。\r
-        * \r
-        * @param i_rot\r
-        * @param i_off\r
-        * @param i_trans\r
-        */\r
-       public void updateMatrixValue(NyARRotMatrix i_rot, NyARDoublePoint3d i_off, NyARDoublePoint3d i_trans)\r
-       {\r
-               double[] pa;\r
-               pa = this.m[0];\r
-               pa[0] = i_rot.m00;\r
-               pa[1] = i_rot.m01;\r
-               pa[2] = i_rot.m02;\r
-               pa[3] = i_rot.m00 * i_off.x + i_rot.m01 * i_off.y + i_rot.m02 * i_off.z + i_trans.x;\r
-\r
-               pa = this.m[1];\r
-               pa[0] = i_rot.m10;\r
-               pa[1] = i_rot.m11;\r
-               pa[2] = i_rot.m12;\r
-               pa[3] = i_rot.m10 * i_off.x + i_rot.m11 * i_off.y + i_rot.m12 * i_off.z + i_trans.y;\r
-\r
-               pa = this.m[2];\r
-               pa[0] = i_rot.m20;\r
-               pa[1] = i_rot.m21;\r
-               pa[2] = i_rot.m22;\r
-               pa[3] = i_rot.m20 * i_off.x + i_rot.m21 * i_off.y + i_rot.m22 * i_off.z + i_trans.z;\r
-\r
-               this.has_value = true;\r
-               return;\r
-       }\r
-\r
-       public void copyFrom(NyARTransMatResult i_from) throws NyARException\r
-       {\r
-               super.copyFrom(i_from);\r
-               this.has_value = i_from.has_value;\r
-       }\r
-\r
-       public boolean hasValue()\r
-       {\r
-               return this.has_value;\r
-       }\r
+       public boolean has_value = false;\r
+       public final NyARDoublePoint3d angle=new NyARDoublePoint3d();\r
 }\r