Skip to content

Commit 178dc0a

Browse files
bitworkingbitworking
committed
Merge branch 'development'
2 parents 8a7b140 + 492b674 commit 178dc0a

26 files changed

+1100
-120
lines changed

‎docs/css3d.ajax.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -985,13 +985,13 @@ <h5>Parameters:</h5>
985985
</div>
986986

987987
<nav>
988-
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
988+
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.collision.html">collision</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
989989
</nav>
990990

991991
<br clear="both">
992992

993993
<footer>
994-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 01:52:19 GMT+0200 (Mitteleuropäische Sommerzeit)
994+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 18:22:37 GMT+0200 (Mitteleuropäische Sommerzeit)
995995
</footer>
996996

997997
<script> prettyPrint(); </script>

‎docs/css3d.ajax.js.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,13 @@ <h1 class="page-title">Source: css3d.ajax.js</h1>
226226
</div>
227227

228228
<nav>
229-
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
229+
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.collision.html">collision</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
230230
</nav>
231231

232232
<br clear="both">
233233

234234
<footer>
235-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 01:52:19 GMT+0200 (Mitteleuropäische Sommerzeit)
235+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 18:22:37 GMT+0200 (Mitteleuropäische Sommerzeit)
236236
</footer>
237237

238238
<script> prettyPrint(); </script>

‎docs/css3d.camera.html

+101-16
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ <h5>Parameters:</h5>
507507

508508
<dt class="tag-source">Source:</dt>
509509
<dd class="tag-source"><ul class="dummy"><li>
510-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line167">line 167</a>
510+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line178">line 178</a>
511511
</li></ul></dd>
512512

513513

@@ -550,6 +550,91 @@ <h5>Returns:</h5>
550550

551551

552552

553+
</dd>
554+
555+
556+
557+
<dt>
558+
<h4 class="name" id="forwardVector"><span class="type-signature"></span>#camera#forwardVector<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="css3d.vector3.html">css3d.vector3</a>}</span></h4>
559+
560+
561+
</dt>
562+
<dd>
563+
564+
565+
566+
567+
568+
569+
570+
571+
572+
573+
<dl class="details">
574+
575+
576+
577+
578+
579+
580+
581+
582+
583+
584+
585+
586+
587+
588+
589+
590+
591+
592+
593+
<dt class="tag-source">Source:</dt>
594+
<dd class="tag-source"><ul class="dummy"><li>
595+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line165">line 165</a>
596+
</li></ul></dd>
597+
598+
599+
600+
601+
602+
603+
604+
</dl>
605+
606+
607+
608+
609+
610+
611+
612+
613+
614+
615+
616+
617+
618+
<h5>Returns:</h5>
619+
620+
621+
622+
623+
<dl>
624+
<dt>
625+
Type
626+
</dt>
627+
<dd>
628+
629+
<span class="param-type"><a href="css3d.vector3.html">css3d.vector3</a></span>
630+
631+
632+
</dd>
633+
</dl>
634+
635+
636+
637+
553638
</dd>
554639

555640

@@ -663,7 +748,7 @@ <h5>Parameters:</h5>
663748

664749
<dt class="tag-source">Source:</dt>
665750
<dd class="tag-source"><ul class="dummy"><li>
666-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line305">line 305</a>
751+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line316">line 316</a>
667752
</li></ul></dd>
668753

669754

@@ -819,7 +904,7 @@ <h5>Parameters:</h5>
819904

820905
<dt class="tag-source">Source:</dt>
821906
<dd class="tag-source"><ul class="dummy"><li>
822-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line277">line 277</a>
907+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line288">line 288</a>
823908
</li></ul></dd>
824909

825910

@@ -1074,7 +1159,7 @@ <h4 class="name" id="getViewMatrix"><span class="type-signature"></span>#camera#
10741159

10751160
<dt class="tag-source">Source:</dt>
10761161
<dd class="tag-source"><ul class="dummy"><li>
1077-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line244">line 244</a>
1162+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line255">line 255</a>
10781163
</li></ul></dd>
10791164

10801165

@@ -1211,7 +1296,7 @@ <h5>Parameters:</h5>
12111296

12121297
<dt class="tag-source">Source:</dt>
12131298
<dd class="tag-source"><ul class="dummy"><li>
1214-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line197">line 197</a>
1299+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line208">line 208</a>
12151300
</li></ul></dd>
12161301

12171302

@@ -1436,7 +1521,7 @@ <h5>Parameters:</h5>
14361521

14371522
<dt class="tag-source">Source:</dt>
14381523
<dd class="tag-source"><ul class="dummy"><li>
1439-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line371">line 371</a>
1524+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line382">line 382</a>
14401525
</li></ul></dd>
14411526

14421527

@@ -1615,7 +1700,7 @@ <h5>Parameters:</h5>
16151700

16161701
<dt class="tag-source">Source:</dt>
16171702
<dd class="tag-source"><ul class="dummy"><li>
1618-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line352">line 352</a>
1703+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line363">line 363</a>
16191704
</li></ul></dd>
16201705

16211706

@@ -1794,7 +1879,7 @@ <h5>Parameters:</h5>
17941879

17951880
<dt class="tag-source">Source:</dt>
17961881
<dd class="tag-source"><ul class="dummy"><li>
1797-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line333">line 333</a>
1882+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line344">line 344</a>
17981883
</li></ul></dd>
17991884

18001885

@@ -1927,7 +2012,7 @@ <h5>Parameters:</h5>
19272012

19282013
<dt class="tag-source">Source:</dt>
19292014
<dd class="tag-source"><ul class="dummy"><li>
1930-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line392">line 392</a>
2015+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line403">line 403</a>
19312016
</li></ul></dd>
19322017

19332018

@@ -2012,7 +2097,7 @@ <h4 class="name" id="rightVector"><span class="type-signature"></span>#camera#ri
20122097

20132098
<dt class="tag-source">Source:</dt>
20142099
<dd class="tag-source"><ul class="dummy"><li>
2015-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line184">line 184</a>
2100+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line195">line 195</a>
20162101
</li></ul></dd>
20172102

20182103

@@ -2792,7 +2877,7 @@ <h5>Parameters:</h5>
27922877

27932878
<dt class="tag-source">Source:</dt>
27942879
<dd class="tag-source"><ul class="dummy"><li>
2795-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line256">line 256</a>
2880+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line267">line 267</a>
27962881
</li></ul></dd>
27972882

27982883

@@ -2929,7 +3014,7 @@ <h5>Parameters:</h5>
29293014

29303015
<dt class="tag-source">Source:</dt>
29313016
<dd class="tag-source"><ul class="dummy"><li>
2932-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line227">line 227</a>
3017+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line238">line 238</a>
29333018
</li></ul></dd>
29343019

29353020

@@ -3018,7 +3103,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>#camera#update<
30183103

30193104
<dt class="tag-source">Source:</dt>
30203105
<dd class="tag-source"><ul class="dummy"><li>
3021-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line406">line 406</a>
3106+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line417">line 417</a>
30223107
</li></ul></dd>
30233108

30243109

@@ -3103,7 +3188,7 @@ <h4 class="name" id="upVector"><span class="type-signature"></span>#camera#upVec
31033188

31043189
<dt class="tag-source">Source:</dt>
31053190
<dd class="tag-source"><ul class="dummy"><li>
3106-
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line214">line 214</a>
3191+
<a href="css3d.camera.js.html">css3d.camera.js</a>, <a href="css3d.camera.js.html#line225">line 225</a>
31073192
</li></ul></dd>
31083193

31093194

@@ -3164,13 +3249,13 @@ <h5>Returns:</h5>
31643249
</div>
31653250

31663251
<nav>
3167-
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
3252+
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.collision.html">collision</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
31683253
</nav>
31693254

31703255
<br clear="both">
31713256

31723257
<footer>
3173-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 01:52:19 GMT+0200 (Mitteleuropäische Sommerzeit)
3258+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 18:22:37 GMT+0200 (Mitteleuropäische Sommerzeit)
31743259
</footer>
31753260

31763261
<script> prettyPrint(); </script>

‎docs/css3d.camera.js.html

+17-6
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,17 @@ <h1 class="page-title">Source: css3d.camera.js</h1>
182182
{
183183
return css3d.matrix4.back(this._rotation).normalize();
184184
};
185+
186+
/**
187+
*
188+
* @memberof! css3d.camera
189+
* @instance
190+
* @returns {css3d.vector3}
191+
*/
192+
camera.prototype.forwardVector = function()
193+
{
194+
return css3d.matrix4.forward(this._rotation).normalize();
195+
};
185196

186197
/**
187198
* Move camera forward
@@ -193,11 +204,11 @@ <h1 class="page-title">Source: css3d.camera.js</h1>
193204
*/
194205
camera.prototype.forward = function(steps)
195206
{
196-
var backVector = this.backVector();
207+
var forwardVector = this.forwardVector();
197208
this.setTranslation(
198-
this._translation.x - (backVector.x * steps),
199-
this._translation.y - (backVector.y * steps),
200-
this._translation.z - (backVector.z * steps)
209+
this._translation.x + (forwardVector.x * steps),
210+
this._translation.y + (forwardVector.y * steps),
211+
this._translation.z + (forwardVector.z * steps)
201212
);
202213
return this;
203214
};
@@ -460,13 +471,13 @@ <h1 class="page-title">Source: css3d.camera.js</h1>
460471
</div>
461472

462473
<nav>
463-
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
474+
<h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="css3d.html">css3d</a></li><li><a href="css3d.camera.html">camera</a></li><li><a href="css3d.collision.html">collision</a></li><li><a href="css3d.element.html">element</a></li><li><a href="css3d.quaternion.html">quaternion</a></li><li><a href="css3d.scene.html">scene</a></li><li><a href="css3d.vector3.html">vector3</a></li><li><a href="css3d.vector4.html">vector4</a></li></ul><h3>Namespaces</h3><ul><li><a href="css3d.ajax.html">ajax</a></li><li><a href="css3d.elementFactory.html">elementFactory</a></li><li><a href="css3d.math.html">math</a></li><li><a href="css3d.math.interpolation.html">interpolation</a></li><li><a href="css3d.matrix4.html">matrix4</a></li></ul>
464475
</nav>
465476

466477
<br clear="both">
467478

468479
<footer>
469-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 01:52:19 GMT+0200 (Mitteleuropäische Sommerzeit)
480+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Fri Jul 11 2014 18:22:37 GMT+0200 (Mitteleuropäische Sommerzeit)
470481
</footer>
471482

472483
<script> prettyPrint(); </script>

0 commit comments

Comments
 (0)