@planara/core 1.2.4 → 1.3.0

package/README.md

@@ -1,4 +1,5 @@
 ![build](https://github.com/planara/planara-core/actions/workflows/build.yml/badge.svg)
+![deploy](https://github.com/planara/planara-core/actions/workflows/deploy.yml/badge.svg)
 
 ## Planara Core
 
@@ -20,4 +21,4 @@
 
 - Покраска объектов (через материалы или vertex colors).
 
-- Отображение сетки и осей (Grid и Axes Helper).
+- Отображение сетки и осей (Grid и Axes Helper).

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;gBACS,MAAM,EAAE,iBAAiB;IAgBrC;;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;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"}

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

@@ -1 +1 @@
-{"version":3,"file":"preview-renderer.d.ts","sourceRoot":"","sources":["../../src/core/preview-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,QAAQ;IAC3C,8CAA8C;IAC9C,OAAO,CAAC,KAAK,CAAS;IAEtB;;;OAGG;gBACS,MAAM,EAAE,iBAAiB;IAcrC;;OAEG;IACH,SAAS,CAAC,MAAM;CAIjB"}
+{"version":3,"file":"preview-renderer.d.ts","sourceRoot":"","sources":["../../src/core/preview-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,QAAQ;IAC3C,8CAA8C;IAC9C,OAAO,CAAC,KAAK,CAAS;IAEtB;;;OAGG;gBACS,MAAM,EAAE,iBAAiB;IAerC;;OAEG;IACH,SAAS,CAAC,MAAM;CAIjB"}

package/dist/core/renderer.d.ts

@@ -1,22 +1,24 @@
-import { Renderer as OGLRenderer, Camera, Transform } from 'ogl';
+import { Renderer as OGLRenderer, Camera, Transform, Mesh, Geometry, Program } from 'ogl';
+import { Figure } from '@planara/types';
 /**
  * Абстрактный базовый класс рендерера для работы с WebGL через OGL.
  * Отвечает за инициализацию сцены, камеры и цикла рендеринга.
  */
 export declare abstract class Renderer {
     /** Экземпляр рендерера OGL */
-    gl: OGLRenderer;
+    protected gl: OGLRenderer;
     /** Корневой объект сцены */
-    scene: Transform;
+    protected scene: Transform;
     /** Камера для сцены */
-    camera: Camera;
+    protected camera: Camera;
     /** HTML-элемент canvas, на котором рендерится сцена */
     protected canvas: HTMLCanvasElement;
+    protected program: Program;
     /**
      * Конструктор рендерера
      * @param canvas - HTMLCanvasElement для рендеринга
      */
-    constructor(canvas: HTMLCanvasElement);
+    protected constructor(canvas: HTMLCanvasElement);
     /**
      * Обновляет размер рендерера и камеры при изменении размеров canvas.
      */
@@ -24,14 +26,19 @@ export declare abstract class Renderer {
     /**
      * Выполняет рендеринг сцены с текущей камерой.
      */
-    render(): void;
+    protected render(): void;
+    /**
+     * Метод для обновления логики рендерера.
+     */
+    protected update(): void;
     /**
      * Запускает основной цикл рендеринга.
      */
     loop(): void;
     /**
-     * Метод для обновления логики рендерера.
+     * Публичный метод для добавления фигуры.
+     * @param figure Данные фигуры: position, normal, uv
      */
-    protected update(): void;
+    addFigure(figure: Figure): Mesh<Geometry, Program>;
 }
 //# sourceMappingURL=renderer.d.ts.map

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,MAAM,KAAK,CAAC;AAEjE;;;GAGG;AACH,8BAAsB,QAAQ;IAC5B,8BAA8B;IACvB,EAAE,EAAE,WAAW,CAAC;IAEvB,4BAA4B;IACrB,KAAK,EAAE,SAAS,CAAC;IAExB,uBAAuB;IAChB,MAAM,EAAE,MAAM,CAAC;IAEtB,uDAAuD;IACvD,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEpC;;;OAGG;gBACS,MAAM,EAAE,iBAAiB;IAarC;;OAEG;IACH,MAAM;IAKN;;OAEG;IACH,MAAM;IAIN;;OAEG;IACH,IAAI;IAMJ;;OAEG;IACH,SAAS,CAAC,MAAM,IAAI,IAAI;CACzB"}
+{"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;IAUb;;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"}

package/dist/index.cjs.js

@@ -1,2 +1,33 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ogl");class h{gl;scene;camera;canvas;constructor(e){this.canvas=e,this.gl=new n.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new n.Transform,this.camera=new n.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0])}resize(){this.gl.setSize(this.canvas.clientWidth,this.canvas.clientHeight),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}update(){}}class d extends h{orbit;constructor(e){super(e);const t=new n.GridHelper(this.gl.gl,{size:10,divisions:10});t.position.y=-.001,t.setParent(this.scene),new n.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new n.Orbit(this.camera)}update(){this.orbit?.update()}}class v extends h{orbit;constructor(e){super(e),this.orbit=new n.Orbit(this.camera,{target:new n.Vec3(0,0,0),minPolarAngle:Math.PI/2,maxPolarAngle:Math.PI/2,enableRotate:!0,enableZoom:!1,enablePan:!1})}update(){this.orbit?.update()}}class g{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=(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))(u||{});class b{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];parse(e){const t=e.split(`
-`);for(const a of t){if(!a.trim()||a.startsWith("#"))continue;const i=a.trim().split(/\s+/);switch(i[0]){case"v":this.tmpPositions.push(i.slice(1).map(Number));break;case"vn":this.tmpNormals.push(i.slice(1).map(Number));break;case"vt":this.tmpUVs.push(i.slice(1).map(Number));break;case"f":this.processFaceLine(i);break}}const o={type:u.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new g(o)}processFaceLine(e){for(let t=1;t<e.length;t++){const o=e[t];if(!o)continue;const[a,i,l]=o.split("/"),c=a?parseInt(a,10):void 0,p=i?parseInt(i,10):void 0,m=l?parseInt(l,10):void 0;if(c!==void 0){const r=this.tmpPositions[c-1];r&&this.positions.push(...r)}if(p!==void 0){const r=this.tmpUVs[p-1];r&&this.uvs.push(...r)}if(m!==void 0){const r=this.tmpNormals[m-1];r&&this.normals.push(...r)}}}}exports.EditorRenderer=d;exports.ObjLoader=b;exports.PreviewRenderer=v;exports.Renderer=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ogl");function p(t){const e=`
+    attribute vec3 position;
+    attribute vec3 normal;
+    attribute vec2 uv;
+
+    uniform mat4 modelViewMatrix;
+    uniform mat4 projectionMatrix;
+    uniform mat3 normalMatrix;
+
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vUv = uv;
+      vNormal = normalize(normalMatrix * normal);
+      gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+    }
+  `,i=`
+    precision highp float;
+
+    uniform sampler2D tMap;
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vec3 tex = texture2D(tMap, vUv).rgb;
+      vec3 light = normalize(vec3(0.5, 1.0, -0.3));
+      float shading = dot(normalize(vNormal), light) * 0.15;
+      gl_FragColor.rgb = tex + shading;
+      gl_FragColor.a = 1.0;
+    }
+  `,r=new s.Texture(t);return new s.Program(t,{vertex:e,fragment:i,uniforms:{tMap:{value:r}}})}class l{gl;scene;camera;canvas;program;constructor(e){this.canvas=e,this.gl=new s.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new s.Transform,this.camera=new s.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0]),this.program=p(this.gl.gl)}resize(){this.canvas.width=this.canvas.clientWidth,this.canvas.height=this.canvas.clientHeight,this.gl.setSize(this.canvas.clientWidth,this.canvas.clientHeight),this.camera.perspective({aspect:this.canvas.clientWidth/this.canvas.clientHeight})}render(){this.gl.render({scene:this.scene,camera:this.camera})}update(){}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}addFigure(e){const i=new s.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 s.Mesh(this.gl.gl,{geometry:i,program:this.program});return r.setParent(this.scene),r}}class d extends l{orbit;constructor(e){super(e);const i=new s.GridHelper(this.gl.gl,{size:10,divisions:10});i.position.y=-.001,i.setParent(this.scene),new s.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new s.Orbit(this.camera,{element:this.canvas})}update(){this.orbit?.update()}}class g extends l{orbit;constructor(e){super(e),this.orbit=new s.Orbit(this.camera,{element:this.canvas,target:new s.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 i=e.split(`
+`);for(const o of i){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 i=1;i<e.length;i++){const r=e[i];if(!r)continue;const[o,a,c]=r.split("/"),h=o?parseInt(o,10):void 0,m=a?parseInt(a,10):void 0,v=c?parseInt(c,10):void 0;if(h!==void 0){const n=this.tmpPositions[h-1];n&&this.positions.push(...n)}if(m!==void 0){const n=this.tmpUVs[m-1];n&&this.uvs.push(...n)}if(v!==void 0){const n=this.tmpNormals[v-1];n&&this.normals.push(...n)}}}}exports.EditorRenderer=d;exports.ObjLoader=f;exports.PreviewRenderer=g;exports.Renderer=l;exports.createProgram=p;

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export * from './core/renderer';
 export * from './core/editor-renderer';
 export * from './core/preview-renderer';
 export * from './loaders/obj-loader';
+export * from './utils/program-settings';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC"}

package/dist/index.es.js

@@ -1,5 +1,50 @@
-import { Renderer as d, Transform as v, Camera as g, GridHelper as b, AxesHelper as f, Orbit as p, Vec3 as x } from "ogl";
-class m {
+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 m, Vec3 as M } from "ogl";
+function z(e) {
+  const t = (
+    /* glsl */
+    `
+    attribute vec3 position;
+    attribute vec3 normal;
+    attribute vec2 uv;
+
+    uniform mat4 modelViewMatrix;
+    uniform mat4 projectionMatrix;
+    uniform mat3 normalMatrix;
+
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vUv = uv;
+      vNormal = normalize(normalMatrix * normal);
+      gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+    }
+  `
+  ), i = (
+    /* glsl */
+    `
+    precision highp float;
+
+    uniform sampler2D tMap;
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vec3 tex = texture2D(tMap, vUv).rgb;
+      vec3 light = normalize(vec3(0.5, 1.0, -0.3));
+      float shading = dot(normalize(vNormal), light) * 0.15;
+      gl_FragColor.rgb = tex + shading;
+      gl_FragColor.a = 1.0;
+    }
+  `
+  ), s = new u(e);
+  return new d(e, {
+    vertex: t,
+    fragment: i,
+    uniforms: { tMap: { value: s } }
+  });
+}
+class p {
   /** Экземпляр рендерера OGL */
   gl;
   /** Корневой объект сцены */
@@ -8,18 +53,19 @@ class m {
   camera;
   /** HTML-элемент canvas, на котором рендерится сцена */
   canvas;
+  program;
   /**
    * Конструктор рендерера
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(s) {
-    this.canvas = s, this.gl = new d({ canvas: s }), this.gl.setSize(s.clientWidth, s.clientHeight), this.gl.gl.clearColor(1, 1, 1, 1), this.scene = new v(), this.camera = new g(this.gl.gl, { fov: 45 }), this.camera.position.set(1, 1, 7), this.camera.lookAt([0, 0, 0]);
+  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);
   }
   /**
    * Обновляет размер рендерера и камеры при изменении размеров canvas.
    */
   resize() {
-    this.gl.setSize(this.canvas.clientWidth, this.canvas.clientHeight), this.camera.perspective({ aspect: this.canvas.width / this.canvas.height });
+    this.canvas.width = this.canvas.clientWidth, this.canvas.height = this.canvas.clientHeight, this.gl.setSize(this.canvas.clientWidth, this.canvas.clientHeight), this.camera.perspective({ aspect: this.canvas.clientWidth / this.canvas.clientHeight });
   }
   /**
    * Выполняет рендеринг сцены с текущей камерой.
@@ -27,6 +73,11 @@ class m {
   render() {
     this.gl.render({ scene: this.scene, camera: this.camera });
   }
+  /**
+   * Метод для обновления логики рендерера.
+   */
+  update() {
+  }
   /**
    * Запускает основной цикл рендеринга.
    */
@@ -34,12 +85,22 @@ class m {
     this.update(), this.render(), requestAnimationFrame(this.loop.bind(this));
   }
   /**
-   * Метод для обновления логики рендерера.
+   * Публичный метод для добавления фигуры.
+   * @param figure Данные фигуры: position, normal, uv
    */
-  update() {
+  addFigure(t) {
+    const i = 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 ?? []) }
+    }), s = new w(this.gl.gl, {
+      geometry: i,
+      program: this.program
+    });
+    return s.setParent(this.scene), s;
   }
 }
-class I extends m {
+class N extends p {
   /** Orbit-контроллер для управления камерой */
   orbit;
   /**
@@ -47,10 +108,10 @@ class I extends m {
    * Создает сетку, оси координат и orbit-контроллер.
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(s) {
-    super(s);
-    const t = new b(this.gl.gl, { size: 10, divisions: 10 });
-    t.position.y = -1e-3, t.setParent(this.scene), new f(this.gl.gl, { size: 6, symmetric: !0 }).setParent(this.scene), this.orbit = new p(this.camera);
+  constructor(t) {
+    super(t);
+    const i = new y(this.gl.gl, { size: 10, divisions: 10 });
+    i.position.y = -1e-3, i.setParent(this.scene), new P(this.gl.gl, { size: 6, symmetric: !0 }).setParent(this.scene), this.orbit = new m(this.camera, { element: this.canvas });
   }
   /**
    * Обновление состояния рендерера.
@@ -59,16 +120,17 @@ class I extends m {
     this.orbit?.update();
   }
 }
-class C extends m {
+class F extends p {
   /** Orbit-контроллер для управления камерой */
   orbit;
   /**
    * Инициализация сцены предпросмотра.
    * @param canvas - HTMLCanvasElement для рендеринга
    */
-  constructor(s) {
-    super(s), this.orbit = new p(this.camera, {
-      target: new x(0, 0, 0),
+  constructor(t) {
+    super(t), this.orbit = new m(this.camera, {
+      element: this.canvas,
+      target: new M(0, 0, 0),
       minPolarAngle: Math.PI / 2,
       maxPolarAngle: Math.PI / 2,
       enableRotate: !0,
@@ -83,7 +145,7 @@ class C extends m {
     this.orbit?.update();
   }
 }
-class P {
+class C {
   /** Тип фигуры */
   type;
   /** Позиции вершин */
@@ -98,15 +160,19 @@ class P {
    * Создаёт новую фигуру
    * @param data - исходные данные фигуры
    */
-  constructor(s) {
-    this.type = s.type, this.position = s.position, this.normal = s.normal ?? [], this.uv = s.uv ?? [], this.material = s.material;
+  constructor(t) {
+    this.type = t.type, this.position = t.position, this.normal = t.normal ?? [], this.uv = t.uv ?? [], this.material = t.material;
   }
 }
-var u = /* @__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))(u || {});
-class y {
+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 || {});
+class A {
+  /** Позиции вершин */
   positions = [];
+  /** Нормали вершин */
   normals = [];
+  /** UV-координаты (опционально) */
   uvs = [];
+  // Временные поля для парсинга файла
   tmpPositions = [];
   tmpNormals = [];
   tmpUVs = [];
@@ -114,61 +180,62 @@ class y {
    * Загружает OBJ-модель в Figure
    * @param objContent Строка содержимого .obj файла
    */
-  parse(s) {
-    const t = s.split(`
+  load(t) {
+    const i = t.split(`
 `);
-    for (const n of t) {
+    for (const n of i) {
       if (!n.trim() || n.startsWith("#")) continue;
-      const i = n.trim().split(/\s+/);
-      switch (i[0]) {
+      const r = n.trim().split(/\s+/);
+      switch (r[0]) {
         case "v":
-          this.tmpPositions.push(i.slice(1).map(Number));
+          this.tmpPositions.push(r.slice(1).map(Number));
           break;
         case "vn":
-          this.tmpNormals.push(i.slice(1).map(Number));
+          this.tmpNormals.push(r.slice(1).map(Number));
           break;
         case "vt":
-          this.tmpUVs.push(i.slice(1).map(Number));
+          this.tmpUVs.push(r.slice(1).map(Number));
           break;
         case "f":
-          this.processFaceLine(i);
+          this.processFaceLine(r);
           break;
       }
     }
-    const a = {
-      type: u.Custom,
+    const s = {
+      type: v.Custom,
       position: this.positions,
       ...this.normals.length > 0 && { normal: this.normals },
       ...this.uvs.length > 0 && { uv: this.uvs }
     };
-    return new P(a);
+    return new C(s);
   }
   /**
    * Обрабатывает строку face (f) и разворачивает индексы в массивы для рендеринга
    */
-  processFaceLine(s) {
-    for (let t = 1; t < s.length; t++) {
-      const a = s[t];
-      if (!a) continue;
-      const [n, i, o] = a.split("/"), h = n ? parseInt(n, 10) : void 0, c = i ? parseInt(i, 10) : void 0, l = o ? parseInt(o, 10) : void 0;
-      if (h !== void 0) {
-        const r = this.tmpPositions[h - 1];
-        r && this.positions.push(...r);
+  processFaceLine(t) {
+    for (let i = 1; i < t.length; i++) {
+      const s = t[i];
+      if (!s) continue;
+      const [n, r, o] = s.split("/"), l = n ? parseInt(n, 10) : void 0, c = r ? parseInt(r, 10) : void 0, h = o ? parseInt(o, 10) : void 0;
+      if (l !== void 0) {
+        const a = this.tmpPositions[l - 1];
+        a && this.positions.push(...a);
       }
       if (c !== void 0) {
-        const r = this.tmpUVs[c - 1];
-        r && this.uvs.push(...r);
+        const a = this.tmpUVs[c - 1];
+        a && this.uvs.push(...a);
       }
-      if (l !== void 0) {
-        const r = this.tmpNormals[l - 1];
-        r && this.normals.push(...r);
+      if (h !== void 0) {
+        const a = this.tmpNormals[h - 1];
+        a && this.normals.push(...a);
       }
     }
   }
 }
 export {
-  I as EditorRenderer,
-  y as ObjLoader,
-  C as PreviewRenderer,
-  m as Renderer
+  N as EditorRenderer,
+  A as ObjLoader,
+  F as PreviewRenderer,
+  p as Renderer,
+  z as createProgram
 };

package/dist/index.umd.js

@@ -1,2 +1,33 @@
-(function(i,t){typeof exports=="object"&&typeof module<"u"?t(exports,require("ogl")):typeof define=="function"&&define.amd?define(["exports","ogl"],t):(i=typeof globalThis<"u"?globalThis:i||self,t(i.PlanaraCore={},i.OGL))})(this,(function(i,t){"use strict";class c{gl;scene;camera;canvas;constructor(e){this.canvas=e,this.gl=new t.Renderer({canvas:e}),this.gl.setSize(e.clientWidth,e.clientHeight),this.gl.gl.clearColor(1,1,1,1),this.scene=new t.Transform,this.camera=new t.Camera(this.gl.gl,{fov:45}),this.camera.position.set(1,1,7),this.camera.lookAt([0,0,0])}resize(){this.gl.setSize(this.canvas.clientWidth,this.canvas.clientHeight),this.camera.perspective({aspect:this.canvas.width/this.canvas.height})}render(){this.gl.render({scene:this.scene,camera:this.camera})}loop(){this.update(),this.render(),requestAnimationFrame(this.loop.bind(this))}update(){}}class v extends c{orbit;constructor(e){super(e);const n=new t.GridHelper(this.gl.gl,{size:10,divisions:10});n.position.y=-.001,n.setParent(this.scene),new t.AxesHelper(this.gl.gl,{size:6,symmetric:!0}).setParent(this.scene),this.orbit=new t.Orbit(this.camera)}update(){this.orbit?.update()}}class f extends c{orbit;constructor(e){super(e),this.orbit=new t.Orbit(this.camera,{target:new t.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 g{positions=[];normals=[];uvs=[];tmpPositions=[];tmpNormals=[];tmpUVs=[];parse(e){const n=e.split(`
-`);for(const o of n){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));break;case"vn":this.tmpNormals.push(r.slice(1).map(Number));break;case"vt":this.tmpUVs.push(r.slice(1).map(Number));break;case"f":this.processFaceLine(r);break}}const h={type:l.Custom,position:this.positions,...this.normals.length>0&&{normal:this.normals},...this.uvs.length>0&&{uv:this.uvs}};return new b(h)}processFaceLine(e){for(let n=1;n<e.length;n++){const h=e[n];if(!h)continue;const[o,r,p]=h.split("/"),m=o?parseInt(o,10):void 0,d=r?parseInt(r,10):void 0,u=p?parseInt(p,10):void 0;if(m!==void 0){const a=this.tmpPositions[m-1];a&&this.positions.push(...a)}if(d!==void 0){const a=this.tmpUVs[d-1];a&&this.uvs.push(...a)}if(u!==void 0){const a=this.tmpNormals[u-1];a&&this.normals.push(...a)}}}}i.EditorRenderer=v,i.ObjLoader=g,i.PreviewRenderer=f,i.Renderer=c,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})}));
+(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=`
+    attribute vec3 position;
+    attribute vec3 normal;
+    attribute vec2 uv;
+
+    uniform mat4 modelViewMatrix;
+    uniform mat4 projectionMatrix;
+    uniform mat3 normalMatrix;
+
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vUv = uv;
+      vNormal = normalize(normalMatrix * normal);
+      gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+    }
+  `,s=`
+    precision highp float;
+
+    uniform sampler2D tMap;
+    varying vec3 vNormal;
+    varying vec2 vUv;
+
+    void main() {
+      vec3 tex = texture2D(tMap, vUv).rgb;
+      vec3 light = normalize(vec3(0.5, 1.0, -0.3));
+      float shading = dot(normalize(vNormal), light) * 0.15;
+      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 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=h(this.gl.gl)}resize(){this.canvas.width=this.canvas.clientWidth,this.canvas.height=this.canvas.clientHeight,this.gl.setSize(this.canvas.clientWidth,this.canvas.clientHeight),this.camera.perspective({aspect:this.canvas.clientWidth/this.canvas.clientHeight})}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 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 f 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 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 c of s){if(!c.trim()||c.startsWith("#"))continue;const a=c.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[c,a,p]=n.split("/"),v=c?parseInt(c,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=l,r.createProgram=h,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})}));

package/dist/loaders/obj-loader.d.ts

@@ -1,7 +1,10 @@
 import { Figure } from '@planara/types';
 export declare class ObjLoader {
+    /** Позиции вершин */
     private positions;
+    /** Нормали вершин */
     private normals;
+    /** UV-координаты (опционально) */
     private uvs;
     private tmpPositions;
     private tmpNormals;
@@ -10,7 +13,7 @@ export declare class ObjLoader {
      * Загружает OBJ-модель в Figure
      * @param objContent Строка содержимого .obj файла
      */
-    parse(objContent: string): Figure;
+    load(objContent: string): Figure;
     /**
      * Обрабатывает строку face (f) и разворачивает индексы в массивы для рендеринга
      */

package/dist/loaders/obj-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obj-loader.d.ts","sourceRoot":"","sources":["../../src/loaders/obj-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA+B,MAAM,gBAAgB,CAAC;AAErE,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,GAAG,CAAgB;IAE3B,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAkB;IAEhC;;;OAGG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAmCjC;;OAEG;IACH,OAAO,CAAC,eAAe;CA2BxB"}
+{"version":3,"file":"obj-loader.d.ts","sourceRoot":"","sources":["../../src/loaders/obj-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA+B,MAAM,gBAAgB,CAAC;AAErE,qBAAa,SAAS;IACpB,qBAAqB;IACrB,OAAO,CAAC,SAAS,CAAgB;IAEjC,qBAAqB;IACrB,OAAO,CAAC,OAAO,CAAgB;IAE/B,kCAAkC;IAClC,OAAO,CAAC,GAAG,CAAgB;IAG3B,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAkB;IAEhC;;;OAGG;IACI,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAmCvC;;OAEG;IACH,OAAO,CAAC,eAAe;CA2BxB"}

package/dist/utils/program-settings.d.ts

@@ -0,0 +1,12 @@
+import { OGLRenderingContext, Program } from 'ogl';
+/**
+ * Создает универсальный Program для рендерера.
+ *
+ * Включает базовый vertex и fragment шейдеры, добавляет uniform `tMap` с дефолтной текстурой.
+ * Этот Program можно использовать для всех фигур в сцене, а также для сетки и осей.
+ *
+ * @param {OGLRenderingContext} gl - WebGL контекст.
+ * @returns {Program} Экземпляр Program с базовыми шейдерами и uniform.
+ */
+export declare function createProgram(gl: OGLRenderingContext): Program;
+//# sourceMappingURL=program-settings.d.ts.map

package/dist/utils/program-settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"program-settings.d.ts","sourceRoot":"","sources":["../../src/utils/program-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,OAAO,EAAW,MAAM,KAAK,CAAC;AAEjE;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,mBAAmB,GAAG,OAAO,CA2C9D"}

package/package.json

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