Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
bffab886
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 搜索 >>
提交
bffab886
编写于
11月 19, 2016
作者:
T
Takahiro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove gradientMapAxisY
上级
2e4f812e
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
24 deletion
+30
-24
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+29
-7
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+0
-1
src/materials/Material.js
src/materials/Material.js
+0
-1
src/materials/MeshPhongMaterial.js
src/materials/MeshPhongMaterial.js
+0
-2
src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl
...derers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl
+1
-11
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+0
-1
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+0
-1
未找到文件。
examples/js/loaders/MMDLoader.js
浏览文件 @
bffab886
...
...
@@ -94,15 +94,15 @@ THREE.MMDLoader.prototype.loadModel = function ( url, callback, onProgress, onEr
this
.
loadFileAsBuffer
(
url
,
function
(
buffer
)
{
callback
(
scope
.
createModel
(
buffer
,
modelExtension
,
texturePath
)
);
callback
(
scope
.
createModel
(
buffer
,
modelExtension
,
texturePath
,
onProgress
,
onError
)
);
},
onProgress
,
onError
);
};
THREE
.
MMDLoader
.
prototype
.
createModel
=
function
(
buffer
,
modelExtension
,
texturePath
)
{
THREE
.
MMDLoader
.
prototype
.
createModel
=
function
(
buffer
,
modelExtension
,
texturePath
,
onProgress
,
onError
)
{
return
this
.
createMesh
(
this
.
parseModel
(
buffer
,
modelExtension
),
texturePath
);
return
this
.
createMesh
(
this
.
parseModel
(
buffer
,
modelExtension
),
texturePath
,
onProgress
,
onError
);
};
...
...
@@ -860,6 +860,8 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
textures
=
[];
var
textureLoader
=
new
THREE
.
TextureLoader
(
scope
.
manager
);
var
tgaLoader
=
new
THREE
.
TGALoader
(
scope
.
manager
);
var
canvas
=
document
.
createElement
(
'
canvas
'
);
var
context
=
canvas
.
getContext
(
'
2d
'
);
var
offset
=
0
;
var
materialParams
=
[];
...
...
@@ -902,7 +904,29 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
texture
=
loader
.
load
(
fullPath
,
function
(
t
)
{
t
.
flipY
=
(
params
.
isToonTexture
===
true
)
?
true
:
false
;
// MMD toon texture is Axis-Y oriented
// but Three.js gradient map is Axis-X oriented.
// So here replaces the toon texture image with the rotated one.
if
(
params
.
isToonTexture
===
true
)
{
var
image
=
t
.
image
;
var
width
=
image
.
width
;
var
height
=
image
.
height
;
canvas
.
width
=
width
;
canvas
.
height
=
height
;
context
.
clearRect
(
0
,
0
,
width
,
height
);
context
.
translate
(
width
/
2.0
,
height
/
2.0
);
context
.
rotate
(
0.5
*
Math
.
PI
);
// 90.0 * Math.PI / 180.0
context
.
translate
(
-
width
/
2.0
,
-
height
/
2.0
);
context
.
drawImage
(
image
,
0
,
0
);
t
.
image
=
context
.
getImageData
(
0
,
0
,
width
,
height
);
}
t
.
flipY
=
false
;
t
.
wrapS
=
THREE
.
RepeatWrapping
;
t
.
wrapT
=
THREE
.
RepeatWrapping
;
...
...
@@ -920,7 +944,7 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
delete
texture
.
readyCallbacks
;
}
);
}
,
onProgress
,
onError
);
texture
.
readyCallbacks
=
[];
...
...
@@ -1265,7 +1289,6 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
toonFileName
=
(
p2
.
toonIndex
===
-
1
)
?
'
toon00.bmp
'
:
model
.
toonTextures
[
p2
.
toonIndex
].
fileName
;
var
uuid
=
loadTexture
(
toonFileName
,
{
isToonTexture
:
true
,
defaultTexturePath
:
isDefaultToonTexture
(
toonFileName
)
}
);
m
.
gradientMap
=
getTexture
(
uuid
,
textures
);
m
.
gradientMapAxisY
=
true
;
}
else
{
...
...
@@ -1294,7 +1317,6 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
uuid
=
loadTexture
(
toonFileName
,
{
isToonTexture
:
true
,
defaultTexturePath
:
isDefaultToon
}
);
m
.
gradientMap
=
getTexture
(
uuid
,
textures
);
m
.
gradientMapAxisY
=
true
;
}
...
...
src/loaders/MaterialLoader.js
浏览文件 @
bffab886
...
...
@@ -143,7 +143,6 @@ Object.assign( MaterialLoader.prototype, {
if
(
json
.
aoMapIntensity
!==
undefined
)
material
.
aoMapIntensity
=
json
.
aoMapIntensity
;
if
(
json
.
gradientMap
!==
undefined
)
material
.
gradientMap
=
getTexture
(
json
.
gradientMap
);
if
(
json
.
gradientMapAxisY
!==
undefined
)
material
.
gradientMapAxisY
=
json
.
gradientMapAxisY
;
// MultiMaterial
...
...
src/materials/Material.js
浏览文件 @
bffab886
...
...
@@ -205,7 +205,6 @@ Material.prototype = {
if
(
this
.
gradientMap
&&
this
.
gradientMap
.
isTexture
)
{
data
.
gradientMap
=
this
.
gradientMap
.
toJSON
(
meta
).
uuid
;
data
.
gradientMapAxisY
=
this
.
gradientMapAxisY
;
}
...
...
src/materials/MeshPhongMaterial.js
浏览文件 @
bffab886
...
...
@@ -45,7 +45,6 @@ import { Color } from '../math/Color';
* refractionRatio: <float>,
*
* gradientMap: new THREE.Texture( <Image> ),
* gradientMapAxisY: <bool>,
*
* wireframe: <boolean>,
* wireframeLinewidth: <float>,
...
...
@@ -98,7 +97,6 @@ function MeshPhongMaterial( parameters ) {
this
.
refractionRatio
=
0.98
;
this
.
gradientMap
=
null
;
this
.
gradientMapAxisY
=
false
;
this
.
wireframe
=
false
;
this
.
wireframeLinewidth
=
1
;
...
...
src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl
浏览文件 @
bffab886
...
...
@@ -6,17 +6,7 @@
// dotNL will be from -1.0 to 1.0
float
dotNL
=
dot
(
normal
,
lightDirection
);
#ifdef GRADIENTMAP_AXIS_Y
vec2
coord
=
vec2
(
0
.
0
,
dotNL
*
0
.
5
+
0
.
5
);
#else
vec2
coord
=
vec2
(
dotNL
*
0
.
5
+
0
.
5
,
0
.
0
);
#endif
vec2
coord
=
vec2
(
dotNL
*
0
.
5
+
0
.
5
,
0
.
0
);
return
texture2D
(
gradientMap
,
coord
).
rgb
;
}
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
bffab886
...
...
@@ -447,7 +447,6 @@ function WebGLProgram( renderer, code, material, parameters ) {
parameters
.
vertexColors
?
'
#define USE_COLOR
'
:
''
,
parameters
.
gradientMap
?
'
#define USE_GRADIENTMAP
'
:
''
,
parameters
.
gradientMapAxisY
?
'
#define GRADIENTMAP_AXIS_Y
'
:
''
,
parameters
.
flatShading
?
'
#define FLAT_SHADED
'
:
''
,
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
bffab886
...
...
@@ -154,7 +154,6 @@ function WebGLPrograms( renderer, capabilities ) {
alphaMap
:
!!
material
.
alphaMap
,
gradientMap
:
!!
material
.
gradientMap
,
gradientMapAxisY
:
!!
material
.
gradientMapAxisY
,
combine
:
material
.
combine
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录