Merge branch 'master' into Alpha-2-VR

tparisi · Feb 10, 2015 · 77c9625 · 77c9625
2 parents b3f23cd + c03c65e
commit 77c9625
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 10 deletions.
diff --git a/examples/materials/glamenvmap.html b/examples/materials/glamenvmap.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<script src="../../build/glam.min.js" ></script>
+<title>glam - bump mapping</title>
+
+<style>
+	body{
+		margin: 0px;
+		background-color: #000;
+	}
+
+	#earth {
+		shader:phong;
+		cube-image-right:url(../../images/Park2/posx.jpg);
+		cube-image-left:url(../../images/Park2/negx.jpg);
+		cube-image-top:url(../../images/Park2/posy.jpg);
+		cube-image-bottom:url(../../images/Park2/negy.jpg);
+		cube-image-front:url(../../images/Park2/posz.jpg);
+		cube-image-back:url(../../images/Park2/negz.jpg);
+		/*image:url(../../images/earth_atmos_2048.jpg);*/
+		backface-visibility:visible;
+	}
+
+	@-webkit-keyframes kfRotateY {
+	  from {
+	    -webkit-transform: rotateY(0deg);
+	  }
+
+	  to {
+	   -webkit-transform: rotateY(360deg);
+	  }
+	}
+	.animRotateY
+	 {
+	  -webkit-animation-duration: 90s;
+	  -webkit-animation-name: kfRotateY;
+	  -webkit-animation-iteration-count: infinite;
+	  -webkit-animation-timing-function:linear;
+	}
+
+
+</style>
+</head>
+<body>
+<!-- 
+glam - Simple scene with bump mapping
+ -->
+<div id="container" style="width:98%; height:98%;position:absolute;">
+<glam>
+  <scene>
+	<sphere id="earth" class="" radius='1'></sphere>
+  </scene>
+</glam>
+</div>
+
+</body>
+</html>
diff --git a/examples/vr/bubblepopcb.html b/examples/vr/bubblepopcb.html
@@ -21,18 +21,14 @@
 	}
 
 	.skybox {
-		cube-image-right:url(../../images/Park2_1024/posx.jpg);
-		cube-image-left:url(../../images/Park2_1024/negx.jpg);
-		cube-image-top:url(../../images/Park2_1024/posy.jpg);
-		cube-image-bottom:url(../../images/Park2_1024/negy.jpg);
-		cube-image-front:url(../../images/Park2_1024/posz.jpg);
-		cube-image-back:url(../../images/Park2_1024/negz.jpg);
+		cube-image-right:url(../../images/Park2_1024/posx.png);
+		cube-image-left:url(../../images/Park2_1024/negx.png);
+		cube-image-top:url(../../images/Park2_1024/posy.png);
+		cube-image-bottom:url(../../images/Park2_1024/negy.png);
+		cube-image-front:url(../../images/Park2_1024/posz.png);
+		cube-image-back:url(../../images/Park2_1024/negz.png);
 	}
 
-	#ss1 {
-		sphere-image:url(../../images/spherepano/pan0.jpg);
-	}
-
 	.bubble {
 		radius:.5;
 		diffuse-color:lightgray;

diff --git a/images/Park2_1024/negx.png b/images/Park2_1024/negx.png
diff --git a/images/Park2_1024/negy.png b/images/Park2_1024/negy.png
diff --git a/images/Park2_1024/negz.png b/images/Park2_1024/negz.png
diff --git a/images/Park2_1024/posx.png b/images/Park2_1024/posx.png
diff --git a/images/Park2_1024/posy.png b/images/Park2_1024/posy.png
diff --git a/images/Park2_1024/posz.png b/images/Park2_1024/posz.png