Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
e1360010
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,发现更多精彩内容 >>
提交
e1360010
编写于
7月 24, 2015
作者:
G
gero3
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't allow else statemnt on new line
上级
760252a5
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
32 addition
and
66 deletion
+32
-66
examples/js/Ocean.js
examples/js/Ocean.js
+4
-8
examples/js/Sparks.js
examples/js/Sparks.js
+2
-4
examples/js/crossfade/scenes.js
examples/js/crossfade/scenes.js
+1
-2
examples/js/crossfade/transition.js
examples/js/crossfade/transition.js
+1
-2
examples/js/loaders/AWDLoader.js
examples/js/loaders/AWDLoader.js
+3
-6
examples/js/loaders/AssimpJSONLoader.js
examples/js/loaders/AssimpJSONLoader.js
+9
-18
examples/js/loaders/PVRLoader.js
examples/js/loaders/PVRLoader.js
+2
-4
examples/js/math/Lut.js
examples/js/math/Lut.js
+4
-12
examples/js/postprocessing/AdaptiveToneMappingPass.js
examples/js/postprocessing/AdaptiveToneMappingPass.js
+1
-2
examples/js/postprocessing/GlitchPass.js
examples/js/postprocessing/GlitchPass.js
+3
-6
examples/js/renderers/SoftwareRenderer.js
examples/js/renderers/SoftwareRenderer.js
+1
-2
utils/codestyle/config.json
utils/codestyle/config.json
+1
-0
未找到文件。
examples/js/Ocean.js
浏览文件 @
e1360010
...
...
@@ -315,15 +315,13 @@ THREE.Ocean.prototype.renderSpectrumFFT = function() {
this
.
materialOceanHorizontal
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
this
.
renderer
.
render
(
this
.
scene
,
this
.
oceanCamera
,
this
.
pingTransformFramebuffer
);
}
else
if
(
i
%
2
===
1
)
{
}
else
if
(
i
%
2
===
1
)
{
this
.
materialOceanHorizontal
.
uniforms
.
u_input
.
value
=
this
.
pingTransformFramebuffer
;
this
.
materialOceanHorizontal
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
this
.
renderer
.
render
(
this
.
scene
,
this
.
oceanCamera
,
this
.
pongTransformFramebuffer
);
}
else
{
}
else
{
this
.
materialOceanHorizontal
.
uniforms
.
u_input
.
value
=
this
.
pongTransformFramebuffer
;
this
.
materialOceanHorizontal
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
...
...
@@ -341,15 +339,13 @@ THREE.Ocean.prototype.renderSpectrumFFT = function() {
this
.
materialOceanVertical
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
this
.
renderer
.
render
(
this
.
scene
,
this
.
oceanCamera
,
this
.
displacementMapFramebuffer
);
}
else
if
(
i
%
2
===
1
)
{
}
else
if
(
i
%
2
===
1
)
{
this
.
materialOceanVertical
.
uniforms
.
u_input
.
value
=
this
.
pingTransformFramebuffer
;
this
.
materialOceanVertical
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
this
.
renderer
.
render
(
this
.
scene
,
this
.
oceanCamera
,
this
.
pongTransformFramebuffer
);
}
else
{
}
else
{
this
.
materialOceanVertical
.
uniforms
.
u_input
.
value
=
this
.
pongTransformFramebuffer
;
this
.
materialOceanVertical
.
uniforms
.
u_subtransformSize
.
value
=
Math
.
pow
(
2
,
(
i
%
(
iterations
)
)
+
1
);
...
...
examples/js/Sparks.js
浏览文件 @
e1360010
...
...
@@ -389,8 +389,7 @@ SPARKS.Age.prototype.update = function ( emitter, particle, time ) {
particle
.
energy
=
0
;
particle
.
isDead
=
true
;
}
else
{
}
else
{
var
t
=
this
.
_easing
(
particle
.
age
/
particle
.
lifetime
);
particle
.
energy
=
-
1
*
t
+
1
;
...
...
@@ -970,8 +969,7 @@ SPARKS.Utils = {
return
new
THREE
.
Vector3D
(
1
,
0
,
0
);
}
else
{
}
else
{
var
temp
=
new
THREE
.
Vector3
(
v
.
y
,
-
v
.
x
,
0
);
return
temp
.
normalize
();
...
...
examples/js/crossfade/scenes.js
浏览文件 @
e1360010
...
...
@@ -45,8 +45,7 @@ function generateGeometry( objectType, numObjects ) {
scale
.
z
=
Math
.
random
()
*
200
+
100
;
color
.
setRGB
(
0
,
0
,
Math
.
random
()
+
0.1
);
}
else
if
(
objectType
==
"
sphere
"
)
{
}
else
if
(
objectType
==
"
sphere
"
)
{
geom
=
new
THREE
.
IcosahedronGeometry
(
1
,
1
);
scale
.
y
=
scale
.
z
=
scale
.
x
;
...
...
examples/js/crossfade/transition.js
浏览文件 @
e1360010
...
...
@@ -136,8 +136,7 @@ function Transition ( sceneA, sceneB ) {
}
}
else
}
else
this
.
needChange
=
true
;
}
...
...
examples/js/loaders/AWDLoader.js
浏览文件 @
e1360010
...
...
@@ -334,8 +334,7 @@
}
}
else
{
}
else
{
mesh
=
new
THREE
.
Mesh
(
geometries
[
0
]
);
meshes
.
push
(
mesh
);
...
...
@@ -417,8 +416,7 @@
// Color material
mat
.
color
.
setHex
(
props
.
get
(
1
,
0xcccccc
)
);
}
else
if
(
type
===
2
)
{
}
else
if
(
type
===
2
)
{
// Bitmap material
var
tex_addr
=
props
.
get
(
2
,
0
);
...
...
@@ -1133,8 +1131,7 @@
return
list
;
}
else
{
}
else
{
return
read_func
.
call
(
this
);
...
...
examples/js/loaders/AssimpJSONLoader.js
浏览文件 @
e1360010
...
...
@@ -279,18 +279,15 @@ THREE.AssimpJSONLoader.prototype = {
keyname
=
'
map
'
;
}
else
if
(
semantic
===
5
)
{
}
else
if
(
semantic
===
5
)
{
keyname
=
'
bumpMap
'
;
}
else
if
(
semantic
===
6
)
{
}
else
if
(
semantic
===
6
)
{
keyname
=
'
normalMap
'
;
}
else
if
(
semantic
===
2
)
{
}
else
if
(
semantic
===
2
)
{
keyname
=
'
specularMap
'
;
...
...
@@ -320,28 +317,23 @@ THREE.AssimpJSONLoader.prototype = {
}
}
else
if
(
prop
.
key
===
'
?mat.name
'
)
{
}
else
if
(
prop
.
key
===
'
?mat.name
'
)
{
init_props
.
name
=
prop
.
value
;
}
else
if
(
prop
.
key
===
'
$clr.diffuse
'
)
{
}
else
if
(
prop
.
key
===
'
$clr.diffuse
'
)
{
init_props
.
color
=
toColor
(
prop
.
value
);
}
else
if
(
prop
.
key
===
'
$clr.specular
'
)
{
}
else
if
(
prop
.
key
===
'
$clr.specular
'
)
{
init_props
.
specular
=
toColor
(
prop
.
value
);
}
else
if
(
prop
.
key
===
'
$clr.emissive
'
)
{
}
else
if
(
prop
.
key
===
'
$clr.emissive
'
)
{
init_props
.
emissive
=
toColor
(
prop
.
value
);
}
else
if
(
prop
.
key
===
'
$mat.shadingm
'
)
{
}
else
if
(
prop
.
key
===
'
$mat.shadingm
'
)
{
// aiShadingMode_Flat
if
(
prop
.
value
===
1
)
{
...
...
@@ -350,8 +342,7 @@ THREE.AssimpJSONLoader.prototype = {
}
}
else
if
(
prop
.
key
===
'
$mat.shininess
'
)
{
}
else
if
(
prop
.
key
===
'
$mat.shininess
'
)
{
init_props
.
shininess
=
prop
.
value
;
...
...
examples/js/loaders/PVRLoader.js
浏览文件 @
e1360010
...
...
@@ -134,14 +134,12 @@ THREE.PVRLoader._parseV2 = function ( pvrDatas ) {
format
=
_hasAlpha
?
THREE
.
RGBA_PVRTC_4BPPV1_Format
:
THREE
.
RGB_PVRTC_4BPPV1_Format
;
bpp
=
4
;
}
else
if
(
formatFlags
===
PVRTC_2
)
{
}
else
if
(
formatFlags
===
PVRTC_2
)
{
format
=
_hasAlpha
?
THREE
.
RGBA_PVRTC_2BPPV1_Format
:
THREE
.
RGB_PVRTC_2BPPV1_Format
;
bpp
=
2
;
}
else
}
else
throw
new
Error
(
"
pvrtc - unknown format
"
+
formatFlags
);
...
...
examples/js/math/Lut.js
浏览文件 @
e1360010
...
...
@@ -376,17 +376,13 @@ THREE.Lut.prototype = {
value
=
callback
(
value
);
}
else
{
}
else
{
if
(
this
.
legend
.
labels
.
notation
==
'
scientific
'
)
{
value
=
value
.
toExponential
(
this
.
legend
.
labels
.
decimal
);
}
else
{
}
else
{
value
=
value
.
toFixed
(
this
.
legend
.
labels
.
decimal
);
...
...
@@ -440,17 +436,13 @@ THREE.Lut.prototype = {
var
offset
=
1.7
;
}
else
{
}
else
{
var
offset
=
2.1
;
}
}
else
{
}
else
{
var
offset
=
1.7
;
...
...
examples/js/postprocessing/AdaptiveToneMappingPass.js
浏览文件 @
e1360010
...
...
@@ -221,8 +221,7 @@ THREE.AdaptiveToneMappingPass.prototype = {
this
.
materialToneMap
.
defines
[
"
ADAPTED_LUMINANCE
"
]
=
""
;
this
.
materialToneMap
.
uniforms
.
luminanceMap
.
value
=
this
.
luminanceRT
;
}
else
{
}
else
{
this
.
adaptive
=
false
;
delete
this
.
materialToneMap
.
defines
[
"
ADAPTED_LUMINANCE
"
];
...
...
examples/js/postprocessing/GlitchPass.js
浏览文件 @
e1360010
...
...
@@ -59,8 +59,7 @@ THREE.GlitchPass.prototype = {
this
.
curF
=
0
;
this
.
generateTrigger
();
}
else
if
(
this
.
curF
%
this
.
randX
<
this
.
randX
/
5
)
{
}
else
if
(
this
.
curF
%
this
.
randX
<
this
.
randX
/
5
)
{
this
.
uniforms
[
'
amount
'
].
value
=
Math
.
random
()
/
90
;
this
.
uniforms
[
'
angle
'
].
value
=
THREE
.
Math
.
randFloat
(
-
Math
.
PI
,
Math
.
PI
);
...
...
@@ -69,8 +68,7 @@ THREE.GlitchPass.prototype = {
this
.
uniforms
[
'
seed_x
'
].
value
=
THREE
.
Math
.
randFloat
(
-
0.3
,
0.3
);
this
.
uniforms
[
'
seed_y
'
].
value
=
THREE
.
Math
.
randFloat
(
-
0.3
,
0.3
);
}
else
if
(
this
.
goWild
==
false
)
{
}
else
if
(
this
.
goWild
==
false
)
{
this
.
uniforms
[
'
byp
'
].
value
=
1
;
...
...
@@ -82,8 +80,7 @@ THREE.GlitchPass.prototype = {
renderer
.
render
(
this
.
scene
,
this
.
camera
);
}
else
{
}
else
{
renderer
.
render
(
this
.
scene
,
this
.
camera
,
writeBuffer
,
false
);
...
...
examples/js/renderers/SoftwareRenderer.js
浏览文件 @
e1360010
...
...
@@ -375,8 +375,7 @@ THREE.SoftwareRenderer = function ( parameters ) {
buffer
[
colorOffset
+
3
]
=
material
.
opacity
*
255
;
depthBuf
[
offset
]
=
depth
;
}
else
{
}
else
{
var
opaci
=
tdata
[
tIndex
+
3
]
*
material
.
opacity
;
var
texel
=
(
tdata
[
tIndex
]
<<
16
)
+
(
tdata
[
tIndex
+
1
]
<<
8
)
+
tdata
[
tIndex
+
2
];
...
...
utils/codestyle/config.json
浏览文件 @
e1360010
...
...
@@ -2,6 +2,7 @@
"preset"
:
"mdcs"
,
"disallowNewlineBeforeBlockStatements"
:
true
,
"requireSpaceAfterBinaryOperators"
:
[
","
],
"disallowKeywordsOnNewLine"
:
[
"else"
],
"excludeFiles"
:
[
"../../.c9/"
,
"../../.c9version/"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录