gs-bim-air 3.0.3 → 3.0.5

package/public/js/shaders/screenSpaceCurvature.fragment.fx

@@ -1,5 +1,5 @@
 // From Blender sources: https://developer.blender.org/D3617#change-jG1fqR1RpokL
-// Forum request: https://forum.babylonjs.com/t/cavity-shader-effect-like-blender-2-8-viewport-for-babylon-js/11789
+// Forum request: https://forum.longanjs.com/t/cavity-shader-effect-like-blender-2-8-viewport-for-longan-js/11789
 precision highp float;
 
 // Samplers

package/public/js/shaders/shadersInclude/screenSpaceRayTrace.fx

@@ -2,7 +2,7 @@
 // * http://casual-effects.blogspot.com/2014/08/screen-space-ray-tracing.html
 // * https://sourceforge.net/p/g3d/code/HEAD/tree/G3D10/data-files/shader/screenSpaceRayTrace.glsl
 // * https://github.com/kode80/kode80SSR
-// Adapted to Babylon.js case where the camera space coordinate system is left-handed (visible geometries in this space have positive Z values)
+// Adapted to Longan.js case where the camera space coordinate system is left-handed (visible geometries in this space have positive Z values)
 
 float distanceSquared(vec2 a, vec2 b) { a -= b; return dot(a, a); }
 

package/public/js/shadersWGSL/shadersInclude/screenSpaceRayTrace.fx

@@ -2,7 +2,7 @@
 // * http://casual-effects.blogspot.com/2014/08/screen-space-ray-tracing.html
 // * https://sourceforge.net/p/g3d/code/HEAD/tree/G3D10/data-files/shader/screenSpaceRayTrace.glsl
 // * https://github.com/kode80/kode80SSR
-// Adapted to Babylon.js case where the camera space coordinate system is left-handed (visible geometries in this space have positive Z values)
+// Adapted to Longan.js case where the camera space coordinate system is left-handed (visible geometries in this space have positive Z values)
 
 fn distanceSquared(a: vec2f, b: vec2f) -> f32 { 
     var temp = a - b; 

package/src/api/cuttingService.ts

@@ -1,55 +0,0 @@
-import { Cutting } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingObject";
-import axios from "../axiosRequestExport";
-
-// export interface Cutting {
-//   id?: string;
-//   name: string;
-//   isDefault: boolean;
-//   skyBox?: {};
-//   illumination?: {};
-//   weather?: {};
-//   shadow?: {};
-// }
-
-let prefix = () => `${cuttingService.prefix}`;
-let scenePrefix = () => `${prefix()}/api/scenes`;
-
-let urls = {
-  cuttings: (sceneId: string) => `${scenePrefix()}/${sceneId}/cuttings`,
-};
-
-let cuttingService = {
-  prefix: window.location.protocol + "//" + window.location.host + "/bimair-engine",
-
-  getCuttings: (sceneId: string) => {
-    return axios.get(urls.cuttings(sceneId)).then((data: any) => {
-      return data as Cutting[];
-    });
-  },
-
-  createCutting: (sceneId: string, cutting: Cutting) => {
-    return axios.post(urls.cuttings(sceneId), cutting).then((data: any) => {
-      return data as Cutting;
-    });
-  },
-
-  getCutting: (cuttingId: string) => {
-    return axios.get(`${prefix()}/api/cuttings/${cuttingId}`).then((data: any) => {
-      return data as Cutting;
-    });
-  },
-
-  editCutting: (cuttingId: string, cutting: Cutting) => {
-    return axios.put(`${prefix()}/api/cuttings/${cuttingId}`, cutting).then((data: any) => {
-      return data as Cutting;
-    });
-  },
-
-  deleteCutting: (cuttingId: string) => {
-    return axios.delete(`${prefix()}/api/cuttings/${cuttingId}`).then((data: any) => {
-      return data as null;
-    });
-  },
-};
-
-export { cuttingService };

package/src/api/effectService.ts

@@ -1,46 +0,0 @@
-import { SceneOptions } from "gs-bim-air-core/gsDevFx/options/sceneOptions";
-import axios from "../axiosRequestExport";
-import { EffectOption } from "gs-bim-air-core/sdk/animation";
-
-let prefix = () => `${effectService.prefix}`;
-let scenePrefix = () => `${prefix()}/api/scenes`;
-
-let urls = {
-  effects: (sceneId: string) => `${scenePrefix()}/${sceneId}/effects`,
-};
-
-let effectService = {
-  prefix: window.location.protocol + "//" + window.location.host + "/bimair-engine",
-
-  getEffects: (sceneId: string) => {
-    return axios.get(urls.effects(sceneId)).then((data: any) => {
-      return data as EffectOption[];
-    });
-  },
-
-  createEffect: (sceneId: string, effect: EffectOption) => {
-    return axios.post(urls.effects(sceneId), effect).then((data: any) => {
-      return data as EffectOption;
-    });
-  },
-
-  getEffect: (effectId: string) => {
-    return axios.get(`${prefix()}/api/effects/${effectId}`).then((data: any) => {
-      return data as EffectOption;
-    });
-  },
-
-  editEffect: (effectId: string, effect: EffectOption) => {
-    return axios.put(`${prefix()}/api/effects/${effectId}`, effect).then((data: any) => {
-      return data as EffectOption;
-    });
-  },
-
-  deleteEffect: (effectId: string) => {
-    return axios.delete(`${prefix()}/api/effects/${effectId}`).then((data: any) => {
-      return data as null;
-    });
-  },
-};
-
-export { effectService };

package/src/api/file/fileService.ts

@@ -1,21 +0,0 @@
-import axios from "../../axiosRequestExport";
-
-let prefix = `/file-service`;
-let urls = {
-  files: (fileService) => `${fileService}${prefix}/files`,
-  file: (fileService, id) => `${fileService}${prefix}/files/${id}`,
-};
-
-let fileService = {
-  urls,
-  uploadFile: (fileService, file: File | Blob) => {
-    let formData = new FormData();
-    formData.append("file", file);
-    return axios.post(urls.files(fileService), formData);
-  },
-  deleteFile: (fileService, id) => {
-    return axios.delete(urls.file(fileService, id));
-  },
-};
-
-export default fileService;

package/src/api/gisProjectService.ts

@@ -1,129 +0,0 @@
-import axios from "../axiosRequestExport";
-export interface GisProject {
-  id?: string;
-  name: string;
-  category?: string;
-  tag?: string;
-  remarks: string;
-  updateTime?: string;
-  createTime?: string;
-}
-
-export const defaultGisProject = {
-  id: "",
-  name: "",
-  category: "GisProject",
-  tag: "",
-  remarks: "",
-};
-
-export interface Instance {
-  id?: string;
-  name: string;
-  type: "Project" | "Model";
-  templateId: string;
-  lla?: {
-    x: number;
-    y: number;
-    z: number;
-  };
-  enu?: {
-    x: number;
-    y: number;
-    z: number;
-  };
-  options?: {};
-}
-
-export const defaultInstance = {
-  id: "",
-  name: "",
-  type: "",
-  templateId: "",
-  lla: { x: undefined, y: undefined, z: undefined },
-  enu: { x: undefined, y: undefined, z: undefined },
-  options: null,
-};
-
-let prefix = () => `${gisProjectService.prefix}`;
-let gisProjectPrefix = () => `${prefix()}/api/gis-projects`;
-
-let urls = {
-  gisProjects: (name?: string, startTime?: string, endTime?: string) =>
-    `${gisProjectPrefix()}?${name ? `name=${name}&` : ""}${startTime ? `startTime=${startTime}&` : ``}${
-      endTime ? `endTime=${endTime}` : ``
-    }`,
-  instances: (gisProjectId: string) => `${gisProjectPrefix()}/${gisProjectId}/gis-instances`,
-};
-
-let gisProjectService = {
-  prefix: window.location.protocol + "//" + window.location.host + "/bimair-engine",
-
-  getGisProjects: (name?: string, startTime?: string, endTime?: string) => {
-    return axios.get(urls.gisProjects(name, startTime, endTime)).then((data: any) => {
-      return data as GisProject[];
-    });
-  },
-
-  createGisProject: (project: GisProject) => {
-    return axios.post(urls.gisProjects(), project).then((data: any) => {
-      return data as GisProject;
-    });
-  },
-
-  getGisProject: (gisProjectId: string) => {
-    return axios.get(`${urls.gisProjects()}/${gisProjectId}`).then((data: any) => {
-      return data as GisProject;
-    });
-  },
-
-  editGisProject: (gisProjectId: string, project: GisProject) => {
-    return axios.put(`${urls.gisProjects()}/${gisProjectId}`, project).then((data: any) => {
-      return data as GisProject;
-    });
-  },
-
-  deleteGisProject: (gisProjectId: string) => {
-    return axios.delete(`${urls.gisProjects()}/${gisProjectId}`).then((data: any) => {
-      return data as GisProject;
-    });
-  },
-
-  getInstances: (gisProjectId: string) => {
-    return axios.get(urls.instances(gisProjectId)).then((data: any) => {
-      return data as Instance[];
-    });
-  },
-
-  createInstance: (gisProjectId: string, instance: Instance) => {
-    return axios.post(urls.instances(gisProjectId), instance).then((data: any) => {
-      return data as Instance;
-    });
-  },
-
-  getInstance: (instanceId: string) => {
-    return axios.get(`${prefix()}/api/gis-instances/${instanceId}`).then((data: any) => {
-      return data as Instance;
-    });
-  },
-
-  editInstance: (instanceId: string, instance: Instance) => {
-    return axios.put(`${prefix()}/api/gis-instances/${instanceId}`, instance).then((data: any) => {
-      return data as Instance;
-    });
-  },
-
-  deleteInstance: (instanceId: string) => {
-    return axios.delete(`${prefix()}/api/gis-instances/${instanceId}`).then((data: any) => {
-      return data as null;
-    });
-  },
-
-  checkInstance: (instanceId: string) => {
-    return axios.get(`${prefix()}/api/gis-instances/${instanceId}/check`).then((data: any) => {
-      return data as null;
-    });
-  },
-};
-
-export { gisProjectService };

package/src/api/gsl/gslService.ts

@@ -1,36 +0,0 @@
-import axios from "../../axiosRequestExport";
-
-let prefix = `/model-service`
-let urls = {
-    gsl: (modelService, modelId, versionCode?) => {
-        if (versionCode !== undefined) {
-            return `${modelService}${prefix}/models/${modelId}/gsl?v=${versionCode}`
-        } else {
-            return `${modelService}${prefix}/models/${modelId}/gsl`
-        }
-    },
-    properties: (modelService, modelId, componentId, versionCode?) => {
-        if (versionCode) {
-            return `${modelService}${prefix}/models/${modelId}/components/${componentId}/properties?v=${versionCode}`
-        } else {
-            return `${modelService}${prefix}/models/${modelId}/components/${componentId}/properties`
-        }
-    },
-    // geometryGroup: (modelId) => `${prefix}/models/${modelId}/segments/group`,
-    geometries: (modelService, modelId, ids, versionCode?) => {
-        if (versionCode) {
-            return `${modelService}${prefix}/models/${modelId}/segments/multi/${ids}?v=${versionCode}`
-        } else {
-            return `${modelService}${prefix}/models/${modelId}/segments/multi/${ids}`
-        }
-    }
-}
-
-let gslService = {
-    urls,
-    getComponentProperties: (modelService, modelId, componentId, versionCode?) => {
-        return axios.get(urls.properties(modelService, modelId, componentId, versionCode))
-    }
-}
-
-export default gslService

package/src/api/indexedDB.ts

@@ -1,212 +0,0 @@
-// // onmessage = (e) => {
-// //   // console.log("Message received from main script", e);
-
-// //   let { method, prefix, dbName, filePath } = e.data;
-// //   if (method === "update") {
-// //     initIDB(dbName).then(() => {
-// //       fetchData(prefix, dbName, filePath);
-// //     });
-// //   } else if (method === "set") {
-// //     initIDB(dbName).then(() => {
-// //       checkFileExists(dbName, filePath).then((fileExists) => {
-// //         if (fileExists) {
-// //           self.postMessage({
-// //             method: "getIdbFinished",
-// //             prefix,
-// //             dbName,
-// //             filePath,
-// //           });
-// //         } else {
-// //           fetchData(prefix, dbName, filePath);
-// //         }
-// //       });
-// //     });
-// //   } else if (method === "close") {
-// //     if (dbList[dbName]) {
-// //       dbList[dbName].close();
-// //       dbList[dbName] = null;
-// //       objectStore = null;
-// //       self.close();
-// //     }
-// //   }
-// // };
-
-// // self.addEventListener("message", onmessage);
-
-// let dbList = {};
-// let objectStore;
-// let xhrList = [];
-// let readerList = [];
-
-// export function initIDB(dbName): Promise<void> {
-//   return new Promise((resolve) => {
-//     if (dbList[dbName]) {
-//       dbList[dbName].close();
-//       dbList[dbName] = null;
-//       objectStore = null;
-//     }
-//     if (!dbList[dbName]) {
-//       let request = indexedDB.open(dbName, 22); // Increment the version as needed
-
-//       request.onupgradeneeded = (event) => {
-//         dbList[dbName] = (event.target as any).result;
-//         if (!dbList[dbName].objectStoreNames.contains("FILE_DATA")) {
-//           objectStore = dbList[dbName].createObjectStore("FILE_DATA", {
-//             autoIncrement: true,
-//           });
-//         }
-//       };
-
-//       request.onsuccess = (event) => {
-//         // Move the resolve outside of request.onsuccess
-//         if (dbList[dbName] && objectStore) {
-//           resolve();
-//         } else {
-//           dbList[dbName] = (event.target as any).result;
-//           if (!dbList[dbName].objectStoreNames.contains("FILE_DATA")) {
-//             objectStore = dbList[dbName].createObjectStore("FILE_DATA", {
-//               autoIncrement: true,
-//             });
-//             resolve();
-//           } else {
-//             let transaction = dbList[dbName].transaction(
-//               ["FILE_DATA"],
-//               "readwrite"
-//             );
-//             objectStore = transaction.objectStore("FILE_DATA");
-//             resolve();
-//           }
-//         }
-//       };
-//     } else {
-//       // If the database is already open, resolve immediately
-//       resolve();
-//     }
-//   });
-// }
-
-// export function checkFileExists(dbName, filePath): Promise<boolean> {
-//   return new Promise((resolve) => {
-//     if (!dbList[dbName]) {
-//       // You should handle this case appropriately if the database is not open.
-//       resolve(false);
-//       return;
-//     }
-
-//     let transaction = dbList[dbName].transaction(["FILE_DATA"], "readonly");
-//     let store = transaction.objectStore("FILE_DATA");
-//     let req = store.get(filePath);
-
-//     req.onsuccess = (event) => {
-//       resolve(event.target.result !== undefined);
-//     };
-
-//     req.onerror = () => {
-//       // Handle the error appropriately
-//       resolve(false);
-//     };
-//   });
-// }
-
-// export function getDataFromIDB(dbName, filePath): Promise<Uint8Array | false> {
-//   return new Promise((resolve) => {
-//     if (!dbList[dbName]) {
-//       initIDB(dbName).then(() => {
-//         let transaction = dbList[dbName].transaction(["FILE_DATA"], "readonly");
-//         let store = transaction.objectStore("FILE_DATA");
-//         let req = store.get(filePath);
-
-//         req.onsuccess = (event) => {
-//           resolve(event.target.result);
-//         };
-
-//         req.onerror = () => {
-//           // Handle the error appropriately
-//           resolve(false);
-//         };
-//       });
-//     } else {
-//       let transaction = dbList[dbName].transaction(["FILE_DATA"], "readonly");
-//       let store = transaction.objectStore("FILE_DATA");
-//       let req = store.get(filePath);
-
-//       req.onsuccess = (event) => {
-//         resolve(event.target.result);
-//       };
-
-//       req.onerror = () => {
-//         // Handle the error appropriately
-//         resolve(false);
-//       };
-//     }
-//   });
-// }
-
-// export function saveDataToIDB(dbName, filePath, data) {
-//   if (!dbList[dbName]) {
-//     initIDB(dbName).then(() => {
-//       let transaction = dbList[dbName].transaction(["FILE_DATA"], "readwrite");
-//       let store = transaction.objectStore("FILE_DATA");
-//       let req = store.add(data, filePath);
-//     });
-//   } else {
-//     let transaction = dbList[dbName].transaction(["FILE_DATA"], "readwrite");
-//     let store = transaction.objectStore("FILE_DATA");
-//     let req = store.add(data, filePath);
-//   }
-// }
-
-// // export function fetchData(prefix, dbName, filePath) {
-// //   let url = prefix + dbName + filePath;
-
-// //   if (xhrList.find((xhr) => xhr.url === url)) {
-// //     return;
-// //   }
-
-// //   let xhr = new XMLHttpRequest();
-// //   xhr.open("GET", url, true);
-// //   xhr.responseType = "blob";
-
-// //   xhr.onload = () => {
-// //     if (xhr.status === 200) {
-// //       let response = xhr.response;
-
-// //       if (response) {
-// //         let reader = new FileReader();
-// //         reader.readAsArrayBuffer(response);
-
-// //         reader.onload = () => {
-// //           let data = new Uint8Array(reader.result as ArrayBuffer);
-// //           if (dbList[dbName]) {
-// //             saveDataToIDB(prefix, dbName, filePath, data);
-// //           } else {
-// //             initIDB(dbName).then(() => {
-// //               saveDataToIDB(prefix, dbName, filePath, data);
-// //             });
-// //           }
-// //         };
-// //       }
-// //     }
-// //   };
-
-// //   xhr.send();
-// // }
-
-// // export function saveDataToIDB(prefix, dbName, filePath, data) {
-// //   let transaction = dbList[dbName].transaction(["FILE_DATA"], "readwrite");
-// //   let store = transaction.objectStore("FILE_DATA");
-// //   let req = store.add(data, filePath);
-
-// //   req.onsuccess = () => {
-// //     self.postMessage({
-// //       method: "getIdbFinished",
-// //       prefix,
-// //       dbName,
-// //       filePath,
-// //     });
-// //   };
-
-// //   req.onerror = (event) => {
-// //     // Handle the error appropriately
-// //   };
-// // }

package/src/api/labelService.ts

@@ -1,55 +0,0 @@
-import { Label } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import axios from "../axiosRequestExport";
-
-// export interface Label {
-//   id?: string;
-//   name: string;
-//   isDefault: boolean;
-//   skyBox?: {};
-//   illumination?: {};
-//   weather?: {};
-//   shadow?: {};
-// }
-
-let prefix = () => `${labelService.prefix}`;
-let scenePrefix = () => `${prefix()}/api/scenes`;
-
-let urls = {
-  labels: (sceneId: string) => `${scenePrefix()}/${sceneId}/labels`,
-};
-
-let labelService = {
-  prefix: window.location.protocol + "//" + window.location.host + "/bimair-engine",
-
-  getLabels: (sceneId: string) => {
-    return axios.get(urls.labels(sceneId)).then((data: any) => {
-      return data as Label[];
-    });
-  },
-
-  createLabel: (sceneId: string, label: Label) => {
-    return axios.post(urls.labels(sceneId), label).then((data: any) => {
-      return data as Label;
-    });
-  },
-
-  getLabel: (labelId: string) => {
-    return axios.get(`${prefix()}/api/labels/${labelId}`).then((data: any) => {
-      return data as Label;
-    });
-  },
-
-  editLabel: (labelId: string, label: Label) => {
-    return axios.put(`${prefix()}/api/labels/${labelId}`, label).then((data: any) => {
-      return data as Label;
-    });
-  },
-
-  deleteLabel: (labelId: string) => {
-    return axios.delete(`${prefix()}/api/labels/${labelId}`).then((data: any) => {
-      return data as null;
-    });
-  },
-};
-
-export { labelService };