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 ff.

Browse Source
This commit is contained in:
Zemledelec 2025-11-29 13:53:59 +04:00
parent 43816ba1a4
commit d53aceaf56
2 changed files with 107 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/entity/Polyline.ts
View File

@ -24,6 +24,7 @@ import type {HTMLImageElementExt} from "../utils/ImagesCacheManager";
const VERTICES_BUFFER = 0;
const INDEX_BUFFER = 1;
const COLORS_BUFFER = 2;
const TEXCOORD_BUFFER = 3;
const DEFAULT_COLOR = "#0000FF";
@ -154,12 +155,14 @@ class Polyline {
protected _orders: TypedArray | number[];
protected _indexes: TypedArray | number[];
protected _colors: TypedArray | number[];
protected _texCoordArr: TypedArray | number[];
protected _verticesHighBuffer: WebGLBufferExt | null;
protected _verticesLowBuffer: WebGLBufferExt | null;
protected _ordersBuffer: WebGLBufferExt | null;
protected _indexesBuffer: WebGLBufferExt | null;
protected _colorsBuffer: WebGLBufferExt | null;
protected _texCoordBuffer: WebGLBufferExt | null;
protected _pickingColor: NumberArray3;
@ -242,12 +245,14 @@ class Polyline {
this._orders = [];
this._indexes = [];
this._colors = [];
this._texCoordArr = [];
this._verticesHighBuffer = null;
this._verticesLowBuffer = null;
this._ordersBuffer = null;
this._indexesBuffer = null;
this._colorsBuffer = null;
this._texCoordBuffer = null;
this._pickingColor = [0, 0, 0];
@ -271,6 +276,7 @@ class Polyline {
this._buffersUpdateCallbacks[VERTICES_BUFFER] = this._createVerticesBuffer;
this._buffersUpdateCallbacks[INDEX_BUFFER] = this._createIndexBuffer;
this._buffersUpdateCallbacks[COLORS_BUFFER] = this._createColorsBuffer;
this._buffersUpdateCallbacks[TEXCOORD_BUFFER] = this._createTexCoordBuffer;
this._changedBuffers = new Array(this._buffersUpdateCallbacks.length);
@ -294,7 +300,6 @@ class Polyline {
public set texOffset(value: number) {
this._texOffset = value;
this._setTexOffsetArr(value);
}
public get strokeSize(): number {
@ -303,7 +308,6 @@ class Polyline {
public set strokeSize(value: number) {
this._strokeSize = value;
this._setStrokeSizeArr(value);
}
/**
@ -325,7 +329,7 @@ class Polyline {
let taData = ta.get(img!.__nodeIndex!)!;
let minY = taData.texCoords[1],
imgHeight = taData.texCoords[3] - minY;
bh!._setTexCoordArr(
this._setTexCoordArr(
taData.texCoords,
minY,
imgHeight
@ -338,7 +342,7 @@ class Polyline {
}
});
} else {
bh!.setTextureDisabled();
this.setTextureDisabled();
rn!.updateTexCoords();
}
}
@ -362,6 +366,60 @@ class Polyline {
return this._image;
}
public _setTexCoordArr(tcoordArr: number[] | TypedArray, minY: number, imgHeight: number) {
let index = 0;
let i = index * 24;
let a = this._texCoordArr;
// a[i] = tcoordArr[0];
// a[i + 1] = tcoordArr[1];
// a[i + 2] = minY;
// a[i + 3] = imgHeight;
//
// a[i + 4] = tcoordArr[2];
// a[i + 5] = tcoordArr[3];
// a[i + 6] = minY;
// a[i + 7] = imgHeight;
//
// a[i + 8] = tcoordArr[4];
// a[i + 9] = tcoordArr[5];
// a[i + 10] = minY;
// a[i + 11] = imgHeight;
//
// a[i + 12] = tcoordArr[6];
// a[i + 13] = tcoordArr[7];
// a[i + 14] = minY;
// a[i + 15] = imgHeight;
//
// a[i + 16] = tcoordArr[8];
// a[i + 17] = tcoordArr[9];
// a[i + 18] = minY;
// a[i + 19] = imgHeight;
//
// a[i + 20] = tcoordArr[10];
// a[i + 21] = tcoordArr[11];
// a[i + 22] = minY;
// a[i + 23] = imgHeight;
this._changedBuffers[TEXCOORD_BUFFER] = true;
}
public setTextureDisabled() {
// let index = 0;
// let i = index * 24;
// let a = this._texCoordArr;
//
// a[i + 3] = 0;
// a[i + 7] = 0;
// a[i + 11] = 0;
// a[i + 15] = 0;
// a[i + 19] = 0;
// a[i + 23] = 0;
//
// this._changedBuffers[TEXCOORD_BUFFER] = true;
this._strokeSize = 0;
}
/**
* Appends to the line array new cartesian coordinates line data.
*/
@ -1948,6 +2006,8 @@ class Polyline {
this._indexes = null;
//@ts-ignore
this._colors = null;
//@ts-ignore
this._texCoordArr = null;
this._verticesHigh = [];
this._verticesLow = [];
@ -2026,12 +2086,15 @@ class Polyline {
this._indexes = null;
//@ts-ignore
this._colors = null;
//@ts-ignore
this._texCoordArr = null;
this._verticesHigh = [];
this._verticesLow = [];
this._orders = [];
this._indexes = [];
this._colors = [];
this._texCoordArr = [];
this._deleteBuffers();
@ -2226,9 +2289,15 @@ class Polyline {
gl.uniform1f(shu.thickness, this.thickness * 0.5);
gl.uniform1f(shu.opacity, this._opacity * ec._fadingOpacity);
gl.bindBuffer(gl.ARRAY_BUFFER, this._colorsBuffer as WebGLBuffer);
gl.uniform1f(shu.texOffset, this._texOffset);
gl.uniform1f(shu.strokeSize, this._strokeSize);
gl.bindBuffer(gl.ARRAY_BUFFER, this._colorsBuffer!);
gl.vertexAttribPointer(sha.color, this._colorsBuffer!.itemSize, gl.FLOAT, false, 0, 0);
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordBuffer!);
gl.vertexAttribPointer(sha.a_texCoord, this._texCoordBuffer!.itemSize, gl.FLOAT, false, 0, 0);
let v = this._verticesHighBuffer!;
gl.bindBuffer(gl.ARRAY_BUFFER, v);
gl.vertexAttribPointer(sha.prevHigh, v.itemSize, gl.FLOAT, false, 12, 0);
@ -2241,10 +2310,10 @@ class Polyline {
gl.vertexAttribPointer(sha.currentLow, v.itemSize, gl.FLOAT, false, 12, 48);
gl.vertexAttribPointer(sha.nextLow, v.itemSize, gl.FLOAT, false, 12, 96);
gl.bindBuffer(gl.ARRAY_BUFFER, this._ordersBuffer as WebGLBuffer);
gl.bindBuffer(gl.ARRAY_BUFFER, this._ordersBuffer!);
gl.vertexAttribPointer(sha.order, this._ordersBuffer!.itemSize, gl.FLOAT, false, 4, 0);
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexesBuffer as WebGLBuffer);
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indexesBuffer!);
gl.drawElements(gl.TRIANGLE_STRIP, this._indexesBuffer!.numItems, gl.UNSIGNED_INT, 0);
gl.enable(gl.CULL_FACE);
@ -2345,17 +2414,19 @@ class Polyline {
let r = this._renderNode.renderer!,
gl = r.handler.gl!;
gl.deleteBuffer(this._verticesHighBuffer as WebGLBuffer);
gl.deleteBuffer(this._verticesLowBuffer as WebGLBuffer);
gl.deleteBuffer(this._ordersBuffer as WebGLBuffer);
gl.deleteBuffer(this._indexesBuffer as WebGLBuffer);
gl.deleteBuffer(this._colorsBuffer as WebGLBuffer);
gl.deleteBuffer(this._verticesHighBuffer!);
gl.deleteBuffer(this._verticesLowBuffer!);
gl.deleteBuffer(this._ordersBuffer!);
gl.deleteBuffer(this._indexesBuffer!);
gl.deleteBuffer(this._colorsBuffer!);
gl.deleteBuffer(this._texCoordBuffer!);
this._verticesHighBuffer = null;
this._verticesLowBuffer = null;
this._ordersBuffer = null;
this._indexesBuffer = null;
this._colorsBuffer = null;
this._texCoordBuffer = null;
}
}
@ -2369,8 +2440,8 @@ class Polyline {
let numItems = this._verticesHigh.length / 3;
if (!this._verticesHighBuffer || this._verticesHighBuffer.numItems !== numItems) {
h.gl!.deleteBuffer(this._verticesHighBuffer as WebGLBuffer);
h.gl!.deleteBuffer(this._verticesLowBuffer as WebGLBuffer);
h.gl!.deleteBuffer(this._verticesHighBuffer!);
h.gl!.deleteBuffer(this._verticesLowBuffer!);
this._verticesHighBuffer = h.createStreamArrayBuffer(3, numItems);
this._verticesLowBuffer = h.createStreamArrayBuffer(3, numItems);
}
@ -2378,8 +2449,8 @@ class Polyline {
this._verticesHigh = makeArrayTyped(this._verticesHigh);
this._verticesLow = makeArrayTyped(this._verticesLow);
h.setStreamArrayBuffer(this._verticesHighBuffer!, this._verticesHigh as Float32Array);
h.setStreamArrayBuffer(this._verticesLowBuffer!, this._verticesLow as Float32Array);
h.setStreamArrayBuffer(this._verticesHighBuffer!, this._verticesHigh as TypedArray);
h.setStreamArrayBuffer(this._verticesLowBuffer!, this._verticesLow as TypedArray);
}
/**
@ -2388,22 +2459,30 @@ class Polyline {
*/
protected _createIndexBuffer() {
let h = this._renderNode!.renderer!.handler;
h.gl!.deleteBuffer(this._ordersBuffer as WebGLBuffer);
h.gl!.deleteBuffer(this._indexesBuffer as WebGLBuffer);
h.gl!.deleteBuffer(this._ordersBuffer!);
h.gl!.deleteBuffer(this._indexesBuffer!);
this._orders = makeArrayTyped(this._orders);
this._ordersBuffer = h.createArrayBuffer(this._orders as Uint8Array, 1, this._orders.length / 2);
this._ordersBuffer = h.createArrayBuffer(this._orders as TypedArray, 1, this._orders.length / 2);
this._indexes = makeArrayTyped(this._indexes, Uint32Array);
this._indexesBuffer = h.createElementArrayBuffer(this._indexes as Uint32Array, 1, this._indexes.length);
this._indexesBuffer = h.createElementArrayBuffer(this._indexes as TypedArray, 1, this._indexes.length);
}
protected _createColorsBuffer() {
let h = this._renderNode!.renderer!.handler;
h.gl!.deleteBuffer(this._colorsBuffer as WebGLBuffer);
h.gl!.deleteBuffer(this._colorsBuffer!);
//@todo: change to STREAM teh same as _createVerticesBuffer
this._colors = makeArrayTyped(this._colors);
this._colorsBuffer = h.createArrayBuffer(new Float32Array(this._colors), 4, this._colors.length / 4);
this._colorsBuffer = h.createArrayBuffer(this._colors as TypedArray, 4, this._colors.length / 4);
}
public _createTexCoordBuffer() {
let h = this._renderNode!.renderer!.handler;
h.gl!.deleteBuffer(this._texCoordBuffer!);
this._texCoordArr = makeArrayTyped(this._texCoordArr);
this._texCoordBuffer = h.createArrayBuffer(this._texCoordArr as TypedArray, 4, this._texCoordArr.length / 4);
}
public setVisibleSphere(p: Vec3, r: number) {

12
src/entity/RayHandler.ts
View File

@ -43,7 +43,6 @@ 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;
@ -51,11 +50,11 @@ class RayHandler {
protected _thicknessBuffer: WebGLBufferExt | null;
protected _rgbaBuffer: WebGLBufferExt | null;
protected _pickingColorBuffer: WebGLBufferExt | null;
protected _texCoordBuffer: WebGLBufferExt | null;
protected _texOffsetBuffer: WebGLBufferExt | null;
protected _strokeSizeBuffer: WebGLBufferExt | null;
protected _vertexArr: TypedArray | number[];
protected _texCoordArr: TypedArray;
protected _startPositionHighArr: TypedArray | number[];
protected _startPositionLowArr: TypedArray | number[];
protected _endPositionHighArr: TypedArray | number[];
@ -63,6 +62,7 @@ class RayHandler {
protected _thicknessArr: TypedArray | number[];
protected _rgbaArr: TypedArray | number[];
protected _pickingColorArr: TypedArray | number[];
protected _texCoordArr: TypedArray;
protected _texOffsetArr: TypedArray;
protected _strokeSizeArr: TypedArray;
@ -87,7 +87,6 @@ class RayHandler {
this._rays = [];
this._vertexBuffer = null;
this._texCoordBuffer = null;
this._startPositionHighBuffer = null;
this._startPositionLowBuffer = null;
this._endPositionHighBuffer = null;
@ -95,11 +94,11 @@ class RayHandler {
this._thicknessBuffer = null;
this._rgbaBuffer = null;
this._pickingColorBuffer = null;
this._texCoordBuffer = null;
this._texOffsetBuffer = null;
this._strokeSizeBuffer = null;
this._vertexArr = [];
this._texCoordArr = new Float32Array([]);
this._startPositionHighArr = [];
this._startPositionLowArr = [];
this._endPositionHighArr = [];
@ -107,6 +106,7 @@ class RayHandler {
this._thicknessArr = [];
this._rgbaArr = [];
this._pickingColorArr = [];
this._texCoordArr = new Float32Array([]);
this._texOffsetArr = new Float32Array([]);
this._strokeSizeArr = new Float32Array([]);
@ -175,8 +175,6 @@ class RayHandler {
//@ts-ignore
this._vertexArr = null;
//@ts-ignore
this._texCoordArr = null;
//@ts-ignore
this._startPositionHighArr = null;
//@ts-ignore
this._startPositionLowArr = null;
@ -189,6 +187,8 @@ class RayHandler {
//@ts-ignore
this._rgbaArr = null;
//@ts-ignore
this._texCoordArr = null;
//@ts-ignore
this._texOffsetArr = null;
//@ts-ignore
this._strokeSizeArr = null;