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.

Sign up for GitHub

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

Feat: Add dependency map #2476

Open
wants to merge 27 commits into
base: dev/1.4
Choose a base branch
from
Open

Feat: Add dependency map #2476

Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c3b2aef
fix(pick): fix pick not avalid for sprite renderer
singlecoder Aug 17, 2022
e82a3fc
fix(pick): fix pick not valid for sprite renderer
singlecoder Aug 17, 2022
ba86d40
fix(pick): opt code
singlecoder Aug 17, 2022
880cb70
fix(pick): opt code
singlecoder Aug 17, 2022
de6f83c
Merge branch 'main' of https://github.com/oasis-engine/engine
singlecoder Aug 17, 2022
97a13a7
Merge branch 'main' of https://github.com/oasis-engine/engine
singlecoder Aug 19, 2022
5d0f426
Merge branch 'main' of https://github.com/oasis-engine/engine
singlecoder Aug 22, 2022
5e7d7ab
Merge branch 'main' of https://github.com/oasis-engine/engine
singlecoder Sep 7, 2022
d10530b
fix(text): fix set font size not valid error
singlecoder Sep 7, 2022
8ca3c9c
refactor: opt code (#5)
GuoLei1990 Sep 8, 2022
98042c1
merge
johanzhu Oct 26, 2024
1130b13
Merge branch 'main' of https://github.com/galacean/engine
Nov 27, 2024
94b7be4
feat: merge
Dec 4, 2024
f5a51b0
Merge branch 'dev/1.4' of https://github.com/galacean/engine into dev…
Dec 13, 2024
5bf17b3
Merge branch 'dev/1.4' of https://github.com/galacean/engine into dev…
Dec 19, 2024
f739fcf
Merge branch 'dev/1.4' of https://github.com/galacean/engine into dev…
Dec 24, 2024
8a9a2e2
feat: add dep
Dec 24, 2024
8de27d3
feat: add dep
Dec 24, 2024
a6eb435
feat: fix lint
Dec 25, 2024
ff7ca78
feat: fix lint
Dec 25, 2024
d79fd47
feat: fix lint
Dec 25, 2024
c534e51
feat: delete console
Dec 25, 2024
5174b59
Merge branch 'dev/1.4' of https://github.com/galacean/engine into fea…
Dec 26, 2024
b54f336
feat: fix cr problem
Dec 26, 2024
6b1c196
feat: fix cr problem
Dec 26, 2024
9a413e6
feat: fix cr problem
Dec 26, 2024
4155cc1
feat: change name
Dec 26, 2024
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
7 changes: 5 additions & 2 deletions packages/core/src/asset/ResourceManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ export class ResourceManager {
_editorResourceConfig: EditorResourceConfig = Object.create(null);
/** @internal */
_virtualPathMap: Record<string, string> = Object.create(null);
/** @internal */
_dependencyMap: Record<string, { [key: string]: string }> = Object.create(null);

/**
* @internal
Expand Down Expand Up @@ -593,6 +595,7 @@ export class ResourceManager {
initVirtualResources(config: EditorResourceItem[]): void {
config.forEach((element) => {
this._virtualPathMap[element.virtualPath] = element.path;
element.depndentAssets && this._dependencyMap[element.virtualPath] = element.depndentAssets;
Copy link

@coderabbitai coderabbitai bot Dec 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix assignment syntax and add null check.

The current implementation has several issues:

  1. The assignment syntax is incorrect
  2. Missing null check before accessing depndentAssets
  3. Property name has a typo ("depndent" should be "dependent")

Apply this diff to fix the issues:

-      element.depndentAssets && this._dependencyMap[element.virtualPath] = element.depndentAssets;
+      if (element.dependentAssets) {
+        this._dependencyMap[element.virtualPath] = element.dependentAssets;
+      }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
element.depndentAssets && this._dependencyMap[element.virtualPath] = element.depndentAssets;
if (element.dependentAssets) {
this._dependencyMap[element.virtualPath] = element.dependentAssets;
}
🧰 Tools
🪛 Biome (1.9.4)

[error] 598-598: Invalid assignment to element.depndentAssets && this._dependencyMap[element.virtualPath]

This expression cannot be assigned to

(parse)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johanzhu, thanks for confirming the fix has been applied! Nice work.

If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

this._editorResourceConfig[element.id] = element;
});
}
Expand Down Expand Up @@ -631,8 +634,8 @@ const rePropName = RegExp(
"g"
);

type EditorResourceItem = { virtualPath: string; path: string; type: string; id: string };
type EditorResourceConfig = Record<string, EditorResourceItem>;
type EditorResourceItem = { virtualPath: string; path: string; type: string; id: string, depndentAssets: { [key: string]: string } };
Copy link

@coderabbitai coderabbitai bot Dec 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Address ESLint’s formatting recommendations and fix the property name.

Use multiline for readability, and correct the property name to dependentAssets.

Below is a suggested diff:

- type EditorResourceItem = { virtualPath: string; path: string; type: string; id: string, depndentAssets: { [key: string]: string } };
+ type EditorResourceItem = {
+   virtualPath: string;
+   path: string;
+   type: string;
+   id: string;
+   dependentAssets: { [key: string]: string };
+ };
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
type EditorResourceItem = { virtualPath: string; path: string; type: string; id: string, depndentAssets: { [key: string]: string } };
type EditorResourceItem = {
virtualPath: string;
path: string;
type: string;
id: string;
dependentAssets: { [key: string]: string };
};
🧰 Tools
🪛 eslint

[error] 637-637: Replace ·virtualPath:·string;·path:·string;·type:·string;·id:·string,·depndentAssets:·{·[key:·string]:·string·}· with ⏎··virtualPath:·string;⏎··path:·string;⏎··type:·string;⏎··id:·string;⏎··depndentAssets:·{·[key:·string]:·string·};⏎

(prettier/prettier)

🪛 GitHub Check: lint

[failure] 637-637:
Replace ·virtualPath:·string;·path:·string;·type:·string;·id:·string,·depndentAssets:·{·[key:·string]:·string·}· with ⏎··virtualPath:·string;⏎··path:·string;⏎··type:·string;⏎··id:·string;⏎··depndentAssets:·{·[key:·string]:·string·};⏎

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johanzhu, thanks for confirming everything is done!

If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

type EditorResourceConfig = Record< string, EditorResourceItem >;
type SubAssetPromiseCallbacks<T> = Record<
// main asset url, ie. "https://***.glb"
string,
Expand Down
Loading