[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
cmarrin at apple.com
cmarrin at apple.com
Thu Oct 29 20:39:23 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 17048028e8779564f2a52a5d1f361c98700ad37d
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 5 22:44:09 2009 +0000
Fixed some tests for WebGL blog post
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49121 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitSite/blog-files/webgl/Earth.html b/WebKitSite/blog-files/webgl/Earth.html
index fa59a20..0a2271f 100644
--- a/WebKitSite/blog-files/webgl/Earth.html
+++ b/WebKitSite/blog-files/webgl/Earth.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>Earth and Mars</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
diff --git a/WebKitSite/blog-files/webgl/ManyPlanetsDeep.html b/WebKitSite/blog-files/webgl/ManyPlanetsDeep.html
index e5bb773..6657e7e 100644
--- a/WebKitSite/blog-files/webgl/ManyPlanetsDeep.html
+++ b/WebKitSite/blog-files/webgl/ManyPlanetsDeep.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>Many Planets Deep</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
diff --git a/WebKitSite/blog-files/webgl/SpinningBox.html b/WebKitSite/blog-files/webgl/SpinningBox.html
index 203d7bd..b93ab76 100644
--- a/WebKitSite/blog-files/webgl/SpinningBox.html
+++ b/WebKitSite/blog-files/webgl/SpinningBox.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>Spinning Box</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
<script id="vshader" type="x-shader/x-vertex">
diff --git a/WebKitSite/blog-files/webgl/TeapotPerPixel.html b/WebKitSite/blog-files/webgl/TeapotPerPixel.html
index 6274c8b..2d155af 100644
--- a/WebKitSite/blog-files/webgl/TeapotPerPixel.html
+++ b/WebKitSite/blog-files/webgl/TeapotPerPixel.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>Teapot (per-pixel)</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
<script id="vshader" type="x-shader/x-vertex">
diff --git a/WebKitSite/blog-files/webgl/TeapotPerVertex.html b/WebKitSite/blog-files/webgl/TeapotPerVertex.html
index d2544a3..9c4c58d 100644
--- a/WebKitSite/blog-files/webgl/TeapotPerVertex.html
+++ b/WebKitSite/blog-files/webgl/TeapotPerVertex.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>Teapot (per-vertex)</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
<script id="vshader" type="x-shader/x-vertex">
diff --git a/WebKitSite/blog-files/webgl/WebGL+CSS.html b/WebKitSite/blog-files/webgl/WebGL+CSS.html
index e293a08..7828fc7 100644
--- a/WebKitSite/blog-files/webgl/WebGL+CSS.html
+++ b/WebKitSite/blog-files/webgl/WebGL+CSS.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Canvas3d example</title>
+ <title>WebGL + CSS Effects</title>
<script src="resources/CanvasMatrix.js"> </script>
<script src="resources/utils3d.js"> </script>
<script id="vshader" type="x-shader/x-vertex">
@@ -332,7 +332,7 @@
}
#container {
-webkit-transform: perspective(800) rotateY(0) rotateZ(0);
- -webkit-transition: -webkit-transform 0.5s;
+ -webkit-transition: -webkit-transform 2s;
}
#container.tilted {
-webkit-transform: perspective(800) rotateY(60deg) rotateZ(320deg);
@@ -347,6 +347,23 @@
width:90%;
height:90%;
}
+ #rocker {
+ position:absolute;
+ top:300px;
+ left:300px;
+ font-size:3em;
+ text-shadow: white 2px 2px 4px;
+ -webkit-animation:5s rock infinite alternate ease-in-out;
+ }
+
+ @-webkit-keyframes rock {
+ 0% { -webkit-transform: translateX(-100px) rotate3d(0,0,1, -30deg) }
+ 25% { -webkit-transform: translateX(-50px) rotate3d(0,0,1, 30deg) }
+ 50% { -webkit-transform: translateX(0px) rotate3d(0,0,1, -30deg) }
+ 75% { -webkit-transform: translateX(50px) rotate3d(0,0,1, 30deg) }
+ 100% { -webkit-transform: translateX(100px) rotate3d(0,0,1, -30deg) }
+ }
+
#framerate {
position:absolute;
top:10px;
@@ -365,6 +382,7 @@
There is supposed to be an example drawing here, but it's not important.
</canvas>
</div>
+ <div id="rocker">WebGL Rocks!</div>
<div id="framerate"></div>
</body>
</html>
diff --git a/WebKitSite/blog-files/webgl/resources/utils3d.js b/WebKitSite/blog-files/webgl/resources/utils3d.js
index 0ffd7c4..e8f43a8 100644
--- a/WebKitSite/blog-files/webgl/resources/utils3d.js
+++ b/WebKitSite/blog-files/webgl/resources/utils3d.js
@@ -16,7 +16,15 @@
function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth)
{
var canvas = document.getElementById(canvasName);
- var gl = canvas.getContext("webkit-3d");
+ var gl;
+
+ try {gl = canvas.getContext("webkit-3d") } catch(e) { }
+ if (!gl)
+ try {gl = canvas.getContext("moz-webgl") } catch(e) { }
+ if (!gl) {
+ alert("No WebGL context found");
+ return null;
+ }
// create our shaders
var vertexShader = loadShader(gl, vshader);
@@ -58,8 +66,8 @@ function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth
gl.useProgram(gl.program);
- gl.clearColor (clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
- gl.clearDepth (clearDepth);
+ gl.clearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
+ gl.clearDepth(clearDepth);
gl.enable(gl.DEPTH_TEST);
gl.enable(gl.BLEND);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list