ohzi-core 13.0.3 → 13.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "13.0.3",
+  "version": "13.0.5",
   "description": "OHZI Interactive Core Library",
   "type": "module",
   "source": "src/index.ts",

package/src/Graphics.ts

@@ -6,15 +6,14 @@ import { BaseRender } from './render_mode/BaseRender';
 import { Blitter } from './render_utilities/Blitter';
 import { DepthAndNormalsRenderer } from './render_utilities/DepthAndNormalsRenderer';
 
-import type {
-  Material,
-  RenderTarget,
-  Scene,
-  TypedArray
+import {
+  type Material,
+  type RenderTarget,
+  type Scene,
+  type TypedArray
 } from 'three';
 
 import type { Renderer } from 'three/webgpu';
-import { WebGPURenderer } from 'three/webgpu';
 import type { OrthographicCamera } from './OrthographicCamera';
 import type { PerspectiveCamera } from './PerspectiveCamera';
 import type { AbstractScene } from './scenes/AbstractScene';
@@ -22,13 +21,6 @@ import type { AbstractScene } from './scenes/AbstractScene';
 export interface CoreAttributes {
     xr_enabled: boolean;
 }
-export interface RendererAttributes {
-  alpha: boolean,
-  logarithmicDepthBuffer: boolean,
-  antialias: boolean,
-  preserveDrawingBuffer: boolean,
-  forceWebGL: boolean
-}
 class Graphics
 {
   _renderer: Renderer;
@@ -40,10 +32,10 @@ class Graphics
   generate_depth_normal_texture: boolean;
   no_render: BaseRender;
   
-  init({ core_attributes, renderer_attributes, dpr }: 
-       { core_attributes: CoreAttributes, renderer_attributes: RendererAttributes, dpr: number })
+  init({ renderer, core_attributes, dpr }: 
+       { renderer: Renderer, core_attributes: CoreAttributes,  dpr: number })
   {
-    this._renderer = undefined;
+    this._renderer = renderer;
     this.blitter = undefined;
     this.canvas = undefined;
     this.no_render = undefined;
@@ -52,13 +44,11 @@ class Graphics
     this.depth_and_normals_renderer = undefined;
 
     this.core_attributes = {
-      xr_enabled: false
+      xr_enabled: false,
     };
 
     Object.assign(this.core_attributes, core_attributes);
 
-    this._renderer = new WebGPURenderer(renderer_attributes);
-
     if (this.core_attributes.xr_enabled)
     {
       this._renderer.xr.enabled = true;
@@ -244,7 +234,7 @@ class Graphics
     }
   }
 
-  material_pass(mat: Material, dst: RenderTarget): void
+  material_pass(mat: Material, dst?: RenderTarget): void
   {
     this.blitter.material_pass(mat, dst);
   }

package/src/materials/BlitMaterial.ts

@@ -1,16 +1,10 @@
 import frag from '../shaders/copy/copy.frag';
 import vert from '../shaders/copy/copy.vert';
 
-import { AlwaysDepth, NoBlending, ShaderMaterial, Texture, Vector2 } from 'three';
+import { AlwaysDepth, NoBlending, ShaderMaterial, Vector2 } from 'three';
 
 class BlitMaterial extends ShaderMaterial
 {
-  uniforms = {
-    _MainTex: { value: Texture },
-    _Resolution: { value: Vector2 },
-    _TargetResolution: { value: Vector2 }
-  };
-
   constructor(frag_shader?: string, vert_shader?: string, defines?: Record<string, any>)
   {
     super({

package/src/render_utilities/Blitter.ts

@@ -31,6 +31,7 @@ class Blitter
     const src_height  = src.isRenderTarget === true ? src.height  : src.image.height;
 
     this._blit_quad.material.uniforms._MainTex.value = src_texture;
+
     this._blit_quad.material.uniforms._Resolution.value.set(src_width, src_height);
 
     if (dst)
@@ -89,7 +90,7 @@ class Blitter
     this._blit_quad.material.dispose();
   }
 
-  __render(dst_RT: any)
+  __render(dst_RT?: any)
   {
     const RT = dst_RT === undefined ? null : dst_RT;