ohzi-core 10.7.0 → 10.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "10.7.0",
+  "version": "10.7.2",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",
@@ -43,18 +43,19 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "three": "0.148.0"
+    "three": "0.161.0"
   },
   "standardx": {
     "ignore": [
-      "rollup.config.mjs"
+      "rollup.config.js"
     ]
   },
   "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.4",
-    "rollup": "4.1.4",
-    "rollup-plugin-glslify": "^1.3.1",
+    "rollup": "^2.44.0",
+    "rollup-plugin-glslify": "^1.2.0",
+    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup-plugin-terser": "^7.0.2",
     "standardx": "^7.0.0",
-    "typescript": "4.4.4"
+    "typescript": "^4.4.3"
   }
 }

package/src/Browser.js

@@ -1,22 +1,16 @@
 
 class Browser
 {
-  init()
+  async init()
   {
     this.browser_name = '';
     this.agent = window.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

@@ -1,21 +1,22 @@
+import { CameraManager } from './CameraManager';
+import { Capabilities } from './Capabilities';
 import { Configuration } from './Configuration';
-import { BaseRender } from './render_mode/BaseRender';
 import { OScreen } from './OScreen';
-import { CameraManager } from './CameraManager';
 import { SceneManager } from './SceneManager';
-import { Capabilities } from './Capabilities';
-import { DepthAndNormalsRenderer } from './render_utilities/DepthAndNormalsRenderer';
+
+import { BaseRender } from './render_mode/BaseRender';
 import { Blitter } from './render_utilities/Blitter';
+import { DepthAndNormalsRenderer } from './render_utilities/DepthAndNormalsRenderer';
 
 import {
+  AlwaysDepth,
+  FloatType,
   NearestFilter,
+  NoBlending,
+  NoColorSpace,
   RGBAFormat,
-  LinearEncoding,
-  FloatType,
-  WebGLRenderTarget,
   ShaderMaterial,
-  NoBlending,
-  AlwaysDepth
+  WebGLRenderTarget
 } from 'three';
 
 import { WebGLRenderer } from 'three';
@@ -179,6 +180,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)
@@ -363,7 +388,7 @@ class Graphics
       minFilter: NearestFilter,
       magFilter: NearestFilter,
       format: RGBAFormat,
-      encoding: LinearEncoding,
+      colorSpace: NoColorSpace,
       type: FloatType,
       stencilBuffer: false,
       depthBuffer: false

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/data_textures/RGBDataTexture.js

@@ -1,12 +1,12 @@
+import { RGBAFormat } from 'three';
 import { CustomDataTexture } from './CustomDataTexture';
-import { RGBFormat } from 'three';
 
 class RGBDataTexture extends CustomDataTexture
 {
   constructor(width, height)
   {
     const data = new Uint8Array(width * height * 3);
-    super(data, width, height, RGBFormat);
+    super(data, width, height, RGBAFormat);
     this.multiplier = 255;
   }
 }

package/src/data_textures/RGBFloatDataTexture.js

@@ -1,13 +1,12 @@
+import { FloatType, RGBAFormat } from 'three';
 import { CustomDataTexture } from './CustomDataTexture';
-import { FloatType } from 'three';
-import { RGBFormat } from 'three';
 
 class RGBFloatDataTexture extends CustomDataTexture
 {
   constructor(width, height)
   {
     const data = new Float32Array(width * height * 3);
-    super(data, width, height, RGBFormat, FloatType);
+    super(data, width, height, RGBAFormat, FloatType);
   }
 }
 

package/src/gpu_particles/ParticleAttribute.js

@@ -1,11 +1,6 @@
 import { Graphics } from '../Graphics';
 
-import { NearestFilter } from 'three';
-import { RGBAFormat } from 'three';
-import { LinearEncoding } from 'three';
-import { HalfFloatType } from 'three';
-import { FloatType } from 'three';
-import { WebGLRenderTarget } from 'three';
+import { FloatType, HalfFloatType, NearestFilter, NoColorSpace, RGBAFormat, WebGLRenderTarget } from 'three';
 import { Capabilities } from '../Capabilities';
 
 class ParticleAttribute
@@ -37,7 +32,7 @@ class ParticleAttribute
       minFilter: NearestFilter,
       magFilter: NearestFilter,
       format: RGBAFormat,
-      encoding: LinearEncoding,
+      colorScape: NoColorSpace,
       type: Capabilities.fp_textures_available ? FloatType : HalfFloatType,
       stencilBuffer: false,
       depthBuffer: false

package/src/materials/SSAOMaterial.js

@@ -3,11 +3,7 @@ import { BlitMaterial } from '../materials/BlitMaterial';
 import frag from '../shaders/ssao/ssao.frag';
 import vert from '../shaders/ssao/ssao.vert';
 
-import { Matrix4 } from 'three';
-import { Vector3 } from 'three';
-import { DataTexture } from 'three';
-import { RGBFormat } from 'three';
-import { RepeatWrapping } from 'three';
+import { DataTexture, Matrix4, RGBAFormat, RepeatWrapping, Vector3 } from 'three';
 
 import { OMath } from '../utilities/OMath';
 class SSAOMaterial extends BlitMaterial
@@ -57,7 +53,7 @@ class SSAOMaterial extends BlitMaterial
       rotation_kernel[i * 3 + 3] = 0;
     }
 
-    const rotation_texture = new DataTexture(rotation_kernel, 4, 4, RGBFormat);
+    const rotation_texture = new DataTexture(rotation_kernel, 4, 4, RGBAFormat);
     rotation_texture.wrapS = RepeatWrapping;
     rotation_texture.wrapT = RepeatWrapping;
 

package/src/primitives/Arrow.js

@@ -1,7 +1,4 @@
-import { CylinderBufferGeometry } from 'three';
-import { ConeBufferGeometry } from 'three';
-import { MeshBasicMaterial } from 'three';
-import { Vector3, Mesh } from 'three';
+import { ConeGeometry, CylinderGeometry, Mesh, MeshBasicMaterial, Vector3 } from 'three';
 
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 
@@ -14,13 +11,13 @@ class Arrow extends Mesh
 
     const cone_height = 0.4;
     const cylinder_height = length - cone_height;
-    const cylinder_geo = new CylinderBufferGeometry(0.01, 0.01, cylinder_height, 32);
+    const cylinder_geo = new CylinderGeometry(0.01, 0.01, cylinder_height, 32);
     cylinder_geo.translate(0, cylinder_height / 2, 0);
 
-    const cone_geometry = new ConeBufferGeometry(0.1, cone_height, 32);
+    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/primitives/Sphere.js

@@ -1,6 +1,4 @@
-import { Mesh } from 'three';
-import { SphereBufferGeometry } from 'three';
-import { MeshBasicMaterial } from 'three';
+import { Mesh, MeshBasicMaterial, SphereGeometry } from 'three';
 
 class Sphere extends Mesh
 {
@@ -8,7 +6,7 @@ class Sphere extends Mesh
   {
     color = color || '#FF0000';
     radius = radius || 1;
-    const geometry = new SphereBufferGeometry(radius, 64, 64);
+    const geometry = new SphereGeometry(radius, 64, 64);
     const material = new MeshBasicMaterial({ color: color });
     super(geometry, material);
   }

package/src/render_mode/DeferredRender.js

@@ -1,16 +1,12 @@
 import { CameraManager } from '../CameraManager';
-import { SceneManager } from '../SceneManager';
+import { Graphics } from '../Graphics';
 import { OScreen } from '../OScreen';
-import { BaseRender } from '../render_mode/BaseRender';
+import { SceneManager } from '../SceneManager';
 import { DeferredRendererComposeMaterial } from '../materials/DeferredRendererComposeMaterial';
-import { Graphics } from '../Graphics';
 import { DeferredPointLightMaterial } from '../materials/deferred/DeferredPointLightMaterial';
+import { BaseRender } from '../render_mode/BaseRender';
 
-import { WebGLRenderTarget } from 'three';
-import { Scene } from 'three';
-import { Mesh } from 'three';
-import { SphereBufferGeometry } from 'three';
-import { Matrix4 } from 'three';
+import { Matrix4, Mesh, Scene, SphereGeometry, WebGLRenderTarget } from 'three';
 
 class DeferredRender extends BaseRender
 {
@@ -29,7 +25,7 @@ class DeferredRender extends BaseRender
     const light_intensity = 1;
     const light_brightest_component = 1;
     const radius_needed_for_intensity = Math.sqrt(4 * light_intensity * (light_brightest_component * (256.0 / 5.0))) / (2 * light_intensity);
-    const sphere = new Mesh(new SphereBufferGeometry(radius_needed_for_intensity), new DeferredPointLightMaterial(light_intensity));
+    const sphere = new Mesh(new SphereGeometry(radius_needed_for_intensity), new DeferredPointLightMaterial(light_intensity));
     // sphere.position.y = 2;
     // this.scene_lights.add(sphere);
 

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/GeometryBatch.js

@@ -1,10 +1,4 @@
-import { Vector2 } from 'three';
-import { ShaderMaterial } from 'three';
-import { Mesh } from 'three';
-import { DataTexture } from 'three';
-import { RGBAFormat } from 'three';
-import { RGBFormat } from 'three';
-import { FloatType } from 'three';
+import { DataTexture, FloatType, Mesh, RGBAFormat, ShaderMaterial, Vector2 } from 'three';
 
 class GeometryBatch
 {
@@ -242,7 +236,7 @@ class GeometryBatch
   __create_rgb_texture(width)
   {
     const data = new Uint8Array(3 * width * width);
-    return new DataTexture(data, width, width, RGBFormat);
+    return new DataTexture(data, width, width, RGBAFormat);
   }
 
   __create_rgba_texture(width)

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);