diff options
97 files changed, 97 insertions, 97 deletions
diff --git a/o3d/command_buffer/samples/bubble/bubble.html b/o3d/command_buffer/samples/bubble/bubble.html index e9d086f..b56afbc 100644 --- a/o3d/command_buffer/samples/bubble/bubble.html +++ b/o3d/command_buffer/samples/bubble/bubble.html @@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <HEAD> <TITLE>Native Client + Command buffer bubble test</TITLE> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> var client; var server; diff --git a/o3d/samples/2d.html b/o3d/samples/2d.html index e39bde6..864bbdc 100644 --- a/o3d/samples/2d.html +++ b/o3d/samples/2d.html @@ -99,7 +99,7 @@ Things to notice: <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step01ex.html b/o3d/samples/GoogleIO-2009/step01ex.html index a10b961..8c131d0 100644 --- a/o3d/samples/GoogleIO-2009/step01ex.html +++ b/o3d/samples/GoogleIO-2009/step01ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step02ex.html b/o3d/samples/GoogleIO-2009/step02ex.html index 4d6770b..b2466ae 100644 --- a/o3d/samples/GoogleIO-2009/step02ex.html +++ b/o3d/samples/GoogleIO-2009/step02ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step03ex.html b/o3d/samples/GoogleIO-2009/step03ex.html index 5a24793..0de8221 100644 --- a/o3d/samples/GoogleIO-2009/step03ex.html +++ b/o3d/samples/GoogleIO-2009/step03ex.html @@ -46,7 +46,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step04ex.html b/o3d/samples/GoogleIO-2009/step04ex.html index 6dc7e60..a72259f 100644 --- a/o3d/samples/GoogleIO-2009/step04ex.html +++ b/o3d/samples/GoogleIO-2009/step04ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step05ex.html b/o3d/samples/GoogleIO-2009/step05ex.html index 2013aee..4dfb4cc 100644 --- a/o3d/samples/GoogleIO-2009/step05ex.html +++ b/o3d/samples/GoogleIO-2009/step05ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step06ex.html b/o3d/samples/GoogleIO-2009/step06ex.html index e5e3969f..e61c868 100644 --- a/o3d/samples/GoogleIO-2009/step06ex.html +++ b/o3d/samples/GoogleIO-2009/step06ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step07ex.html b/o3d/samples/GoogleIO-2009/step07ex.html index 8528d56..31f5a74 100644 --- a/o3d/samples/GoogleIO-2009/step07ex.html +++ b/o3d/samples/GoogleIO-2009/step07ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step08ex.html b/o3d/samples/GoogleIO-2009/step08ex.html index e57ae9b..f0426fb 100644 --- a/o3d/samples/GoogleIO-2009/step08ex.html +++ b/o3d/samples/GoogleIO-2009/step08ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step09ex.html b/o3d/samples/GoogleIO-2009/step09ex.html index 63a4b45..6e1afb7 100644 --- a/o3d/samples/GoogleIO-2009/step09ex.html +++ b/o3d/samples/GoogleIO-2009/step09ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step10ex.html b/o3d/samples/GoogleIO-2009/step10ex.html index 44967c2..7e92911 100644 --- a/o3d/samples/GoogleIO-2009/step10ex.html +++ b/o3d/samples/GoogleIO-2009/step10ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step11ex.html b/o3d/samples/GoogleIO-2009/step11ex.html index 0376012..db9fd9e 100644 --- a/o3d/samples/GoogleIO-2009/step11ex.html +++ b/o3d/samples/GoogleIO-2009/step11ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step12ex.html b/o3d/samples/GoogleIO-2009/step12ex.html index c7fe250..99c7ce4 100644 --- a/o3d/samples/GoogleIO-2009/step12ex.html +++ b/o3d/samples/GoogleIO-2009/step12ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step13ex.html b/o3d/samples/GoogleIO-2009/step13ex.html index 0b0bcc9..62f56fc 100644 --- a/o3d/samples/GoogleIO-2009/step13ex.html +++ b/o3d/samples/GoogleIO-2009/step13ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/GoogleIO-2009/step14ex.html b/o3d/samples/GoogleIO-2009/step14ex.html index 8c05081..a1545c4 100644 --- a/o3d/samples/GoogleIO-2009/step14ex.html +++ b/o3d/samples/GoogleIO-2009/step14ex.html @@ -54,7 +54,7 @@ Google I/O O3D Sample <script type="text/javascript" src="../o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/animated-scene.html b/o3d/samples/animated-scene.html index 07cc80d..b60f286 100644 --- a/o3d/samples/animated-scene.html +++ b/o3d/samples/animated-scene.html @@ -49,7 +49,7 @@ Animated Scene. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/animation.html b/o3d/samples/animation.html index 96c0422..92dc49d 100644 --- a/o3d/samples/animation.html +++ b/o3d/samples/animation.html @@ -46,7 +46,7 @@ Animation. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.effect'); diff --git a/o3d/samples/archive-textures.html b/o3d/samples/archive-textures.html index cd771aa..2e33a3e 100644 --- a/o3d/samples/archive-textures.html +++ b/o3d/samples/archive-textures.html @@ -42,7 +42,7 @@ In this tutorial, we show how to progressively load in textures from a tar.gz ar Progressive Texture Loading </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.io'); diff --git a/o3d/samples/billboards.html b/o3d/samples/billboards.html index 41fc281..981ef3c 100644 --- a/o3d/samples/billboards.html +++ b/o3d/samples/billboards.html @@ -44,7 +44,7 @@ Billboard Example <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/bitmap-draw-image.html b/o3d/samples/bitmap-draw-image.html index 710ba22..66471f1 100644 --- a/o3d/samples/bitmap-draw-image.html +++ b/o3d/samples/bitmap-draw-image.html @@ -42,7 +42,7 @@ image on both bitmap and texture. Bitmap Draw Image Demo
</title>
<script type="text/javascript" src="o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.io');
diff --git a/o3d/samples/canvas-fonts.html b/o3d/samples/canvas-fonts.html index b89fb0a..edae578 100644 --- a/o3d/samples/canvas-fonts.html +++ b/o3d/samples/canvas-fonts.html @@ -46,7 +46,7 @@ O3D Canvas <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.primitives'); diff --git a/o3d/samples/canvas-texturedraw.html b/o3d/samples/canvas-texturedraw.html index 5ec6e57..c1331a82 100644 --- a/o3d/samples/canvas-texturedraw.html +++ b/o3d/samples/canvas-texturedraw.html @@ -45,7 +45,7 @@ O3D Canvas <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.io'); o3djs.require('o3djs.math'); diff --git a/o3d/samples/canvas.html b/o3d/samples/canvas.html index 0b55323..ea73f0f 100644 --- a/o3d/samples/canvas.html +++ b/o3d/samples/canvas.html @@ -45,7 +45,7 @@ O3D Canvas <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.primitives'); diff --git a/o3d/samples/checkers.html b/o3d/samples/checkers.html index 60d0d263..54530e4 100644 --- a/o3d/samples/checkers.html +++ b/o3d/samples/checkers.html @@ -45,7 +45,7 @@ This sample demonstates usage of primitive functions and simple 3d animation tec <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); o3djs.require('o3djs.effect'); diff --git a/o3d/samples/convolution.html b/o3d/samples/convolution.html index 249cf4b..5994a0c 100644 --- a/o3d/samples/convolution.html +++ b/o3d/samples/convolution.html @@ -44,7 +44,7 @@ O3D: Convolution Shader Sample </title> <!-- Include sample javascript library functions--> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.camera'); diff --git a/o3d/samples/culling.html b/o3d/samples/culling.html index b7eba7e..4e5816b 100644 --- a/o3d/samples/culling.html +++ b/o3d/samples/culling.html @@ -50,7 +50,7 @@ Culling. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/customcamera.html b/o3d/samples/customcamera.html index 4c38ad9..3ce9597 100644 --- a/o3d/samples/customcamera.html +++ b/o3d/samples/customcamera.html @@ -59,7 +59,7 @@ Tutorial B4: Cameras and events </style> <!-- Our javascript code --> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/debugging.html b/o3d/samples/debugging.html index 31506e5..84af399 100644 --- a/o3d/samples/debugging.html +++ b/o3d/samples/debugging.html @@ -44,7 +44,7 @@ Debugging. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/displayfps.html b/o3d/samples/displayfps.html index 6a7891c..c873eff 100644 --- a/o3d/samples/displayfps.html +++ b/o3d/samples/displayfps.html @@ -49,7 +49,7 @@ Compute and Display FPS. </style> <!-- Our javascript code --> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/error-texture.html b/o3d/samples/error-texture.html index 9650d68..c6a99e5 100644 --- a/o3d/samples/error-texture.html +++ b/o3d/samples/error-texture.html @@ -37,7 +37,7 @@ how turning it off will generate helpful error information. <head> <title>Error Texture</title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/fullscreen.html b/o3d/samples/fullscreen.html index 1bf7563..2014cc9 100644 --- a/o3d/samples/fullscreen.html +++ b/o3d/samples/fullscreen.html @@ -46,7 +46,7 @@ Full-Screen Mode Example <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/generate-texture.html b/o3d/samples/generate-texture.html index 951f81b..159ffbd 100644 --- a/o3d/samples/generate-texture.html +++ b/o3d/samples/generate-texture.html @@ -41,7 +41,7 @@ How to generate a texture. Generate Texture. </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/hellocube-colors.html b/o3d/samples/hellocube-colors.html index c784206a..aa3355f 100644 --- a/o3d/samples/hellocube-colors.html +++ b/o3d/samples/hellocube-colors.html @@ -44,7 +44,7 @@ to change the values of uniform parameters used by shaders. Hello Square Colors: Getting started with O3D, take 2. </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/hellocube-textures.html b/o3d/samples/hellocube-textures.html index b320f3b..44fa47e 100644 --- a/o3d/samples/hellocube-textures.html +++ b/o3d/samples/hellocube-textures.html @@ -43,7 +43,7 @@ This sample is a simple demonstration of texture usage in O3D. Hello Square Textures: Getting started with O3D, take 3. </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/hellocube.html b/o3d/samples/hellocube.html index 7b09abc..c036d6f 100644 --- a/o3d/samples/hellocube.html +++ b/o3d/samples/hellocube.html @@ -42,7 +42,7 @@ This sample shows how to place an O3D area in a page and draw simple Hello Cube: Getting started with O3D </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/helloworld.html b/o3d/samples/helloworld.html index b34b8d5..735d710 100644 --- a/o3d/samples/helloworld.html +++ b/o3d/samples/helloworld.html @@ -46,7 +46,7 @@ Tutorial A1: Loading a scene <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/home-configurators/homedesigner.html b/o3d/samples/home-configurators/homedesigner.html index 241fad3..387e99a2 100644 --- a/o3d/samples/home-configurators/homedesigner.html +++ b/o3d/samples/home-configurators/homedesigner.html @@ -89,7 +89,7 @@ BODY { <script type="text/javascript" src="zoomtool.js"></script> <script type="text/javascript" src="deletetool.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> /** * A structure to store our list of catalog items that can be dragged in. * If the url doesn't start with 'http:' then we assume it's a local diff --git a/o3d/samples/hud-2d-overlay.html b/o3d/samples/hud-2d-overlay.html index d9782d9..9c95126 100644 --- a/o3d/samples/hud-2d-overlay.html +++ b/o3d/samples/hud-2d-overlay.html @@ -46,7 +46,7 @@ HUD 2D Overlay. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/instance-override.html b/o3d/samples/instance-override.html index 0a1f750..f700a9d 100644 --- a/o3d/samples/instance-override.html +++ b/o3d/samples/instance-override.html @@ -47,7 +47,7 @@ Instancing with Overrides. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/instancing.html b/o3d/samples/instancing.html index 8525944..9612203 100644 --- a/o3d/samples/instancing.html +++ b/o3d/samples/instancing.html @@ -46,7 +46,7 @@ Instancing. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/juggler.html b/o3d/samples/juggler.html index 233e958..dd6fc77 100644 --- a/o3d/samples/juggler.html +++ b/o3d/samples/juggler.html @@ -43,7 +43,7 @@ O3D Juggler <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/julia.html b/o3d/samples/julia.html index c301f2f..e795cfd 100644 --- a/o3d/samples/julia.html +++ b/o3d/samples/julia.html @@ -46,7 +46,7 @@ Julia Set Pixel Shader <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/multiple-clients.html b/o3d/samples/multiple-clients.html index 650794b..94a2129 100644 --- a/o3d/samples/multiple-clients.html +++ b/o3d/samples/multiple-clients.html @@ -43,7 +43,7 @@ Multiple Clients </title> <!-- Our javascript code --> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.io'); diff --git a/o3d/samples/multiple-views.html b/o3d/samples/multiple-views.html index b2d493b..353e625 100644 --- a/o3d/samples/multiple-views.html +++ b/o3d/samples/multiple-views.html @@ -44,7 +44,7 @@ Multiple Views <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/o3djs/util.js b/o3d/samples/o3djs/util.js index 8a696c9..4c40c67 100644 --- a/o3d/samples/o3djs/util.js +++ b/o3d/samples/o3djs/util.js @@ -674,7 +674,7 @@ o3djs.util.isScriptUri = function(uri) { * @return {boolean} True if we want this script tag. */ o3djs.util.isWantedScriptTag_ = function(scriptElement) { - return scriptElement.id && scriptElement.id.match(/^o3d/); + return scriptElement.id && scriptElement.id.match(/^o3dscript/); }; /** diff --git a/o3d/samples/old-school-shadows.html b/o3d/samples/old-school-shadows.html index 2162387..bcdc7cc 100644 --- a/o3d/samples/old-school-shadows.html +++ b/o3d/samples/old-school-shadows.html @@ -44,7 +44,7 @@ Old School Shadows. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/particles.html b/o3d/samples/particles.html index d50345c..da38c53 100644 --- a/o3d/samples/particles.html +++ b/o3d/samples/particles.html @@ -46,7 +46,7 @@ Particles. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/samples/phongshading.html b/o3d/samples/phongshading.html index 534ef32..b26f654 100644 --- a/o3d/samples/phongshading.html +++ b/o3d/samples/phongshading.html @@ -55,7 +55,7 @@ Tutorial B5: Phong Shading </title> <!-- Our javascript code --> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/pingpong/o3dPingPong.html b/o3d/samples/pingpong/o3dPingPong.html index edeffe9..b0e3bf0 100644 --- a/o3d/samples/pingpong/o3dPingPong.html +++ b/o3d/samples/pingpong/o3dPingPong.html @@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <title>o3dPingPong</title> <script type="text/javascript" src="../o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/primitives.html b/o3d/samples/primitives.html index 849d83c..0137cc2 100644 --- a/o3d/samples/primitives.html +++ b/o3d/samples/primitives.html @@ -44,7 +44,7 @@ to make various shapes. Primitives </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/procedural-texture.html b/o3d/samples/procedural-texture.html index 9bba357..312c62c 100644 --- a/o3d/samples/procedural-texture.html +++ b/o3d/samples/procedural-texture.html @@ -47,7 +47,7 @@ Applying a Procedural Texture to a scene <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); o3djs.require('o3djs.pack'); diff --git a/o3d/samples/render-mode.html b/o3d/samples/render-mode.html index 7e2bdf5..2af091b 100644 --- a/o3d/samples/render-mode.html +++ b/o3d/samples/render-mode.html @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </head> <body onload="init();" onunload="uninit();"> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/samples/render-targets.html b/o3d/samples/render-targets.html index 28c706e..461ac4c 100644 --- a/o3d/samples/render-targets.html +++ b/o3d/samples/render-targets.html @@ -43,7 +43,7 @@ O3D: Render-Target Sample </title> <!-- Include sample javascript library functions--> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/rotatemodel.html b/o3d/samples/rotatemodel.html index d129fbf..9cc8143 100644 --- a/o3d/samples/rotatemodel.html +++ b/o3d/samples/rotatemodel.html @@ -46,7 +46,7 @@ Tutorial A2: Transformations <!-- Include sample javascript library functions--> <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.camera'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/scatter-chart.html b/o3d/samples/scatter-chart.html index c7a3dfb..a1f5f8d 100644 --- a/o3d/samples/scatter-chart.html +++ b/o3d/samples/scatter-chart.html @@ -45,7 +45,7 @@ This sample demonstrates how to plot a 3d scatter chart and how to rotate and zo <script type="text/javascript" src="o3djs/base.js"></script> <script type="text/javascript" src="assets/teapot_vertices.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/samples/shader-test.html b/o3d/samples/shader-test.html index eb4e4ed..9c49939 100644 --- a/o3d/samples/shader-test.html +++ b/o3d/samples/shader-test.html @@ -54,7 +54,7 @@ Shader Test <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); o3djs.require('o3djs.pack'); diff --git a/o3d/samples/shadow-map.html b/o3d/samples/shadow-map.html index 47230f1..cecaeef 100755 --- a/o3d/samples/shadow-map.html +++ b/o3d/samples/shadow-map.html @@ -48,7 +48,7 @@ render pass samples it to determine which points in the scene are in shaodow. Shadow Mapping </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/simple.html b/o3d/samples/simple.html index 90d5280..0b58ba1 100644 --- a/o3d/samples/simple.html +++ b/o3d/samples/simple.html @@ -45,7 +45,7 @@ Simple <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.simple'); // Events diff --git a/o3d/samples/simpletexture.html b/o3d/samples/simpletexture.html index fff5772..9d3052e 100644 --- a/o3d/samples/simpletexture.html +++ b/o3d/samples/simpletexture.html @@ -43,7 +43,7 @@ In this tutorial, we show how to use textures in o3d. Tutorial B3: Textures </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/simpleviewer/simpleviewer.html b/o3d/samples/simpleviewer/simpleviewer.html index da2d3d4..582cacd 100644 --- a/o3d/samples/simpleviewer/simpleviewer.html +++ b/o3d/samples/simpleviewer/simpleviewer.html @@ -47,7 +47,7 @@ html, body { </head> <body onload="init();" onunload="uninit();"> <script type="text/javascript" src="../o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/samples/siteswap/siteswap.html b/o3d/samples/siteswap/siteswap.html index 22bc094..15d7497 100644 --- a/o3d/samples/siteswap/siteswap.html +++ b/o3d/samples/siteswap/siteswap.html @@ -26,7 +26,7 @@ Author: Eric Uhrhane (ericu@google.com) <script type="text/javascript" src="siteswap.js"></script>
<script type="text/javascript" src="math.js"></script>
<script type="text/javascript" src="animation.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
diff --git a/o3d/samples/skinning.html b/o3d/samples/skinning.html index 5534fd2..c329623 100644 --- a/o3d/samples/skinning.html +++ b/o3d/samples/skinning.html @@ -46,7 +46,7 @@ Skinning. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/sobel.html b/o3d/samples/sobel.html index 3443654..90242bc 100644 --- a/o3d/samples/sobel.html +++ b/o3d/samples/sobel.html @@ -43,7 +43,7 @@ O3D: Sobel Shader Sample </title> <!-- Include sample javascript library functions--> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/stencil_example.html b/o3d/samples/stencil_example.html index 3277918..8d52e2b 100644 --- a/o3d/samples/stencil_example.html +++ b/o3d/samples/stencil_example.html @@ -56,7 +56,7 @@ Stencil Example <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/texturesamplers.html b/o3d/samples/texturesamplers.html index 23e6533..ebb76f4 100644 --- a/o3d/samples/texturesamplers.html +++ b/o3d/samples/texturesamplers.html @@ -44,7 +44,7 @@ Demonstrates how to create samplers and set their various states. Texture Samplers </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/trends/trends.html b/o3d/samples/trends/trends.html index bf2d67c..7b49537 100644 --- a/o3d/samples/trends/trends.html +++ b/o3d/samples/trends/trends.html @@ -58,7 +58,7 @@ Google Trends Visualizer </head> <body onload="init();" onunload="uninit();"> <script type="text/javascript" src="../o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/samples/tutorial-primitive.html b/o3d/samples/tutorial-primitive.html index 501ec25..b6f4c73 100644 --- a/o3d/samples/tutorial-primitive.html +++ b/o3d/samples/tutorial-primitive.html @@ -43,7 +43,7 @@ Tutorial: Primitive. </title> <!-- Include sample javascript library functions--> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); o3djs.require('o3djs.primitives'); diff --git a/o3d/samples/vertex-shader-animation.html b/o3d/samples/vertex-shader-animation.html index ab6c752..5cc2220 100644 --- a/o3d/samples/vertex-shader-animation.html +++ b/o3d/samples/vertex-shader-animation.html @@ -54,7 +54,7 @@ Vertex Shader Animation } </style> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/vertex-shader.html b/o3d/samples/vertex-shader.html index c0df47c..8443374 100644 --- a/o3d/samples/vertex-shader.html +++ b/o3d/samples/vertex-shader.html @@ -45,7 +45,7 @@ through the vertices in javascript. Vertex Shader </title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/yuv2rgb.html b/o3d/samples/yuv2rgb.html index 7f48aad..4af0d23d 100644 --- a/o3d/samples/yuv2rgb.html +++ b/o3d/samples/yuv2rgb.html @@ -43,7 +43,7 @@ RGB texture using a shader to do the conversion on the video hardware. <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <title>YUV to RGB Conversion in a shader.</title> <script type="text/javascript" src="o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/samples/zsorting.html b/o3d/samples/zsorting.html index c136e41..55826ba 100644 --- a/o3d/samples/zsorting.html +++ b/o3d/samples/zsorting.html @@ -44,7 +44,7 @@ ZSorting. <script type="text/javascript" src="o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/base-test.html b/o3d/tests/selenium/tests/base-test.html index 0cefe47..c799ec3 100644 --- a/o3d/tests/selenium/tests/base-test.html +++ b/o3d/tests/selenium/tests/base-test.html @@ -49,7 +49,7 @@ This tests base.js. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.test'); o3djs.require('o3djs.util'); diff --git a/o3d/tests/selenium/tests/culling-zsort-test.html b/o3d/tests/selenium/tests/culling-zsort-test.html index 44b6c20..2fe62ed 100644 --- a/o3d/tests/selenium/tests/culling-zsort-test.html +++ b/o3d/tests/selenium/tests/culling-zsort-test.html @@ -46,7 +46,7 @@ Culling and ZSorting Test. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/drawshapes.html b/o3d/tests/selenium/tests/drawshapes.html index 3901194..dcd9831 100644 --- a/o3d/tests/selenium/tests/drawshapes.html +++ b/o3d/tests/selenium/tests/drawshapes.html @@ -45,7 +45,7 @@ The color is set randomly. Drawshape stress test for O3D </title> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/effect-import-test.html b/o3d/tests/selenium/tests/effect-import-test.html index fec01dc..06357e0 100644 --- a/o3d/tests/selenium/tests/effect-import-test.html +++ b/o3d/tests/selenium/tests/effect-import-test.html @@ -44,7 +44,7 @@ Effect Import Test <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); o3djs.require('o3djs.camera'); diff --git a/o3d/tests/selenium/tests/event-test.html b/o3d/tests/selenium/tests/event-test.html index 5b463fd..4e03d6fd 100644 --- a/o3d/tests/selenium/tests/event-test.html +++ b/o3d/tests/selenium/tests/event-test.html @@ -44,7 +44,7 @@ This tests the event-handler functions in the event.js library. <br/> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.event'); o3djs.require('o3djs.test'); diff --git a/o3d/tests/selenium/tests/features-test.html b/o3d/tests/selenium/tests/features-test.html index d42c2f9..ea4ec7d 100644 --- a/o3d/tests/selenium/tests/features-test.html +++ b/o3d/tests/selenium/tests/features-test.html @@ -47,7 +47,7 @@ Features Test. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/init-status-test.html b/o3d/tests/selenium/tests/init-status-test.html index c17e74f..c46a587 100644 --- a/o3d/tests/selenium/tests/init-status-test.html +++ b/o3d/tests/selenium/tests/init-status-test.html @@ -46,7 +46,7 @@ Init Status Test. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/math-test.html b/o3d/tests/selenium/tests/math-test.html index c96b11d..bba64c0 100644 --- a/o3d/tests/selenium/tests/math-test.html +++ b/o3d/tests/selenium/tests/math-test.html @@ -44,7 +44,7 @@ This tests the math utility library. <br/> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.math'); o3djs.require('o3djs.test'); diff --git a/o3d/tests/selenium/tests/no-rendergraph.html b/o3d/tests/selenium/tests/no-rendergraph.html index bf07950..dd20206 100644 --- a/o3d/tests/selenium/tests/no-rendergraph.html +++ b/o3d/tests/selenium/tests/no-rendergraph.html @@ -44,7 +44,7 @@ No Rendergraph. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); // Events diff --git a/o3d/tests/selenium/tests/non-cachable-params.html b/o3d/tests/selenium/tests/non-cachable-params.html index 74d2007..14e8fdd 100644 --- a/o3d/tests/selenium/tests/non-cachable-params.html +++ b/o3d/tests/selenium/tests/non-cachable-params.html @@ -44,7 +44,7 @@ Non Cachable Params <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/offscreen-test.html b/o3d/tests/selenium/tests/offscreen-test.html index dcdb78d..e1e3519 100644 --- a/o3d/tests/selenium/tests/offscreen-test.html +++ b/o3d/tests/selenium/tests/offscreen-test.html @@ -47,7 +47,7 @@ Offscreen Test. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/ownership-test.html b/o3d/tests/selenium/tests/ownership-test.html index 8caeb91..298ef77 100644 --- a/o3d/tests/selenium/tests/ownership-test.html +++ b/o3d/tests/selenium/tests/ownership-test.html @@ -42,7 +42,7 @@ Ownership Test </title> <!-- Our javascript code --> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); window.onload = init; diff --git a/o3d/tests/selenium/tests/param-array-test.html b/o3d/tests/selenium/tests/param-array-test.html index 3b753a2..a5fd6d8 100644 --- a/o3d/tests/selenium/tests/param-array-test.html +++ b/o3d/tests/selenium/tests/param-array-test.html @@ -41,7 +41,7 @@ Param Array Test Param Array Test. </title> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/pixel-perfection.html b/o3d/tests/selenium/tests/pixel-perfection.html index cbb19c2..18ecb1d 100644 --- a/o3d/tests/selenium/tests/pixel-perfection.html +++ b/o3d/tests/selenium/tests/pixel-perfection.html @@ -52,7 +52,7 @@ we have a way to do that. Pixel Perfection </title> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.effect'); o3djs.require('o3djs.material'); o3djs.require('o3djs.math'); diff --git a/o3d/tests/selenium/tests/quaternion-test.html b/o3d/tests/selenium/tests/quaternion-test.html index 142fb65..0fda49c 100644 --- a/o3d/tests/selenium/tests/quaternion-test.html +++ b/o3d/tests/selenium/tests/quaternion-test.html @@ -44,7 +44,7 @@ This tests the quaternion utility library. <br/> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.math'); o3djs.require('o3djs.quaternions'); diff --git a/o3d/tests/selenium/tests/render-test.html b/o3d/tests/selenium/tests/render-test.html index d1a2000..0571ede 100644 --- a/o3d/tests/selenium/tests/render-test.html +++ b/o3d/tests/selenium/tests/render-test.html @@ -51,7 +51,7 @@ Render Test. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/serialization-test.html b/o3d/tests/selenium/tests/serialization-test.html index 6c5c186..b62d757 100644 --- a/o3d/tests/selenium/tests/serialization-test.html +++ b/o3d/tests/selenium/tests/serialization-test.html @@ -48,7 +48,7 @@ This tests deserialization of packs from JSON. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.io'); o3djs.require('o3djs.serialization'); diff --git a/o3d/tests/selenium/tests/test-test.html b/o3d/tests/selenium/tests/test-test.html index faa815a..0161ff9 100644 --- a/o3d/tests/selenium/tests/test-test.html +++ b/o3d/tests/selenium/tests/test-test.html @@ -44,7 +44,7 @@ This tests the operation of the unit testing library. <br/> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.test'); diff --git a/o3d/tests/selenium/tests/texture-set-test.html b/o3d/tests/selenium/tests/texture-set-test.html index 8bbc3fe..891a08d 100644 --- a/o3d/tests/selenium/tests/texture-set-test.html +++ b/o3d/tests/selenium/tests/texture-set-test.html @@ -41,7 +41,7 @@ Texture set test. Texture Set Test. </title> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/type-test.html b/o3d/tests/selenium/tests/type-test.html index 06edcb3..84eee91 100644 --- a/o3d/tests/selenium/tests/type-test.html +++ b/o3d/tests/selenium/tests/type-test.html @@ -43,7 +43,7 @@ Type Test <!-- Our javascript code --> <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.math'); diff --git a/o3d/tests/selenium/tests/util-test.html b/o3d/tests/selenium/tests/util-test.html index 1504fd3..0101840 100644 --- a/o3d/tests/selenium/tests/util-test.html +++ b/o3d/tests/selenium/tests/util-test.html @@ -49,7 +49,7 @@ This tests util.js. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.test'); o3djs.require('o3djs.util'); diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html index 167c8309..0c2dafe 100644 --- a/o3d/tests/selenium/tests/v8-test.html +++ b/o3d/tests/selenium/tests/v8-test.html @@ -49,7 +49,7 @@ This tests V8/NPAPI interoperation and the ActiveX bridge. <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.test'); o3djs.require('o3djs.util'); diff --git a/o3d/tests/selenium/tests/version-check-test.html b/o3d/tests/selenium/tests/version-check-test.html index ddeef25..fcc3acb 100644 --- a/o3d/tests/selenium/tests/version-check-test.html +++ b/o3d/tests/selenium/tests/version-check-test.html @@ -46,7 +46,7 @@ Version Check src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); // Events diff --git a/o3d/tests/selenium/tests/window-overlap-test.html b/o3d/tests/selenium/tests/window-overlap-test.html index 4b3f9c0..8a7910e 100644 --- a/o3d/tests/selenium/tests/window-overlap-test.html +++ b/o3d/tests/selenium/tests/window-overlap-test.html @@ -47,7 +47,7 @@ Window Overlap Test <script type="text/javascript" src="../../../samples/o3djs/base.js"></script> <!-- Our javascript code --> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> o3djs.require('o3djs.util'); o3djs.require('o3djs.rendergraph'); diff --git a/o3d/tests/selenium/tests/window-overlap-top.html b/o3d/tests/selenium/tests/window-overlap-top.html index 3c5cc2d..8243465 100644 --- a/o3d/tests/selenium/tests/window-overlap-top.html +++ b/o3d/tests/selenium/tests/window-overlap-top.html @@ -42,7 +42,7 @@ See window-overlap-test.html <title> Window Overlap Test Top Window </title> -<script type="text/javascript" id="o3d"> +<script type="text/javascript" id="o3dscript"> // Events // init() once the page has finished loading. window.onload = init; |