diff options
author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/helper-classes/3D/vec-utils.js | |
parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/helper-classes/3D/vec-utils.js')
-rwxr-xr-x | js/helper-classes/3D/vec-utils.js | 71 |
1 files changed, 70 insertions, 1 deletions
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js index 3db95ab7..e6db4a8d 100755 --- a/js/helper-classes/3D/vec-utils.js +++ b/js/helper-classes/3D/vec-utils.js | |||
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype, | |||
191 | 191 | ||
192 | return vec; | 192 | return vec; |
193 | } | 193 | } |
194 | } | 194 | }, |
195 | |||
196 | matI : | ||
197 | { | ||
198 | value: function(dimen) | ||
199 | { | ||
200 | var mat = []; | ||
201 | for (var i=0; i<dimen*dimen; i++) mat.push(0); | ||
202 | |||
203 | var index = 0; | ||
204 | for (var i=0; i<dimen; i++) | ||
205 | { | ||
206 | mat[index] = 1.0; | ||
207 | index += dimen + 1; | ||
208 | } | ||
209 | |||
210 | return mat; | ||
211 | } | ||
212 | }, | ||
213 | |||
214 | matTranslation: | ||
215 | { | ||
216 | value: function (vec) | ||
217 | { | ||
218 | var mat = Matrix.I(4); | ||
219 | glmat4.translate(mat, vec); | ||
220 | return mat; | ||
221 | } | ||
222 | }, | ||
223 | |||
224 | matRotationX: | ||
225 | { | ||
226 | value: function( angle ) | ||
227 | { | ||
228 | var mat = Matrix.I(4); | ||
229 | glmat4.rotateX(mat, angle); | ||
230 | return mat; | ||
231 | } | ||
232 | }, | ||
233 | |||
234 | matRotationY: | ||
235 | { | ||
236 | value: function( angle ) | ||
237 | { | ||
238 | var mat = Matrix.I(4); | ||
239 | glmat4.rotateY(mat, angle); | ||
240 | return mat; | ||
241 | } | ||
242 | }, | ||
243 | |||
244 | matRotationZ: | ||
245 | { | ||
246 | value: function( angle ) | ||
247 | { | ||
248 | var mat = Matrix.I(4); | ||
249 | glmat4.rotateZ(mat, angle); | ||
250 | return mat; | ||
251 | } | ||
252 | }, | ||
253 | |||
254 | matRotation: | ||
255 | { | ||
256 | value: function(angle, axis) | ||
257 | { | ||
258 | var mat = Matrix.I(4); | ||
259 | glmat4.rotate(mat, angle, axis); | ||
260 | return mat; | ||
261 | } | ||
262 | }, | ||
263 | |||
195 | }); \ No newline at end of file | 264 | }); \ No newline at end of file |