@planara/core 1.3.1 → 1.4.0

package/dist/core/editor-renderer.d.ts

@@ -1,4 +1,6 @@
 import { Renderer } from './renderer';
+import { Mesh } from 'ogl';
+import { Figure } from '@planara/types';
 /**
  * Рендерер для редактора.
  * Добавляет сетку, оси координат и поддержку Orbit для управления камерой.
@@ -7,6 +9,10 @@ import { Renderer } from './renderer';
 export declare class EditorRenderer extends Renderer {
     /** Orbit-контроллер для управления камерой */
     private orbit;
+    /** Raycast для подсветки моделей при наведении */
+    private raycast;
+    /** Курсор мыши для остлеживания наведения на 3D-модель */
+    private readonly mouse;
     /**
      * Инициализация сцены редактора.
      * Создает сетку, оси координат и orbit-контроллер.
@@ -17,5 +23,23 @@ export declare class EditorRenderer extends Renderer {
      * Обновление состояния рендерера.
      */
     protected update(): void;
+    /**
+     * Метод для добавления фигуры.
+     * Настройка raycast.
+     * @param figure Данные фигуры: position, normal, uv
+     */
+    addFigure(figure: Figure): Mesh<import('ogl').Geometry, import('ogl').Program>;
+    /**
+     * Обновление uniform uHit для конкретной 3D-модели
+     */
+    protected updateHitUniform(mesh: Mesh): void;
+    /**
+     * Инициализация обработчиков мыши для raycast
+     */
+    private initMouseListeners;
+    /**
+     * Обработчик движения мыши
+     */
+    private handleMouseMove;
 }
 //# sourceMappingURL=editor-renderer.d.ts.map

package/dist/core/editor-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-renderer.d.ts","sourceRoot":"","sources":["../../src/core/editor-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,8CAA8C;IAC9C,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;OAIG;gBACgB,MAAM,EAAE,iBAAiB;IAgB5C;;OAEG;IACH,SAAS,CAAC,MAAM;CAIjB"}
+{"version":3,"file":"editor-renderer.d.ts","sourceRoot":"","sources":["../../src/core/editor-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAgD,KAAK,IAAI,EAAE,MAAM,KAAK,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,8CAA8C;IAC9C,OAAO,CAAC,KAAK,CAAS;IAEtB,kDAAkD;IAClD,OAAO,CAAC,OAAO,CAAW;IAE1B,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAE9B;;;;OAIG;gBACgB,MAAM,EAAE,iBAAiB;IAyB5C;;OAEG;IACH,SAAS,CAAC,MAAM;IAKhB;;;;OAIG;IACa,SAAS,CAAC,MAAM,EAAE,MAAM;IAsBxC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAIrC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,eAAe,CA2BrB;CACH"}

package/dist/core/renderer.d.ts

@@ -13,7 +13,10 @@ export declare abstract class Renderer {
     protected camera: Camera;
     /** HTML-элемент canvas, на котором рендерится сцена */
     protected canvas: HTMLCanvasElement;
+    /** Program для настройки рендеринга моделей */
     protected program: Program;
+    /** Массив моделей на сцене */
+    protected meshes: Mesh[];
     /**
      * Конструктор рендерера
      * @param canvas - HTMLCanvasElement для рендеринга

package/dist/core/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/core/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AAE/F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;GAGG;AACH,8BAAsB,QAAQ;IAC5B,8BAA8B;IAC9B,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC;IAE1B,4BAA4B;IAC5B,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;IAE3B,uBAAuB;IACvB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEpC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,SAAS,aAAa,MAAM,EAAE,iBAAiB;IAyB/C;;OAEG;IACI,MAAM;IAMb;;OAEG;IACH,SAAS,CAAC,MAAM;IAIhB;;OAEG;IACH,SAAS,CAAC,MAAM,IAAI,IAAI;IAExB;;OAEG;IACI,IAAI;IAMX;;;OAGG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM;CAkBhC"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/core/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AAE/F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;GAGG;AACH,8BAAsB,QAAQ;IAC5B,8BAA8B;IAC9B,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC;IAE1B,4BAA4B;IAC5B,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;IAE3B,uBAAuB;IACvB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEpC,+CAA+C;IAC/C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAE3B,8BAA8B;IAC9B,SAAS,CAAC,MAAM,EAAG,IAAI,EAAE,CAAC;IAE1B;;;OAGG;IACH,SAAS,aAAa,MAAM,EAAE,iBAAiB;IAyB/C;;OAEG;IACI,MAAM;IAMb;;OAEG;IACH,SAAS,CAAC,MAAM;IAIhB;;OAEG;IACH,SAAS,CAAC,MAAM,IAAI,IAAI;IAExB;;OAEG;IACI,IAAI;IAMX;;;OAGG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM;CAqBhC"}

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("ogl");function v(t){const e=`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("ogl");function v(s){const e=`
     attribute vec3 position;
     attribute vec3 normal;
     attribute vec2 uv;
@@ -15,7 +15,7 @@
       vNormal = normalize(normalMatrix * normal);
       gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
     }
-  `,s=`
+  `,t=`
     precision highp float;
 
     uniform sampler2D tMap;
@@ -29,5 +29,5 @@
       gl_FragColor.rgb = tex + shading;
       gl_FragColor.a = 1.0;
     }
-  `,r=new i.Texture(t);return new i.Program(t,{vertex:e,fragment:s,uniforms:{tMap:{value:r}}})}class l{gl;scene;camera;canvas;program;constructor(e){this.canvas=e,this.gl=new i.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new i.Transform,this.camera=new i.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0]),this.program=v(this.gl.gl)}resize(){this.gl.setSize(this.canvas.width,this.canvas.height),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}update(){}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}addFigure(e){const s=new i.Geometry(this.gl.gl,{position:{size:3,data:new Float32Array(e.position)},normal:{size:3,data:new Float32Array(e.normal??[])},uv:{size:2,data:new Float32Array(e.uv??[])}}),r=new i.Mesh(this.gl.gl,{geometry:s,program:this.program});return r.setParent(this.scene),r}}class d extends l{orbit;constructor(e){super(e);const s=new i.GridHelper(this.gl.gl,{size:10,divisions:10});s.position.y=-.001,s.setParent(this.scene),new i.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new i.Orbit(this.camera,{element:this.canvas})}update(){this.orbit?.update()}}class g extends l{orbit;constructor(e){super(e),this.orbit=new i.Orbit(this.camera,{element:this.canvas,target:new i.Vec3(0,0,0),minPolarAngle:Math.PI/2,maxPolarAngle:Math.PI/2,enableRotate:!0,enableZoom:!1,enablePan:!1})}update(){this.orbit?.update()}}class b{type;position;normal;uv;material;constructor(e){this.type=e.type,this.position=e.position,this.normal=e.normal??[],this.uv=e.uv??[],this.material=e.material}}var u=(t=>(t[t.Cube=0]="Cube",t[t.Sphere=1]="Sphere",t[t.Plane=2]="Plane",t[t.Cylinder=3]="Cylinder",t[t.Custom=4]="Custom",t))(u||{});class f{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];load(e){const s=e.split(`
-`);for(const o of s){if(!o.trim()||o.startsWith("#"))continue;const a=o.trim().split(/\s+/);switch(a[0]){case"v":this.tmpPositions.push(a.slice(1).map(Number));break;case"vn":this.tmpNormals.push(a.slice(1).map(Number));break;case"vt":this.tmpUVs.push(a.slice(1).map(Number));break;case"f":this.processFaceLine(a);break}}const r={type:u.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new b(r)}processFaceLine(e){for(let s=1;s<e.length;s++){const r=e[s];if(!r)continue;const[o,a,c]=r.split("/"),m=o?parseInt(o,10):void 0,h=a?parseInt(a,10):void 0,p=c?parseInt(c,10):void 0;if(m!==void 0){const n=this.tmpPositions[m-1];n&&this.positions.push(...n)}if(h!==void 0){const n=this.tmpUVs[h-1];n&&this.uvs.push(...n)}if(p!==void 0){const n=this.tmpNormals[p-1];n&&this.normals.push(...n)}}}}exports.EditorRenderer=d;exports.ObjLoader=f;exports.PreviewRenderer=g;exports.Renderer=l;exports.createProgram=v;
+  `,i=new r.Texture(s);return new r.Program(s,{vertex:e,fragment:t,uniforms:{tMap:{value:i}}})}class h{gl;scene;camera;canvas;program;meshes;constructor(e){this.canvas=e,this.gl=new r.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new r.Transform,this.camera=new r.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0]),this.program=v(this.gl.gl)}resize(){this.gl.setSize(this.canvas.width,this.canvas.height),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}update(){}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}addFigure(e){const t=new r.Geometry(this.gl.gl,{position:{size:3,data:new Float32Array(e.position)},normal:{size:3,data:new Float32Array(e.normal??[])},uv:{size:2,data:new Float32Array(e.uv??[])}}),i=new r.Mesh(this.gl.gl,{geometry:t,program:this.program});return i.setParent(this.scene),this.meshes.push(i),i}}class p extends h{orbit;raycast;mouse;constructor(e){super(e);const t=new r.GridHelper(this.gl.gl,{size:10,divisions:10});t.position.y=-.001,t.setParent(this.scene),new r.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new r.Orbit(this.camera,{element:this.canvas}),this.raycast=new r.Raycast,this.mouse=new r.Vec2,this.initMouseListeners()}update(){this.orbit?.update()}addFigure(e){const t=super.addFigure(e);if(t.geometry){const i=t.geometry.constructor.name;t.geometry.raycast=i.includes("Sphere")?"sphere":"box"}return t.isHit=!1,t.onBeforeRender(({mesh:i})=>{this.updateHitUniform(i)}),t}updateHitUniform(e){this.program.uniforms.uHit.value=e.isHit?1:0}initMouseListeners(){window.addEventListener("load",()=>{document.addEventListener("mousemove",this.handleMouseMove,!1),document.addEventListener("touchmove",this.handleMouseMove,!1)})}handleMouseMove=e=>{let t,i;if(e instanceof MouseEvent)t=e.clientX,i=e.clientY;else{if(e.touches[0]===void 0)return;t=e.touches[0].clientX,i=e.touches[0].clientY}this.mouse.set(2*(t/this.canvas.width)-1,2*(1-i/this.canvas.height)-1),this.raycast.castMouse(this.camera,this.mouse),this.meshes.forEach(a=>a.isHit=!1),this.raycast.intersectBounds(this.meshes).forEach(a=>a.isHit=!0)}}class g extends h{orbit;constructor(e){super(e),this.orbit=new r.Orbit(this.camera,{element:this.canvas,target:new r.Vec3(0,0,0),minPolarAngle:Math.PI/2,maxPolarAngle:Math.PI/2,enableRotate:!0,enableZoom:!1,enablePan:!1})}update(){this.orbit?.update()}}class f{type;position;normal;uv;material;constructor(e){this.type=e.type,this.position=e.position,this.normal=e.normal??[],this.uv=e.uv??[],this.material=e.material}}var d=(s=>(s[s.Cube=0]="Cube",s[s.Sphere=1]="Sphere",s[s.Plane=2]="Plane",s[s.Cylinder=3]="Cylinder",s[s.Custom=4]="Custom",s))(d||{});class b{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];load(e){const t=e.split(`
+`);for(const n of t){if(!n.trim()||n.startsWith("#"))continue;const a=n.trim().split(/\s+/);switch(a[0]){case"v":this.tmpPositions.push(a.slice(1).map(Number));break;case"vn":this.tmpNormals.push(a.slice(1).map(Number));break;case"vt":this.tmpUVs.push(a.slice(1).map(Number));break;case"f":this.processFaceLine(a);break}}const i={type:d.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new f(i)}processFaceLine(e){for(let t=1;t<e.length;t++){const i=e[t];if(!i)continue;const[n,a,c]=i.split("/"),l=n?parseInt(n,10):void 0,m=a?parseInt(a,10):void 0,u=c?parseInt(c,10):void 0;if(l!==void 0){const o=this.tmpPositions[l-1];o&&this.positions.push(...o)}if(m!==void 0){const o=this.tmpUVs[m-1];o&&this.uvs.push(...o)}if(u!==void 0){const o=this.tmpNormals[u-1];o&&this.normals.push(...o)}}}}exports.EditorRenderer=p;exports.ObjLoader=b;exports.PreviewRenderer=g;exports.Renderer=h;exports.createProgram=v;

package/dist/index.es.js

@@ -1,6 +1,6 @@
-import { Texture as u, Program as d, Renderer as g, Transform as b, Camera as f, Geometry as x, Mesh as w, GridHelper as y, AxesHelper as P, Orbit as c, Vec3 as M } from "ogl";
-function z(e) {
-  const t = (
+import { Texture as p, Program as d, Renderer as g, Transform as f, Camera as b, Geometry as w, Mesh as x, GridHelper as y, AxesHelper as M, Orbit as m, Raycast as P, Vec2 as z, Vec3 as C } from "ogl";
+function F(s) {
+  const e = (
     /* glsl */
     `
     attribute vec3 position;
@@ -20,7 +20,7 @@ function z(e) {
       gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
     }
   `
-  ), s = (
+  ), t = (
     /* glsl */
     `
     precision highp float;
@@ -37,14 +37,14 @@ function z(e) {
       gl_FragColor.a = 1.0;
     }
   `
-  ), i = new u(e);
-  return new d(e, {
-    vertex: t,
-    fragment: s,
+  ), i = new p(s);
+  return new d(s, {
+    vertex: e,
+    fragment: t,
     uniforms: { tMap: { value: i } }
   });
 }
-class p {
+class u {
   /** Экземпляр рендерера OGL */
   gl;
   /** Корневой объект сцены */
@@ -53,13 +53,16 @@ class p {
   camera;
   /** HTML-элемент canvas, на котором рендерится сцена */
   canvas;
+  /** Program для настройки рендеринга моделей */
   program;
+  /** Массив моделей на сцене */
+  meshes;
   /**
    * Конструктор рендерера
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(t) {
-    this.canvas = t, this.gl = new g({ canvas: t }), this.gl.setSize(t.clientWidth, t.clientHeight), this.gl.gl.clearColor(1, 1, 1, 1), this.scene = new b(), this.camera = new f(this.gl.gl, { fov: 45 }), this.camera.position.set(1, 1, 7), this.camera.lookAt([0, 0, 0]), this.program = z(this.gl.gl);
+  constructor(e) {
+    this.canvas = e, this.gl = new g({ canvas: e }), this.gl.setSize(e.clientWidth, e.clientHeight), this.gl.gl.clearColor(1, 1, 1, 1), this.scene = new f(), this.camera = new b(this.gl.gl, { fov: 45 }), this.camera.position.set(1, 1, 7), this.camera.lookAt([0, 0, 0]), this.program = F(this.gl.gl);
   }
   /**
    * Обновляет размер рендерера и камеры при изменении размеров canvas.
@@ -88,30 +91,34 @@ class p {
    * Публичный метод для добавления фигуры.
    * @param figure Данные фигуры: position, normal, uv
    */
-  addFigure(t) {
-    const s = new x(this.gl.gl, {
-      position: { size: 3, data: new Float32Array(t.position) },
-      normal: { size: 3, data: new Float32Array(t.normal ?? []) },
-      uv: { size: 2, data: new Float32Array(t.uv ?? []) }
-    }), i = new w(this.gl.gl, {
-      geometry: s,
+  addFigure(e) {
+    const t = new w(this.gl.gl, {
+      position: { size: 3, data: new Float32Array(e.position) },
+      normal: { size: 3, data: new Float32Array(e.normal ?? []) },
+      uv: { size: 2, data: new Float32Array(e.uv ?? []) }
+    }), i = new x(this.gl.gl, {
+      geometry: t,
       program: this.program
     });
-    return i.setParent(this.scene), i;
+    return i.setParent(this.scene), this.meshes.push(i), i;
   }
 }
-class N extends p {
+class N extends u {
   /** Orbit-контроллер для управления камерой */
   orbit;
+  /** Raycast для подсветки моделей при наведении */
+  raycast;
+  /** Курсор мыши для остлеживания наведения на 3D-модель */
+  mouse;
   /**
    * Инициализация сцены редактора.
    * Создает сетку, оси координат и orbit-контроллер.
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(t) {
-    super(t);
-    const s = new y(this.gl.gl, { size: 10, divisions: 10 });
-    s.position.y = -1e-3, s.setParent(this.scene), new P(this.gl.gl, { size: 6, symmetric: !0 }).setParent(this.scene), this.orbit = new c(this.camera, { element: this.canvas });
+  constructor(e) {
+    super(e);
+    const t = new y(this.gl.gl, { size: 10, divisions: 10 });
+    t.position.y = -1e-3, t.setParent(this.scene), new M(this.gl.gl, { size: 6, symmetric: !0 }).setParent(this.scene), this.orbit = new m(this.camera, { element: this.canvas }), this.raycast = new P(), this.mouse = new z(), this.initMouseListeners();
   }
   /**
    * Обновление состояния рендерера.
@@ -119,18 +126,60 @@ class N extends p {
   update() {
     this.orbit?.update();
   }
+  /**
+   * Метод для добавления фигуры.
+   * Настройка raycast.
+   * @param figure Данные фигуры: position, normal, uv
+   */
+  addFigure(e) {
+    const t = super.addFigure(e);
+    if (t.geometry) {
+      const i = t.geometry.constructor.name;
+      t.geometry.raycast = i.includes("Sphere") ? "sphere" : "box";
+    }
+    return t.isHit = !1, t.onBeforeRender(({ mesh: i }) => {
+      this.updateHitUniform(i);
+    }), t;
+  }
+  /**
+   * Обновление uniform uHit для конкретной 3D-модели
+   */
+  updateHitUniform(e) {
+    this.program.uniforms.uHit.value = e.isHit ? 1 : 0;
+  }
+  /**
+   * Инициализация обработчиков мыши для raycast
+   */
+  initMouseListeners() {
+    window.addEventListener("load", () => {
+      document.addEventListener("mousemove", this.handleMouseMove, !1), document.addEventListener("touchmove", this.handleMouseMove, !1);
+    });
+  }
+  /**
+   * Обработчик движения мыши
+   */
+  handleMouseMove = (e) => {
+    let t, i;
+    if (e instanceof MouseEvent)
+      t = e.clientX, i = e.clientY;
+    else {
+      if (e.touches[0] === void 0) return;
+      t = e.touches[0].clientX, i = e.touches[0].clientY;
+    }
+    this.mouse.set(2 * (t / this.canvas.width) - 1, 2 * (1 - i / this.canvas.height) - 1), this.raycast.castMouse(this.camera, this.mouse), this.meshes.forEach((r) => r.isHit = !1), this.raycast.intersectBounds(this.meshes).forEach((r) => r.isHit = !0);
+  };
 }
-class F extends p {
+class U extends u {
   /** Orbit-контроллер для управления камерой */
   orbit;
   /**
    * Инициализация сцены предпросмотра.
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(t) {
-    super(t), this.orbit = new c(this.camera, {
+  constructor(e) {
+    super(e), this.orbit = new m(this.camera, {
       element: this.canvas,
-      target: new M(0, 0, 0),
+      target: new C(0, 0, 0),
       minPolarAngle: Math.PI / 2,
       maxPolarAngle: Math.PI / 2,
       enableRotate: !0,
@@ -145,7 +194,7 @@ class F extends p {
     this.orbit?.update();
   }
 }
-class C {
+class I {
   /** Тип фигуры */
   type;
   /** Позиции вершин */
@@ -160,11 +209,11 @@ class C {
    * Создаёт новую фигуру
    * @param data - исходные данные фигуры
    */
-  constructor(t) {
-    this.type = t.type, this.position = t.position, this.normal = t.normal ?? [], this.uv = t.uv ?? [], this.material = t.material;
+  constructor(e) {
+    this.type = e.type, this.position = e.position, this.normal = e.normal ?? [], this.uv = e.uv ?? [], this.material = e.material;
   }
 }
-var v = /* @__PURE__ */ ((e) => (e[e.Cube = 0] = "Cube", e[e.Sphere = 1] = "Sphere", e[e.Plane = 2] = "Plane", e[e.Cylinder = 3] = "Cylinder", e[e.Custom = 4] = "Custom", e))(v || {});
+var v = /* @__PURE__ */ ((s) => (s[s.Cube = 0] = "Cube", s[s.Sphere = 1] = "Sphere", s[s.Plane = 2] = "Plane", s[s.Cylinder = 3] = "Cylinder", s[s.Custom = 4] = "Custom", s))(v || {});
 class A {
   /** Позиции вершин */
   positions = [];
@@ -180,12 +229,12 @@ class A {
    * Загружает OBJ-модель в Figure
    * @param objContent Строка содержимого .obj файла
    */
-  load(t) {
-    const s = t.split(`
+  load(e) {
+    const t = e.split(`
 `);
-    for (const n of s) {
-      if (!n.trim() || n.startsWith("#")) continue;
-      const r = n.trim().split(/\s+/);
+    for (const o of t) {
+      if (!o.trim() || o.startsWith("#")) continue;
+      const r = o.trim().split(/\s+/);
       switch (r[0]) {
         case "v":
           this.tmpPositions.push(r.slice(1).map(Number));
@@ -207,26 +256,26 @@ class A {
       ...this.normals.length > 0 && { normal: this.normals },
       ...this.uvs.length > 0 && { uv: this.uvs }
     };
-    return new C(i);
+    return new I(i);
   }
   /**
    * Обрабатывает строку face (f) и разворачивает индексы в массивы для рендеринга
    */
-  processFaceLine(t) {
-    for (let s = 1; s < t.length; s++) {
-      const i = t[s];
+  processFaceLine(e) {
+    for (let t = 1; t < e.length; t++) {
+      const i = e[t];
       if (!i) continue;
-      const [n, r, o] = i.split("/"), l = n ? parseInt(n, 10) : void 0, m = r ? parseInt(r, 10) : void 0, h = o ? parseInt(o, 10) : void 0;
-      if (l !== void 0) {
-        const a = this.tmpPositions[l - 1];
+      const [o, r, n] = i.split("/"), h = o ? parseInt(o, 10) : void 0, c = r ? parseInt(r, 10) : void 0, l = n ? parseInt(n, 10) : void 0;
+      if (h !== void 0) {
+        const a = this.tmpPositions[h - 1];
         a && this.positions.push(...a);
       }
-      if (m !== void 0) {
-        const a = this.tmpUVs[m - 1];
+      if (c !== void 0) {
+        const a = this.tmpUVs[c - 1];
         a && this.uvs.push(...a);
       }
-      if (h !== void 0) {
-        const a = this.tmpNormals[h - 1];
+      if (l !== void 0) {
+        const a = this.tmpNormals[l - 1];
         a && this.normals.push(...a);
       }
     }
@@ -235,7 +284,7 @@ class A {
 export {
   N as EditorRenderer,
   A as ObjLoader,
-  F as PreviewRenderer,
-  p as Renderer,
-  z as createProgram
+  U as PreviewRenderer,
+  u as Renderer,
+  F as createProgram
 };

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-(function(r,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("ogl")):typeof define=="function"&&define.amd?define(["exports","ogl"],i):(r=typeof globalThis<"u"?globalThis:r||self,i(r.PlanaraCore={},r.OGL))})(this,(function(r,i){"use strict";function h(t){const e=`
+(function(a,r){typeof exports=="object"&&typeof module<"u"?r(exports,require("ogl")):typeof define=="function"&&define.amd?define(["exports","ogl"],r):(a=typeof globalThis<"u"?globalThis:a||self,r(a.PlanaraCore={},a.OGL))})(this,(function(a,r){"use strict";function m(s){const e=`
     attribute vec3 position;
     attribute vec3 normal;
     attribute vec2 uv;
@@ -15,7 +15,7 @@
       vNormal = normalize(normalMatrix * normal);
       gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
     }
-  `,s=`
+  `,t=`
     precision highp float;
 
     uniform sampler2D tMap;
@@ -29,5 +29,5 @@
       gl_FragColor.rgb = tex + shading;
       gl_FragColor.a = 1.0;
     }
-  `,n=new i.Texture(t);return new i.Program(t,{vertex:e,fragment:s,uniforms:{tMap:{value:n}}})}class c{gl;scene;camera;canvas;program;constructor(e){this.canvas=e,this.gl=new i.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new i.Transform,this.camera=new i.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0]),this.program=h(this.gl.gl)}resize(){this.gl.setSize(this.canvas.width,this.canvas.height),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}update(){}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}addFigure(e){const s=new i.Geometry(this.gl.gl,{position:{size:3,data:new Float32Array(e.position)},normal:{size:3,data:new Float32Array(e.normal??[])},uv:{size:2,data:new Float32Array(e.uv??[])}}),n=new i.Mesh(this.gl.gl,{geometry:s,program:this.program});return n.setParent(this.scene),n}}class g extends c{orbit;constructor(e){super(e);const s=new i.GridHelper(this.gl.gl,{size:10,divisions:10});s.position.y=-.001,s.setParent(this.scene),new i.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new i.Orbit(this.camera,{element:this.canvas})}update(){this.orbit?.update()}}class f extends c{orbit;constructor(e){super(e),this.orbit=new i.Orbit(this.camera,{element:this.canvas,target:new i.Vec3(0,0,0),minPolarAngle:Math.PI/2,maxPolarAngle:Math.PI/2,enableRotate:!0,enableZoom:!1,enablePan:!1})}update(){this.orbit?.update()}}class b{type;position;normal;uv;material;constructor(e){this.type=e.type,this.position=e.position,this.normal=e.normal??[],this.uv=e.uv??[],this.material=e.material}}var m=(t=>(t[t.Cube=0]="Cube",t[t.Sphere=1]="Sphere",t[t.Plane=2]="Plane",t[t.Cylinder=3]="Cylinder",t[t.Custom=4]="Custom",t))(m||{});class w{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];load(e){const s=e.split(`
-`);for(const l of s){if(!l.trim()||l.startsWith("#"))continue;const a=l.trim().split(/\s+/);switch(a[0]){case"v":this.tmpPositions.push(a.slice(1).map(Number));break;case"vn":this.tmpNormals.push(a.slice(1).map(Number));break;case"vt":this.tmpUVs.push(a.slice(1).map(Number));break;case"f":this.processFaceLine(a);break}}const n={type:m.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new b(n)}processFaceLine(e){for(let s=1;s<e.length;s++){const n=e[s];if(!n)continue;const[l,a,p]=n.split("/"),v=l?parseInt(l,10):void 0,u=a?parseInt(a,10):void 0,d=p?parseInt(p,10):void 0;if(v!==void 0){const o=this.tmpPositions[v-1];o&&this.positions.push(...o)}if(u!==void 0){const o=this.tmpUVs[u-1];o&&this.uvs.push(...o)}if(d!==void 0){const o=this.tmpNormals[d-1];o&&this.normals.push(...o)}}}}r.EditorRenderer=g,r.ObjLoader=w,r.PreviewRenderer=f,r.Renderer=c,r.createProgram=h,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})}));
+  `,i=new r.Texture(s);return new r.Program(s,{vertex:e,fragment:t,uniforms:{tMap:{value:i}}})}class c{gl;scene;camera;canvas;program;meshes;constructor(e){this.canvas=e,this.gl=new r.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new r.Transform,this.camera=new r.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0]),this.program=m(this.gl.gl)}resize(){this.gl.setSize(this.canvas.width,this.canvas.height),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}update(){}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}addFigure(e){const t=new r.Geometry(this.gl.gl,{position:{size:3,data:new Float32Array(e.position)},normal:{size:3,data:new Float32Array(e.normal??[])},uv:{size:2,data:new Float32Array(e.uv??[])}}),i=new r.Mesh(this.gl.gl,{geometry:t,program:this.program});return i.setParent(this.scene),this.meshes.push(i),i}}class f extends c{orbit;raycast;mouse;constructor(e){super(e);const t=new r.GridHelper(this.gl.gl,{size:10,divisions:10});t.position.y=-.001,t.setParent(this.scene),new r.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new r.Orbit(this.camera,{element:this.canvas}),this.raycast=new r.Raycast,this.mouse=new r.Vec2,this.initMouseListeners()}update(){this.orbit?.update()}addFigure(e){const t=super.addFigure(e);if(t.geometry){const i=t.geometry.constructor.name;t.geometry.raycast=i.includes("Sphere")?"sphere":"box"}return t.isHit=!1,t.onBeforeRender(({mesh:i})=>{this.updateHitUniform(i)}),t}updateHitUniform(e){this.program.uniforms.uHit.value=e.isHit?1:0}initMouseListeners(){window.addEventListener("load",()=>{document.addEventListener("mousemove",this.handleMouseMove,!1),document.addEventListener("touchmove",this.handleMouseMove,!1)})}handleMouseMove=e=>{let t,i;if(e instanceof MouseEvent)t=e.clientX,i=e.clientY;else{if(e.touches[0]===void 0)return;t=e.touches[0].clientX,i=e.touches[0].clientY}this.mouse.set(2*(t/this.canvas.width)-1,2*(1-i/this.canvas.height)-1),this.raycast.castMouse(this.camera,this.mouse),this.meshes.forEach(n=>n.isHit=!1),this.raycast.intersectBounds(this.meshes).forEach(n=>n.isHit=!0)}}class g extends c{orbit;constructor(e){super(e),this.orbit=new r.Orbit(this.camera,{element:this.canvas,target:new r.Vec3(0,0,0),minPolarAngle:Math.PI/2,maxPolarAngle:Math.PI/2,enableRotate:!0,enableZoom:!1,enablePan:!1})}update(){this.orbit?.update()}}class b{type;position;normal;uv;material;constructor(e){this.type=e.type,this.position=e.position,this.normal=e.normal??[],this.uv=e.uv??[],this.material=e.material}}var l=(s=>(s[s.Cube=0]="Cube",s[s.Sphere=1]="Sphere",s[s.Plane=2]="Plane",s[s.Cylinder=3]="Cylinder",s[s.Custom=4]="Custom",s))(l||{});class y{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];load(e){const t=e.split(`
+`);for(const h of t){if(!h.trim()||h.startsWith("#"))continue;const n=h.trim().split(/\s+/);switch(n[0]){case"v":this.tmpPositions.push(n.slice(1).map(Number));break;case"vn":this.tmpNormals.push(n.slice(1).map(Number));break;case"vt":this.tmpUVs.push(n.slice(1).map(Number));break;case"f":this.processFaceLine(n);break}}const i={type:l.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new b(i)}processFaceLine(e){for(let t=1;t<e.length;t++){const i=e[t];if(!i)continue;const[h,n,u]=i.split("/"),d=h?parseInt(h,10):void 0,v=n?parseInt(n,10):void 0,p=u?parseInt(u,10):void 0;if(d!==void 0){const o=this.tmpPositions[d-1];o&&this.positions.push(...o)}if(v!==void 0){const o=this.tmpUVs[v-1];o&&this.uvs.push(...o)}if(p!==void 0){const o=this.tmpNormals[p-1];o&&this.normals.push(...o)}}}}a.EditorRenderer=f,a.ObjLoader=y,a.PreviewRenderer=g,a.Renderer=c,a.createProgram=m,Object.defineProperty(a,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planara/core",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"