Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
c7ae397c
T
three.js
项目概览
Ablesons
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c7ae397c
编写于
1月 10, 2017
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
576f87cb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
558 addition
and
535 deletion
+558
-535
build/three.js
build/three.js
+32
-21
build/three.min.js
build/three.min.js
+494
-493
build/three.module.js
build/three.module.js
+32
-21
未找到文件。
build/three.js
浏览文件 @
c7ae397c
...
...
@@ -17423,7 +17423,6 @@
if ( index !== null ) {
var edges = {};
var array = index.array;
for ( var i = 0, l = array.length; i < l; i += 3 ) {
...
...
@@ -34992,16 +34991,28 @@
var chars = String( text ).split( '' );
var scale = size / data.resolution;
var offset = 0;
var line_height = ( data.boundingBox.yMax - data.boundingBox.yMin + data.underlineThickness ) * scale;
var offsetX = 0, offsetY = 0;
var paths = [];
for ( var i = 0; i < chars.length; i ++ ) {
var ret = createPath( chars[ i ], scale, offset );
offset += ret.offset;
var char = chars[ i ];
if ( char === '\n' ) {
paths.push( ret.path );
offsetX = 0;
offsetY -= line_height;
} else {
var ret = createPath( char, scale, offsetX, offsetY );
offsetX += ret.offsetX;
paths.push( ret.path );
}
}
...
...
@@ -35009,7 +35020,7 @@
}
function createPath( c, scale, offset ) {
function createPath( c, scale, offset
X, offsetY
) {
var glyph = data.glyphs[ c ] || data.glyphs[ '?' ];
...
...
@@ -35032,8 +35043,8 @@
case 'm': // moveTo
x = outline[ i ++ ] * scale + offset;
y = outline[ i ++ ] * scale;
x = outline[ i ++ ] * scale + offset
X
;
y = outline[ i ++ ] * scale
+ offsetY
;
path.moveTo( x, y );
...
...
@@ -35041,8 +35052,8 @@
case 'l': // lineTo
x = outline[ i ++ ] * scale + offset;
y = outline[ i ++ ] * scale;
x = outline[ i ++ ] * scale + offset
X
;
y = outline[ i ++ ] * scale
+ offsetY
;
path.lineTo( x, y );
...
...
@@ -35050,10 +35061,10 @@
case 'q': // quadraticCurveTo
cpx = outline[ i ++ ] * scale + offset;
cpy = outline[ i ++ ] * scale;
cpx1 = outline[ i ++ ] * scale + offset;
cpy1 = outline[ i ++ ] * scale;
cpx = outline[ i ++ ] * scale + offset
X
;
cpy = outline[ i ++ ] * scale
+ offsetY
;
cpx1 = outline[ i ++ ] * scale + offset
X
;
cpy1 = outline[ i ++ ] * scale
+ offsetY
;
path.quadraticCurveTo( cpx1, cpy1, cpx, cpy );
...
...
@@ -35078,12 +35089,12 @@
case 'b': // bezierCurveTo
cpx = outline[ i ++ ] * scale + offset;
cpy = outline[ i ++ ] * scale;
cpx1 = outline[ i ++ ] * scale + offset;
cpy1 = outline[ i ++ ] * scale;
cpx2 = outline[ i ++ ] * scale + offset;
cpy2 = outline[ i ++ ] * scale;
cpx = outline[ i ++ ] * scale + offset
X
;
cpy = outline[ i ++ ] * scale
+ offsetY
;
cpx1 = outline[ i ++ ] * scale + offset
X
;
cpy1 = outline[ i ++ ] * scale
+ offsetY
;
cpx2 = outline[ i ++ ] * scale + offset
X
;
cpy2 = outline[ i ++ ] * scale
+ offsetY
;
path.bezierCurveTo( cpx1, cpy1, cpx2, cpy2, cpx, cpy );
...
...
@@ -35112,7 +35123,7 @@
}
return { offset: glyph.ha * scale, path: path };
return { offset
X
: glyph.ha * scale, path: path };
}
...
...
build/three.min.js
浏览文件 @
c7ae397c
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/three.module.js
浏览文件 @
c7ae397c
...
...
@@ -17417,7 +17417,6 @@ function WebGLObjects( gl, properties, info ) {
if ( index !== null ) {
var edges = {};
var array = index.array;
for ( var i = 0, l = array.length; i < l; i += 3 ) {
...
...
@@ -34986,16 +34985,28 @@ Object.assign( Font.prototype, {
var chars = String( text ).split( '' );
var scale = size / data.resolution;
var offset = 0;
var line_height = ( data.boundingBox.yMax - data.boundingBox.yMin + data.underlineThickness ) * scale;
var offsetX = 0, offsetY = 0;
var paths = [];
for ( var i = 0; i < chars.length; i ++ ) {
var ret = createPath( chars[ i ], scale, offset );
offset += ret.offset;
var char = chars[ i ];
if ( char === '\n' ) {
paths.push( ret.path );
offsetX = 0;
offsetY -= line_height;
} else {
var ret = createPath( char, scale, offsetX, offsetY );
offsetX += ret.offsetX;
paths.push( ret.path );
}
}
...
...
@@ -35003,7 +35014,7 @@ Object.assign( Font.prototype, {
}
function createPath( c, scale, offset ) {
function createPath( c, scale, offset
X, offsetY
) {
var glyph = data.glyphs[ c ] || data.glyphs[ '?' ];
...
...
@@ -35026,8 +35037,8 @@ Object.assign( Font.prototype, {
case 'm': // moveTo
x = outline[ i ++ ] * scale + offset;
y = outline[ i ++ ] * scale;
x = outline[ i ++ ] * scale + offset
X
;
y = outline[ i ++ ] * scale
+ offsetY
;
path.moveTo( x, y );
...
...
@@ -35035,8 +35046,8 @@ Object.assign( Font.prototype, {
case 'l': // lineTo
x = outline[ i ++ ] * scale + offset;
y = outline[ i ++ ] * scale;
x = outline[ i ++ ] * scale + offset
X
;
y = outline[ i ++ ] * scale
+ offsetY
;
path.lineTo( x, y );
...
...
@@ -35044,10 +35055,10 @@ Object.assign( Font.prototype, {
case 'q': // quadraticCurveTo
cpx = outline[ i ++ ] * scale + offset;
cpy = outline[ i ++ ] * scale;
cpx1 = outline[ i ++ ] * scale + offset;
cpy1 = outline[ i ++ ] * scale;
cpx = outline[ i ++ ] * scale + offset
X
;
cpy = outline[ i ++ ] * scale
+ offsetY
;
cpx1 = outline[ i ++ ] * scale + offset
X
;
cpy1 = outline[ i ++ ] * scale
+ offsetY
;
path.quadraticCurveTo( cpx1, cpy1, cpx, cpy );
...
...
@@ -35072,12 +35083,12 @@ Object.assign( Font.prototype, {
case 'b': // bezierCurveTo
cpx = outline[ i ++ ] * scale + offset;
cpy = outline[ i ++ ] * scale;
cpx1 = outline[ i ++ ] * scale + offset;
cpy1 = outline[ i ++ ] * scale;
cpx2 = outline[ i ++ ] * scale + offset;
cpy2 = outline[ i ++ ] * scale;
cpx = outline[ i ++ ] * scale + offset
X
;
cpy = outline[ i ++ ] * scale
+ offsetY
;
cpx1 = outline[ i ++ ] * scale + offset
X
;
cpy1 = outline[ i ++ ] * scale
+ offsetY
;
cpx2 = outline[ i ++ ] * scale + offset
X
;
cpy2 = outline[ i ++ ] * scale
+ offsetY
;
path.bezierCurveTo( cpx1, cpy1, cpx2, cpy2, cpx, cpy );
...
...
@@ -35106,7 +35117,7 @@ Object.assign( Font.prototype, {
}
return { offset: glyph.ha * scale, path: path };
return { offset
X
: glyph.ha * scale, path: path };
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录