浏览代码

Removed font from examples/js, now that fonts are in examples/fonts.

alteredq 14 年之前
父节点
当前提交
44c0f34e2a
共有 3 个文件被更改,包括 20 次插入21 次删除
  1. 1 1
      examples/canvas_geometry_text.html
  2. 0 0
      examples/js/helvetiker-normal-normal.js
  3. 19 20
      examples/webgl_geometry_text.html

+ 1 - 1
examples/canvas_geometry_text.html

@@ -23,7 +23,7 @@
 		      
 		<!-- load the font file from canvas-text -->
 
-		<script type="text/javascript" src="js/helvetiker-normal-normal.js"></script>
+		<script type="text/javascript" src="fonts/helvetiker_regular.typeface.js"></script>
         
 
 		<script type="text/javascript">

文件差异内容过多而无法显示
+ 0 - 0
examples/js/helvetiker-normal-normal.js


+ 19 - 20
examples/webgl_geometry_text.html

@@ -30,11 +30,7 @@
 				<br/>Simple Dynamic 3D Text WebGL Example by <a href="http://www.lab4games.net/zz85/blog">zz85</a>
 			</div>
 			
-			
-<!--
-        <script type="text/javascript" src="http://mrdoob.github.com/three.js/build/Three.js"></script>
 
--->
 		<script type="text/javascript" src="../build/Three.js"></script>
 		<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
 		<script type="text/javascript" src="js/Stats.js"></script>
@@ -42,22 +38,25 @@
      
 		<link href="js/gui/gui.css" media="screen" rel="stylesheet" type="text/css" />
 		<script type="text/javascript" src="js/gui/gui.min.js"></script>
-		 <script type="text/javascript" src="../src/extras/geometries/Text.js"></script> 
-            <!--  
-        
-         <script type="text/javascript" src="helvetiker-normal-normal.js"></script>
-         http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/dejavu_serif-normal-normal.js
-  optimer-normal-normal.js
-  gentilis-normal-normal
-  http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/helvetiker-normal-normal.js
-http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/dejavu_sans-normal-normal.js
-
-	http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/optimer-normal-normal.js
-	http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/gentilis-normal-normal.js
-  -->
-	<script type="text/javascript" src="http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/optimer-normal-normal.js"></script>
-
-        	<script type="text/javascript" src="js/helvetiker-normal-normal.js"></script>
+		
+		<script type="text/javascript" src="../src/extras/geometries/Text.js"></script> 
+		
+	<!--  
+		<script type="text/javascript" src="http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/optimer-normal-normal.js"></script>
+		
+		http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/dejavu_serif-normal-normal.js
+		
+		http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/helvetiker-normal-normal.js
+		http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/dejavu_sans-normal-normal.js
+
+		http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/optimer-normal-normal.js
+		http://canvas-text.googlecode.com/svn-history/r41/trunk/faces/gentilis-normal-normal.js
+		
+	-->
+
+		<script type="text/javascript" src="fonts/helvetiker_regular.typeface.js"></script>
+		<script type="text/javascript" src="fonts/optimer_regular.typeface.js"></script>
+
 		<script type="text/javascript">
 
 			var container, stats;

部分文件因为文件数量过多而无法显示