Skip to content

Commit

Permalink
Merge branch 'master', remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andor committed Mar 1, 2010
2 parents 5a20428 + c60b976 commit 3eb25be
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 61 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -0,0 +1 @@
.DS_Store
2 changes: 1 addition & 1 deletion canvas3dapi-dev/J3DXplorer/J3DXplorer.html
View file
Expand Up @@ -9,8 +9,8 @@

<body>
<canvas id="J3DXplorer" width="500" height="500">
<img src="frontpagess.png"></img>
</canvas>
<img id="screenshot" src="frontpagess.png" width="500", height="500" style="display:none"></img>

<font face="verdana">
<span id="debug"> </span>
Expand Down
8 changes: 4 additions & 4 deletions canvas3dapi-dev/J3DXplorer/J3DXplorer.js
View file
Expand Up @@ -31,11 +31,11 @@ function J3DXplorer_main(canvasName)
scn.setRenderer(renderer);
scn.init(canvasName);
if(!renderer.isReady()){
var imgtag=document.getElementById("screenshot");
imgtag.style.display="block";
var canvas=document.getElementById(canvasName);
var ctx=canvas.getContext('2d');
var img=new Image();
img.src="frontpagess.png";
ctx.drawImage(img,0,0);
canvas.style.display="none";

}
else{
var j=0;
Expand Down
112 changes: 56 additions & 56 deletions documentation/2.0_user_docs/index.html
View file
Expand Up @@ -182,65 +182,65 @@
</div>

<div id="index">
<div align="center"><a href="index.html">Class Index</a>
| <a href="files.html">File Index</a></div>
<div align="center"><a href="/wp-content/documentation/2.0_user_docs/index.html">Class Index</a>
| <a href="/wp-content/documentation/2.0_user_docs/files.html">File Index</a></div>
<hr />
<h2>Classes</h2>
<ul class="classList">

<li><i><a href="symbols/_global_.html">_global_</a></i></li>
<li><i><a href="/wp-content/documentation/2.0_user_docs/symbols/_global_.html">_global_</a></i></li>

<li><a href="symbols/c3dl.html">c3dl</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.html">c3dl</a></li>

<li><a href="symbols/c3dl.Actor.html">c3dl.Actor</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Actor.html">c3dl.Actor</a></li>

<li><a href="symbols/c3dl.Camera.html">c3dl.Camera</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Camera.html">c3dl.Camera</a></li>

<li><a href="symbols/c3dl.Collada.html">c3dl.Collada</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Collada.html">c3dl.Collada</a></li>

<li><a href="symbols/c3dl.debug.html">c3dl.debug</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.debug.html">c3dl.debug</a></li>

<li><a href="symbols/c3dl.DirectionalLight.html">c3dl.DirectionalLight</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.DirectionalLight.html">c3dl.DirectionalLight</a></li>

<li><a href="symbols/c3dl.Effect.html">c3dl.Effect</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Effect.html">c3dl.Effect</a></li>

<li><a href="symbols/c3dl.effects.html">c3dl.effects</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.effects.html">c3dl.effects</a></li>

<li><a href="symbols/c3dl.EffectTemplate.html">c3dl.EffectTemplate</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.EffectTemplate.html">c3dl.EffectTemplate</a></li>

<li><a href="symbols/c3dl.FreeCamera.html">c3dl.FreeCamera</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.FreeCamera.html">c3dl.FreeCamera</a></li>

<li><a href="symbols/c3dl.Geometry.html">c3dl.Geometry</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Geometry.html">c3dl.Geometry</a></li>

<li><a href="symbols/c3dl.Light.html">c3dl.Light</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Light.html">c3dl.Light</a></li>

<li><a href="symbols/c3dl.Line.html">c3dl.Line</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Line.html">c3dl.Line</a></li>

<li><a href="symbols/c3dl.Material.html">c3dl.Material</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Material.html">c3dl.Material</a></li>

<li><a href="symbols/c3dl.OrbitCamera.html">c3dl.OrbitCamera</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.OrbitCamera.html">c3dl.OrbitCamera</a></li>

<li><a href="symbols/c3dl.ParticleSystem.html">c3dl.ParticleSystem</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.ParticleSystem.html">c3dl.ParticleSystem</a></li>

<li><a href="symbols/c3dl.PickingResult.html">c3dl.PickingResult</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PickingResult.html">c3dl.PickingResult</a></li>

<li><a href="symbols/c3dl.Point.html">c3dl.Point</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Point.html">c3dl.Point</a></li>

<li><a href="symbols/c3dl.PositionalLight.html">c3dl.PositionalLight</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PositionalLight.html">c3dl.PositionalLight</a></li>

<li><a href="symbols/c3dl.Primitive.html">c3dl.Primitive</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Primitive.html">c3dl.Primitive</a></li>

<li><a href="symbols/c3dl.PrimitiveSet.html">c3dl.PrimitiveSet</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PrimitiveSet.html">c3dl.PrimitiveSet</a></li>

<li><a href="symbols/c3dl.Renderer.html">c3dl.Renderer</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Renderer.html">c3dl.Renderer</a></li>

<li><a href="symbols/c3dl.RenderingObject.html">c3dl.RenderingObject</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.RenderingObject.html">c3dl.RenderingObject</a></li>

<li><a href="symbols/c3dl.Scene.html">c3dl.Scene</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Scene.html">c3dl.Scene</a></li>

<li><a href="symbols/c3dl.SpotLight.html">c3dl.SpotLight</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.SpotLight.html">c3dl.SpotLight</a></li>

<li><a href="symbols/c3dl.WebGL.html">c3dl.WebGL</a></li>
<li><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.WebGL.html">c3dl.WebGL</a></li>

</ul>
<hr />
Expand All @@ -251,178 +251,178 @@ <h1 class="classTitle">Class Index</h1>


<div>
<h2><a href="symbols/_global_.html">_global_</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/_global_.html">_global_</a></h2>

</div>
<hr />

<div>
<h2><a href="symbols/c3dl.html">c3dl</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.html">c3dl</a></h2>
Prevent name conflicts by placing c3dl variables
and functions in a javascript 'namespace'.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Actor.html">c3dl.Actor</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Actor.html">c3dl.Actor</a></h2>
c3dl.Actor is a base class for 3D objects.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Camera.html">c3dl.Camera</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Camera.html">c3dl.Camera</a></h2>
c3dl.Camera is a base class for c3dl.OrbitCamera and c3dl.FreeCamera.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Collada.html">c3dl.Collada</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Collada.html">c3dl.Collada</a></h2>
c3dl.Collada represents the model data from a collada file.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.debug.html">c3dl.debug</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.debug.html">c3dl.debug</a></h2>
used to output error, warning and information to either the page or firebug.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.DirectionalLight.html">c3dl.DirectionalLight</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.DirectionalLight.html">c3dl.DirectionalLight</a></h2>
A DirectionalLight inherits from Light.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Effect.html">c3dl.Effect</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Effect.html">c3dl.Effect</a></h2>
c3dl.Effect specifies exactly how a geometric object should
be rendered.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.effects.html">c3dl.effects</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.effects.html">c3dl.effects</a></h2>
If a parameter's type is followed by square braces, it means the
parameter has a default value, therefore setting that parameter is
optional.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.EffectTemplate.html">c3dl.EffectTemplate</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.EffectTemplate.html">c3dl.EffectTemplate</a></h2>
<p>An EffectTemplate is a template for creating many Effects which have
similar rendering results.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.FreeCamera.html">c3dl.FreeCamera</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.FreeCamera.html">c3dl.FreeCamera</a></h2>
c3dl.FreeCamera A camera which can be freely moved around in a scene.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Geometry.html">c3dl.Geometry</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Geometry.html">c3dl.Geometry</a></h2>
c3dl.Geometry is a container for the primitiveSets of a
geometric object.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Light.html">c3dl.Light</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Light.html">c3dl.Light</a></h2>
This is an 'abstract' class which should not be instantiaed.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Line.html">c3dl.Line</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Line.html">c3dl.Line</a></h2>
c3dl.Line represents a line segment in 3D space.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Material.html">c3dl.Material</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Material.html">c3dl.Material</a></h2>
c3dl.Material contains values which describe the behaviour of an object when light
illuminates it.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.OrbitCamera.html">c3dl.OrbitCamera</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.OrbitCamera.html">c3dl.OrbitCamera</a></h2>
c3dl.OrbitCamera is a camera which is restricted to orbiting
a point in space.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.ParticleSystem.html">c3dl.ParticleSystem</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.ParticleSystem.html">c3dl.ParticleSystem</a></h2>
ParticleSystem is used to simulate phenomena such as fire, smoke, rain, etc.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.PickingResult.html">c3dl.PickingResult</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PickingResult.html">c3dl.PickingResult</a></h2>
c3dl.PickingResult is contains the result of the user picking something
in the scene.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Point.html">c3dl.Point</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Point.html">c3dl.Point</a></h2>
c3dl.Point is an object with a position and color which will be
rendered using OpenGL's built-in point rendering (either as a circle or
square depending on smoothing) or rendered as sphere meshes.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.PositionalLight.html">c3dl.PositionalLight</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PositionalLight.html">c3dl.PositionalLight</a></h2>
A PositionalLight inherits from Light.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Primitive.html">c3dl.Primitive</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Primitive.html">c3dl.Primitive</a></h2>

</div>
<hr />

<div>
<h2><a href="symbols/c3dl.PrimitiveSet.html">c3dl.PrimitiveSet</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.PrimitiveSet.html">c3dl.PrimitiveSet</a></h2>
c3dl.PrimitiveSet represents a set of primitives within a
geometric class.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Renderer.html">c3dl.Renderer</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Renderer.html">c3dl.Renderer</a></h2>
base class for OpenGLES20.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.RenderingObject.html">c3dl.RenderingObject</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.RenderingObject.html">c3dl.RenderingObject</a></h2>
c3dl.RenderingObject is an object which is created dynamically
and passed to the callback function defined within an effect when
rendering objects.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.Scene.html">c3dl.Scene</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.Scene.html">c3dl.Scene</a></h2>
A Scene should be thought of as a scene on a movie set.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.SpotLight.html">c3dl.SpotLight</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.SpotLight.html">c3dl.SpotLight</a></h2>
A spotlight is a PositionalLight which can have a 'cone' of light used to
restrict what objects or parts of an object get lit.
</div>
<hr />

<div>
<h2><a href="symbols/c3dl.WebGL.html">c3dl.WebGL</a></h2>
<h2><a href="/wp-content/documentation/2.0_user_docs/symbols/c3dl.WebGL.html">c3dl.WebGL</a></h2>
WebGL context.
</div>
<hr />
Expand Down

0 comments on commit 3eb25be

Please sign in to comment.