Skip to content

Commit

Permalink
chore: update to Babylon.JS v6
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-moreau committed Apr 22, 2023
1 parent 98ce48f commit 631101e
Show file tree
Hide file tree
Showing 8 changed files with 339 additions and 323 deletions.
218 changes: 109 additions & 109 deletions module/package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
"@types/react": "16.9.19",
"@types/react-dom": "16.9.5",
"typescript": "4.6.3",
"babylonjs": "5.56.0",
"babylonjs-gui": "5.56.0",
"babylonjs-inspector": "5.56.0",
"babylonjs-loaders": "5.56.0",
"babylonjs-materials": "5.56.0",
"babylonjs-node-editor": "5.56.0",
"babylonjs-post-process": "5.56.0",
"babylonjs-procedural-textures": "5.56.0",
"babylonjs-serializers": "5.56.0",
"babylonjs": "6.0.0",
"babylonjs-gui": "6.0.0",
"babylonjs-inspector": "6.0.0",
"babylonjs-loaders": "6.0.0",
"babylonjs-materials": "6.0.0",
"babylonjs-node-editor": "6.0.0",
"babylonjs-post-process": "6.0.0",
"babylonjs-procedural-textures": "6.0.0",
"babylonjs-serializers": "6.0.0",
"@blueprintjs/core": "3.28.1",
"@blueprintjs/select": "3.13.2",
"react": "16.12.0",
Expand Down
330 changes: 165 additions & 165 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,28 @@
"xhr2": "0.2.0"
},
"dependencies": {
"@babylonjs/core": "5.56.0",
"@babylonjs/gui": "5.56.0",
"@babylonjs/loaders": "5.56.0",
"@babylonjs/materials": "5.56.0",
"@babylonjs/post-processes": "5.56.0",
"@babylonjs/procedural-textures": "5.56.0",
"@babylonjs/core": "6.0.0",
"@babylonjs/gui": "6.0.0",
"@babylonjs/loaders": "6.0.0",
"@babylonjs/materials": "6.0.0",
"@babylonjs/post-processes": "6.0.0",
"@babylonjs/procedural-textures": "6.0.0",
"@blueprintjs/core": "3.51.3",
"@blueprintjs/select": "3.18.10",
"@jniac/color-xplr": "1.0.15",
"adm-zip": "0.4.14",
"ansi-regex": "3.0.1",
"antd": "4.18.7",
"babylonjs": "5.56.0",
"babylonjs-gui": "5.56.0",
"babylonjs-gui-editor": "5.56.0",
"babylonjs-inspector": "5.56.0",
"babylonjs-loaders": "5.56.0",
"babylonjs-materials": "5.56.0",
"babylonjs-node-editor": "5.56.0",
"babylonjs-post-process": "5.56.0",
"babylonjs-procedural-textures": "5.56.0",
"babylonjs-serializers": "5.56.0",
"babylonjs": "6.0.0",
"babylonjs-gui": "6.0.0",
"babylonjs-gui-editor": "6.0.0",
"babylonjs-inspector": "6.0.0",
"babylonjs-loaders": "6.0.0",
"babylonjs-materials": "6.0.0",
"babylonjs-node-editor": "6.0.0",
"babylonjs-post-process": "6.0.0",
"babylonjs-procedural-textures": "6.0.0",
"babylonjs-serializers": "6.0.0",
"cannon": "0.6.2",
"ccapture.js": "1.1.0",
"chalk": "4.0.0",
Expand Down
36 changes: 18 additions & 18 deletions sample-plugin/package-lock.json

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

10 changes: 5 additions & 5 deletions src/renderer/editor/components/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { SceneExporter } from "../project/scene-exporter";
import { ScenePlayer } from "../../play/inline-play";

import { PreviewCopyHelper } from "./preview/copy";
import { CameraPreview } from "./preview/camera-preview";
// import { CameraPreview } from "./preview/camera-preview";

export enum PreviewFocusMode {
Target = 1,
Expand Down Expand Up @@ -138,7 +138,7 @@ export class Preview extends React.Component<IPreviewProps, IPreviewState> {
private _cameraTargetBeforeIsolation: Nullable<Vector3> = null;
private _isolationBaseMeshesArray: Nullable<AbstractMesh[]> = null;

private _cameraPreview: Nullable<CameraPreview> = null;
// private _cameraPreview: Nullable<CameraPreview> = null;

private _searchBar: Omnibar;
private _playIframe: HTMLIFrameElement;
Expand Down Expand Up @@ -189,7 +189,7 @@ export class Preview extends React.Component<IPreviewProps, IPreviewState> {
<Menu>
{this._editor.scene?.cameras.map((c) => (
<MenuItem key={c.id} id={c.id} text={c.name} icon={activeCamera === c ? <Icon src="check.svg" /> : null} onClick={() => {
this._cameraPreview?.clear();
// this._cameraPreview?.clear();
SceneSettings.SetActiveCamera(this._editor, c);
}} />
))}
Expand Down Expand Up @@ -280,7 +280,7 @@ export class Preview extends React.Component<IPreviewProps, IPreviewState> {
<div style={{ position: "absolute", top: "50%", left: "25%", width: "50%" }}>
{loadingProgress}
</div>
<CameraPreview ref={(r) => this._cameraPreview = r} editor={this._editor} />
{/* <CameraPreview ref={(r) => this._cameraPreview = r} editor={this._editor} /> */}
</div>
</>
);
Expand All @@ -290,7 +290,7 @@ export class Preview extends React.Component<IPreviewProps, IPreviewState> {
* Called on the component did mount.
*/
public async componentDidMount(): Promise<void> {
this._editor.selectedNodeObservable.add((n) => this._cameraPreview?.setSelectedNode(n));
// this._editor.selectedNodeObservable.add((n) => this._cameraPreview?.setSelectedNode(n));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion whatsnew/4.6.0.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Babylon.JS Editor v4.5.1
# Babylon.JS Editor v4.6.0

### Features
- Added support of webp images.
Expand Down
16 changes: 16 additions & 0 deletions whatsnew/4.7.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Babylon.JS Editor v4.7.0

### Features
- Add support of Babylon.JS v6
- Add support of `Alt+c` to switch from current to latest used camera in preview panel
- Add support of Video Textures
- Add support of brand now SSR rendering pipeline

### Improvements
- Improve saving speed by checking already saved geometries

### Fixes
- Fixed support of "Space" character in KeyMap inspector values #424
- Clean render targets before saving project to handle null case
- Added missing properties to cascaded shadow maps
- Handle textures with loading errors in assets panel

0 comments on commit 631101e

Please sign in to comment.