Skip to content

Commit

Permalink
Merge branch 'master' of github.com:supereggbert/GLGE
Browse files Browse the repository at this point in the history 
Conflicts:
	src/material/glge_material.js
	src/scene/glge_light.js
  • Loading branch information
@supereggbert
supereggbert committed May 27, 2012
2 parents 5eadfeb + 6f9d4f2 commit e9c7033
Show file tree
Hide file tree
Showing 46 changed files with 1,422 additions and 1,236 deletions.
2 changes: 1 addition & 1 deletion docs/files.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ <h2><a href="symbols/src/src_gui_gui.js.html">widget.js</a></h2>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:57 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:23 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ <h2><a href="symbols/GUI.Widget.html">GUI.Widget</a></h2>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:57 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:23 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Action.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.ActionChannel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Animatable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.AnimationCurve.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.AnimationVector.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Assets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.BezTriple.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Camera.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Collada.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Document.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Group.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.HeightMap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.JSONLoader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.KeyInput.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
137 changes: 136 additions & 1 deletion docs/symbols/GLGE.Light.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,33 @@ <h1 class="classTitle">
</td>
</tr>

<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/GLGE.Light.html#getColorB">getColorB</a></b>(value)
</div>
<div class="description">Gets the blue color of the light source</div>
</td>
</tr>

<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/GLGE.Light.html#getColorG">getColorG</a></b>(value)
</div>
<div class="description">Gets the green color of the light source</div>
</td>
</tr>

<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/GLGE.Light.html#getColorR">getColorR</a></b>(value)
</div>
<div class="description">Gets the red color of the light source</div>
</td>
</tr>

<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
Expand Down Expand Up @@ -1285,6 +1312,114 @@ <h1 class="classTitle">



<hr />

<a name="getColorB"> </a>
<div class="fixedFont">


<b>getColorB</b>(value)

</div>
<div class="description">
Gets the blue color of the light source


</div>




<dl class="detailList">
<dt class="heading">Parameters:</dt>

<dt>
<span class="light fixedFont">{Number}</span> <b>value</b>

</dt>
<dd>The new blue level 0-1</dd>

</dl>








<hr />

<a name="getColorG"> </a>
<div class="fixedFont">


<b>getColorG</b>(value)

</div>
<div class="description">
Gets the green color of the light source


</div>




<dl class="detailList">
<dt class="heading">Parameters:</dt>

<dt>
<span class="light fixedFont">{Number}</span> <b>value</b>

</dt>
<dd>The new green level 0-1</dd>

</dl>








<hr />

<a name="getColorR"> </a>
<div class="fixedFont">


<b>getColorR</b>(value)

</div>
<div class="description">
Gets the red color of the light source


</div>




<dl class="detailList">
<dt class="heading">Parameters:</dt>

<dt>
<span class="light fixedFont">{Number}</span> <b>value</b>

</dt>
<dd>The new red level 0-1</dd>

</dl>








<hr />

<a name="getDistance"> </a>
Expand Down Expand Up @@ -2840,7 +2975,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.LinearPoint.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Material.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2682,7 +2682,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.MaterialLayer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Mesh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Message.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.MouseInput.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.MultiMaterial.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:56 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.Object.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:57 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/GLGE.ObjectLod.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:21:57 GMT+0100 (BST)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun May 27 2012 13:35:22 GMT+0100 (BST)
</div>
</body>
</html>
Loading

0 comments on commit e9c7033

Please sign in to comment.