archive-gh-me/openglobus
1
0
Fork 0
mirror of https://github.com/openglobus/openglobus.git synced 2025-12-08 19:25:27 +00:00
Code Issues Projects Releases Wiki Activity

889 wip.3

Browse Source
This commit is contained in:
Michael Gevlich 2025-10-20 16:44:37 +04:00
parent c40ed2e289
commit ebc34419c3
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/entity/BaseBillboardHandler.ts
View File

@ -196,15 +196,15 @@ class BaseBillboardHandler {
protected _deleteBuffers() {
if (this._renderer) {
let gl = this._renderer.handler.gl!;
gl.deleteBuffer(this._positionHighBuffer as WebGLBuffer);
gl.deleteBuffer(this._positionLowBuffer as WebGLBuffer);
gl.deleteBuffer(this._sizeBuffer as WebGLBuffer);
gl.deleteBuffer(this._offsetBuffer as WebGLBuffer);
gl.deleteBuffer(this._rgbaBuffer as WebGLBuffer);
gl.deleteBuffer(this._rotationBuffer as WebGLBuffer);
gl.deleteBuffer(this._vertexBuffer as WebGLBuffer);
gl.deleteBuffer(this._texCoordBuffer as WebGLBuffer);
gl.deleteBuffer(this._pickingColorBuffer as WebGLBuffer);
gl.deleteBuffer(this._positionHighBuffer!);
gl.deleteBuffer(this._positionLowBuffer!);
gl.deleteBuffer(this._sizeBuffer!);
gl.deleteBuffer(this._offsetBuffer!);
gl.deleteBuffer(this._rgbaBuffer!);
gl.deleteBuffer(this._rotationBuffer!);
gl.deleteBuffer(this._vertexBuffer!);
gl.deleteBuffer(this._texCoordBuffer!);
gl.deleteBuffer(this._pickingColorBuffer!);
}
this._positionHighBuffer = null;

38
src/entity/RayHandler.ts
View File

@ -1,5 +1,5 @@
import * as shaders from "../shaders/ray/ray";
import {concatArrays, makeArrayTyped, spliceArray} from "../utils/shared";
import {concatArrays, concatTypedArrays, makeArrayTyped, spliceArray} from "../utils/shared";
import type {TypedArray} from "../utils/shared";
import {EntityCollection} from "./EntityCollection";
import {Ray} from "./Ray";
@ -41,6 +41,7 @@ class RayHandler {
protected _rays: Ray[];
protected _vertexBuffer: WebGLBufferExt | null;
protected _texCoordBuffer: WebGLBufferExt | null;
protected _startPositionHighBuffer: WebGLBufferExt | null;
protected _startPositionLowBuffer: WebGLBufferExt | null;
protected _endPositionHighBuffer: WebGLBufferExt | null;
@ -50,6 +51,7 @@ class RayHandler {
protected _pickingColorBuffer: WebGLBufferExt | null;
protected _vertexArr: TypedArray | number[];
protected _texCoordArr: TypedArray;
protected _startPositionHighArr: TypedArray | number[];
protected _startPositionLowArr: TypedArray | number[];
protected _endPositionHighArr: TypedArray | number[];
@ -79,6 +81,7 @@ class RayHandler {
this._rays = [];
this._vertexBuffer = null;
this._texCoordBuffer = null;
this._startPositionHighBuffer = null;
this._startPositionLowBuffer = null;
this._endPositionHighBuffer = null;
@ -88,6 +91,7 @@ class RayHandler {
this._pickingColorBuffer = null;
this._vertexArr = [];
this._texCoordArr = new Float32Array([]);
this._startPositionHighArr = [];
this._startPositionLowArr = [];
this._endPositionHighArr = [];
@ -103,6 +107,7 @@ class RayHandler {
this._buffersUpdateCallbacks[THICKNESS_BUFFER] = this.createThicknessBuffer;
this._buffersUpdateCallbacks[RGBA_BUFFER] = this.createRgbaBuffer;
this._buffersUpdateCallbacks[PICKINGCOLOR_BUFFER] = this.createPickingColorBuffer;
this._buffersUpdateCallbacks[TEXCOORD_BUFFER] = this.createTexCoordBuffer;
this._changedBuffers = new Array(this._buffersUpdateCallbacks.length);
}
@ -157,6 +162,8 @@ class RayHandler {
//@ts-ignore
this._vertexArr = null;
//@ts-ignore
this._texCoordArr = null;
//@ts-ignore
this._startPositionHighArr = null;
//@ts-ignore
this._startPositionLowArr = null;
@ -170,6 +177,7 @@ class RayHandler {
this._rgbaArr = null;
this._vertexArr = new Float32Array([]);
this._texCoordArr = new Float32Array([]);
this._startPositionHighArr = new Float32Array([]);
this._startPositionLowArr = new Float32Array([]);
this._endPositionHighArr = new Float32Array([]);
@ -187,13 +195,14 @@ class RayHandler {
let gl = this._renderer.handler.gl;
if (gl) {
gl.deleteBuffer(this._startPositionHighBuffer as WebGLBuffer);
gl.deleteBuffer(this._startPositionLowBuffer as WebGLBuffer);
gl.deleteBuffer(this._endPositionHighBuffer as WebGLBuffer);
gl.deleteBuffer(this._endPositionLowBuffer as WebGLBuffer);
gl.deleteBuffer(this._thicknessBuffer as WebGLBuffer);
gl.deleteBuffer(this._rgbaBuffer as WebGLBuffer);
gl.deleteBuffer(this._vertexBuffer as WebGLBuffer);
gl.deleteBuffer(this._startPositionHighBuffer!);
gl.deleteBuffer(this._startPositionLowBuffer!);
gl.deleteBuffer(this._endPositionHighBuffer!);
gl.deleteBuffer(this._endPositionLowBuffer!);
gl.deleteBuffer(this._thicknessBuffer!);
gl.deleteBuffer(this._rgbaBuffer!);
gl.deleteBuffer(this._vertexBuffer!);
gl.deleteBuffer(this._texCoordBuffer!);
}
this._startPositionHighBuffer = null;
@ -203,6 +212,7 @@ class RayHandler {
this._thicknessBuffer = null;
this._rgbaBuffer = null;
this._vertexBuffer = null;
this._texCoordBuffer = null;
}
}
@ -241,6 +251,8 @@ class RayHandler {
);
}
this._texCoordArr = concatTypedArrays(this._texCoordArr, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
let x = ray._startPositionHigh.x,
y = ray._startPositionHigh.y,
z = ray._startPositionHigh.z;
@ -333,6 +345,9 @@ class RayHandler {
gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexBuffer!);
gl.vertexAttribPointer(sha.a_vertices, this._vertexBuffer!.itemSize, gl.FLOAT, false, 0, 0);
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer as WebGLBuffer);
gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer!.itemSize, gl.FLOAT, false, 0, 0);
gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer!.numItems);
gl.enable(gl.CULL_FACE);
@ -727,6 +742,13 @@ class RayHandler {
);
}
public createTexCoordBuffer() {
let h = this._renderer!.handler;
h.gl!.deleteBuffer(this._texCoordBuffer as WebGLBuffer);
this._texCoordBuffer = h.createArrayBuffer(this._texCoordArr, 2, this._texCoordArr.length / 2);
}
public createPickingColorBuffer() {
let h = this._renderer!.handler;
h.gl!.deleteBuffer(this._pickingColorBuffer as WebGLBuffer);