浏览代码

Merge remote-tracking branch 'remotes/mrdoob/dev' into unflip

alteredq 13 年之前
父节点
当前提交
cbe8a91130
共有 4 个文件被更改,包括 33 次插入10 次删除
  1. 二进制
      docs/files/inconsolata.woff
  2. 14 3
      docs/index.html
  3. 18 6
      docs/page.css
  4. 1 1
      src/core/Geometry.js

二进制
docs/files/inconsolata.woff


+ 14 - 3
docs/index.html

@@ -4,6 +4,13 @@
 		<meta charset="utf-8">
 		<meta charset="utf-8">
 		<title>three.js - documentation</title>
 		<title>three.js - documentation</title>
 		<style>
 		<style>
+			@font-face {
+				font-family: 'inconsolata';
+				src: url('files/inconsolata.woff') format('woff');
+				font-weight: normal;
+				font-style: normal;
+			}
+
 			html {
 			html {
 				height: 100%;
 				height: 100%;
 			}
 			}
@@ -13,7 +20,7 @@
 				padding: 0;
 				padding: 0;
 				height: 100%;
 				height: 100%;
 				color: #555;
 				color: #555;
-				font-family: Arial, sans-serif;
+				font-family: 'inconsolata';
 				font-size: 15px;
 				font-size: 15px;
 				overflow: hidden;
 				overflow: hidden;
 			}
 			}
@@ -36,15 +43,19 @@
 			}
 			}
 
 
 				#panel h1 {
 				#panel h1 {
-					color: #444;
+					color: #333;
 					font-size: 25px;
 					font-size: 25px;
+					font-weight: normal;
+
 					margin-top: 25px;
 					margin-top: 25px;
 					margin-left: 20px;
 					margin-left: 20px;
 				}
 				}
 
 
 				#panel h2 {
 				#panel h2 {
-					color: #999;
+					color: #666;
 					font-size: 16px;
 					font-size: 16px;
+					font-weight: normal;
+
 					margin-top: 20px;
 					margin-top: 20px;
 					margin-left: 20px;
 					margin-left: 20px;
 				}
 				}

+ 18 - 6
docs/page.css

@@ -1,32 +1,44 @@
+@font-face {
+	font-family: 'inconsolata';
+	src: url('files/inconsolata.woff') format('woff');
+	font-weight: normal;
+	font-style: normal;
+}
+
 body {
 body {
-	margin: 20px;
+	margin: 25px 20px;
 	color: #555;
 	color: #555;
-	font-family: Arial, sans-serif;
+	font-family: 'inconsolata';
 	font-size: 15px;
 	font-size: 15px;
 	overflow: auto;
 	overflow: auto;
 }
 }
 
 
 a {
 a {
-	color: #2194CE;
+	color: #1184CE;
 }
 }
 
 
 h1 {
 h1 {
-	color: #444;
+	color: #333;
 	font-size: 25px;
 	font-size: 25px;
+	font-weight: normal;
+
 	margin-top: 10px;
 	margin-top: 10px;
 }
 }
 
 
 h2 {
 h2 {
-	color: #8B2;
+	color: #4B0;
 	font-size: 18px;
 	font-size: 18px;
+	font-weight: normal;
+
 	margin-top: 40px;
 	margin-top: 40px;
 }
 }
 
 
 h3 {
 h3 {
 	color: #000;
 	color: #000;
 	font-size: 16px;
 	font-size: 16px;
-	margin-top: 30px;
 	font-weight: normal;
 	font-weight: normal;
+
+	margin-top: 30px;
 }
 }
 
 
 div {
 div {

+ 1 - 1
src/core/Geometry.js

@@ -34,7 +34,7 @@ THREE.Geometry = function () {
 
 
 	this.hasTangents = false;
 	this.hasTangents = false;
 
 
-	this.dynamic = false; // unless set to true the *Arrays will be deleted once sent to a buffer
+	this.dynamic = true; // the intermediate typearrays will be deleted when set to false
 
 
 };
 };