Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
957051a0
T
three.js
项目概览
车家大少爷
/
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,发现更多精彩内容 >>
提交
957051a0
编写于
1月 21, 2020
作者:
W
WestLangley
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename .applyMatrix() to .applyMatrix4()
上级
9518d5e0
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
82 addition
and
40 deletion
+82
-40
docs/api/en/core/BufferGeometry.html
docs/api/en/core/BufferGeometry.html
+1
-1
docs/api/en/core/Geometry.html
docs/api/en/core/Geometry.html
+1
-1
docs/api/en/core/Object3D.html
docs/api/en/core/Object3D.html
+1
-1
docs/api/en/deprecated/DeprecatedList.html
docs/api/en/deprecated/DeprecatedList.html
+18
-11
docs/api/zh/core/BufferGeometry.html
docs/api/zh/core/BufferGeometry.html
+1
-1
docs/api/zh/core/Geometry.html
docs/api/zh/core/Geometry.html
+1
-1
docs/api/zh/core/Object3D.html
docs/api/zh/core/Object3D.html
+1
-1
examples/js/lines/LineSegmentsGeometry.js
examples/js/lines/LineSegmentsGeometry.js
+9
-1
examples/jsm/lines/LineSegmentsGeometry.d.ts
examples/jsm/lines/LineSegmentsGeometry.d.ts
+1
-1
examples/jsm/lines/LineSegmentsGeometry.js
examples/jsm/lines/LineSegmentsGeometry.js
+9
-1
src/Three.Legacy.js
src/Three.Legacy.js
+19
-0
src/core/BufferGeometry.d.ts
src/core/BufferGeometry.d.ts
+1
-1
src/core/BufferGeometry.js
src/core/BufferGeometry.js
+7
-7
src/core/Geometry.d.ts
src/core/Geometry.d.ts
+1
-1
src/core/Geometry.js
src/core/Geometry.js
+8
-8
src/core/Object3D.d.ts
src/core/Object3D.d.ts
+1
-1
src/core/Object3D.js
src/core/Object3D.js
+2
-2
未找到文件。
docs/api/en/core/BufferGeometry.html
浏览文件 @
957051a0
...
...
@@ -179,7 +179,7 @@
</p>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
Bakes matrix transform directly into vertex coordinates.
</p>
<h3>
[method:BufferGeometry center] ()
</h3>
...
...
docs/api/en/core/Geometry.html
浏览文件 @
957051a0
...
...
@@ -203,7 +203,7 @@
<h3>
[page:EventDispatcher EventDispatcher] methods are available on this class.
</h3>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
Bakes matrix transform directly into vertex coordinates.
</p>
<h3>
[method:Geometry center] ()
</h3>
...
...
docs/api/en/core/Object3D.html
浏览文件 @
957051a0
...
...
@@ -204,7 +204,7 @@
See [page:Group] for info on manually grouping objects.
</p>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
Applies the matrix transform to the object and updates the object's position, rotation and scale.
</p>
<h3>
[method:this applyQuaternion]( [param:Quaternion quaternion] )
</h3>
...
...
docs/api/en/deprecated/DeprecatedList.html
浏览文件 @
957051a0
...
...
@@ -152,15 +152,7 @@
<h2>
Geometry
</h2>
<p>
Geometry.computeTangents() has been removed.
<br
/><br
/>
Geometry.computeLineDistances() has been removed. Use [page:Line.computeLineDistances] instead.
<br
/><br
/>
</p>
<h3>
[page:BufferGeometry]
</h3>
<h2>
[page:BufferGeometry]
</h2>
<p>
BufferGeometry.addIndex has been renamed to [page:BufferGeometry.setIndex].
<br
/><br
/>
...
...
@@ -176,13 +168,25 @@
BufferGeometry.offsets has been renamed to [page:BufferGeometry.groups].
<br
/><br
/>
BufferGeometry.applyMatrix() has been renamed to [page:BufferGeometry.applyMatrix4]().
</p>
<h3>
[page:CubeGeometry]
</h3>
<p>
CubeGeometry has been renamed to [page:BoxGeometry].
</p>
<h3>
[page:Geometry]
</h3>
<p>
Geometry.computeTangents() has been removed.
</p>
<p>
Geometry.computeTangents() has been removed.
<br
/><br
/>
Geometry.computeLineDistances() has been removed. Use [page:Line.computeLineDistances] instead.
<br
/><br
/>
Geometry.applyMatrix() has been renamed to [page:Geometry.applyMatrix4]().
</p>
<h3>
[page:GeometryUtils]
</h3>
<p>
...
...
@@ -458,7 +462,10 @@
Object3D.translate() has been removed. Use [page:Object3D.translateOnAxis]( axis, distance ) instead.
<br
/><br
/>
Object3D.useQuaternion has been removed. The library now uses quaternions by default.
Object3D.useQuaternion has been removed. The library now uses quaternions by default.
<br
/><br
/>
Object3D.applyMatrix() has been renamed to [page:Object3D.applyMatrix4]().
</p>
<h3>
[page:LensFlare]
</h3>
...
...
docs/api/zh/core/BufferGeometry.html
浏览文件 @
957051a0
...
...
@@ -162,7 +162,7 @@
</p>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
用给定矩阵转换几何体的顶点坐标。
</p>
<h3>
[method:BufferGeometry center] ()
</h3>
...
...
docs/api/zh/core/Geometry.html
浏览文件 @
957051a0
...
...
@@ -198,7 +198,7 @@
<h3>
[page:EventDispatcher EventDispatcher] 该类中可用的函数。
</h3>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
将矩阵信息直接应用于几何体顶点坐标。
</p>
<h3>
[method:Geometry center] ()
</h3>
...
...
docs/api/zh/core/Object3D.html
浏览文件 @
957051a0
...
...
@@ -193,7 +193,7 @@
请参阅[page:Group]来查看手动编组对象的相关信息。
</p>
<h3>
[method:null applyMatrix]( [param:Matrix4 matrix] )
</h3>
<h3>
[method:null applyMatrix
4
]( [param:Matrix4 matrix] )
</h3>
<p>
对当前物体应用这个变换矩阵,并更新物体的位置、旋转和缩放。
</p>
<h3>
[method:Object3D applyQuaternion]( [param:Quaternion quaternion] )
</h3>
...
...
examples/js/lines/LineSegmentsGeometry.js
浏览文件 @
957051a0
...
...
@@ -25,7 +25,7 @@ THREE.LineSegmentsGeometry.prototype = Object.assign( Object.create( THREE.Insta
isLineSegmentsGeometry
:
true
,
applyMatrix
:
function
(
matrix
)
{
applyMatrix
4
:
function
(
matrix
)
{
var
start
=
this
.
attributes
.
instanceStart
;
var
end
=
this
.
attributes
.
instanceEnd
;
...
...
@@ -239,6 +239,14 @@ THREE.LineSegmentsGeometry.prototype = Object.assign( Object.create( THREE.Insta
// todo
},
applyMatrix
:
function
(
matrix
)
{
console
.
warn
(
'
THREE.LineSegmentsGeometry: applyMatrix() has been renamed to applyMatrix4().
'
);
return
this
.
applyMatrix4
(
matrix
);
}
}
);
examples/jsm/lines/LineSegmentsGeometry.d.ts
浏览文件 @
957051a0
...
...
@@ -12,7 +12,7 @@ export class LineSegmentsGeometry extends InstancedBufferGeometry {
constructor
();
readonly
isLineSegmentsGeometry
:
true
;
applyMatrix
(
matrix
:
Matrix4
):
this
;
applyMatrix
4
(
matrix
:
Matrix4
):
this
;
computeBoundingBox
():
void
;
computeBoundingSphere
():
void
;
fromEdgesGeometry
(
geometry
:
WireframeGeometry
):
this
;
...
...
examples/jsm/lines/LineSegmentsGeometry.js
浏览文件 @
957051a0
...
...
@@ -36,7 +36,7 @@ LineSegmentsGeometry.prototype = Object.assign( Object.create( InstancedBufferGe
isLineSegmentsGeometry
:
true
,
applyMatrix
:
function
(
matrix
)
{
applyMatrix
4
:
function
(
matrix
)
{
var
start
=
this
.
attributes
.
instanceStart
;
var
end
=
this
.
attributes
.
instanceEnd
;
...
...
@@ -250,6 +250,14 @@ LineSegmentsGeometry.prototype = Object.assign( Object.create( InstancedBufferGe
// todo
},
applyMatrix
:
function
(
matrix
)
{
console
.
warn
(
'
THREE.LineSegmentsGeometry: applyMatrix() has been renamed to applyMatrix4().
'
);
return
this
.
applyMatrix4
(
matrix
);
}
}
);
...
...
src/Three.Legacy.js
浏览文件 @
957051a0
...
...
@@ -930,6 +930,12 @@ Object.assign( Geometry.prototype, {
console
.
error
(
'
THREE.Geometry: .computeLineDistances() has been removed. Use THREE.Line.computeLineDistances() instead.
'
);
},
applyMatrix
:
function
(
matrix
)
{
console
.
warn
(
'
THREE.Geometry: .applyMatrix() has been renamed to .applyMatrix4().
'
);
return
this
.
applyMatrix4
(
matrix
);
}
}
);
...
...
@@ -957,6 +963,12 @@ Object.assign( Object3D.prototype, {
console
.
error
(
'
THREE.Object3D: .getWorldRotation() has been removed. Use THREE.Object3D.getWorldQuaternion( target ) instead.
'
);
},
applyMatrix
:
function
(
matrix
)
{
console
.
warn
(
'
THREE.Object3D: .applyMatrix() has been renamed to .applyMatrix4().
'
);
return
this
.
applyMatrix4
(
matrix
);
}
}
);
...
...
@@ -1303,7 +1315,14 @@ Object.assign( BufferGeometry.prototype, {
return
this
.
deleteAttribute
(
name
);
},
applyMatrix
:
function
(
matrix
)
{
console
.
warn
(
'
THREE.BufferGeometry: .applyMatrix() has been renamed to .applyMatrix4().
'
);
return
this
.
applyMatrix4
(
matrix
);
}
}
);
Object
.
defineProperties
(
BufferGeometry
.
prototype
,
{
...
...
src/core/BufferGeometry.d.ts
浏览文件 @
957051a0
...
...
@@ -63,7 +63,7 @@ export class BufferGeometry extends EventDispatcher {
/**
* Bakes matrix transform directly into vertex coordinates.
*/
applyMatrix
(
matrix
:
Matrix4
):
BufferGeometry
;
applyMatrix
4
(
matrix
:
Matrix4
):
BufferGeometry
;
rotateX
(
angle
:
number
):
BufferGeometry
;
rotateY
(
angle
:
number
):
BufferGeometry
;
...
...
src/core/BufferGeometry.js
浏览文件 @
957051a0
...
...
@@ -123,7 +123,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
},
applyMatrix
:
function
(
matrix
)
{
applyMatrix
4
:
function
(
matrix
)
{
var
position
=
this
.
attributes
.
position
;
...
...
@@ -179,7 +179,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_m1
.
makeRotationX
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -191,7 +191,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_m1
.
makeRotationY
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -203,7 +203,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_m1
.
makeRotationZ
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -215,7 +215,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_m1
.
makeTranslation
(
x
,
y
,
z
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -227,7 +227,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_m1
.
makeScale
(
x
,
y
,
z
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -239,7 +239,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
_obj
.
updateMatrix
();
this
.
applyMatrix
(
_obj
.
matrix
);
this
.
applyMatrix
4
(
_obj
.
matrix
);
return
this
;
...
...
src/core/Geometry.d.ts
浏览文件 @
957051a0
...
...
@@ -166,7 +166,7 @@ export class Geometry extends EventDispatcher {
/**
* Bakes matrix transform directly into vertex coordinates.
*/
applyMatrix
(
matrix
:
Matrix4
):
Geometry
;
applyMatrix
4
(
matrix
:
Matrix4
):
Geometry
;
rotateX
(
angle
:
number
):
Geometry
;
rotateY
(
angle
:
number
):
Geometry
;
...
...
src/core/Geometry.js
浏览文件 @
957051a0
...
...
@@ -67,7 +67,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
isGeometry
:
true
,
applyMatrix
:
function
(
matrix
)
{
applyMatrix
4
:
function
(
matrix
)
{
var
normalMatrix
=
new
Matrix3
().
getNormalMatrix
(
matrix
);
...
...
@@ -116,7 +116,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_m1
.
makeRotationX
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -128,7 +128,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_m1
.
makeRotationY
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -140,7 +140,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_m1
.
makeRotationZ
(
angle
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -152,7 +152,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_m1
.
makeTranslation
(
x
,
y
,
z
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -164,7 +164,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_m1
.
makeScale
(
x
,
y
,
z
);
this
.
applyMatrix
(
_m1
);
this
.
applyMatrix
4
(
_m1
);
return
this
;
...
...
@@ -176,7 +176,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
_obj
.
updateMatrix
();
this
.
applyMatrix
(
_obj
.
matrix
);
this
.
applyMatrix
4
(
_obj
.
matrix
);
return
this
;
...
...
@@ -351,7 +351,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
0
,
0
,
0
,
1
);
this
.
applyMatrix
(
matrix
);
this
.
applyMatrix
4
(
matrix
);
return
this
;
...
...
src/core/Object3D.d.ts
浏览文件 @
957051a0
...
...
@@ -180,7 +180,7 @@ export class Object3D extends EventDispatcher {
/**
* This updates the position, rotation and scale with the matrix.
*/
applyMatrix
(
matrix
:
Matrix4
):
void
;
applyMatrix
4
(
matrix
:
Matrix4
):
void
;
applyQuaternion
(
quaternion
:
Quaternion
):
this
;
...
...
src/core/Object3D.js
浏览文件 @
957051a0
...
...
@@ -127,7 +127,7 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
onBeforeRender
:
function
()
{},
onAfterRender
:
function
()
{},
applyMatrix
:
function
(
matrix
)
{
applyMatrix
4
:
function
(
matrix
)
{
if
(
this
.
matrixAutoUpdate
)
this
.
updateMatrix
();
...
...
@@ -394,7 +394,7 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
}
object
.
applyMatrix
(
_m1
);
object
.
applyMatrix
4
(
_m1
);
object
.
updateWorldMatrix
(
false
,
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录