Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
9f57ad82
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,发现更多精彩内容 >>
提交
9f57ad82
编写于
10月 17, 2012
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: removed dummy textures.
Experimenting with "geometry.buffersNeedUpdate".
上级
2e6fa9c7
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
324 addition
and
337 deletion
+324
-337
build/three.js
build/three.js
+11
-1
build/three.min.js
build/three.min.js
+284
-284
editor/index.html
editor/index.html
+2
-33
editor/js/UI.three.js
editor/js/UI.three.js
+2
-1
editor/js/ui/Sidebar.Properties.Material.js
editor/js/ui/Sidebar.Properties.Material.js
+13
-16
src/core/Geometry.js
src/core/Geometry.js
+3
-1
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+9
-1
未找到文件。
build/three.js
浏览文件 @
9f57ad82
...
...
@@ -4886,7 +4886,7 @@ THREE.Geometry = function () {
this.hasTangents = false;
this.dynamic = true; // the intermediate typearrays will be deleted when set to false
this.dynamic = true; // the intermediate type
d
arrays will be deleted when set to false
// update flags
...
...
@@ -4897,6 +4897,8 @@ THREE.Geometry = function () {
this.tangentsNeedUpdate = false;
this.colorsNeedUpdate = false;
this.buffersNeedUpdate = false;
};
THREE.Geometry.prototype = {
...
...
@@ -19894,6 +19896,12 @@ THREE.WebGLRenderer = function ( parameters ) {
material = getBufferMaterial( object, geometryGroup );
if ( geometry.buffersNeedUpdate ) {
initMeshBuffers( geometryGroup, object );
}
customAttributesDirty = material.attributes && areCustomAttributesDirty( material );
if ( geometry.verticesNeedUpdate || geometry.morphTargetsNeedUpdate || geometry.elementsNeedUpdate ||
...
...
@@ -19914,6 +19922,8 @@ THREE.WebGLRenderer = function ( parameters ) {
geometry.colorsNeedUpdate = false;
geometry.tangentsNeedUpdate = false;
geometry.buffersNeedUpdate = false;
material.attributes && clearCustomAttributes( material );
}
...
...
build/three.min.js
浏览文件 @
9f57ad82
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
editor/index.html
浏览文件 @
9f57ad82
...
...
@@ -85,16 +85,6 @@
//
var
canvas
=
document
.
createElement
(
'
canvas
'
);
var
context
=
canvas
.
getContext
(
'
2d
'
);
context
.
fillStyle
=
'
rgb(255,255,255)
'
;
context
.
fillRect
(
0
,
0
,
canvas
.
width
,
canvas
.
height
);
var
dummyTexture
=
new
THREE
.
Texture
(
canvas
);
dummyTexture
.
needsUpdate
=
true
;
//
var
menubar
=
new
Menubar
(
signals
);
menubar
.
setWidth
(
'
100%
'
);
menubar
.
setHeight
(
'
32px
'
);
...
...
@@ -184,7 +174,6 @@
loader
.
parse
(
xml
,
function
(
collada
)
{
collada
.
scene
.
name
=
filename
;
applyDummyTexture
(
collada
.
scene
);
signals
.
objectAdded
.
dispatch
(
collada
.
scene
);
signals
.
objectSelected
.
dispatch
(
collada
.
scene
);
...
...
@@ -268,7 +257,6 @@
var
object
=
new
THREE
.
OBJLoader
().
parse
(
contents
);
object
.
name
=
filename
;
applyDummyTexture
(
object
);
signals
.
objectAdded
.
dispatch
(
object
);
signals
.
objectSelected
.
dispatch
(
object
);
...
...
@@ -345,7 +333,7 @@
var
geometry
=
new
THREE
.
SphereGeometry
(
75
,
25
,
15
);
var
color
=
Math
.
random
()
*
0xffffff
;
var
material
=
new
THREE
.
MeshLambertMaterial
(
{
color
:
color
,
ambient
:
color
,
map
:
dummyTexture
}
);
var
material
=
new
THREE
.
MeshLambertMaterial
(
{
color
:
color
,
ambient
:
color
}
);
var
mesh
=
new
THREE
.
Mesh
(
geometry
,
material
);
mesh
.
name
=
"
Sphere
"
;
...
...
@@ -361,26 +349,7 @@
var
createDummyMaterial
=
function
(
geometry
)
{
var
material
=
new
THREE
.
MeshLambertMaterial
();
if
(
geometry
.
faceVertexUvs
[
0
].
length
>
0
)
material
.
map
=
dummyTexture
;
return
material
;
};
var
applyDummyTexture
=
function
(
root
)
{
root
.
traverse
(
function
(
node
)
{
if
(
node
.
material
&&
node
.
geometry
.
faceVertexUvs
[
0
].
length
>
0
)
{
node
.
material
.
map
=
dummyTexture
;
}
}
);
return
new
THREE
.
MeshLambertMaterial
();
};
...
...
editor/js/UI.three.js
浏览文件 @
9f57ad82
...
...
@@ -6,7 +6,8 @@ UI.Texture = function ( position ) {
var
scope
=
this
;
this
.
texture
=
new
THREE
.
Texture
();
var
image
=
new
Image
();
this
.
texture
=
new
THREE
.
Texture
(
image
);
this
.
dom
=
document
.
createElement
(
'
input
'
);
this
.
dom
.
type
=
'
file
'
;
...
...
editor/js/ui/Sidebar.Properties.Material.js
浏览文件 @
9f57ad82
...
...
@@ -220,14 +220,6 @@ Sidebar.Properties.Material = function ( signals ) {
var
selected
=
null
;
var
selectedHasUvs
=
false
;
var
canvas
=
document
.
createElement
(
'
canvas
'
);
var
context
=
canvas
.
getContext
(
'
2d
'
);
context
.
fillStyle
=
'
rgb(255,255,255)
'
;
context
.
fillRect
(
0
,
0
,
canvas
.
width
,
canvas
.
height
);
var
dummyTexture
=
new
THREE
.
Texture
(
canvas
);
dummyTexture
.
needsUpdate
=
true
;
function
update
()
{
var
material
=
selected
.
material
;
...
...
@@ -242,12 +234,6 @@ Sidebar.Properties.Material = function ( signals ) {
material
=
new
materials
[
materialClass
.
getValue
()
]();
selected
.
material
=
material
;
if
(
selectedHasUvs
)
{
material
.
map
=
dummyTexture
;
}
}
if
(
material
.
color
!==
undefined
)
{
...
...
@@ -286,8 +272,10 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
selectedHasUvs
)
{
material
.
map
=
mapEnabled
?
materialMap
.
getValue
()
:
dummyTexture
;
material
.
map
=
mapEnabled
?
materialMap
.
getValue
()
:
null
;
material
.
needsUpdate
=
true
;
selected
.
geometry
.
buffersNeedUpdate
=
true
;
selected
.
geometry
.
uvsNeedUpdate
=
true
;
}
else
{
...
...
@@ -306,6 +294,8 @@ Sidebar.Properties.Material = function ( signals ) {
material.lightMap = lightMapEnabled ? materialLightMap.getValue() : null;
material.needsUpdate = true;
selected.geometry.buffersNeedUpdate = true;
selected.geometry.uvsNeedUpdate = true;
} else {
...
...
@@ -325,6 +315,8 @@ Sidebar.Properties.Material = function ( signals ) {
material
.
bumpMap
=
bumpMapEnabled
?
materialBumpMap
.
getValue
()
:
null
;
material
.
bumpScale
=
materialBumpScale
.
getValue
();
material
.
needsUpdate
=
true
;
selected
.
geometry
.
buffersNeedUpdate
=
true
;
selected
.
geometry
.
uvsNeedUpdate
=
true
;
}
else
{
...
...
@@ -342,6 +334,8 @@ Sidebar.Properties.Material = function ( signals ) {
material
.
normalMap
=
normalMapEnabled
?
materialNormalMap
.
getValue
()
:
null
;
material
.
needsUpdate
=
true
;
selected
.
geometry
.
buffersNeedUpdate
=
true
;
selected
.
geometry
.
uvsNeedUpdate
=
true
;
}
else
{
...
...
@@ -359,6 +353,8 @@ Sidebar.Properties.Material = function ( signals ) {
material
.
specularMap
=
specularMapEnabled
?
materialSpecularMap
.
getValue
()
:
null
;
material
.
needsUpdate
=
true
;
selected
.
geometry
.
buffersNeedUpdate
=
true
;
selected
.
geometry
.
uvsNeedUpdate
=
true
;
}
else
{
...
...
@@ -377,6 +373,8 @@ Sidebar.Properties.Material = function ( signals ) {
material
.
envMap
=
envMapEnabled
?
materialEnvMap
.
getValue
()
:
null
;
material
.
reflectivity
=
materialReflectivity
.
getValue
();
material
.
needsUpdate
=
true
;
selected
.
geometry
.
buffersNeedUpdate
=
true
;
selected
.
geometry
.
uvsNeedUpdate
=
true
;
}
else
{
...
...
@@ -520,7 +518,6 @@ Sidebar.Properties.Material = function ( signals ) {
}
else
{
materialMapEnabled
.
setValue
(
false
);
materialMap
.
setValue
(
dummyTexture
);
}
...
...
src/core/Geometry.js
浏览文件 @
9f57ad82
...
...
@@ -36,7 +36,7 @@ THREE.Geometry = function () {
this
.
hasTangents
=
false
;
this
.
dynamic
=
true
;
// the intermediate typearrays will be deleted when set to false
this
.
dynamic
=
true
;
// the intermediate type
d
arrays will be deleted when set to false
// update flags
...
...
@@ -47,6 +47,8 @@ THREE.Geometry = function () {
this
.
tangentsNeedUpdate
=
false
;
this
.
colorsNeedUpdate
=
false
;
this
.
buffersNeedUpdate
=
false
;
};
THREE
.
Geometry
.
prototype
=
{
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
9f57ad82
...
...
@@ -838,7 +838,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
if
(
!
attribute
.
__webglInitialized
||
attribute
.
createUniqueBuffers
)
{
if
(
!
attribute
.
__webglInitialized
||
attribute
.
createUniqueBuffers
)
{
attribute
.
__webglInitialized
=
true
;
...
...
@@ -4359,6 +4359,12 @@ THREE.WebGLRenderer = function ( parameters ) {
material
=
getBufferMaterial
(
object
,
geometryGroup
);
if
(
geometry
.
buffersNeedUpdate
)
{
initMeshBuffers
(
geometryGroup
,
object
);
}
customAttributesDirty
=
material
.
attributes
&&
areCustomAttributesDirty
(
material
);
if
(
geometry
.
verticesNeedUpdate
||
geometry
.
morphTargetsNeedUpdate
||
geometry
.
elementsNeedUpdate
||
...
...
@@ -4379,6 +4385,8 @@ THREE.WebGLRenderer = function ( parameters ) {
geometry
.
colorsNeedUpdate
=
false
;
geometry
.
tangentsNeedUpdate
=
false
;
geometry
.
buffersNeedUpdate
=
false
;
material
.
attributes
&&
clearCustomAttributes
(
material
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录