summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 19:03:43 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 19:03:43 +0000
commit14e62ae91977234b17d2c3fa301d49c02cbd60ed (patch)
treee21fbb174dbcf3ba928efbc2c64aa8518459e3b9 /o3d
parent692033a35dd662cd04b965cfa31581176ebdcfe6 (diff)
downloadchromium_src-14e62ae91977234b17d2c3fa301d49c02cbd60ed.zip
chromium_src-14e62ae91977234b17d2c3fa301d49c02cbd60ed.tar.gz
chromium_src-14e62ae91977234b17d2c3fa301d49c02cbd60ed.tar.bz2
Hierarchy. Hierarchy. Hierarchy!!!
BUG=none TEST=none Review URL: http://codereview.chromium.org/1561020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/samples/manipulators/manipsample.js2
-rw-r--r--o3d/samples/primitives.html2
-rw-r--r--o3d/samples/vertex-shader.html4
-rw-r--r--o3d/tests/selenium/tests/pixel-perfection.html2
4 files changed, 5 insertions, 5 deletions
diff --git a/o3d/samples/manipulators/manipsample.js b/o3d/samples/manipulators/manipsample.js
index c788006..a63cf8c 100644
--- a/o3d/samples/manipulators/manipsample.js
+++ b/o3d/samples/manipulators/manipsample.js
@@ -86,7 +86,7 @@ function main(clientElements) {
// Init global variables.
initGlobals(clientElements);
- // Add the shapes to the transform heirarchy.
+ // Add the shapes to the transform hierarchy.
createShapes();
// Add the manipulators to the transform hierarchy.
diff --git a/o3d/samples/primitives.html b/o3d/samples/primitives.html
index 27763d1..6c2021e 100644
--- a/o3d/samples/primitives.html
+++ b/o3d/samples/primitives.html
@@ -84,7 +84,7 @@ function main(clientElements) {
// Set up the view and projection transformations.
initContext();
- // Add the shapes to the transform heirarchy.
+ // Add the shapes to the transform hierarchy.
createShapes();
window.g_finished = true; // for selenium testing.
diff --git a/o3d/samples/vertex-shader.html b/o3d/samples/vertex-shader.html
index 8443374..f3f4602 100644
--- a/o3d/samples/vertex-shader.html
+++ b/o3d/samples/vertex-shader.html
@@ -91,7 +91,7 @@ function initStep2(clientElements) {
// Set up the view and projection transformations.
initContext();
- // Add the shapes to the transform heirarchy.
+ // Add the shapes to the transform hierarchy.
createPlane();
// Setup render callback.
@@ -192,7 +192,7 @@ function createPlane() {
var plane = o3djs.primitives.createPlane(
g_pack, createMaterial(), 4, 4, 300, 300);
- // Add the shape to the transform heirarchy.
+ // Add the shape to the transform hierarchy.
g_client.root.addShape(plane);
}
diff --git a/o3d/tests/selenium/tests/pixel-perfection.html b/o3d/tests/selenium/tests/pixel-perfection.html
index 18ecb1d..a1e84b0 100644
--- a/o3d/tests/selenium/tests/pixel-perfection.html
+++ b/o3d/tests/selenium/tests/pixel-perfection.html
@@ -96,7 +96,7 @@ function main(clientElements) {
// Set up the view and projection transformations.
initContext();
- // Add the shapes to the transform heirarchy.
+ // Add the shapes to the transform hierarchy.
createShapes();
window.g_testResult = true; // for selenium testing.