Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
a6fcf5bb
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,发现更多精彩内容 >>
提交
a6fcf5bb
编写于
2月 23, 2017
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Removed material.skinning references. See #10754."
This reverts commit
0b3497f9
.
上级
5617c05b
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
24 addition
and
1 deletion
+24
-1
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+1
-0
src/materials/Material.js
src/materials/Material.js
+1
-0
src/materials/MeshBasicMaterial.js
src/materials/MeshBasicMaterial.js
+3
-0
src/materials/MeshDepthMaterial.js
src/materials/MeshDepthMaterial.js
+2
-0
src/materials/MeshLambertMaterial.js
src/materials/MeshLambertMaterial.js
+3
-0
src/materials/MeshNormalMaterial.js
src/materials/MeshNormalMaterial.js
+3
-0
src/materials/MeshPhongMaterial.js
src/materials/MeshPhongMaterial.js
+3
-0
src/materials/MeshStandardMaterial.js
src/materials/MeshStandardMaterial.js
+3
-0
src/materials/ShaderMaterial.js
src/materials/ShaderMaterial.js
+4
-0
src/renderers/webgl/WebGLShadowMap.js
src/renderers/webgl/WebGLShadowMap.js
+1
-1
未找到文件。
src/loaders/MaterialLoader.js
浏览文件 @
a6fcf5bb
...
...
@@ -81,6 +81,7 @@ Object.assign( MaterialLoader.prototype, {
if
(
json
.
wireframeLinewidth
!==
undefined
)
material
.
wireframeLinewidth
=
json
.
wireframeLinewidth
;
if
(
json
.
wireframeLinecap
!==
undefined
)
material
.
wireframeLinecap
=
json
.
wireframeLinecap
;
if
(
json
.
wireframeLinejoin
!==
undefined
)
material
.
wireframeLinejoin
=
json
.
wireframeLinejoin
;
if
(
json
.
skinning
!==
undefined
)
material
.
skinning
=
json
.
skinning
;
if
(
json
.
morphTargets
!==
undefined
)
material
.
morphTargets
=
json
.
morphTargets
;
// for PointsMaterial
...
...
src/materials/Material.js
浏览文件 @
a6fcf5bb
...
...
@@ -232,6 +232,7 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
if
(
this
.
wireframeLinecap
!==
'
round
'
)
data
.
wireframeLinecap
=
this
.
wireframeLinecap
;
if
(
this
.
wireframeLinejoin
!==
'
round
'
)
data
.
wireframeLinejoin
=
this
.
wireframeLinejoin
;
data
.
skinning
=
this
.
skinning
;
data
.
morphTargets
=
this
.
morphTargets
;
// TODO: Copied from Object3D.toJSON
...
...
src/materials/MeshBasicMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -33,6 +33,7 @@ import { Color } from '../math/Color';
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
*
* skinning: <bool>,
* morphTargets: <bool>
* }
*/
...
...
@@ -67,6 +68,7 @@ function MeshBasicMaterial( parameters ) {
this
.
wireframeLinecap
=
'
round
'
;
this
.
wireframeLinejoin
=
'
round
'
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
lights
=
false
;
...
...
@@ -108,6 +110,7 @@ MeshBasicMaterial.prototype.copy = function ( source ) {
this
.
wireframeLinecap
=
source
.
wireframeLinecap
;
this
.
wireframeLinejoin
=
source
.
wireframeLinejoin
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
return
this
;
...
...
src/materials/MeshDepthMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -32,6 +32,7 @@ function MeshDepthMaterial( parameters ) {
this
.
depthPacking
=
BasicDepthPacking
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
map
=
null
;
...
...
@@ -63,6 +64,7 @@ MeshDepthMaterial.prototype.copy = function ( source ) {
this
.
depthPacking
=
source
.
depthPacking
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
map
=
source
.
map
;
...
...
src/materials/MeshLambertMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -34,6 +34,7 @@ import { Color } from '../math/Color';
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
*
* skinning: <bool>,
* morphTargets: <bool>,
* morphNormals: <bool>
* }
...
...
@@ -73,6 +74,7 @@ function MeshLambertMaterial( parameters ) {
this
.
wireframeLinecap
=
'
round
'
;
this
.
wireframeLinejoin
=
'
round
'
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
morphNormals
=
false
;
...
...
@@ -117,6 +119,7 @@ MeshLambertMaterial.prototype.copy = function ( source ) {
this
.
wireframeLinecap
=
source
.
wireframeLinecap
;
this
.
wireframeLinejoin
=
source
.
wireframeLinejoin
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
morphNormals
=
source
.
morphNormals
;
...
...
src/materials/MeshNormalMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -21,6 +21,7 @@ import { Vector2 } from '../math/Vector2';
* wireframe: <boolean>,
* wireframeLinewidth: <float>
*
* skinning: <bool>,
* morphTargets: <bool>,
* morphNormals: <bool>
* }
...
...
@@ -48,6 +49,7 @@ function MeshNormalMaterial( parameters ) {
this
.
fog
=
false
;
this
.
lights
=
false
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
morphNormals
=
false
;
...
...
@@ -77,6 +79,7 @@ MeshNormalMaterial.prototype.copy = function ( source ) {
this
.
wireframe
=
source
.
wireframe
;
this
.
wireframeLinewidth
=
source
.
wireframeLinewidth
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
morphNormals
=
source
.
morphNormals
;
...
...
src/materials/MeshPhongMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -47,6 +47,7 @@ import { Color } from '../math/Color';
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
*
* skinning: <bool>,
* morphTargets: <bool>,
* morphNormals: <bool>
* }
...
...
@@ -98,6 +99,7 @@ function MeshPhongMaterial( parameters ) {
this
.
wireframeLinecap
=
'
round
'
;
this
.
wireframeLinejoin
=
'
round
'
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
morphNormals
=
false
;
...
...
@@ -154,6 +156,7 @@ MeshPhongMaterial.prototype.copy = function ( source ) {
this
.
wireframeLinecap
=
source
.
wireframeLinecap
;
this
.
wireframeLinejoin
=
source
.
wireframeLinejoin
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
morphNormals
=
source
.
morphNormals
;
...
...
src/materials/MeshStandardMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -47,6 +47,7 @@ import { Color } from '../math/Color';
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
*
* skinning: <bool>,
* morphTargets: <bool>,
* morphNormals: <bool>
* }
...
...
@@ -102,6 +103,7 @@ function MeshStandardMaterial( parameters ) {
this
.
wireframeLinecap
=
'
round
'
;
this
.
wireframeLinejoin
=
'
round
'
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
morphNormals
=
false
;
...
...
@@ -162,6 +164,7 @@ MeshStandardMaterial.prototype.copy = function ( source ) {
this
.
wireframeLinecap
=
source
.
wireframeLinecap
;
this
.
wireframeLinejoin
=
source
.
wireframeLinejoin
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
morphNormals
=
source
.
morphNormals
;
...
...
src/materials/ShaderMaterial.js
浏览文件 @
a6fcf5bb
...
...
@@ -16,6 +16,7 @@ import { UniformsUtils } from '../renderers/shaders/UniformsUtils';
*
* lights: <bool>,
*
* skinning: <bool>,
* morphTargets: <bool>,
* morphNormals: <bool>
* }
...
...
@@ -42,6 +43,7 @@ function ShaderMaterial( parameters ) {
this
.
lights
=
false
;
// set to use scene lights
this
.
clipping
=
false
;
// set to use user-defined clipping planes
this
.
skinning
=
false
;
// set to use skinning attribute streams
this
.
morphTargets
=
false
;
// set to use morph targets
this
.
morphNormals
=
false
;
// set to use morph normals
...
...
@@ -98,6 +100,8 @@ ShaderMaterial.prototype.copy = function ( source ) {
this
.
lights
=
source
.
lights
;
this
.
clipping
=
source
.
clipping
;
this
.
skinning
=
source
.
skinning
;
this
.
morphTargets
=
source
.
morphTargets
;
this
.
morphNormals
=
source
.
morphNormals
;
...
...
src/renderers/webgl/WebGLShadowMap.js
浏览文件 @
a6fcf5bb
...
...
@@ -307,7 +307,7 @@ function WebGLShadowMap( _renderer, _lights, _objects, capabilities ) {
}
var
useSkinning
=
object
.
isSkinnedMesh
;
var
useSkinning
=
object
.
isSkinnedMesh
&&
material
.
skinning
;
var
variantIndex
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录