model component support lighting map #6796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pandamicro
suggested changes
Jun 2, 2020
| * @zh | ||
| * 静态灯光设置。 | ||
| */ | ||
| get staticSettings () { |
pandamicro
approved these changes
Jun 2, 2020
YunHsiao
reviewed
Jun 2, 2020
| @@ -32,6 +32,19 @@ class BuiltinResMgr { | |||
| blackTexture.image = imgAsset; | |||
| resources[blackTexture._uuid] = blackTexture; | |||
|
|
|||
| // empty texture | |||
| context.fillStyle = 'rgba(0,0,0,0)'; | |||
There was a problem hiding this comment.
如果这个没法返回透明通道为 0 的贴图的话，其实用 black-texture 是不是就好了
| GFXAddress.CLAMP, | ||
| GFXAddress.CLAMP, | ||
| ]); | ||
| sampler = samplerLib.getSampler(this._device, samplerHash); |
| public static SIZE: number = UBOLocal.COUNT * 4; | ||
|
|
||
| public static BLOCK: GFXUniformBlock = { | ||
| binding: UniformBinding.UBO_LOCAL, name: 'CCLocal', members: [ | ||
| { name: 'cc_matWorld', type: GFXType.MAT4, count: 1 }, | ||
| { name: 'cc_matWorldIT', type: GFXType.MAT4, count: 1 }, | ||
| { name: 'cc_lightingMapUVParam', type: GFXType.FLOAT4, count: 1 }, |
There was a problem hiding this comment.
lighting map 听起来语法上不太对，lightmap 就好了吧
pandamicro
pushed a commit
that referenced
this pull request
Jun 2, 2020
* 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts
pandamicro
pushed a commit
that referenced
this pull request
Jun 3, 2020
* 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts
pandamicro
pushed a commit
to pandamicro/fire-engine
that referenced
this pull request
Jun 12, 2020
* 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts # Conflicts: # cocos/core/3d/builtin/effects.ts
pandamicro
pushed a commit
to pandamicro/fire-engine
that referenced
this pull request
Jun 14, 2020
* 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts # Conflicts: # cocos/core/3d/builtin/effects.ts
pandamicro
added a commit
that referenced
this pull request
Jun 14, 2020
* model component support lighting map (#6796) * 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts # Conflicts: # cocos/core/3d/builtin/effects.ts * Update effects Co-authored-by: Myway <MSoft1115@hotmail.com>
pandamicro
pushed a commit
that referenced
this pull request
Jun 17, 2020
* 模型支持lighting map渲染 * change static lighting settings # Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/model-component.ts # cocos/core/renderer/scene/model.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: cocos-creator/2d-tasks#
Changes:
*