ohzi-core 11.2.0 → 11.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ohzi-core",
   "sideEffects": false,
-  "version": "11.2.0",
+  "version": "11.2.2",
   "description": "OHZI Interactive Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",
@@ -44,7 +44,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "three": "0.157.0"
+    "three": "0.161.0"
   },
   "standardx": {
     "ignore": [

package/src/Browser.js

@@ -1,22 +1,16 @@
 
 class Browser
 {
-  init(opr, chrome)
+  async init(opr, chrome)
   {
     this.browser_name = '';
     this.agent = navigator.userAgent.toLowerCase();
 
-    // vr specific
-    this.vr_browser_keywords = ['oculusbrowser', 'oculus', 'vive', 'rift', 'windowsmr', 'cardboard', 'daydream', 'wolvic'];
-    this.vr_browser_name = this.vr_browser_keywords.find(keyword => this.agent.includes(keyword));
-    // Check for WebXR support (indicating VR capabilities)
     this.has_web_xr_support = 'xr' in navigator;
+    this.is_vr = this.has_web_xr_support && await navigator.xr.isSessionSupported('immersive-vr');
 
     switch (true)
     {
-    case this.vr_browser_name !== undefined && this.has_web_xr_support:
-      this.browser_name = this.vr_browser_name;
-      break;
     case this.agent.indexOf('edge') > -1:
       this.browser_name = 'edge_ie';
       break;
@@ -71,11 +65,6 @@ class Browser
     return this.browser_name === 'edge_chromium';
   }
 
-  get is_vr()
-  {
-    return  this.vr_browser_keywords.includes(this.browser_name);
-  }
-
   get has_webm()
   {
     return !!(this.is_chrome || this.is_firefox || this.is_edge_chromium);

package/src/Graphics.js

@@ -2,6 +2,7 @@ import { CameraManager } from './CameraManager';
 import { Capabilities } from './Capabilities';
 import { OScreen } from './OScreen';
 import { SceneManager } from './SceneManager';
+
 import { BaseRender } from './render_mode/BaseRender';
 import { Blitter } from './render_utilities/Blitter';
 import { DepthAndNormalsRenderer } from './render_utilities/DepthAndNormalsRenderer';
@@ -175,6 +176,30 @@ class Graphics
     this.__apply_override_material(scene, undefined);
   }
 
+  compile(scene, camera, RT, override_mat)
+  {
+    this.__apply_override_material(scene, override_mat);
+
+    this._renderer.setRenderTarget(RT === undefined ? null : RT);
+    this._renderer.compile(scene  || SceneManager.current,
+      camera || CameraManager.current);
+
+    this.__apply_override_material(scene, undefined);
+  }
+
+  async compile_async(scene, camera, RT, override_mat, target_scene)
+  {
+    this.__apply_override_material(scene, override_mat);
+
+    this._renderer.setRenderTarget(RT === undefined ? null : RT);
+    const promise = this._renderer.compileAsync(scene  || SceneManager.current,
+      camera || CameraManager.current, target_scene);
+
+    this.__apply_override_material(scene, undefined);
+
+    return promise;
+  }
+
   render_scene(scene)
   {
     if (scene.on_pre_render)

package/src/components/EdgeMesh.js

@@ -1,20 +1,11 @@
-import edge_line_vert from '../shaders/edges/edges.vert';
-import edge_line_frag from '../shaders/edges/edges.frag';
-import corners_vert from '../shaders/edges/corners.vert';
 import corners_frag from '../shaders/edges/corners.frag';
+import corners_vert from '../shaders/edges/corners.vert';
+import edge_line_frag from '../shaders/edges/edges.frag';
+import edge_line_vert from '../shaders/edges/edges.vert';
 
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 
-import { Object3D } from 'three';
-import { ShaderMaterial } from 'three';
-import { Color } from 'three';
-import { Mesh } from 'three';
-import { EdgesGeometry } from 'three';
-import { LineSegments } from 'three';
-import { LineBasicMaterial } from 'three';
-import { Vector3 } from 'three';
-import { PlaneGeometry } from 'three';
-import { BufferAttribute } from 'three';
+import { BufferAttribute, Color, EdgesGeometry, LineBasicMaterial, LineSegments, Mesh, Object3D, PlaneGeometry, ShaderMaterial, Vector3 } from 'three';
 
 class EdgeMesh extends Object3D
 {
@@ -114,7 +105,7 @@ class EdgeMesh extends Object3D
       buffer_geometries.push(geometry);
     }
 
-    return BufferGeometryUtils.mergeBufferGeometries(buffer_geometries);
+    return BufferGeometryUtils.mergeGeometries(buffer_geometries);
   }
 
   __get_corners_geometry(geometry_vertices)
@@ -135,7 +126,7 @@ class EdgeMesh extends Object3D
       plane_geometry.setAttribute('w_pos', new BufferAttribute(pos_array, 3));
       circle_buffer_geometries.push(plane_geometry);
     }
-    return BufferGeometryUtils.mergeBufferGeometries(circle_buffer_geometries);
+    return BufferGeometryUtils.mergeGeometries(circle_buffer_geometries);
   }
 
   set_visible(boolean)

package/src/primitives/Arrow.js

@@ -17,7 +17,7 @@ class Arrow extends Mesh
     const cone_geometry = new ConeGeometry(0.1, cone_height, 32);
     cone_geometry.translate(0, cylinder_height + cone_height / 2, 0);
 
-    const buffer_geometry = BufferGeometryUtils.mergeBufferGeometries([cylinder_geo, cone_geometry]);
+    const buffer_geometry = BufferGeometryUtils.mergeGeometries([cylinder_geo, cone_geometry]);
     buffer_geometry.rotateX(3.14 / 2);
 
     const material = new MeshBasicMaterial({ color: color });

package/src/resource_loader/HDRCubeTextureLoader.js

@@ -1,43 +1,49 @@
 import { AbstractLoader } from './AbstractLoader';
 
 import { HDRCubeTextureLoader as THDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureLoader.js';
-import { UnsignedByteType } from 'three';
 
 class HDRCubeTextureLoader extends AbstractLoader
 {
-  constructor(resource_id, url, size)
+  constructor(resource_id, url, extension, size)
   {
     super(resource_id, url, size);
     this.loader = new THDRCubeTextureLoader();
-    this.url_suffix = ['/px.hdr', '/nx.hdr', '/py.hdr', '/ny.hdr', '/pz.hdr', '/nz.hdr'];
+    this.loader.setPath(url + '/');
+    // this.loader.setDataType(UnsignedByteType);
+    this.urls = [
+      `px.${extension}`,
+      `nx.${extension}`,
+      `py.${extension}`,
+      `ny.${extension}`,
+      `pz.${extension}`,
+      `nz.${extension}`
+    ];
   }
 
   on_preloaded_finished(resource_container)
   {
     if (resource_container.resources_by_url[this.url] === undefined)
     {
-      this.loader.setPath(this.url)
-        .setDataType(UnsignedByteType)
-        .load(this.url_suffix, (hdr) =>
-        {
-          resource_container.set_resource(this.resource_id, this.url, hdr);
+      this.loader.load(this.urls, (hdr) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, hdr);
 
-          this.__update_downloaded_bytes(1, 1);
-          this.__loading_ended();
-        },
-        (xhr) =>
-        {
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
         // if (xhr)
         // {
         //   let total = xhr.total || this.total_bytes;
         //   this.__update_downloaded_bytes(xhr.loaded, total);
         // }
-        },
-        (msg) =>
-        {
-          this.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
-          this.__loading_ended();
-        });
+      },
+      (msg) =>
+      {
+        this.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
+        this.__loading_ended();
+      });
     }
     else
     {

package/src/static_batcher/GeometryBatcher.js

@@ -36,7 +36,7 @@ class GeometryBatcher
     }
 
     const buffer_attribute = new BufferAttribute(new Float32Array(attr_accessor_uvs), 2);
-    const buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(buffer_geometries);
+    const buffer_geometry = BufferGeometryUtils.mergeGeometries(buffer_geometries);
     buffer_geometry.setAttribute('attr_accessor_uv', buffer_attribute);
 
     this.batches.push(new GeometryBatch(buffer_geometry, texture_width));

package/src/static_batcher/MeshBatcher.js

@@ -41,7 +41,7 @@ class MeshBatcher
       }
     }
 
-    const buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(geometries);
+    const buffer_geometry = BufferGeometryUtils.mergeGeometries(geometries);
 
     const buffer_attribute = new BufferAttribute(new Float32Array(attr_mesh_id), 1);
     buffer_geometry.setAttribute('mesh_id', buffer_attribute);