Skip to content

Commit

Permalink
chore: move alpha_texture from PBRMaterial to UnlitMaterial (#1019)
Browse files Browse the repository at this point in the history
* Pointed to this chore branch in protocol, this will reverted before merging

* Updated build file with the changes from protocl

* Fixed Material test

* Updated protocol to point latest commit

* Updated sdk-commands to use latest protocol
  • Loading branch information
AlejandroAlvarezMelucciDCL authored Oct 18, 2024
1 parent aeb6a17 commit d9e3bec
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 38 deletions.
15 changes: 7 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/decentraland/js-sdk-toolchain/issues",
"dependencies": {
"@actions/core": "^1.10.0",
"@dcl/protocol": "1.0.0-10955038136.commit-7fe9554",
"@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f",
"@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1",
"@dcl/ts-proto": "1.153.0",
"@types/fs-extra": "^9.0.12",
Expand Down
2 changes: 2 additions & 0 deletions packages/@dcl/playground-assets/etc/playground-assets.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -2418,6 +2418,7 @@ export namespace PBMaterial {
export interface PBMaterial_PbrMaterial {
albedoColor?: PBColor4 | undefined;
alphaTest?: number | undefined;
// @deprecated (undocumented)
alphaTexture?: TextureUnion | undefined;
bumpTexture?: TextureUnion | undefined;
castShadows?: boolean | undefined;
Expand All @@ -2444,6 +2445,7 @@ export namespace PBMaterial_PbrMaterial {
// @public (undocumented)
export interface PBMaterial_UnlitMaterial {
alphaTest?: number | undefined;
alphaTexture?: TextureUnion | undefined;
castShadows?: boolean | undefined;
diffuseColor?: PBColor4 | undefined;
texture?: TextureUnion | undefined;
Expand Down
15 changes: 7 additions & 8 deletions packages/@dcl/sdk-commands/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@dcl/sdk-commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@dcl/inspector": "file:../inspector",
"@dcl/linker-dapp": "^0.14.2",
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
"@dcl/protocol": "1.0.0-10955038136.commit-7fe9554",
"@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f",
"@dcl/quests-client": "^1.0.3",
"@dcl/quests-manager": "^0.1.4",
"@dcl/rpc": "^1.1.1",
Expand Down
23 changes: 3 additions & 20 deletions test/ecs/components/Material.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,7 @@ describe('Generated Material ProtoBuf', () => {
}
}
},
alphaTexture: {
tex: {
$case: 'texture',
texture: {
filterMode: undefined,
wrapMode: undefined,
src: 'not-casla'
}
}
},
alphaTexture: undefined,
castShadows: true,
metallic: 1,
roughness: 1,
Expand All @@ -79,16 +70,7 @@ describe('Generated Material ProtoBuf', () => {
createPbrMaterial({
albedoColor: { r: 0, g: 1, b: 1, a: 1 },
alphaTest: 1,
alphaTexture: {
tex: {
$case: 'texture',
texture: {
wrapMode: TextureWrapMode.TWM_CLAMP,
filterMode: TextureFilterMode.TFM_BILINEAR,
src: 'not-casla'
}
}
},
alphaTexture: undefined,
bumpTexture: {
tex: {
$case: 'texture',
Expand Down Expand Up @@ -136,6 +118,7 @@ describe('Generated Material ProtoBuf', () => {
createUnlitMaterial({
castShadows: true,
diffuseColor: { r: 0, g: 1, b: 1, a: 1 },
alphaTexture: undefined,
alphaTest: undefined,
texture: undefined
})
Expand Down

0 comments on commit d9e3bec

Please sign in to comment.