チェンジセット 3339
- コミット日時:
- 2010/01/24 00:10:41 (2 年前)
- ファイル:
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/support/alternativa3d/FLARCamera3D.as
r2936 r3339 34 34 import alternativa.types.Matrix3D; 35 35 36 import jp.nyatla.nyartoolkit.as3.core.types.NyARIntSize; 37 36 38 import org.libspark.flartoolkit.core.FLARMat; 37 39 import org.libspark.flartoolkit.core.param.FLARParam; 38 import org.libspark.flartoolkit.core.types.FLARIntSize;39 40 import org.libspark.flartoolkit.utils.ArrayUtil; 40 41 … … 51 52 { 52 53 53 const size: FLARIntSize = param.getScreenSize ();54 const size:NyARIntSize = param.getScreenSize (); 54 55 const tMat:FLARMat = new FLARMat (3, 4); 55 56 const iMat:FLARMat = new FLARMat (3, 4); 56 57 param.getPerspectiveProjectionMatrix ().decompMat (iMat, tMat); 57 const i: Array= iMat.getArray ();58 const t: Array= tMat.getArray ();58 const i:Vector.<Vector.<Number>> = iMat.getArray (); 59 const t:Vector.<Vector.<Number>> = tMat.getArray (); 59 60 const h1:Number = size.h - 1; 60 61 const p11:Number = (h1 * i[2][1] - i[1][1]) / i[2][2]; … … 66 67 67 68 this.fov = 2 * Math.atan (tan); 68 69 70 71 /*72 var m_projection:Array = new Array(16);73 var trans_mat:FLARMat = new FLARMat(3,4);74 var icpara_mat:FLARMat = new FLARMat(3,4);75 var p:Array = ArrayUtil.createJaggedArray(3, 3);76 var q:Array = ArrayUtil.createJaggedArray(4, 4);77 var i:int;78 var j:int;79 const size:FLARIntSize = param.getScreenSize();80 const width:int = size.w;81 const height:int = size.h;82 83 param.getPerspectiveProjectionMatrix().decompMat(icpara_mat, trans_mat);84 85 var icpara:Array = icpara_mat.getArray();86 var trans:Array = trans_mat.getArray();87 for (i = 0; i < 4; i++) {88 icpara[1][i] = (height - 1) * (icpara[2][i]) - icpara[1][i];89 }90 91 for(i = 0; i < 3; i++) {92 for(j = 0; j < 3; j++) {93 p[i][j] = icpara[i][j] / icpara[2][2];94 }95 }96 97 var div:Number = zoom*focus;98 99 q[0][0] = 2.0 * p[0][0]/div;100 q[0][1] = 2.0 * p[0][1]/div;101 q[0][2] = -(2.0 * p[0][2] - (width - 1))/div;102 q[0][3] = 0.0;103 104 q[1][0] = 0.0;105 q[1][1] = 2.0 * p[1][1]/div;106 q[1][2] = -(2.0 * p[1][2] - (height - 1))/div;107 q[1][3] = 0.0;108 109 q[2][0] = 0.0;110 q[2][1] = 0.0;111 q[2][2] = 1.0;112 q[2][3] = 0.0;113 114 q[3][0] = 0.0;115 q[3][1] = 0.0;116 q[3][2] = 0.0;117 q[3][3] = 1.0;118 119 for (i = 0; i < 4; i++) { // Row.120 // First 3 columns of the current row.121 for (j = 0; j < 3; j++) { // Column.122 m_projection[i*4 + j] = q[i][0] * trans[0][j] + q[i][1] * trans[1][j] + q[i][2] * trans[2][j];123 }124 // Fourth column of the current row.125 m_projection[i*4 + 3] = q[i][0] * trans[0][3] + q[i][1] * trans[1][3] + q[i][2] * trans[2][3] + q[i][3];126 }127 128 var m:Matrix3D = _projectionMatrix = new Matrix3D();129 m.sxx = m_projection[0];130 m.sxy = m_projection[1];131 m.sxz = m_projection[2];132 m.tx = m_projection[3];133 m.syx = m_projection[4];134 m.syy = m_projection[5];135 m.syz = m_projection[6];136 m.ty = m_projection[7];137 m.szx = m_projection[8];138 m.szy = m_projection[9];139 m.szz = m_projection[10];140 m.tz = m_projection[11];141 m.swx = m_projection[12];142 m.swy = m_projection[13];143 m.swz = m_projection[14];144 m.tw = m_projection[15];145 */146 69 } 147 148 /*149 public override function get viewMatrix():Matrix3D150 {151 invViewMatrix.inverse(_projectionMatrix)152 return _projectionMatrix;153 }154 */155 70 } 156 71 } as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/support/away3d/FLARCamera3D.as
r2936 r3339 35 35 import away3d.core.math.*; 36 36 37 import jp.nyatla.nyartoolkit.as3.core.types.NyARIntSize; 38 37 39 import org.libspark.flartoolkit.core.FLARMat; 38 40 import org.libspark.flartoolkit.core.param.FLARParam; 39 import org.libspark.flartoolkit.core.types.FLARIntSize;40 41 import org.libspark.flartoolkit.utils.ArrayUtil; 41 42 … … 59 60 var i:int; 60 61 var j:int; 61 const size: FLARIntSize = param.getScreenSize();62 const size:NyARIntSize = param.getScreenSize(); 62 63 const width:int = size.w; 63 64 const height:int = size.h; as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/support/pv3d/FLARCamera3D.as
r2936 r3339 31 31 package org.libspark.flartoolkit.support.pv3d { 32 32 33 import jp.nyatla.nyartoolkit.as3.core.types.NyARIntSize; 34 33 35 import org.libspark.flartoolkit.core.FLARMat; 34 36 import org.libspark.flartoolkit.core.param.FLARParam; 35 import org.libspark.flartoolkit.core.types.FLARIntSize;36 37 import org.libspark.flartoolkit.utils.ArrayUtil; 37 38 import org.papervision3d.cameras.Camera3D; … … 60 61 var i:int; 61 62 var j:int; 62 const size: FLARIntSize = param.getScreenSize();63 const size:NyARIntSize = param.getScreenSize(); 63 64 const width:int = size.w; 64 65 const height:int = size.h; … … 66 67 param.getPerspectiveProjectionMatrix().decompMat(icpara_mat, trans_mat); 67 68 68 var icpara: Array= icpara_mat.getArray();69 var trans: Array= trans_mat.getArray();69 var icpara:Vector.<Vector.<Number>> = icpara_mat.getArray(); 70 var trans:Vector.<Vector.<Number>> = trans_mat.getArray(); 70 71 for (i = 0; i < 4; i++) { 71 72 icpara[1][i] = (height - 1) * (icpara[2][i]) - icpara[1][i];
