Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
f51a53bd
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,发现更多精彩内容 >>
提交
f51a53bd
编写于
3月 30, 2011
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
差异文件
Synced with mrdoob's branch.
上级
ccc56646
8b638423
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
384 addition
and
346 deletion
+384
-346
build/Three.js
build/Three.js
+282
-281
build/custom/ThreeCanvas.js
build/custom/ThreeCanvas.js
+52
-52
src/materials/MeshBasicMaterial.js
src/materials/MeshBasicMaterial.js
+1
-1
src/renderers/CanvasRenderer.js
src/renderers/CanvasRenderer.js
+49
-12
未找到文件。
build/Three.js
浏览文件 @
f51a53bd
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/custom/ThreeCanvas.js
浏览文件 @
f51a53bd
此差异已折叠。
点击以展开。
src/materials/MeshBasicMaterial.js
浏览文件 @
f51a53bd
...
@@ -53,7 +53,7 @@ THREE.MeshBasicMaterial = function ( parameters ) {
...
@@ -53,7 +53,7 @@ THREE.MeshBasicMaterial = function ( parameters ) {
this
.
wireframeLinejoin
=
'
round
'
;
// implemented just in CanvasRenderer
this
.
wireframeLinejoin
=
'
round
'
;
// implemented just in CanvasRenderer
this
.
vertexColors
=
false
;
this
.
vertexColors
=
false
;
this
.
skinning
=
false
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
morphTargets
=
false
;
...
...
src/renderers/CanvasRenderer.js
浏览文件 @
f51a53bd
...
@@ -18,7 +18,9 @@ THREE.CanvasRenderer = function () {
...
@@ -18,7 +18,9 @@ THREE.CanvasRenderer = function () {
_contextGlobalCompositeOperation
=
0
,
_contextGlobalCompositeOperation
=
0
,
_contextStrokeStyle
=
null
,
_contextStrokeStyle
=
null
,
_contextFillStyle
=
null
,
_contextFillStyle
=
null
,
_contextLineWidth
=
1
,
_contextLineWidth
=
null
,
_contextLineCap
=
null
,
_contextLineJoin
=
null
,
_v1
,
_v2
,
_v3
,
_v4
,
_v1
,
_v2
,
_v3
,
_v4
,
_v5
=
new
THREE
.
RenderableVertex
(),
_v5
=
new
THREE
.
RenderableVertex
(),
...
@@ -95,7 +97,9 @@ THREE.CanvasRenderer = function () {
...
@@ -95,7 +97,9 @@ THREE.CanvasRenderer = function () {
_contextGlobalCompositeOperation
=
0
;
_contextGlobalCompositeOperation
=
0
;
_contextStrokeStyle
=
null
;
_contextStrokeStyle
=
null
;
_contextFillStyle
=
null
;
_contextFillStyle
=
null
;
_contextLineWidth
=
1
;
_contextLineWidth
=
null
;
_contextLineCap
=
null
;
_contextLineJoin
=
null
;
};
};
...
@@ -521,6 +525,8 @@ THREE.CanvasRenderer = function () {
...
@@ -521,6 +525,8 @@ THREE.CanvasRenderer = function () {
_color
.
__styleString
=
material
.
color
.
__styleString
;
_color
.
__styleString
=
material
.
color
.
__styleString
;
setLineWidth
(
material
.
linewidth
);
setLineWidth
(
material
.
linewidth
);
setLineCap
(
material
.
linecap
);
setLineJoin
(
material
.
linejoin
);
setStrokeStyle
(
_color
.
__styleString
);
setStrokeStyle
(
_color
.
__styleString
);
_context
.
stroke
();
_context
.
stroke
();
...
@@ -583,7 +589,7 @@ THREE.CanvasRenderer = function () {
...
@@ -583,7 +589,7 @@ THREE.CanvasRenderer = function () {
}
else
{
}
else
{
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
material
.
color
.
__styleString
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
material
.
color
.
__styleString
);
}
}
...
@@ -635,13 +641,14 @@ THREE.CanvasRenderer = function () {
...
@@ -635,13 +641,14 @@ THREE.CanvasRenderer = function () {
_color
.
b
=
material
.
color
.
b
*
_light
.
b
;
_color
.
b
=
material
.
color
.
b
*
_light
.
b
;
_color
.
updateStyleString
();
_color
.
updateStyleString
();
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
_color
.
__styleString
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
_color
.
__styleString
);
}
}
}
else
{
}
else
{
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
material
.
color
.
__styleString
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
material
.
color
.
__styleString
);
}
}
...
@@ -669,7 +676,7 @@ THREE.CanvasRenderer = function () {
...
@@ -669,7 +676,7 @@ THREE.CanvasRenderer = function () {
_color
.
b
=
normalToComponent
(
element
.
normalWorld
.
z
);
_color
.
b
=
normalToComponent
(
element
.
normalWorld
.
z
);
_color
.
updateStyleString
();
_color
.
updateStyleString
();
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
_color
.
__styleString
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
_color
.
__styleString
);
}
}
...
@@ -701,7 +708,8 @@ THREE.CanvasRenderer = function () {
...
@@ -701,7 +708,8 @@ THREE.CanvasRenderer = function () {
if
(
material
instanceof
THREE
.
MeshBasicMaterial
)
{
if
(
material
instanceof
THREE
.
MeshBasicMaterial
)
{
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
material
.
color
.
__styleString
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
material
.
color
.
__styleString
);
}
else
if
(
material
instanceof
THREE
.
MeshLambertMaterial
)
{
}
else
if
(
material
instanceof
THREE
.
MeshLambertMaterial
)
{
...
@@ -743,14 +751,16 @@ THREE.CanvasRenderer = function () {
...
@@ -743,14 +751,16 @@ THREE.CanvasRenderer = function () {
_color
.
updateStyleString
();
_color
.
updateStyleString
();
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
_color
.
__styleString
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
_color
.
__styleString
);
}
}
}
else
{
}
else
{
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
material
.
color
.
__styleString
);
material
.
wireframe
?
strokePath
(
material
.
color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
material
.
color
.
__styleString
);
}
}
...
@@ -762,7 +772,8 @@ THREE.CanvasRenderer = function () {
...
@@ -762,7 +772,8 @@ THREE.CanvasRenderer = function () {
_color
.
updateStyleString
();
_color
.
updateStyleString
();
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
drawQuad
(
_v1x
,
_v1y
,
_v2x
,
_v2y
,
_v3x
,
_v3y
,
_v4x
,
_v4y
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
)
:
fillPath
(
_color
.
__styleString
);
material
.
wireframe
?
strokePath
(
_color
.
__styleString
,
material
.
wireframeLinewidth
,
material
.
wireframeLinecap
,
material
.
wireframeLinejoin
)
:
fillPath
(
_color
.
__styleString
);
}
else
if
(
material
instanceof
THREE
.
MeshDepthMaterial
)
{
}
else
if
(
material
instanceof
THREE
.
MeshDepthMaterial
)
{
...
@@ -813,10 +824,12 @@ THREE.CanvasRenderer = function () {
...
@@ -813,10 +824,12 @@ THREE.CanvasRenderer = function () {
}
}
function
strokePath
(
color
,
linewidth
)
{
function
strokePath
(
color
,
linewidth
,
linecap
,
linejoin
)
{
setStrokeStyle
(
color
);
setLineWidth
(
linewidth
);
setLineWidth
(
linewidth
);
setLineCap
(
linecap
);
setLineJoin
(
linejoin
);
setStrokeStyle
(
color
);
_context
.
stroke
();
_context
.
stroke
();
...
@@ -1023,6 +1036,30 @@ THREE.CanvasRenderer = function () {
...
@@ -1023,6 +1036,30 @@ THREE.CanvasRenderer = function () {
}
}
function
setLineCap
(
value
)
{
// "butt", "round", "square"
if
(
_contextLineCap
!=
value
)
{
_context
.
lineCap
=
_contextLineCap
=
value
;
}
}
function
setLineJoin
(
value
)
{
// "round", "bevel", "miter"
if
(
_contextLineJoin
!=
value
)
{
_context
.
lineJoin
=
_contextLineJoin
=
value
;
}
}
function
setStrokeStyle
(
value
)
{
function
setStrokeStyle
(
value
)
{
if
(
_contextStrokeStyle
!=
value
)
{
if
(
_contextStrokeStyle
!=
value
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录