@tolokoban/tgd 2.0.40 → 2.0.42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/dist/controller/camera/orbit.d.ts +5 -3
- package/lib/dist/controller/camera/orbit.d.ts.map +1 -1
- package/lib/dist/controller/camera/orbit.js +25 -23
- package/lib/dist/material/depth.d.ts +2 -1
- package/lib/dist/material/depth.d.ts.map +1 -1
- package/lib/dist/material/depth.js +3 -2
- package/lib/dist/material/diffuse.d.ts.map +1 -1
- package/lib/dist/material/diffuse.js +12 -9
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +2 -1
- package/package.json +1 -1
- package/lib/dist/material/solid.d.ts +0 -22
- package/lib/dist/material/solid.d.ts.map +0 -1
- package/lib/dist/material/solid.js +0 -20
|
@@ -8,11 +8,12 @@ export interface TgdControllerCameraOrbitZoomRequest extends TgdInputPointerModi
|
|
|
8
8
|
y: number;
|
|
9
9
|
}
|
|
10
10
|
export interface TgdControllerCameraOrbitOptions {
|
|
11
|
-
minZoom: number;
|
|
12
|
-
maxZoom: number;
|
|
13
11
|
minDistance: number;
|
|
14
12
|
maxDistance: number;
|
|
15
13
|
speedOrbit: number;
|
|
14
|
+
/**
|
|
15
|
+
* Units of zoom per second.
|
|
16
|
+
*/
|
|
16
17
|
speedZoom: number;
|
|
17
18
|
speedPanning: number;
|
|
18
19
|
/**
|
|
@@ -120,6 +121,7 @@ export declare class TgdControllerCameraOrbit {
|
|
|
120
121
|
private readonly cameraInitialState;
|
|
121
122
|
private readonly geo?;
|
|
122
123
|
private readonly tmpQuat;
|
|
124
|
+
private lastPointerEventTimestamp;
|
|
123
125
|
constructor(context: {
|
|
124
126
|
camera: TgdCamera;
|
|
125
127
|
inputs: TgdInputs;
|
|
@@ -127,7 +129,7 @@ export declare class TgdControllerCameraOrbit {
|
|
|
127
129
|
animSchedule(...animations: TgdAnimation[]): TgdAnimation[];
|
|
128
130
|
animCancel(animation: TgdAnimation): void;
|
|
129
131
|
paint(): void;
|
|
130
|
-
}, { geo,
|
|
132
|
+
}, { geo, minDistance, maxDistance, speedZoom, speedOrbit, speedPanning, inertiaZoom, inertiaOrbit, inertiaPanning, fixedTarget, debug, onZoomRequest, }?: Partial<TgdControllerCameraOrbitOptions>);
|
|
131
133
|
get enabled(): boolean;
|
|
132
134
|
set enabled(value: boolean);
|
|
133
135
|
reset(animDuration: number, easingFunction?: (x: number) => number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbit.d.ts","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAMnD,OAAO,EAEH,2BAA2B,EAE9B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,SAAS,EAAkB,MAAM,aAAa,CAAA;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,MAAM,WAAW,mCACb,SAAQ,2BAA2B;IACnC,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,+BAA+B;IAC5C,
|
|
1
|
+
{"version":3,"file":"orbit.d.ts","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { tgdCalcClamp } from "./../../utils/math.js";
|
|
|
3
3
|
import { TgdEvent } from "./../../event/index.js";
|
|
4
4
|
import { TgdMat3, TgdQuat, TgdVec3 } from "./../../math/index.js";
|
|
5
5
|
export class TgdControllerCameraOrbit {
|
|
6
|
-
constructor(context, { geo,
|
|
6
|
+
constructor(context, { geo, minDistance = 0, maxDistance = Infinity, speedZoom = 1, speedOrbit = 1, speedPanning = 1, inertiaZoom = 0, inertiaOrbit = 0, inertiaPanning = 0, fixedTarget = false, debug = false, onZoomRequest = alwaysTrue, } = {}) {
|
|
7
7
|
this.context = context;
|
|
8
8
|
this.id = `TgdControllerCameraOrbit-${TgdControllerCameraOrbit.counter++}`;
|
|
9
9
|
this.eventChange = new TgdEvent();
|
|
@@ -33,7 +33,9 @@ export class TgdControllerCameraOrbit {
|
|
|
33
33
|
*/
|
|
34
34
|
this.disabledUntil = 0;
|
|
35
35
|
this.tmpQuat = new TgdQuat();
|
|
36
|
+
this.lastPointerEventTimestamp = 0;
|
|
36
37
|
this.handleMove = (event) => {
|
|
38
|
+
this.lastPointerEventTimestamp = event.current.t;
|
|
37
39
|
if (!this.enabled || this.animOrbit)
|
|
38
40
|
return;
|
|
39
41
|
this.actualMove(event);
|
|
@@ -104,31 +106,33 @@ export class TgdControllerCameraOrbit {
|
|
|
104
106
|
}
|
|
105
107
|
};
|
|
106
108
|
this.handleZoom = (event) => {
|
|
107
|
-
if (
|
|
108
|
-
this.
|
|
109
|
-
|
|
109
|
+
if (this.lastPointerEventTimestamp > 0 &&
|
|
110
|
+
this.enabled &&
|
|
111
|
+
this.speedZoom > 0 &&
|
|
112
|
+
this.onZoomRequest({
|
|
110
113
|
altKey: event.altKey,
|
|
111
114
|
ctrlKey: event.ctrlKey,
|
|
112
115
|
metaKey: event.metaKey,
|
|
113
116
|
shiftKey: event.shiftKey,
|
|
114
117
|
x: event.current.x,
|
|
115
118
|
y: event.current.y,
|
|
116
|
-
}))
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
119
|
+
})) {
|
|
120
|
+
const { context } = this;
|
|
121
|
+
const { camera } = context;
|
|
122
|
+
// Msec since last mouse event
|
|
123
|
+
const time = 16e-3; // We assume 60 FPS
|
|
124
|
+
let speed = this.speedZoom * time;
|
|
125
|
+
if (this.context.inputs.keyboard.isDown("Shift"))
|
|
126
|
+
speed *= 0.1;
|
|
127
|
+
else if (this.context.inputs.keyboard.isDown("Control"))
|
|
128
|
+
speed *= 10;
|
|
129
|
+
const deltaDistance = -event.direction * speed;
|
|
130
|
+
console.log("🚀 [orbit] speed, event.direction =", speed, event.direction); // @FIXME: Remove this line written on 2025-10-15 at 11:50
|
|
131
|
+
camera.transfo.distance = tgdCalcClamp(camera.transfo.distance + deltaDistance, this.minDistance, this.maxDistance);
|
|
132
|
+
event.preventDefault();
|
|
133
|
+
this.fireZoomChange();
|
|
134
|
+
}
|
|
135
|
+
this.lastPointerEventTimestamp = event.current.t;
|
|
132
136
|
};
|
|
133
137
|
this.geo = undefined;
|
|
134
138
|
if (geo) {
|
|
@@ -147,8 +151,6 @@ export class TgdControllerCameraOrbit {
|
|
|
147
151
|
this.inertiaZoom = inertiaZoom;
|
|
148
152
|
this.inertiaPanning = inertiaPanning;
|
|
149
153
|
this.fixedTarget = fixedTarget;
|
|
150
|
-
this.minZoom = minZoom;
|
|
151
|
-
this.maxZoom = maxZoom;
|
|
152
154
|
this.minDistance = minDistance;
|
|
153
155
|
this.maxDistance = maxDistance;
|
|
154
156
|
this.onZoomRequest = onZoomRequest;
|
|
@@ -280,4 +282,4 @@ function makeGeoVec3(lat, lng) {
|
|
|
280
282
|
const x = radius * Math.sin(lng);
|
|
281
283
|
return new TgdVec3(x, y, z);
|
|
282
284
|
}
|
|
283
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orbit.js","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"AACA,OAAO,EACH,kCAAkC,EAClC,wBAAwB,GAC3B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAM9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAkFrD,MAAM,OAAO,wBAAwB;IA0EjC,YACqB,OAOhB,EACD,EACI,GAAG,EACH,OAAO,GAAG,IAAI,EACd,OAAO,GAAG,QAAQ,EAClB,WAAW,GAAG,CAAC,EACf,WAAW,GAAG,QAAQ,EACtB,SAAS,GAAG,CAAC,EACb,UAAU,GAAG,CAAC,EACd,YAAY,GAAG,CAAC,EAChB,WAAW,GAAG,CAAC,EACf,YAAY,GAAG,CAAC,EAChB,cAAc,GAAG,CAAC,EAClB,WAAW,GAAG,KAAK,EACnB,KAAK,GAAG,KAAK,EACb,aAAa,GAAG,UAAU,MACgB,EAAE;QAvB/B,YAAO,GAAP,OAAO,CAOvB;QA/EW,OAAE,GAAG,4BAA4B,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAA;QAErE,gBAAW,GAAG,IAAI,QAAQ,EAAa,CAAA;QAEhD,YAAO,GAAG,IAAI,CAAA;QAEd,YAAO,GAAG,QAAQ,CAAA;QAElB,gBAAW,GAAG,CAAC,CAAA;QAEf,gBAAW,GAAG,QAAQ,CAAA;QAEtB,cAAS,GAAG,CAAC,CAAA;QAEb,eAAU,GAAG,CAAC,CAAA;QAEd,iBAAY,GAAG,CAAC,CAAA;QAEhB,gBAAW,GAAG,CAAC,CAAA;QAEf,iBAAY,GAAG,CAAC,CAAA;QAEhB,mBAAc,GAAG,CAAC,CAAA;QAEzB;;;WAGG;QACI,gBAAW,GAAG,KAAK,CAAA;QAiB1B;;WAEG;QACI,aAAQ,GAAG,IAAI,CAAA;QAEd,cAAS,GAAwB,IAAI,CAAA;QAE7C;;;WAGG;QACK,kBAAa,GAAG,CAAC,CAAA;QAaR,YAAO,GAAG,IAAI,OAAO,EAAE,CAAA;QAuGvB,eAAU,GAAG,CAAC,KAA+B,EAAE,EAAE;YAC9D,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS;gBAAE,OAAM;YAE3C,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC,CAAA;QAEgB,eAAU,GAAG,CAAC,KAA+B,EAAE,EAAE;YAC9D,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC7C,IAAI,EAAE,IAAI,CAAC;gBAAE,OAAM;YAEnB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;YACnC,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,KAAK,CAAC;gBAChD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAEhC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;oBACjC,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBAClD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;oBACjC,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBAClD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAA;gBACnC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAA;gBACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACvB,OAAM;YACV,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;YAEhE,IAAI,CAAC,KAAK,CACN,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAClC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAClC,KAAK,CAAC,QAAQ,CACjB,CAAA;QACL,CAAC,CAAA;QAwCgB,oBAAe,GAAG,GAAG,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAM;YAEzB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACnC,IAAI,SAAS,EAAE,CAAC;gBACZ,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YACzB,CAAC;QACL,CAAC,CAAA;QAEgB,kBAAa,GAAG,CAAC,KAA+B,EAAE,EAAE;YACjE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAM;YAEzB,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;YACtC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACnB,MAAM,gBAAgB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACjE,MAAM,MAAM,GACR,gBAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAC3D,MAAM,MAAM,GACR,gBAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAC3D,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;gBAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBACnC,IAAI,CAAC,SAAS,GAAG;oBACb,QAAQ,EAAE,YAAY,GAAG,IAAI;oBAC7B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;wBACd,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;wBAChD,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;wBAChD,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;wBAChD,YAAY,CAAC,QAAQ,CAAC,YAAY;4BAC9B,YAAY,CAAC,OAAO,CAAC,YAAY,CAAA;wBACrC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;wBACnC,MAAM,SAAS,GACX,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;wBACpD,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAA;wBAC1B,MAAM,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAA;wBACnC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,MAAM,GAAG,MAAM,CAAA;wBACzC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,MAAM,GAAG,MAAM,CAAA;wBACzC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;oBACjC,CAAC;oBACD,cAAc,EAAE,wBAAwB;iBAC3C,CAAA;gBACD,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxC,CAAC;QACL,CAAC,CAAA;QA6CgB,eAAU,GAAG,CAAC,KAA+B,EAAE,EAAE;YAC9D,IACI,CAAC,IAAI,CAAC,OAAO;gBACb,IAAI,CAAC,SAAS,KAAK,CAAC;gBACpB,CAAC,IAAI,CAAC,aAAa,CAAC;oBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;oBAClB,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBACrB,CAAC;gBAEF,OAAM;YAEV,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACxB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;YAC1B,IAAI,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAA;YAChC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,KAAK,IAAI,GAAG,CAAA;YAC9D,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;YACnC,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAClC,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,EAAE,EAC5B,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,WAAW,CACnB,CAAA;YACD,8BAA8B;YAC9B,8BAA8B;YAC9B,oBAAoB;YACpB,mBAAmB;YACnB,IAAI;YACJ,KAAK,CAAC,cAAc,EAAE,CAAA;YACtB,IAAI,CAAC,cAAc,EAAE,CAAA;QACzB,CAAC,CAAA;QA/QG,IAAI,CAAC,GAAG,GAAG,SAAS,CAAA;QACpB,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,GAAG,mBACJ,GAAG,EAAE,CAAC,EACN,GAAG,EAAE,CAAC,EACN,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EACpB,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EACpB,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,EACzB,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,IACtB,GAAG,CACT,CAAA;QACL,CAAC;QACD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAA;QAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAC1B,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QAC/D,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC3D,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACrD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,IAAI,CAAC,GAAG;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACvD,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5C,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;gBACxD,IAAI,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;gBAC7C,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAA;IAClE,CAAC;IAED,IAAI,OAAO,CAAC,KAAc;QACtB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;IACzB,CAAC;IAED,KAAK,CAAC,YAAoB,EAAE,cAAsC;QAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QACxB,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;QACrC,OAAO,CAAC,YAAY,CAAC;YACjB,MAAM,EAAE,kCAAkC,CACtC,OAAO,CAAC,MAAM,EACd,IAAI,CAAC,kBAAkB,CAC1B;YACD,QAAQ,EAAE,YAAY;YACtB,cAAc;SACjB,CAAC,CAAA;IACN,CAAC;IAED,kBAAkB,CAAC,WAAmB;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CACzB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,WAAW,CAClC,CAAA;IACL,CAAC;IAED,MAAM;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAC/B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACxD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC5D,CAAC;IAwCO,KAAK,CAAC,MAAc,EAAE,MAAc,EAAE,QAAiB;QAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QACxB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAC1B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;QACnC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;QACxD,MAAM,EAAE,GAAG,MAAM,GAAG,KAAK,CAAA;QACzB,MAAM,EAAE,GAAG,MAAM,GAAG,KAAK,CAAA;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QAC1D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAA;QAC3D,IAAI,CAAC,eAAe,EAAE,CAAA;IAC1B,CAAC;IAED;;;;OAIG;IACI,QAAQ,CAAC,GAAW,EAAE,GAAW;QACpC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,GAAG;YAAE,OAAM;QAEhB,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC/C,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;QACb,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC/C,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAA;QAC/C,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAClC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;QAChD,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,GAAG,GAAG,IAAI,OAAO,EAAE,CAAA;QACzB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAC3C,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACnB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAA;QACtD,IAAI,CAAC,eAAe,EAAE,CAAA;IAC1B,CAAC;IA+CO,SAAS,CAAC,KAA+B;QAC7C,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QACnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAC1B,MAAM,WAAW,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAA;QACnC,MAAM,QAAQ,GAAG,GAAG,GAAG,YAAY,GAAG,WAAW,CAAA;QACjD,MAAM,EAAE,GACJ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpC,QAAQ;YACR,MAAM,CAAC,kBAAkB,CAAA;QAC7B,MAAM,EAAE,GACJ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpC,QAAQ;YACR,MAAM,CAAC,mBAAmB,CAAA;QAC9B,IAAI,WAAW,EAAE,CAAC;YACd,gCAAgC;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAA;IAC1B,CAAC;IAEO,mBAAmB,CAAC,KAA+B;QACvD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAC/B,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC3B,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;YAAE,OAAM;QAE7C,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;QAC1B,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;YAAE,OAAM;QAE7C,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;QAC3B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAA;QAC9C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAChC,IAAI,CAAC,eAAe,EAAE,CAAA;IAC1B,CAAC;IAEO,eAAe;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClD,CAAC;IAoCO,cAAc;QAClB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClD,CAAC;;AAvXc,gCAAO,GAAG,CAAC,AAAJ,CAAI;AA0X9B;;GAEG;AACH,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AAE7B,SAAS,WAAW,CAAC,GAAW,EAAE,GAAW;IACzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACvB,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAC/B,CAAC"}
|
|
285
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orbit.js","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { TgdMaterial } from "./material";
|
|
2
2
|
/**
|
|
3
3
|
* This material is to be used along with `TgdPainterBackgroundWithDepth`.
|
|
4
|
-
* It will only convert the distance to the camera (float between 0.0 and 1.0)
|
|
4
|
+
* It will only convert the distance to the camera (float between 0.0 and 1.0)
|
|
5
|
+
* into the color channels R, G and B.
|
|
5
6
|
* @see TgdPainterBackgroundWithDepth
|
|
6
7
|
*/
|
|
7
8
|
export declare class TgdMaterialDepth extends TgdMaterial {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depth.d.ts","sourceRoot":"","sources":["../../src/material/depth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC
|
|
1
|
+
{"version":3,"file":"depth.d.ts","sourceRoot":"","sources":["../../src/material/depth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;;CAchD"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { TgdMaterial } from "./material.js";
|
|
2
2
|
/**
|
|
3
3
|
* This material is to be used along with `TgdPainterBackgroundWithDepth`.
|
|
4
|
-
* It will only convert the distance to the camera (float between 0.0 and 1.0)
|
|
4
|
+
* It will only convert the distance to the camera (float between 0.0 and 1.0)
|
|
5
|
+
* into the color channels R, G and B.
|
|
5
6
|
* @see TgdPainterBackgroundWithDepth
|
|
6
7
|
*/
|
|
7
8
|
export class TgdMaterialDepth extends TgdMaterial {
|
|
@@ -19,4 +20,4 @@ export class TgdMaterialDepth extends TgdMaterial {
|
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwdGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0ZXJpYWwvZGVwdGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV4Qzs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxXQUFXO0lBQzdDO1FBQ0ksS0FBSyxDQUFDO1lBQ0Ysa0JBQWtCLEVBQUU7Z0JBQ2hCLGdEQUFnRDtnQkFDaEQsb0NBQW9DO2dCQUNwQyxVQUFVO2dCQUNWLG9DQUFvQztnQkFDcEMsVUFBVTtnQkFDVixvQ0FBb0M7Z0JBQ3BDLDBCQUEwQjthQUM3QjtTQUNKLENBQUMsQ0FBQTtJQUNOLENBQUM7Q0FDSiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAW,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC5C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC5B,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IACxC,KAAK,WAAiB;IACtB,OAAO,WAAuD;IAC9D,gBAAgB,SAAK;IACrB,iBAAiB,SAAI;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;gBAEjC,OAAO,GAAE,yBAA8B;
|
|
1
|
+
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAW,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC5C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC5B,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IACxC,KAAK,WAAiB;IACtB,OAAO,WAAuD;IAC9D,gBAAgB,SAAK;IACrB,iBAAiB,SAAI;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;gBAEjC,OAAO,GAAE,yBAA8B;CAoFtD"}
|
|
@@ -35,17 +35,20 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
35
35
|
`);`,
|
|
36
36
|
`return color;`,
|
|
37
37
|
];
|
|
38
|
-
const vertexShaderCode = [
|
|
39
|
-
"varNormal = mat3(uniTransfoMatrix) * NORMAL;",
|
|
40
|
-
];
|
|
41
38
|
const varyings = {
|
|
42
39
|
varNormal: "vec3",
|
|
43
40
|
};
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
41
|
+
const vertexShaderCode = () => {
|
|
42
|
+
const code = [
|
|
43
|
+
`varNormal = mat3(uniTransfoMatrix) * ${this.attNormal};`,
|
|
44
|
+
];
|
|
45
|
+
if (hasTexture) {
|
|
46
|
+
code.push(`varUV = ${this.attUV};`);
|
|
47
|
+
varyings.varUV = "vec2";
|
|
48
|
+
uniforms.texDiffuse = "sampler2D";
|
|
49
|
+
}
|
|
50
|
+
return code;
|
|
51
|
+
};
|
|
49
52
|
super({
|
|
50
53
|
uniforms,
|
|
51
54
|
varyings,
|
|
@@ -87,4 +90,4 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
87
90
|
}
|
|
88
91
|
}
|
|
89
92
|
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlmZnVzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9kaWZmdXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBVzNDLE1BQU0sYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRW5ELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxXQUFXO0lBVS9DLFlBQVksVUFBcUMsRUFBRTs7UUFDL0MsTUFBTSxLQUFLLEdBQ1AsT0FBTyxDQUFDLEtBQUssWUFBWSxZQUFZO1lBQ2pDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSztZQUNmLENBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxLQUFLLG1DQUFJLGFBQWEsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLFlBQVksT0FBTyxDQUFDLENBQUE7UUFDOUMsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFdBQVcsRUFBRSxNQUFNO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLG1CQUFtQixFQUFFLE9BQU87WUFDNUIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixrQkFBa0IsRUFBRSxNQUFNO1NBQzdCLENBQUE7UUFDRCxNQUFNLGtCQUFrQixHQUFnQjtZQUNwQyxxQ0FBcUM7WUFDckMsK0NBQStDO1lBQy9DLFVBQVU7Z0JBQ04sQ0FBQyxDQUFDLDBDQUEwQztnQkFDNUMsQ0FBQyxDQUFDLHFCQUFx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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAA;AAIvE,MAAM,MAAM,yBAAyB,GAAG;IACpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;CACzB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAgB1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB;IAlBE,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAI;IACrB,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB,EACD,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG;QAC1C,WAAW,EAAE,MAAM,eAAe,CAAA;KACrC;
|
|
1
|
+
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAA;AAIvE,MAAM,MAAM,yBAAyB,GAAG;IACpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;CACzB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAgB1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB;IAlBE,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAI;IACrB,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB,EACD,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG;QAC1C,WAAW,EAAE,MAAM,eAAe,CAAA;KACrC;IA6HL,MAAM,IAAI,IAAI;IAMd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAyB3C;AAED,KAAK,eAAe,GAAG,UAAU,CAAA;AAEjC,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAE7C,IAAI,KAAK,WAER;IAED;;;;;;;OAOG;IACH,GAAG,CACC,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,YAAY,EACnB,GAAG,GAAE,YAAqB,EAC1B,GAAG,GAAE,YAAqB,EAC1B,0BAA0B,SAAI,EAC9B,0BAA0B,SAAI;IAWlC,QAAQ,CAAC,WAAW,QAAO,eAAe,CAqBzC;CACJ"}
|
|
@@ -44,6 +44,7 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
44
44
|
this.material = material;
|
|
45
45
|
material.attPosition = geometry.attPosition;
|
|
46
46
|
material.attNormal = geometry.attNormal;
|
|
47
|
+
material.attUV = "((attUV0 + attUV1) * .5)";
|
|
47
48
|
this.minRadius = minRadius;
|
|
48
49
|
if (roundness > 127) {
|
|
49
50
|
throw new Error("[TgdPainterSegments] Max roundness is 127!");
|
|
@@ -218,4 +219,4 @@ export class TgdPainterSegmentsData {
|
|
|
218
219
|
this._count++;
|
|
219
220
|
}
|
|
220
221
|
}
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { ArrayNumber4, WebglAttributeType, WebglUniformType } from "../types";
|
|
2
|
-
import { TgdVec4 } from "../math";
|
|
3
|
-
import { TgdMaterial } from "./material";
|
|
4
|
-
import { TgdCodeBloc } from "../shader/code";
|
|
5
|
-
import { TgdProgram } from "../program";
|
|
6
|
-
export type TgdMaterialSolidOptions = Partial<{
|
|
7
|
-
color: ArrayNumber4 | TgdVec4;
|
|
8
|
-
}>;
|
|
9
|
-
export declare class TgdMaterialSolid extends TgdMaterial {
|
|
10
|
-
color: TgdVec4;
|
|
11
|
-
readonly varyings: {
|
|
12
|
-
[name: string]: WebglAttributeType;
|
|
13
|
-
};
|
|
14
|
-
readonly uniforms: {
|
|
15
|
-
[name: string]: WebglUniformType;
|
|
16
|
-
};
|
|
17
|
-
readonly fragmentShaderCode: TgdCodeBloc;
|
|
18
|
-
readonly vertexShaderCode: TgdCodeBloc;
|
|
19
|
-
constructor(options?: TgdMaterialSolidOptions);
|
|
20
|
-
setUniforms(program: TgdProgram): void;
|
|
21
|
-
}
|
|
22
|
-
//# sourceMappingURL=solid.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"solid.d.ts","sourceRoot":"","sources":["../../src/material/solid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC;IAC1C,KAAK,EAAE,YAAY,GAAG,OAAO,CAAA;CAChC,CAAC,CAAA;AAIF,qBAAa,gBAAiB,SAAQ,WAAW;IACtC,KAAK,EAAE,OAAO,CAAA;IAErB,SAAgB,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAA;IAChE,SAAgB,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAE7D;IACD,SAAgB,kBAAkB,EAAE,WAAW,CAAA;IAC/C,SAAgB,gBAAgB,EAAE,WAAW,CAAA;gBAEjC,OAAO,GAAE,uBAA4B;IAQjD,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;CAGzC"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { TgdVec4 } from "./../math/index.js";
|
|
2
|
-
import { TgdMaterial } from "./material.js";
|
|
3
|
-
const DEFAULT_COLOR = [0.111, 0.333, 0.999, 1];
|
|
4
|
-
export class TgdMaterialSolid extends TgdMaterial {
|
|
5
|
-
constructor(options = {}) {
|
|
6
|
-
var _a;
|
|
7
|
-
super();
|
|
8
|
-
this.uniforms = {
|
|
9
|
-
uniColor: "vec4",
|
|
10
|
-
};
|
|
11
|
-
this.color = new TgdVec4((_a = options.color) !== null && _a !== void 0 ? _a : DEFAULT_COLOR);
|
|
12
|
-
this.fragmentShaderCode = [`return uniColor;`];
|
|
13
|
-
this.vertexShaderCode = [];
|
|
14
|
-
this.varyings = {};
|
|
15
|
-
}
|
|
16
|
-
setUniforms(program) {
|
|
17
|
-
program.uniform4fv("uniColor", this.color);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29saWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0ZXJpYWwvc29saWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUNuQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBUXhDLE1BQU0sYUFBYSxHQUFpQixDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRTVELE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxXQUFXO0lBVTdDLFlBQVksVUFBbUMsRUFBRTs7UUFDN0MsS0FBSyxFQUFFLENBQUE7UUFQSyxhQUFRLEdBQXlDO1lBQzdELFFBQVEsRUFBRSxNQUFNO1NBQ25CLENBQUE7UUFNRyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLE1BQUEsT0FBTyxDQUFDLEtBQUssbUNBQUksYUFBYSxDQUFDLENBQUE7UUFDeEQsSUFBSSxDQUFDLGtCQUFrQixHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQTtRQUM5QyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsRUFBRSxDQUFBO1FBQzFCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFBO0lBQ3RCLENBQUM7SUFFRCxXQUFXLENBQUMsT0FBbUI7UUFDM0IsT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlDLENBQUM7Q0FDSiJ9
|