diff --git a/src/renderer/src/renderer/collections.ts b/src/renderer/src/renderer/collections.ts index 6ce8e74c..f89b649b 100644 --- a/src/renderer/src/renderer/collections.ts +++ b/src/renderer/src/renderer/collections.ts @@ -4,7 +4,6 @@ import * as Symbols from './symbols' import { glFloatSize } from './constants' import { FeatureTypeIdentifier, Binary } from './types' import { MacroRenderer, StepAndRepeatRenderer } from './layer' -import onChange from 'on-change' import PadFrag from '../shaders/src/Pad.frag' import PadVert from '../shaders/src/Pad.vert' @@ -1001,10 +1000,10 @@ export class SymbolShaderCollection { return this } const symbols = Array.from(this.symbols.values()).map((symbol, i) => { - // symbol.sym_num = i - onChange.target(symbol).sym_num.value = i + symbol.sym_num.value = i return this.getSymbolParameters(symbol) }) + // TODO: make symbols texture fit to max texture size this.texture({ width: SYMBOL_PARAMETERS.length, height: symbols.length, @@ -1012,7 +1011,6 @@ export class SymbolShaderCollection { format: 'luminance', data: symbols }) - // console.log('refreshing symbols', this.symbols.size) return this } } diff --git a/src/renderer/src/renderer/layer.ts b/src/renderer/src/renderer/layer.ts index fd627de8..38becaf4 100644 --- a/src/renderer/src/renderer/layer.ts +++ b/src/renderer/src/renderer/layer.ts @@ -2,7 +2,6 @@ import REGL from 'regl' import { vec2, vec3, mat3 } from 'gl-matrix' import * as Shapes from './shapes' import * as Symbols from './symbols' -// import onChange from 'on-change' import { Binary, Transform, Units, BoundingBox } from './types' import { ArcAttachments, diff --git a/src/renderer/src/shaders/src/Arc.vert b/src/renderer/src/shaders/src/Arc.vert index ab3c2f47..7c22c5bb 100644 --- a/src/renderer/src/shaders/src/Arc.vert +++ b/src/renderer/src/shaders/src/Arc.vert @@ -75,9 +75,9 @@ void main() { float Aspect = u_Resolution.y / u_Resolution.x; - float t_Outer_Dia = pullSymbolParameter(u_Parameters.outer_dia, int(v_SymNum)); - float t_Width = pullSymbolParameter(u_Parameters.width, int(v_SymNum)); - float t_Height = pullSymbolParameter(u_Parameters.height, int(v_SymNum)); + float t_Outer_Dia = pullSymbolParameter(u_Parameters.outer_dia, int(a_SymNum)); + float t_Width = pullSymbolParameter(u_Parameters.width, int(a_SymNum)); + float t_Height = pullSymbolParameter(u_Parameters.height, int(a_SymNum)); float OD = max(t_Outer_Dia, max(t_Width, t_Height)); vec2 ShapeSize = vec2(OD, OD) + vec2(pixel_size, pixel_size);