Skip to content

Commit a3da166

Browse files
webseon@gmail.comwebseon@gmail.com
[email protected]
authored and
[email protected]
committed
- #746 
1 parent 92f481f commit a3da166

File tree

5 files changed

+104
-8
lines changed

5 files changed

+104
-8
lines changed

‎redDoc/docs/base/RedBaseObject3D.json

+14
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,20 @@
4848
"example": "\n (RedMesh Instance).autoUpdateMatrix = true;\n (RedMesh Instance).autoUpdateMatrix = false;\n ",
4949
"return": "boolean"
5050
},
51+
{
52+
"code": "PROPERTY",
53+
"title": "blendAlphaDst",
54+
"description": "\n\t 블렌드 목표값 factor\n\t 기본값 : gl.ONE_MINUS_SRC_ALPHA\n ",
55+
"example": "\n var tGL = (RedGL Instance).gl;\n (RedMesh Instance).blendAlphaDst = tGL.SRC_ALPHA;\n (RedMesh Instance).blendAlphaDst = tGL.DST_ALPHA;\n ",
56+
"return": "gl 상수"
57+
},
58+
{
59+
"code": "PROPERTY",
60+
"title": "blendAlphaSrc",
61+
"description": "\n\t 블렌드 소스값 factor\n\t 기본값 : gl.ONE\n ",
62+
"example": "\n var tGL = (RedGL Instance).gl;\n (RedMesh Instance).blendAlphaSrc = tGL.SRC_ALPHA;\n (RedMesh Instance).blendAlphaSrc = tGL.DST_ALPHA;\n ",
63+
"return": "gl 상수"
64+
},
5165
{
5266
"code": "PROPERTY",
5367
"title": "blendDst",

‎release/RedGL.js

+44-3
Original file line numberDiff line numberDiff line change
@@ -3460,6 +3460,40 @@ var RedBaseObject3D;
34603460
}
34613461
:DOC*/
34623462
this['blendDst'] = gl.ONE_MINUS_SRC_ALPHA;
3463+
/*DOC:
3464+
{
3465+
code : 'PROPERTY',
3466+
title :`blendAlphaSrc`,
3467+
description : `
3468+
블렌드 소스값 factor
3469+
기본값 : gl.ONE
3470+
`,
3471+
example : `
3472+
var tGL = (RedGL Instance).gl;
3473+
(RedMesh Instance).blendAlphaSrc = tGL.SRC_ALPHA;
3474+
(RedMesh Instance).blendAlphaSrc = tGL.DST_ALPHA;
3475+
`,
3476+
return : 'gl 상수'
3477+
}
3478+
:DOC*/
3479+
this['blendAlphaSrc'] = gl.ONE;
3480+
/*DOC:
3481+
{
3482+
code : 'PROPERTY',
3483+
title :`blendAlphaDst`,
3484+
description : `
3485+
블렌드 목표값 factor
3486+
기본값 : gl.ONE_MINUS_SRC_ALPHA
3487+
`,
3488+
example : `
3489+
var tGL = (RedGL Instance).gl;
3490+
(RedMesh Instance).blendAlphaDst = tGL.SRC_ALPHA;
3491+
(RedMesh Instance).blendAlphaDst = tGL.DST_ALPHA;
3492+
`,
3493+
return : 'gl 상수'
3494+
}
3495+
:DOC*/
3496+
this['blendAlphaDst'] = gl.ONE_MINUS_SRC_ALPHA;
34633497
/*DOC:
34643498
{
34653499
code : 'PROPERTY',
@@ -21178,10 +21212,17 @@ var RedRenderer;
2117821212
if (!tDirectionalShadowMaterialYn) {
2117921213
tCacheState['useBlendMode'] != tMesh['useBlendMode'] ? (tCacheState['useBlendMode'] = tMesh['useBlendMode']) ? tGL.enable(tGL.BLEND) : tGL.disable(tGL.BLEND) : 0;
2118021214
// 블렌딩팩터 캐싱처리
21181-
if (tCacheState['blendSrc'] != tMesh['blendSrc'] || tCacheState['blendDst'] != tMesh['blendDst']) {
21182-
tGL.blendFuncSeparate(tMesh['blendSrc'], tMesh['blendDst'],tGL.ONE,tGL.ONE_MINUS_SRC_ALPHA);
21215+
if (
21216+
tCacheState['blendSrc'] != tMesh['blendSrc']
21217+
|| tCacheState['blendDst'] != tMesh['blendDst']
21218+
|| tCacheState['blendAlphaSrc'] != tMesh['blendAlphaSrc']
21219+
|| tCacheState['blendAlphaDst'] != tMesh['blendAlphaDst']
21220+
) {
21221+
tGL.blendFuncSeparate(tMesh['blendSrc'], tMesh['blendDst'],tMesh['blendAlphaSrc'], tMesh['blendAlphaDst']);
2118321222
tCacheState['blendSrc'] = tMesh['blendSrc'];
2118421223
tCacheState['blendDst'] = tMesh['blendDst'];
21224+
tCacheState['blendAlphaSrc'] = tMesh['blendAlphaSrc'];
21225+
tCacheState['blendAlphaDst'] = tMesh['blendAlphaDst'];
2118521226
}
2118621227
}
2118721228
/////////////////////////////////////////////////////////////////////////
@@ -30400,4 +30441,4 @@ var RedGLOffScreen;
3040030441
};
3040130442
RedWorkerCode = RedWorkerCode.toString().replace(/^function ?. ?\) ?\{|\}\;?$/g, '');
3040230443
})();
30403-
})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2022-07-08 14:05:55)' };console.log(RedGL_VERSION);
30444+
})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2022-07-11 15:52:49)' };console.log(RedGL_VERSION);

‎release/RedGL.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/base/RedBaseObject3D.js

+34
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,40 @@ var RedBaseObject3D;
194194
}
195195
:DOC*/
196196
this['blendDst'] = gl.ONE_MINUS_SRC_ALPHA;
197+
/*DOC:
198+
{
199+
code : 'PROPERTY',
200+
title :`blendAlphaSrc`,
201+
description : `
202+
블렌드 소스값 factor
203+
기본값 : gl.ONE
204+
`,
205+
example : `
206+
var tGL = (RedGL Instance).gl;
207+
(RedMesh Instance).blendAlphaSrc = tGL.SRC_ALPHA;
208+
(RedMesh Instance).blendAlphaSrc = tGL.DST_ALPHA;
209+
`,
210+
return : 'gl 상수'
211+
}
212+
:DOC*/
213+
this['blendAlphaSrc'] = gl.ONE;
214+
/*DOC:
215+
{
216+
code : 'PROPERTY',
217+
title :`blendAlphaDst`,
218+
description : `
219+
블렌드 목표값 factor
220+
기본값 : gl.ONE_MINUS_SRC_ALPHA
221+
`,
222+
example : `
223+
var tGL = (RedGL Instance).gl;
224+
(RedMesh Instance).blendAlphaDst = tGL.SRC_ALPHA;
225+
(RedMesh Instance).blendAlphaDst = tGL.DST_ALPHA;
226+
`,
227+
return : 'gl 상수'
228+
}
229+
:DOC*/
230+
this['blendAlphaDst'] = gl.ONE_MINUS_SRC_ALPHA;
197231
/*DOC:
198232
{
199233
code : 'PROPERTY',

‎src/renderer/RedRenderer.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1049,10 +1049,17 @@ var RedRenderer;
10491049
if (!tDirectionalShadowMaterialYn) {
10501050
tCacheState['useBlendMode'] != tMesh['useBlendMode'] ? (tCacheState['useBlendMode'] = tMesh['useBlendMode']) ? tGL.enable(tGL.BLEND) : tGL.disable(tGL.BLEND) : 0;
10511051
// 블렌딩팩터 캐싱처리
1052-
if (tCacheState['blendSrc'] != tMesh['blendSrc'] || tCacheState['blendDst'] != tMesh['blendDst']) {
1053-
tGL.blendFuncSeparate(tMesh['blendSrc'], tMesh['blendDst'],tGL.ONE,tGL.ONE_MINUS_SRC_ALPHA);
1052+
if (
1053+
tCacheState['blendSrc'] != tMesh['blendSrc']
1054+
|| tCacheState['blendDst'] != tMesh['blendDst']
1055+
|| tCacheState['blendAlphaSrc'] != tMesh['blendAlphaSrc']
1056+
|| tCacheState['blendAlphaDst'] != tMesh['blendAlphaDst']
1057+
) {
1058+
tGL.blendFuncSeparate(tMesh['blendSrc'], tMesh['blendDst'],tMesh['blendAlphaSrc'], tMesh['blendAlphaDst']);
10541059
tCacheState['blendSrc'] = tMesh['blendSrc'];
10551060
tCacheState['blendDst'] = tMesh['blendDst'];
1061+
tCacheState['blendAlphaSrc'] = tMesh['blendAlphaSrc'];
1062+
tCacheState['blendAlphaDst'] = tMesh['blendAlphaDst'];
10561063
}
10571064
}
10581065
/////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)