Skip to content

Commit 7977fa9

Browse files
greggmanphemavax
greggman
authored and
phemavax
committed
cleanup
1 parent 870549b commit 7977fa9

File tree

89 files changed

+526
-477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+526
-477
lines changed

‎aquarium-vr/aquarium-vr.html

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<html>
3333
<head>
3434
<meta charset="utf-8">
35+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
3536
<title>WebGL Aquarium</title>
3637
<style>
3738
html, body {
@@ -105,17 +106,17 @@
105106
padding: 10px;
106107
}
107108
</style>
108-
<link type="text/css" href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
109-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
110-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
111-
<script type="text/javascript" src="../khronos/webgl-debug.js"></script>
112-
<script type="text/javascript" src="../tdl/base.js"></script>
113-
<script type="text/javascript" src="utils/vr_text_renderer.js"></script>
114-
<script type="text/javascript" src="utils/gamepad.js"></script>
115-
<script type="text/javascript" src="utils/ui.js"></script>
116-
<script type="text/javascript" src="aquarium-config.js"></script>
117-
<script type="text/javascript" src="../aquarium/aquarium-common.js"></script>
118-
<script type="text/javascript" src="../aquarium/aquarium.js"></script>
109+
<link href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
110+
<script src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
111+
<script src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
112+
<script src="../khronos/webgl-debug.js"></script>
113+
<script src="../tdl/base.js"></script>
114+
<script src="utils/vr_text_renderer.js"></script>
115+
<script src="utils/gamepad.js"></script>
116+
<script src="utils/ui.js"></script>
117+
<script src="aquarium-config.js"></script>
118+
<script src="../aquarium/aquarium-common.js"></script>
119+
<script src="../aquarium/aquarium.js"></script>
119120
</head>
120121
<body>
121122
<div id="info"><a href="http://threedlibrary.googlecode.com" target="_blank">tdl.js</a> - aquarium</div>

‎aquarium/aquarium-control-panel.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<html>
3434
<head>
3535
<meta charset="utf-8">
36+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
3637
<title>WebGL Aquarium</title>
3738
<style>
3839
html, body {
@@ -97,12 +98,12 @@
9798
cursor: pointer;
9899
}
99100
</style>
100-
<link type="text/css" href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
101-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
102-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
103-
<script type="text/javascript" src="../tdl/base.js"></script>
104-
<script type="text/javascript" src="aquarium-common.js"></script>
105-
<script type="text/javascript" src="aquarium-control-panel.js"></script>
101+
<link href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
102+
<script src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
103+
<script src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
104+
<script src="../tdl/base.js"></script>
105+
<script src="aquarium-common.js"></script>
106+
<script src="aquarium-control-panel.js"></script>
106107
</head>
107108
<body>
108109
<div id="contentOuter">

‎aquarium/aquarium.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<html>
3333
<head>
3434
<meta charset="utf-8">
35+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
3536
<title>WebGL Aquarium</title>
3637
<style>
3738
html, body {
@@ -193,14 +194,14 @@
193194
padding: 10px;
194195
}
195196
</style>
196-
<link type="text/css" href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
197-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
198-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
199-
<script type="text/javascript" src="../khronos/webgl-debug.js"></script>
200-
<script type="text/javascript" src="../tdl/base.js"></script>
201-
<script type="text/javascript" src="aquarium-config.js"></script>
202-
<script type="text/javascript" src="aquarium-common.js"></script>
203-
<script type="text/javascript" src="aquarium.js"></script>
197+
<link href="../jquery-ui-1.8.2.custom/css/ui-lightness/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
198+
<script src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
199+
<script src="../jquery-ui-1.8.2.custom/js/jquery-ui-1.8.2.custom.min.js"></script>
200+
<script src="../khronos/webgl-debug.js"></script>
201+
<script src="../tdl/base.js"></script>
202+
<script src="aquarium-config.js"></script>
203+
<script src="aquarium-common.js"></script>
204+
<script src="aquarium.js"></script>
204205
</head>
205206
<body>
206207
<div id="info"><a href="http://threedlibrary.googlecode.com" target="_blank">tdl.js</a> - aquarium</div>

‎aquarium/aquarium.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ function main() {
10201020

10211021
function handleContextLost() {
10221022
tdl.log("context lost");
1023-
tdl.webgl.cancelRequestAnimationFrame(g_requestId);
1023+
cancelAnimationFrame(g_requestId);
10241024
// remove loading scenes
10251025
for (var name in g_scenes) {
10261026
var scene = g_scenes[name];
@@ -2039,7 +2039,7 @@ function initialize() {
20392039
g_requestId = g_vrDisplay.requestAnimationFrame(onAnimationFrame);
20402040
g_vrDisplay.getFrameData(g_frameData);
20412041
} else {
2042-
g_requestId = tdl.webgl.requestAnimationFrame(onAnimationFrame, canvas);
2042+
g_requestId = requestAnimationFrame(onAnimationFrame);
20432043
}
20442044

20452045
if (g_shadersNeedUpdate) {

‎blob/blob.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<html>
4747
<head>
4848
<meta charset="utf-8">
49+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
4950
<title>WebGL Blobs</title>
5051
<style>
5152
body {
@@ -97,12 +98,12 @@
9798
font-weight: bold;
9899
}
99100
</style>
100-
<script type="text/javascript" src="../khronos/webgl-debug.js"></script>
101-
<script type="text/javascript" src="../tdl/base.js"></script>
102-
<script type="text/javascript" src="immediate_sim.js"></script>
103-
<script type="text/javascript" src="marching_cubes_tables.js"></script>
104-
<script type="text/javascript" src="marching_cubes.js"></script>
105-
<script type="text/javascript">
101+
<script src="../khronos/webgl-debug.js"></script>
102+
<script src="../tdl/base.js"></script>
103+
<script src="immediate_sim.js"></script>
104+
<script src="marching_cubes_tables.js"></script>
105+
<script src="marching_cubes.js"></script>
106+
<script>
106107

107108
tdl.require('tdl.fast');
108109
tdl.require('tdl.fps');
@@ -170,7 +171,7 @@
170171
singleEffect.render(null, now, g_numBlobs)
171172
frameCount++;
172173
totalFrameCount++;
173-
g_requestId = tdl.webgl.requestAnimationFrame(render, canvas);
174+
g_requestId = requestAnimationFrame(render);
174175
}
175176

176177
// Repeatedly run render(), attempt to hold 60 but the demo is
@@ -271,7 +272,7 @@
271272

272273
function handleContextLost() {
273274
tdl.log("context lost");
274-
tdl.webgl.cancelRequestAnimationFrame(g_requestId);
275+
cancelAnimationFrame(g_requestId);
275276
}
276277

277278
function handleContextRestored() {

‎book/book.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<head>
44
<title>Chrome Book</title>
55

6-
<script type="text/javascript" src="extension/glMatrix-0.9.5.min.js"></script>
7-
<script type="text/javascript" src="extension/webgl-utils.js"></script>
8-
<script type="text/javascript" src="extension/chrome_book_graphics.js"></script>
9-
<script type="text/javascript" src="extension/chrome_book_physics.js"></script>
10-
<script type="text/javascript" src="extension/chrome_book_mesh.js"></script>
6+
<script src="extension/glMatrix-0.9.5.min.js"></script>
7+
<script src="extension/webgl-utils.js"></script>
8+
<script src="extension/chrome_book_graphics.js"></script>
9+
<script src="extension/chrome_book_physics.js"></script>
10+
<script src="extension/chrome_book_mesh.js"></script>
1111
<!-- Interactivity, glue and application-dependent code is in chrome_book_sim.js -->
12-
<script type="text/javascript" src="chrome_book_sim.js"></script>
12+
<script src="chrome_book_sim.js"></script>
1313

1414
<script id="shader-fs" type="x-shader/x-fragment">
1515
#ifdef GL_ES
@@ -58,7 +58,7 @@
5858
}
5959
</script>
6060

61-
<script type="text/javascript">
61+
<script>
6262
function start_sim() {
6363
var body = document.getElementById('page-body');
6464
var canvas = document.getElementById('cloth-canvas');

‎book/extension/book.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<head>
44
<title>Chrome Book with Offscreen Tabs</title>
55

6-
<script type="text/javascript" src="glMatrix-0.9.5.min.js"></script>
7-
<script type="text/javascript" src="webgl-utils.js"></script>
8-
<script type="text/javascript" src="webgl-debug.js"></script>
9-
<script type="text/javascript" src="chrome_book_graphics.js"></script>
10-
<script type="text/javascript" src="chrome_book_physics.js"></script>
11-
<script type="text/javascript" src="chrome_book_mesh.js"></script>
12-
<script type="text/javascript" src="imageData.js"></script>
6+
<script src="glMatrix-0.9.5.min.js"></script>
7+
<script src="webgl-utils.js"></script>
8+
<script src="webgl-debug.js"></script>
9+
<script src="chrome_book_graphics.js"></script>
10+
<script src="chrome_book_physics.js"></script>
11+
<script src="chrome_book_mesh.js"></script>
12+
<script src="imageData.js"></script>
1313
<!-- Interactivity, glue and application-dependent code is in chrome_book_sim.js -->
14-
<script type="text/javascript" src="chrome_book_sim.js"></script>
14+
<script src="chrome_book_sim.js"></script>
1515

1616
<script id="shader-fs" type="x-shader/x-fragment">
1717
#ifdef GL_ES
@@ -60,7 +60,7 @@
6060
}
6161
</script>
6262

63-
<script type="text/javascript">
63+
<script>
6464
function start_sim() {
6565
var body = document.getElementById('page-body');
6666
var canvas = document.getElementById('cloth-canvas');

‎book/extension/webgl-utils.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,8 @@ var setupWebGL = function(canvas, opt_attribs, opt_onError) {
140140
* @return {!WebGLContext} The created context.
141141
*/
142142
var create3DContext = function(canvas, opt_attribs) {
143-
var names = ["webgl", "experimental-webgl", "webkit-3d", "moz-webgl"];
144-
var context = null;
145-
for (var ii = 0; ii < names.length; ++ii) {
146-
try {
147-
context = canvas.getContext(names[ii], opt_attribs);
148-
} catch(e) {}
149-
if (context) {
150-
break;
151-
}
152-
}
153-
return context;
154-
}
143+
return canvas.getContext("webgl", opt_attribs);
144+
};
155145

156146
return {
157147
create3DContext: create3DContext,

‎caves/caves.html

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
56
<title>WebGL Caves Demo</title>
67
<style>
78
html, body {
@@ -38,15 +39,15 @@
3839
background-color: rgba(255, 255, 255, 0.5);
3940
}
4041
</style>
41-
<script type="text/javascript" src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
42-
<script type="text/javascript" src="../tdl/base.js"></script>
43-
<script type="text/javascript" src="growable.js"></script>
44-
<script type="text/javascript" src="field.js"></script>
45-
<script type="text/javascript" src="display_list.js"></script>
46-
<script type="text/javascript" src="marching_cubes_tables.js"></script>
47-
<script type="text/javascript" src="marching_cubes.js"></script>
48-
<script type="text/javascript" src="caves_main.js"></script>
49-
<script type="text/javascript">
42+
<script src="../jquery-ui-1.8.2.custom/js/jquery-1.4.2.min.js"></script>
43+
<script src="../tdl/base.js"></script>
44+
<script src="growable.js"></script>
45+
<script src="field.js"></script>
46+
<script src="display_list.js"></script>
47+
<script src="marching_cubes_tables.js"></script>
48+
<script src="marching_cubes.js"></script>
49+
<script src="caves_main.js"></script>
50+
<script>
5051

5152
tdl.require('tdl.fast');
5253
tdl.require('tdl.math');

‎city/city.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<html>
3333
<head>
3434
<meta charset="utf-8">
35+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
3536
<title>WebGL City</title>
3637
<style>
3738
html, body {
@@ -86,8 +87,8 @@
8687
height: 100%;
8788
}
8889
</style>
89-
<script type="text/javascript" src="../tdl/base.js"></script>
90-
<script type="text/javascript">
90+
<script src="../tdl/base.js"></script>
91+
<script>
9192
tdl.require('tdl.buffers');
9293
tdl.require('tdl.fast');
9394
tdl.require('tdl.fps');
@@ -880,7 +881,7 @@
880881
function render() {
881882
++frameCount;
882883
if (!g_drawOnce) {
883-
tdl.webgl.requestAnimationFrame(render, canvas);
884+
requestAnimationFrame(render);
884885
}
885886
var now = (new Date()).getTime() * 0.001;
886887
var elapsedTime;

0 commit comments

Comments
 (0)