Merge remote-tracking branch 'origin/master' into shader-optimizations

Conflicts: .gitignore README.markdown build.xml resources/web/style.css src/scenejs/boundary/boundingBox.js src/scenejs/geometry/objects/sphere.js src/scenejs/interpolation/interpolator.js src/scenejs/scene/scene.js src/scenejs/scene/sceneModule.js
tsherif · Jun 3, 2015 · 9e6cec5 · 9e6cec5
2 parents 36c1896 + 350b8c8
commit 9e6cec5
Show file tree

Hide file tree

Showing 10 changed files with 38,618 additions and 99 deletions.
diff --git a/api/latest/scenejs.js b/api/latest/scenejs.js
diff --git a/api/latest/scenejs.min.js b/api/latest/scenejs.min.js
diff --git a/build/4.2.0/scenejs-4.2.0.js b/build/4.2.0/scenejs-4.2.0.js
diff --git a/build/4.2.0/scenejs-4.2.0.min.js b/build/4.2.0/scenejs-4.2.0.min.js
diff --git a/build/scenejs.js b/build/scenejs.js
diff --git a/build/scenejs.min.js b/build/scenejs.min.js
diff --git a/src/examples/multiple-canvases/index.html b/src/examples/multiple-canvases/index.html
@@ -0,0 +1,92 @@
+<html>
+<head>
+    <title></title>
+    <script type="text/javascript" src="../../lib/scenejs.js"></script>
+
+    <link href="../web/style.css" rel="stylesheet" type="text/css"/>
+
+</head>
+<div id="container">
+    <div id="header">
+        <div id="header-nav">
+
+        </div>
+        <div id="header-inner">
+            <h1><a href="http://scenejs.org">SceneJS</a> &gt; <a href="../index.html">Examples</a> &gt;&nbsp;Multiple Canvases
+            </h1>
+            <a class="a2a_dd" href="http://www.addtoany.com/share_save?linkname=s&amp;linkurl=s"><img
+                    src="http://static.addtoany.com/buttons/share_save_171_16.png" width="171" height="16" border="0"
+                    alt="Share/Bookmark"/></a>
+            <script type="text/javascript">
+                var a2a_linkname = "SceneJS Live Examples";
+                var a2a_linkurl = window.location;
+                var a2a_onclick = 1;</script>
+            <script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
+        </div>
+    </div>
+    <div id="content">
+        <ul class="hlist">
+          <li>
+            <canvas id="theCanvas1" width="500" height="350">
+                <p>This example requires a browser that supports the
+                    <a href="http://www.w3.org/html/wg/html5/">HTML5</a>
+                    &lt;canvas&gt; feature.</p>
+            </canvas>
+          </li>
+          <li>
+            <canvas id="theCanvas2" width="500" height="350">
+                <p>This example requires a browser that supports the
+                    <a href="http://www.w3.org/html/wg/html5/">HTML5</a>
+                    &lt;canvas&gt; feature.</p>
+            </canvas>
+          </li>
+        </ul>
+        <ul class="hlist">
+          <li>
+            <canvas id="theCanvas3" width="500" height="350">
+                <p>This example requires a browser that supports the
+                    <a href="http://www.w3.org/html/wg/html5/">HTML5</a>
+                    &lt;canvas&gt; feature.</p>
+            </canvas>
+          </li>
+          <li>
+            <canvas id="theCanvas4" width="500" height="350">
+                <p>This example requires a browser that supports the
+                    <a href="http://www.w3.org/html/wg/html5/">HTML5</a>
+                    &lt;canvas&gt; feature.</p>
+            </canvas>
+          </li>
+        </ul>
+        <div id="info">
+            <h2>Multiple Canvases, Using SceneJS</h2>
+
+            <p>This renders separate scenegraphs containing a teapot object from different perspectives 
+              into four separate canvases. Dragging in the pitch and yaw axes in any one canvas will 
+              affect the orientation of the teapot object in the other three canvases. Each of the 
+              rotatable Newell Teapots are illuminated by three light sources from the same direction.</p>
+
+            <br/>
+
+            <ul>
+                <li><a target="_other" href="multiple-canvases.js">Scene source code</a></li>
+                <li><a target="_other" href="http://scenejs.wikispaces.com/Getting+Started+-+A+Newell+Teapot">Wiki page
+                    on
+                    this example</a></li>
+            </ul>
+        </div>
+        <div id="log">
+            <h3>Log 1</h3>
+            <div id="theLoggingDiv1"></div>
+            <h3>Log 2</h3>
+            <div id="theLoggingDiv2"></div>
+            <h3>Log 3</h3>
+            <div id="theLoggingDiv3"></div>
+            <h3>Log 4</h3>
+            <div id="theLoggingDiv4"></div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="multiple-canvases.js"></script>
+</body>
+</html>