diff --git a/Makefile b/Makefile index 77e2e0999..7d781eb44 100644 --- a/Makefile +++ b/Makefile @@ -32,10 +32,23 @@ install: make node_modules/.bin/protobuf/bin/protoc update-protocol: - npm i --save-exact @dcl/protocol@next - cd packages/@dcl/sdk-commands; npm i --save-exact @dcl/protocol@next + @TARGET_PACKAGE=$(word 2,$(MAKECMDGOALS)); \ + if [ -z "$$TARGET_PACKAGE" ]; then TARGET_PACKAGE=next; fi; \ + if [[ "$$TARGET_PACKAGE" =~ ^[\"\'].*[\"\']$$ ]]; then \ + TARGET_PACKAGE=$${TARGET_PACKAGE:1:$${#TARGET_PACKAGE}-2}; \ + echo "Using exact version: $$TARGET_PACKAGE"; \ + npm i --save-exact $$TARGET_PACKAGE; \ + (cd packages/@dcl/sdk-commands && npm i --save-exact $$TARGET_PACKAGE); \ + else \ + echo "Using protocol tag: $$TARGET_PACKAGE"; \ + npm i --save-exact @dcl/protocol@$$TARGET_PACKAGE; \ + (cd packages/@dcl/sdk-commands && npm i --save-exact @dcl/protocol@$$TARGET_PACKAGE); \ + fi; \ $(MAKE) sync-deps compile_apis +%: + @: + update-renderer: cd packages/@dcl/sdk; npm i --save-exact @dcl/explorer@latest diff --git a/package-lock.json b/package-lock.json index b5afdd2c6..d689c7a5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "1.0.0-12891435340.commit-b3fea33", + "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-13304761112.commit-6bf7163.tgz", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", @@ -577,9 +577,10 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-12891435340.commit-b3fea33", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-12891435340.commit-b3fea33.tgz", - "integrity": "sha512-WBiLqh5g8imJNPvihgxBbqLf9cOY7g+rsj98yjkU1wl+WTuIyXKIWJn6XlQ2+h797ZF+aDRm66q9bhTGMmYdsA==", + "version": "1.0.0-13304761112.commit-6bf7163", + "resolved": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-13304761112.commit-6bf7163.tgz", + "integrity": "sha512-vX+fcid4+Qbh4FDKC6dEyFY2z7bHgO9U0xaPrhD6Sm9k/IEU4mis7pNtAon+IzmYtd5DiyLdv0ybe5pj8xdQhw==", + "license": "Apache-2.0", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -8393,9 +8394,8 @@ } }, "@dcl/protocol": { - "version": "1.0.0-12891435340.commit-b3fea33", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-12891435340.commit-b3fea33.tgz", - "integrity": "sha512-WBiLqh5g8imJNPvihgxBbqLf9cOY7g+rsj98yjkU1wl+WTuIyXKIWJn6XlQ2+h797ZF+aDRm66q9bhTGMmYdsA==", + "version": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-13304761112.commit-6bf7163.tgz", + "integrity": "sha512-vX+fcid4+Qbh4FDKC6dEyFY2z7bHgO9U0xaPrhD6Sm9k/IEU4mis7pNtAon+IzmYtd5DiyLdv0ybe5pj8xdQhw==", "requires": { "@dcl/ts-proto": "1.154.0" }, diff --git a/package.json b/package.json index 0efe00a20..48dbe20e6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "1.0.0-12891435340.commit-b3fea33", + "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-13304761112.commit-6bf7163.tgz", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", diff --git a/packages/@dcl/playground-assets/etc/playground-assets.api.md b/packages/@dcl/playground-assets/etc/playground-assets.api.md index 2307de0e7..a61622f6f 100644 --- a/packages/@dcl/playground-assets/etc/playground-assets.api.md +++ b/packages/@dcl/playground-assets/etc/playground-assets.api.md @@ -627,6 +627,7 @@ export const componentDefinitionByName: { "core::GltfContainer": LwwComponentGetter>; "core::GltfContainerLoadingState": LwwComponentGetter>; "core::InputModifier": LwwComponentGetter>; + "core::LightSource": LwwComponentGetter>; "core::MainCamera": LwwComponentGetter>; "core::Material": LwwComponentGetter>; "core::MeshCollider": LwwComponentGetter>; @@ -1556,6 +1557,9 @@ export interface LastWriteWinElementSetComponentDefinition extends BaseCompon getOrNull(entity: Entity): DeepReadonly | null; } +// @public (undocumented) +export const LightSource: LastWriteWinElementSetComponentDefinition; + // @public export type Listeners = { onMouseDown?: Callback; @@ -2404,6 +2408,66 @@ export namespace PBInputModifier_StandardInput { export function encode(message: PBInputModifier_StandardInput, writer?: _m0.Writer): _m0.Writer; } +// @public (undocumented) +export interface PBLightSource { + active?: boolean | undefined; + brightness?: number | undefined; + color?: PBColor3 | undefined; + range?: number | undefined; + // (undocumented) + type?: { + $case: "point"; + point: PBLightSource_Point; + } | { + $case: "spot"; + spot: PBLightSource_Spot; + } | undefined; +} + +// @public (undocumented) +export namespace PBLightSource { + // (undocumented) + export function decode(input: _m0.Reader | Uint8Array, length?: number): PBLightSource; + // (undocumented) + export function encode(message: PBLightSource, writer?: _m0.Writer): _m0.Writer; +} + +// @public (undocumented) +export interface PBLightSource_Point { + shadow?: PBLightSource_ShadowType | undefined; +} + +// @public (undocumented) +export namespace PBLightSource_Point { + // (undocumented) + export function decode(input: _m0.Reader | Uint8Array, length?: number): PBLightSource_Point; + // (undocumented) + export function encode(message: PBLightSource_Point, writer?: _m0.Writer): _m0.Writer; +} + +// @public (undocumented) +export const enum PBLightSource_ShadowType { + ST_HARD = 2, + ST_NONE = 0, + ST_SOFT = 1 +} + +// @public (undocumented) +export interface PBLightSource_Spot { + innerAngle?: number | undefined; + outerAngle?: number | undefined; + shadow?: PBLightSource_ShadowType | undefined; + shadowMaskTexture?: TextureUnion | undefined; +} + +// @public (undocumented) +export namespace PBLightSource_Spot { + // (undocumented) + export function decode(input: _m0.Reader | Uint8Array, length?: number): PBLightSource_Spot; + // (undocumented) + export function encode(message: PBLightSource_Spot, writer?: _m0.Writer): _m0.Writer; +} + // @public (undocumented) export interface PBMainCamera { virtualCameraEntity?: number | undefined;