Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
92db041e
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,体验更适合开发者的 AI 搜索 >>
提交
92db041e
编写于
11月 24, 2019
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
c415c6b4
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
414 addition
and
448 deletion
+414
-448
build/three.js
build/three.js
+18
-35
build/three.min.js
build/three.min.js
+378
-378
build/three.module.js
build/three.module.js
+18
-35
未找到文件。
build/three.js
浏览文件 @
92db041e
...
...
@@ -23034,15 +23034,6 @@
var userHeight = referenceSpaceType === 'local-floor' ? 1.6 : 0;
if ( isPresenting() === false ) {
camera.position.set( 0, userHeight, 0 );
camera.rotation.set( 0, 0, 0 );
return camera;
}
device.depthNear = camera.near;
device.depthFar = camera.far;
...
...
@@ -23394,38 +23385,32 @@
this.getCamera = function ( camera ) {
if ( isPresenting() ) {
var parent = camera.parent;
var cameras = cameraVR.cameras;
var parent = camera.parent;
var cameras = cameraVR.cameras;
updateCamera( cameraVR, parent );
for ( var i = 0; i < cameras.length; i ++ ) {
updateCamera( cameras[ i ], parent );
}
updateCamera( cameraVR, parent );
// update camera and its children
for ( var i = 0; i < cameras.length; i ++ ) {
camera.matrixWorld.copy( cameraVR.matrixWorld
);
updateCamera( cameras[ i ], parent
);
var children = camera.children;
}
for ( var i = 0, l = children.length; i < l; i ++ ) {
// update camera and its children
children[ i ].updateMatrixWorld( true
);
camera.matrixWorld.copy( cameraVR.matrixWorld
);
}
var children = camera.children;
setProjectionFromUnion( cameraVR, cameraL, cameraR );
for ( var i = 0, l = children.length; i < l; i ++ ) {
return cameraVR
;
children[ i ].updateMatrixWorld( true )
;
}
return camera;
setProjectionFromUnion( cameraVR, cameraL, cameraR );
return cameraVR;
};
...
...
@@ -24652,7 +24637,7 @@
if ( camera.parent === null ) { camera.updateMatrixWorld(); }
if ( vr.enabled ) {
if ( vr.enabled
&& vr.isPresenting()
) {
camera = vr.getCamera( camera );
...
...
@@ -27367,21 +27352,19 @@
for ( var instanceId = 0; instanceId < raycastTimes; instanceId ++ ) {
//
C
alculate the world matrix for each instance
//
c
alculate the world matrix for each instance
this.getMatrixAt( instanceId, _instanceLocalMatrix );
_instanceWorldMatrix.multiplyMatrices( matrixWorld, _instanceLocalMatrix );
//The mesh represents this single instance
// the mesh represents this single instance
_mesh.matrixWorld = _instanceWorldMatrix;
_mesh.raycast( raycaster, _instanceIntersects );
//Process the result of raycast
// process the result of raycast
if ( _instanceIntersects.length > 0 ) {
build/three.min.js
浏览文件 @
92db041e
此差异已折叠。
点击以展开。
build/three.module.js
浏览文件 @
92db041e
...
...
@@ -23026,15 +23026,6 @@ function WebVRManager( renderer ) {
var userHeight = referenceSpaceType === 'local-floor' ? 1.6 : 0;
if ( isPresenting() === false ) {
camera.position.set( 0, userHeight, 0 );
camera.rotation.set( 0, 0, 0 );
return camera;
}
device.depthNear = camera.near;
device.depthFar = camera.far;
...
...
@@ -23386,38 +23377,32 @@ function WebXRManager( renderer, gl ) {
this.getCamera = function ( camera ) {
if ( isPresenting() ) {
var parent = camera.parent;
var cameras = cameraVR.cameras;
var parent = camera.parent;
var cameras = cameraVR.cameras;
updateCamera( cameraVR, parent );
for ( var i = 0; i < cameras.length; i ++ ) {
updateCamera( cameras[ i ], parent );
}
updateCamera( cameraVR, parent );
// update camera and its children
for ( var i = 0; i < cameras.length; i ++ ) {
camera.matrixWorld.copy( cameraVR.matrixWorld
);
updateCamera( cameras[ i ], parent
);
var children = camera.children;
}
for ( var i = 0, l = children.length; i < l; i ++ ) {
// update camera and its children
children[ i ].updateMatrixWorld( true
);
camera.matrixWorld.copy( cameraVR.matrixWorld
);
}
var children = camera.children;
setProjectionFromUnion( cameraVR, cameraL, cameraR );
for ( var i = 0, l = children.length; i < l; i ++ ) {
return cameraVR
;
children[ i ].updateMatrixWorld( true )
;
}
return camera;
setProjectionFromUnion( cameraVR, cameraL, cameraR );
return cameraVR;
};
...
...
@@ -24644,7 +24629,7 @@ function WebGLRenderer( parameters ) {
if ( camera.parent === null ) camera.updateMatrixWorld();
if ( vr.enabled ) {
if ( vr.enabled
&& vr.isPresenting()
) {
camera = vr.getCamera( camera );
...
...
@@ -27359,21 +27344,19 @@ InstancedMesh.prototype = Object.assign( Object.create( Mesh.prototype ), {
for ( var instanceId = 0; instanceId < raycastTimes; instanceId ++ ) {
//
C
alculate the world matrix for each instance
//
c
alculate the world matrix for each instance
this.getMatrixAt( instanceId, _instanceLocalMatrix );
_instanceWorldMatrix.multiplyMatrices( matrixWorld, _instanceLocalMatrix );
//The mesh represents this single instance
// the mesh represents this single instance
_mesh.matrixWorld = _instanceWorldMatrix;
_mesh.raycast( raycaster, _instanceIntersects );
//Process the result of raycast
// process the result of raycast
if ( _instanceIntersects.length > 0 ) {
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录