Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add light probe group help #15797

Merged
merged 1 commit into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cocos/core/math/vec2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,10 @@
* @override (a:Vec2, b:Vec2) => number
* @override [deprecated] (out:Vec3, a:Vec2, b:Vec2) => Vec3
*/
/**
* @deprecated since v3.8.0, There is no physical meaning.
*/
public static cross (a: IVec2Like, b: IVec2Like): number;

/**
* @deprecated since v3.8.0, There is no physical meaning.
* @deprecated Consider use another overrides please.
*/
public static cross <Out extends IVec2Like> (out: Vec3, a: Out, b: Out): Vec3;

Expand Down Expand Up @@ -640,7 +637,7 @@
* @param scalar scalar number
*/
public multiplyScalar (scalar: number): Vec2 {
if (typeof scalar === 'object') { console.warn('should use Vec2.multiply for vector * vector operation'); }

Check failure on line 640 in cocos/core/math/vec2.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected console statement
this.x *= scalar;
this.y *= scalar;
return this;
Expand All @@ -652,7 +649,7 @@
* @param other specified vector
*/
public multiply (other: Vec2): Vec2 {
if (typeof other !== 'object') { console.warn('should use Vec2.scale for vector * scalar operation'); }

Check failure on line 652 in cocos/core/math/vec2.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected console statement
this.x *= other.x;
this.y *= other.y;
return this;
Expand Down Expand Up @@ -719,9 +716,6 @@
* @param other specified vector
* @return `out`
*/
/**
* @deprecated since v3.8.0, There is no physical meaning.
*/
public cross (other: Vec2): number {
return this.x * other.y - this.y * other.x;
}
Expand Down Expand Up @@ -785,7 +779,7 @@
* @zh 获取当前向量和指定向量之间的有符号弧度。<br/>
* 有符号弧度的取值范围为 (-PI, PI],当前向量可以通过逆时针旋转有符号角度与指定向量同向。<br/>
* @param other specified vector
* @return The signed angle between the current vector and the specified vector (in radians); if there is a zero vector in the current vector and the specified vector, 0 is returned.

Check warning on line 782 in cocos/core/math/vec2.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

This line has a length of 186. Maximum allowed is 150
*/
public signAngle (other: Vec2): number {
const angle = this.angle(other);
Expand Down Expand Up @@ -842,7 +836,7 @@
export function v2 (x?: number, y?: number): Vec2;

export function v2 (x?: number | Vec2, y?: number): Vec2 {
return new Vec2(x as any, y);

Check failure on line 839 in cocos/core/math/vec2.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unsafe argument of type `any` assigned to a parameter of type `number | undefined`
}

legacyCC.v2 = v2;
2 changes: 2 additions & 0 deletions cocos/gi/light-probe/light-probe-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
displayName,
editable,
executeInEditMode,
help,
menu,
range,
serializable,
Expand All @@ -46,6 +47,7 @@ import { AutoPlacement, PlaceMethod } from './auto-placement';
* @zh 光照探针组组件。
*/
@ccclass('cc.LightProbeGroup')
@help('i18n:cc.LightProbeGroup')
@menu('Rendering/LightProbeGroup')
@disallowMultiple
@executeInEditMode
Expand Down
1 change: 1 addition & 0 deletions editor/i18n/en/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = link(mixin({
DirectionalLight: `${url}/${version}/manual/en/concepts/scene/light/lightType/dir-light.html`,
SphereLight: `${url}/${version}/manual/en/concepts/scene/light/lightType/sphere-light.html`,
SpotLight: `${url}/${version}/manual/en/concepts/scene/light/lightType/spot-light.html`,
LightProbeGroup: `${url}/${version}/manual/en/concepts/scene/light/probe/light-probe.html`,
UICoordinateTracker: `${url}/${version}/manual/en/ui-system/components/editor/ui-coordinate-tracker.html`,
Animation: `${url}/${version}/manual/en/animation/animation-component.html`,
SkeletalAnimation: `${url}/${version}/manual/en/animation/skeletal-animation.html`,
Expand Down
1 change: 1 addition & 0 deletions editor/i18n/zh/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = link(mixin({
DirectionalLight: `${url}/${version}/manual/zh/concepts/scene/light/lightType/dir-light.html`,
SphereLight: `${url}/${version}/manual/zh/concepts/scene/light/lightType/sphere-light.html`,
SpotLight: `${url}/${version}/manual/zh/concepts/scene/light/lightType/spot-light.html`,
LightProbeGroup: `${url}/${version}/manual/zh/concepts/scene/light/probe/light-probe.html`,
UICoordinateTracker: `${url}/${version}/manual/zh/ui-system/components/editor/ui-coordinate-tracker.html`,
Animation: `${url}/${version}/manual/zh/animation/animation-component.html`,
SkeletalAnimation: `${url}/${version}/manual/zh/animation/skeletal-animation.html`,
Expand Down
1 change: 0 additions & 1 deletion native/cocos/math/Vec2.h
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,6 @@ class CC_DLL Vec2 {
/** Calculates cross product of two points.
@return float
@since v2.1.4
@deprecated since v3.8.0, There is no physical meaning.
*/
inline float cross(const Vec2 &other) const {
return x * other.y - y * other.x;
Expand Down
Loading