Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
c9213ab5
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,发现更多精彩内容 >>
提交
c9213ab5
编写于
2月 26, 2012
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added default material to Mesh, Line and ParticleSystem. Fixes #1373.
上级
927a8980
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
407 addition
and
416 deletion
+407
-416
build/Three.js
build/Three.js
+36
-35
build/custom/ThreeCanvas.js
build/custom/ThreeCanvas.js
+84
-87
build/custom/ThreeDOM.js
build/custom/ThreeDOM.js
+58
-57
build/custom/ThreeExtras.js
build/custom/ThreeExtras.js
+7
-7
build/custom/ThreeSVG.js
build/custom/ThreeSVG.js
+70
-73
build/custom/ThreeWebGL.js
build/custom/ThreeWebGL.js
+140
-143
src/objects/Line.js
src/objects/Line.js
+1
-2
src/objects/Mesh.js
src/objects/Mesh.js
+1
-1
src/objects/MorphAnimMesh.js
src/objects/MorphAnimMesh.js
+1
-1
src/objects/ParticleSystem.js
src/objects/ParticleSystem.js
+1
-1
src/objects/SkinnedMesh.js
src/objects/SkinnedMesh.js
+1
-1
utils/build.py
utils/build.py
+7
-8
未找到文件。
build/Three.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
build/custom/ThreeCanvas.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
build/custom/ThreeDOM.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
build/custom/ThreeExtras.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
build/custom/ThreeSVG.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
build/custom/ThreeWebGL.js
浏览文件 @
c9213ab5
此差异已折叠。
点击以展开。
src/objects/Line.js
浏览文件 @
c9213ab5
...
@@ -7,8 +7,7 @@ THREE.Line = function ( geometry, material, type ) {
...
@@ -7,8 +7,7 @@ THREE.Line = function ( geometry, material, type ) {
THREE
.
Object3D
.
call
(
this
);
THREE
.
Object3D
.
call
(
this
);
this
.
geometry
=
geometry
;
this
.
geometry
=
geometry
;
this
.
material
=
material
;
this
.
material
=
(
material
!==
undefined
)
?
material
:
new
THREE
.
LineBasicMaterial
(
{
color
:
Math
.
random
()
*
0xffffff
}
);
this
.
type
=
(
type
!==
undefined
)
?
type
:
THREE
.
LineStrip
;
this
.
type
=
(
type
!==
undefined
)
?
type
:
THREE
.
LineStrip
;
if
(
this
.
geometry
)
{
if
(
this
.
geometry
)
{
...
...
src/objects/Mesh.js
浏览文件 @
c9213ab5
...
@@ -9,7 +9,7 @@ THREE.Mesh = function ( geometry, material ) {
...
@@ -9,7 +9,7 @@ THREE.Mesh = function ( geometry, material ) {
THREE
.
Object3D
.
call
(
this
);
THREE
.
Object3D
.
call
(
this
);
this
.
geometry
=
geometry
;
this
.
geometry
=
geometry
;
this
.
material
=
material
;
this
.
material
=
(
material
!==
undefined
)
?
material
:
new
THREE
.
MeshBasicMaterial
(
{
color
:
Math
.
random
()
*
0xffffff
,
wireframe
:
true
}
)
;
if
(
this
.
geometry
)
{
if
(
this
.
geometry
)
{
...
...
src/objects/MorphAnimMesh.js
浏览文件 @
c9213ab5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @author alteredq / http://alteredqualia.com/
* @author alteredq / http://alteredqualia.com/
*/
*/
THREE
.
MorphAnimMesh
=
function
(
geometry
,
material
)
{
THREE
.
MorphAnimMesh
=
function
(
geometry
,
material
)
{
THREE
.
Mesh
.
call
(
this
,
geometry
,
material
);
THREE
.
Mesh
.
call
(
this
,
geometry
,
material
);
...
...
src/objects/ParticleSystem.js
浏览文件 @
c9213ab5
...
@@ -7,7 +7,7 @@ THREE.ParticleSystem = function ( geometry, material ) {
...
@@ -7,7 +7,7 @@ THREE.ParticleSystem = function ( geometry, material ) {
THREE
.
Object3D
.
call
(
this
);
THREE
.
Object3D
.
call
(
this
);
this
.
geometry
=
geometry
;
this
.
geometry
=
geometry
;
this
.
material
=
material
;
this
.
material
=
(
material
!==
undefined
)
?
material
:
new
THREE
.
ParticleBasicMaterial
(
{
color
:
Math
.
random
()
*
0xffffff
}
)
;
this
.
sortParticles
=
false
;
this
.
sortParticles
=
false
;
...
...
src/objects/SkinnedMesh.js
浏览文件 @
c9213ab5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* @author alteredq / http://alteredqualia.com/
* @author alteredq / http://alteredqualia.com/
*/
*/
THREE
.
SkinnedMesh
=
function
(
geometry
,
material
)
{
THREE
.
SkinnedMesh
=
function
(
geometry
,
material
)
{
THREE
.
Mesh
.
call
(
this
,
geometry
,
material
);
THREE
.
Mesh
.
call
(
this
,
geometry
,
material
);
...
...
utils/build.py
浏览文件 @
c9213ab5
...
@@ -191,8 +191,7 @@ CANVAS_FILES = [
...
@@ -191,8 +191,7 @@ CANVAS_FILES = [
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableLine.js'
,
'renderers/renderables/RenderableLine.js'
'extras/ImageUtils.js'
]
]
DOM_FILES
=
[
DOM_FILES
=
[
...
@@ -219,6 +218,9 @@ DOM_FILES = [
...
@@ -219,6 +218,9 @@ DOM_FILES = [
'cameras/PerspectiveCamera.js'
,
'cameras/PerspectiveCamera.js'
,
'lights/Light.js'
,
'lights/Light.js'
,
'materials/Material.js'
,
'materials/Material.js'
,
'materials/LineBasicMaterial.js'
,
'materials/MeshBasicMaterial.js'
,
'materials/ParticleBasicMaterial.js'
,
'materials/ParticleDOMMaterial.js'
,
'materials/ParticleDOMMaterial.js'
,
'textures/Texture.js'
,
'textures/Texture.js'
,
'textures/DataTexture.js'
,
'textures/DataTexture.js'
,
...
@@ -235,8 +237,7 @@ DOM_FILES = [
...
@@ -235,8 +237,7 @@ DOM_FILES = [
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableLine.js'
,
'renderers/renderables/RenderableLine.js'
'extras/ImageUtils.js'
]
]
SVG_FILES
=
[
SVG_FILES
=
[
...
@@ -289,8 +290,7 @@ SVG_FILES = [
...
@@ -289,8 +290,7 @@ SVG_FILES = [
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableFace4.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableObject.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableParticle.js'
,
'renderers/renderables/RenderableLine.js'
,
'renderers/renderables/RenderableLine.js'
'extras/ImageUtils.js'
]
]
WEBGL_FILES
=
[
WEBGL_FILES
=
[
...
@@ -365,8 +365,7 @@ WEBGL_FILES = [
...
@@ -365,8 +365,7 @@ WEBGL_FILES = [
'extras/renderers/plugins/ShadowMapPlugin.js'
,
'extras/renderers/plugins/ShadowMapPlugin.js'
,
'extras/renderers/plugins/SpritePlugin.js'
,
'extras/renderers/plugins/SpritePlugin.js'
,
'extras/shaders/ShaderFlares.js'
,
'extras/shaders/ShaderFlares.js'
,
'extras/shaders/ShaderSprite.js'
,
'extras/shaders/ShaderSprite.js'
'extras/ImageUtils.js'
]
]
def
merge
(
files
):
def
merge
(
files
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录