Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
0e2957d4
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,发现更多精彩内容 >>
提交
0e2957d4
编写于
10月 12, 2013
作者:
A
acgessler
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:mrdoob/three.js into dev
上级
19a71e9b
6a7d187e
变更
8
展开全部
隐藏空白更改
内联
并排
Showing
8 changed file
with
64 addition
and
81 deletion
+64
-81
build/three.js
build/three.js
+11
-0
build/three.min.js
build/three.min.js
+17
-17
examples/canvas_performance.html
examples/canvas_performance.html
+12
-7
examples/webgl_buffergeometry.html
examples/webgl_buffergeometry.html
+5
-18
examples/webgl_buffergeometry_custom_attributes_particles.html
...les/webgl_buffergeometry_custom_attributes_particles.html
+4
-17
examples/webgl_buffergeometry_lines.html
examples/webgl_buffergeometry_lines.html
+2
-10
examples/webgl_buffergeometry_particles.html
examples/webgl_buffergeometry_particles.html
+2
-12
src/core/BufferGeometry.js
src/core/BufferGeometry.js
+11
-0
未找到文件。
build/three.js
浏览文件 @
0e2957d4
...
...
@@ -9041,6 +9041,17 @@ THREE.BufferGeometry.prototype = {
constructor: THREE.BufferGeometry,
addAttribute: function( name, type, numItems, itemSize ) {
this.attributes[ name ] = {
itemSize: itemSize,
array: new type( numItems * itemSize )
};
},
applyMatrix: function ( matrix ) {
var positionArray;
...
...
build/three.min.js
浏览文件 @
0e2957d4
此差异已折叠。
点击以展开。
examples/canvas_performance.html
浏览文件 @
0e2957d4
...
...
@@ -25,7 +25,7 @@
var
camera
,
scene
,
renderer
;
var
sphere
,
plane
;
var
light
;
init
();
animate
();
...
...
@@ -35,10 +35,12 @@
container
=
document
.
createElement
(
'
div
'
);
document
.
body
.
appendChild
(
container
);
scene
=
new
THREE
.
Scene
();
camera
=
new
THREE
.
PerspectiveCamera
(
45
,
window
.
innerWidth
/
window
.
innerHeight
,
1
,
10000
);
camera
.
position
.
set
(
0
,
1000
,
1000
);
camera
.
lookAt
(
scene
.
position
);
scene
=
new
THREE
.
Scene
();
// Grid
...
...
@@ -69,7 +71,7 @@
for
(
var
i
=
0
;
i
<
20
;
i
++
)
{
sphere
=
new
THREE
.
Mesh
(
geometry
,
material
);
var
sphere
=
new
THREE
.
Mesh
(
geometry
,
material
);
sphere
.
position
.
x
=
(
i
%
5
)
*
200
-
400
;
sphere
.
position
.
z
=
Math
.
floor
(
i
/
5
)
*
200
-
400
;
...
...
@@ -87,12 +89,11 @@
directionalLight
.
position
.
set
(
0
,
1
,
0
);
scene
.
add
(
directionalLight
);
var
pointL
ight
=
new
THREE
.
PointLight
(
0xff0000
,
1
,
500
);
scene
.
add
(
pointL
ight
);
l
ight
=
new
THREE
.
PointLight
(
0xff0000
,
1
,
500
);
scene
.
add
(
l
ight
);
renderer
=
new
THREE
.
CanvasRenderer
();
renderer
.
setSize
(
window
.
innerWidth
,
window
.
innerHeight
);
container
.
appendChild
(
renderer
.
domElement
);
stats
=
new
Stats
();
...
...
@@ -128,7 +129,11 @@
function
render
()
{
camera
.
lookAt
(
scene
.
position
);
var
timer
=
Date
.
now
()
*
0.001
;
light
.
position
.
x
=
Math
.
cos
(
timer
)
*
1000
;
light
.
position
.
y
=
500
;
light
.
position
.
z
=
Math
.
sin
(
timer
)
*
1000
;
renderer
.
render
(
scene
,
camera
);
...
...
examples/webgl_buffergeometry.html
浏览文件 @
0e2957d4
...
...
@@ -81,24 +81,11 @@
var
triangles
=
160000
;
var
geometry
=
new
THREE
.
BufferGeometry
();
geometry
.
attributes
=
{
index
:
{
itemSize
:
1
,
array
:
new
Uint16Array
(
triangles
*
3
)
},
position
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
triangles
*
3
*
3
)
},
normal
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
triangles
*
3
*
3
)
},
color
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
triangles
*
3
*
3
)
}
}
geometry
.
addAttribute
(
'
index
'
,
Uint16Array
,
triangles
*
3
,
1
);
geometry
.
addAttribute
(
'
position
'
,
Float32Array
,
triangles
*
3
,
3
);
geometry
.
addAttribute
(
'
normal
'
,
Float32Array
,
triangles
*
3
,
3
);
geometry
.
addAttribute
(
'
color
'
,
Float32Array
,
triangles
*
3
,
3
);
// break geometry into
// chunks of 21,845 triangles (3 unique vertices per triangle)
...
...
examples/webgl_buffergeometry_custom_attributes_particles.html
浏览文件 @
0e2957d4
...
...
@@ -137,24 +137,11 @@
geometry
=
new
THREE
.
BufferGeometry
();
// geometry.dynamic = true;
geometry
.
attributes
=
{
position
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
particles
*
3
)
},
customColor
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
particles
*
3
)
},
size
:
{
itemSize
:
1
,
array
:
new
Float32Array
(
particles
),
dynamic
:
true
},
}
geometry
.
addAttribute
(
'
position
'
,
Float32Array
,
particles
,
3
);
geometry
.
addAttribute
(
'
customColor
'
,
Float32Array
,
particles
,
3
);
geometry
.
addAttribute
(
'
size
'
,
Float32Array
,
particles
,
1
);
geometry
.
attributes
.
size
.
dynamic
=
true
;
values_size
=
geometry
.
attributes
.
size
.
array
;
var
positions
=
geometry
.
attributes
.
position
.
array
;
...
...
examples/webgl_buffergeometry_lines.html
浏览文件 @
0e2957d4
...
...
@@ -69,16 +69,8 @@
var
geometry
=
new
THREE
.
BufferGeometry
();
var
material
=
new
THREE
.
LineBasicMaterial
({
vertexColors
:
true
});
geometry
.
attributes
=
{
position
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
segments
*
3
)
},
color
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
segments
*
3
)
}
};
geometry
.
addAttribute
(
'
position
'
,
Float32Array
,
segments
,
3
);
geometry
.
addAttribute
(
'
color
'
,
Float32Array
,
segments
,
3
);
var
positions
=
geometry
.
attributes
.
position
.
array
;
var
colors
=
geometry
.
attributes
.
color
.
array
;
...
...
examples/webgl_buffergeometry_particles.html
浏览文件 @
0e2957d4
...
...
@@ -68,19 +68,9 @@
var
particles
=
500000
;
var
geometry
=
new
THREE
.
BufferGeometry
();
geometry
.
attributes
=
{
position
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
particles
*
3
)
},
color
:
{
itemSize
:
3
,
array
:
new
Float32Array
(
particles
*
3
)
}
}
geometry
.
addAttribute
(
'
position
'
,
Float32Array
,
particles
,
3
);
geometry
.
addAttribute
(
'
color
'
,
Float32Array
,
particles
,
3
);
var
positions
=
geometry
.
attributes
.
position
.
array
;
var
colors
=
geometry
.
attributes
.
color
.
array
;
...
...
src/core/BufferGeometry.js
浏览文件 @
0e2957d4
...
...
@@ -38,6 +38,17 @@ THREE.BufferGeometry.prototype = {
constructor
:
THREE
.
BufferGeometry
,
addAttribute
:
function
(
name
,
type
,
numItems
,
itemSize
)
{
this
.
attributes
[
name
]
=
{
itemSize
:
itemSize
,
array
:
new
type
(
numItems
*
itemSize
)
};
},
applyMatrix
:
function
(
matrix
)
{
var
positionArray
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录