David `Deltakosh` Catuhe 5 年之前
父節點
當前提交
6222bf268f

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/babylon.js


文件差異過大導致無法顯示
+ 1 - 1700
dist/preview release/babylon.ktx2Decoder.js


+ 3 - 1
dist/preview release/babylon.max.js

@@ -89625,6 +89625,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Engines_Extensions_engine_renderTargetCube__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../../Engines/Extensions/engine.renderTargetCube */ "./Engines/Extensions/engine.renderTargetCube.ts");
 /* harmony import */ var _Shaders_procedural_vertex__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../../../Shaders/procedural.vertex */ "./Shaders/procedural.vertex.ts");
 /* harmony import */ var _Misc_typeStore__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../../Misc/typeStore */ "./Misc/typeStore.ts");
+/* harmony import */ var _Engines_engineStore__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../../Engines/engineStore */ "./Engines/engineStore.ts");
+
 
 
 
@@ -89702,7 +89704,7 @@ var ProceduralTexture = /** @class */ (function (_super) {
         _this._fallbackTextureUsed = false;
         _this._cachedDefines = "";
         _this._contentUpdateId = -1;
-        scene = _this.getScene();
+        scene = _this.getScene() || _Engines_engineStore__WEBPACK_IMPORTED_MODULE_13__["EngineStore"].LastCreatedScene;
         var component = scene._getComponent(_sceneComponent__WEBPACK_IMPORTED_MODULE_4__["SceneComponentConstants"].NAME_PROCEDURALTEXTURE);
         if (!component) {
             component = new _proceduralTextureSceneComponent__WEBPACK_IMPORTED_MODULE_8__["ProceduralTextureSceneComponent"](scene);

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/babylon.max.js.map


+ 2 - 0
dist/preview release/nodeEditor/babylon.nodeEditor.d.ts

@@ -1430,7 +1430,9 @@ declare module NODEEDITOR {
         private _currentType;
         private _lightParent;
         private _postprocess;
+        private _proceduralTexture;
         private _particleSystem;
+        private _layer;
         constructor(targetCanvas: HTMLCanvasElement, globalState: GlobalState);
         private _handleAnimations;
         private _prepareLights;

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/nodeEditor/babylon.nodeEditor.js


+ 28 - 6
dist/preview release/nodeEditor/babylon.nodeEditor.max.js

@@ -64111,6 +64111,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 var PreviewManager = /** @class */ (function () {
     function PreviewManager(targetCanvas, globalState) {
         var _this = this;
@@ -64286,6 +64287,10 @@ var PreviewManager = /** @class */ (function () {
                 }
             }
             this._meshes = [];
+            if (this._layer) {
+                this._layer.dispose();
+                this._layer = null;
+            }
             var lights = this._scene.lights.slice(0);
             for (var _b = 0, lights_1 = lights; _b < lights_1.length; _b++) {
                 var light = lights_1[_b];
@@ -64345,6 +64350,9 @@ var PreviewManager = /** @class */ (function () {
                         return;
                 }
             }
+            else if (this._globalState.mode === babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].ProceduralTexture) {
+                this._layer = new babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["Layer"]("proceduralLayer", null, this._scene);
+            }
             else if (this._globalState.mode === babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].Particle) {
                 switch (this._globalState.previewType) {
                     case _previewType__WEBPACK_IMPORTED_MODULE_1__["PreviewType"].DefaultParticleSystem:
@@ -64448,9 +64456,12 @@ var PreviewManager = /** @class */ (function () {
                 this._postprocess.dispose(this._camera);
                 this._postprocess = null;
             }
+            if (this._proceduralTexture) {
+                this._proceduralTexture.dispose();
+                this._proceduralTexture = null;
+            }
             switch (this._globalState.mode) {
-                case babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].PostProcess:
-                case babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].ProceduralTexture: {
+                case babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].PostProcess: {
                     this._globalState.onIsLoadingChanged.notifyObservers(false);
                     this._postprocess = tempMaterial_1.createPostProcess(this._camera, 1.0, babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["Constants"].TEXTURE_NEAREST_SAMPLINGMODE, this._engine);
                     var currentScreen_1 = tempMaterial_1.getBlockByPredicate(function (block) { return block instanceof babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["CurrentScreenBlock"]; });
@@ -64465,6 +64476,17 @@ var PreviewManager = /** @class */ (function () {
                     this._material = tempMaterial_1;
                     break;
                 }
+                case babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].ProceduralTexture: {
+                    this._globalState.onIsLoadingChanged.notifyObservers(false);
+                    this._proceduralTexture = tempMaterial_1.createProceduralTexture(512, this._scene);
+                    if (this._material) {
+                        this._material.dispose();
+                    }
+                    if (this._layer) {
+                        this._layer.texture = this._proceduralTexture;
+                    }
+                    break;
+                }
                 case babylonjs_Materials_Node_nodeMaterial__WEBPACK_IMPORTED_MODULE_0__["NodeMaterialModes"].Particle: {
                     this._globalState.onIsLoadingChanged.notifyObservers(false);
                     this._particleSystem.onBeforeDrawParticlesObservable.clear();
@@ -65288,10 +65310,10 @@ var PropertyTabComponent = /** @class */ (function (_super) {
                             replace: material.snippetId
                         });
                     }
-                    alert("NodeMaterial saved with ID: " + material.snippetId + " (please note that the id was also saved to your clipboard)");
+                    _this.props.globalState.hostDocument.defaultView.alert("NodeMaterial saved with ID: " + material.snippetId + " (please note that the id was also saved to your clipboard)");
                 }
                 else {
-                    alert("Unable to save your node material. It may be too large (" + (dataToSend.payload.length / 1024).toFixed(2) + " KB) because of embedded textures. Please reduce texture sizes or point to a specific url instead of embedding them and try again.");
+                    _this.props.globalState.hostDocument.defaultView.alert("Unable to save your node material. It may be too large (" + (dataToSend.payload.length / 1024).toFixed(2) + " KB) because of embedded textures. Please reduce texture sizes or point to a specific url instead of embedding them and try again.");
                 }
             }
         };
@@ -65322,7 +65344,7 @@ var PropertyTabComponent = /** @class */ (function (_super) {
                 _this.props.globalState.onResetRequiredObservable.notifyObservers();
             }
         }).catch(function (err) {
-            alert("Unable to load your node material: " + err);
+            _this.props.globalState.hostDocument.defaultView.alert("Unable to load your node material: " + err);
         });
     };
     PropertyTabComponent.prototype.changeMode = function (value, force, loadDefault) {
@@ -65332,7 +65354,7 @@ var PropertyTabComponent = /** @class */ (function (_super) {
         if (this.props.globalState.mode === value) {
             return false;
         }
-        if (!force && !confirm('Are your sure? You will lose your current changes (if any) if they are not saved!')) {
+        if (!force && !this.props.globalState.hostDocument.defaultView.confirm('Are your sure? You will lose your current changes (if any) if they are not saved!')) {
             (_a = this._modeSelect.current) === null || _a === void 0 ? void 0 : _a.setValue(this.props.globalState.mode);
             return false;
         }

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/nodeEditor/babylon.nodeEditor.max.js.map


+ 4 - 0
dist/preview release/nodeEditor/babylon.nodeEditor.module.d.ts

@@ -1735,7 +1735,9 @@ declare module "babylonjs-node-editor/components/preview/previewManager" {
         private _currentType;
         private _lightParent;
         private _postprocess;
+        private _proceduralTexture;
         private _particleSystem;
+        private _layer;
         constructor(targetCanvas: HTMLCanvasElement, globalState: GlobalState);
         private _handleAnimations;
         private _prepareLights;
@@ -3335,7 +3337,9 @@ declare module NODEEDITOR {
         private _currentType;
         private _lightParent;
         private _postprocess;
+        private _proceduralTexture;
         private _particleSystem;
+        private _layer;
         constructor(targetCanvas: HTMLCanvasElement, globalState: GlobalState);
         private _handleAnimations;
         private _prepareLights;

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/viewer/babylon.viewer.js


文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/viewer/babylon.viewer.max.js