@tolokoban/tgd 2.0.94 → 2.0.95
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/painter/mesh/mesh/mesh.d.ts.map +1 -1
- package/lib/dist/painter/mesh/mesh/mesh.js +2 -2
- package/lib/dist/painter/segments/capsule.d.ts +1 -1
- package/lib/dist/painter/segments/capsule.d.ts.map +1 -1
- package/lib/dist/painter/segments/capsule.js +58 -52
- package/lib/dist/painter/segments/segments-morphing.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments-morphing.js +25 -22
- package/lib/dist/painter/segments/segments.d.ts +1 -0
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +29 -23
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mesh.d.ts","sourceRoot":"","sources":["../../../../src/painter/mesh/mesh/mesh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAKvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,WAAW,qBAAqB;
|
|
1
|
+
{"version":3,"file":"mesh.d.ts","sourceRoot":"","sources":["../../../../src/painter/mesh/mesh/mesh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAKvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,WAAW,qBAAqB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAA;IACjD,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;GACG;AACH,qBAAa,cACT,SAAQ,UACR,YAAW,yBAAyB;IAmBhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;QACjB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;KACrB;IAtBL;;OAEG;IACH,SAAgB,KAAK,WAAiB;IACtC,SAAgB,OAAO,aAAmB;IAC1C,SAAgB,QAAQ,EAAE,WAAW,CAAA;IAErC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;IACrC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,OAAO,CAAuB;gBAGf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;QACjB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;KACrB,EACD,OAAO,GAAE,qBAA0B;IAqFvC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM;IAKtB,kBAAkB,IAAI;QAClB,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;QACtB,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;KACzB;IA4BD,SAAgB,KAAK,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,UA0BnD;IAED,MAAM,IAAI,IAAI;CAIjB"}
|
|
@@ -24,7 +24,7 @@ export class TgdPainterMesh extends TgdPainter {
|
|
|
24
24
|
this.bboxMax = null;
|
|
25
25
|
this.paint = (time, delay) => {
|
|
26
26
|
var _a;
|
|
27
|
-
const { context, program, geometry, material, drawMode, count, transfo } = this;
|
|
27
|
+
const { context, program, geometry, material, drawMode, count, transfo, } = this;
|
|
28
28
|
const { gl, camera } = context;
|
|
29
29
|
this.logic.exec(time, delay);
|
|
30
30
|
program.use();
|
|
@@ -138,4 +138,4 @@ export class TgdPainterMesh extends TgdPainter {
|
|
|
138
138
|
this.program.delete();
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wYWludGVyL21lc2gvbWVzaC9tZXNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDdkMsT0FBTyxFQUFvQixjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFFaEUsT0FBTyxFQUFvQixrQkFBa0IsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUNwRSxPQUFPLEVBQUUsVUFBVSxFQUEwQixPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUN4RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUV6QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBUzFDO0dBQ0c7QUFDSCxNQUFNLE9BQU8sY0FDVCxTQUFRLFVBQVU7SUFtQmxCLFlBQ3VCLE9BS2xCLEVBQ0QsVUFBaUMsRUFBRTs7UUFFbkMsS0FBSyxFQUFFLENBQUE7UUFSWSxZQUFPLEdBQVAsT0FBTyxDQUt6QjtRQXRCTDs7V0FFRztRQUNhLFVBQUssR0FBRyxJQUFJLFFBQVEsRUFBRSxDQUFBO1FBQ3RCLFlBQU8sR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFBO1FBUXpCLGFBQVEsR0FBVyxDQUFDLENBQUE7UUFDN0IsWUFBTyxHQUFtQixJQUFJLENBQUE7UUFDOUIsWUFBTyxHQUFtQixJQUFJLENBQUE7UUFrSXRCLFVBQUssR0FBRyxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsRUFBRTs7WUFDcEQsTUFBTSxFQUNGLE9BQU8sRUFDUCxPQUFPLEVBQ1AsUUFBUSxFQUNSLFFBQVEsRUFDUixRQUFRLEVBQ1IsS0FBSyxFQUNMLE9BQU8sR0FDVixHQUFHLElBQUksQ0FBQTtZQUNSLE1BQU0sRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFBO1lBQzlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQTtZQUM1QixPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7WUFDYixNQUFBLFFBQVEsQ0FBQyxXQUFXLHlEQUFHLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtZQUN6RCxPQUFPLENBQUMsZ0JBQWdCLENBQUMsa0JBQWtCLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQzVELE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUMsZUFBZSxDQUFDLENBQUE7WUFDdEUsT0FBTyxDQUFDLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO1lBQ3hFLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUU7Z0JBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUE7Z0JBQ2YsSUFBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQ3BCLEVBQUUsQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQyxDQUFBO2dCQUMxRCxDQUFDO3FCQUFNLENBQUM7b0JBQ0osRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFBO2dCQUNyQyxDQUFDO2dCQUNELElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUE7WUFDckIsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUE7UUFoSkcsTUFBTSxFQUNGLE9BQU8sRUFDUCxRQUFRLEdBQUcsSUFBSSxrQkFBa0IsRUFBRSxFQUNuQyxRQUFRLEdBQUcsSUFBSSxjQUFjLEVBQUUsR0FDbEMsR0FBRyxPQUFPLENBQUE7UUFDWCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ3RDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFBO1FBQ3hCLElBQUksQ0FBQyxRQUFRO1lBQ1QsT0FBTyxRQUFRLENBQUMsUUFBUSxLQUFLLFFBQVE7Z0JBQ2pDLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUTtnQkFDbkIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZDLFFBQVEsQ0FBQyxXQUFXLEdBQUcsUUFBUSxDQUFDLFdBQVcsQ0FBQTtRQUMzQyxRQUFRLENBQUMsU0FBUyxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUE7UUFDdkMsUUFBUSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFBO1FBQy9CLE1BQU0sSUFBSSxHQUFHLElBQUksZUFBZSxDQUFDO1lBQzdCLFFBQVEsa0JBQ0osZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixrQkFBa0IsRUFBRSxNQUFNLEVBQzFCLG1CQUFtQixFQUFFLE1BQU0sSUFDeEIsUUFBUSxDQUFDLFFBQVEsQ0FDdkI7WUFDRCxVQUFVLEVBQUU7Z0JBQ1IsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEVBQUUsTUFBTTtnQkFDOUIsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLEVBQUUsTUFBTTtnQkFDNUIsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsTUFBTTthQUMzQjtZQUNELE9BQU8sRUFBRSxRQUFRLENBQUMsUUFBUTtZQUMxQixTQUFTLGtDQUNGLFFBQVEsQ0FBQywwQkFBMEIsS0FDdEMsV0FBVyxFQUFFO29CQUNULDhCQUE4QjtvQkFDOUIsQ0FBQyxNQUFBLFFBQVEsQ0FBQyw4QkFBOEIsbUNBQUksYUFBYSxDQUFDO29CQUMxRCxHQUFHO2lCQUNOLEVBQ0QsYUFBYSxFQUFFO29CQUNYLDJEQUEyRDtvQkFDM0QsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUM7b0JBQzNCLEdBQUc7aUJBQ04sR0FDSjtZQUNELFFBQVEsRUFBRTtnQkFDTiwrQkFBK0IsUUFBUSxDQUFDLFdBQVcsSUFBSTtnQkFDdkQsdUZBQXVGO2dCQUN2RiwrQkFBK0IsUUFBUSxDQUFDLFNBQVMsU0FBUyxRQUFRLENBQUMsS0FBSyxPQUFPO2FBQ2xGO1NBQ0osQ0FBQyxDQUFBO1FBQ0YsTUFBTSxJQUFJLEdBQUcsSUFBSSxpQkFBaUIsQ0FBQztZQUMvQixNQUFNLEVBQUUsUUFBUSxDQUFDLG9CQUFvQjtZQUNyQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFFBQVE7WUFDM0IsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRTtZQUM5QixPQUFPLEVBQUUsUUFBUSxDQUFDLFFBQVE7WUFDMUIsU0FBUyxrQ0FDRixRQUFRLENBQUMsNEJBQTRCLEtBQ3hDLGFBQWEsRUFBRTtvQkFDWCx3QkFBd0I7b0JBQ3hCLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDO29CQUM3QixHQUFHO2lCQUNOLEdBQ0o7WUFDRCxRQUFRLEVBQUUsQ0FBQyw4QkFBOEIsQ0FBQztTQUM3QyxDQUFDLENBQUE7UUFDRixJQUFJLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNqQixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDWixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDaEIsQ0FBQztRQUNELE1BQU0sR0FBRyxHQUFHLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUU7WUFDbkMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ2YsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO1NBQ2xCLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFBO1FBQ2xCLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxjQUFjLENBQ3pCLE9BQU8sQ0FBQyxFQUFFLEVBQ1YsR0FBRyxFQUNILENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUNsQixRQUFRLENBQUMsUUFBUSxDQUNwQixDQUFBO1FBQ0QsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFBO1FBQ3pDLElBQUksQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQTtRQUMzQixJQUFJLENBQUMsSUFBSSxHQUFHLE1BQUEsT0FBTyxDQUFDLElBQUksbUNBQUksUUFBUSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDbkQsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFnQjtRQUNsQixJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxPQUFPLGFBQVAsT0FBTyxjQUFQLE9BQU8sR0FBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDeEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxhQUFQLE9BQU8sY0FBUCxPQUFPLEdBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzdDLENBQUM7SUFFRCxrQkFBa0I7UUFJZCxJQUFJLElBQUksQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQy9CLE9BQU87Z0JBQ0gsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPO2dCQUNqQixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDcEIsQ0FBQTtRQUNMLENBQUM7UUFFRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUNqQyxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDeEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDNUIsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztZQUNqRCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFBO1lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUE7WUFDdkIsTUFBTSxDQUFDLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUN2QixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUMxQixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUMxQixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUMxQixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUMxQixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUMxQixHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBQ0QsSUFBSSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUE7UUFDbEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUE7UUFDbEIsT0FBTyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQTtJQUN2QixDQUFDO0lBOEJELE1BQU07UUFDRixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBQ2pCLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDekIsQ0FBQztDQUNKIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TgdGeometry } from "../../geometry";
|
|
2
2
|
/**
|
|
3
|
-
* The capsule is a 3D shape
|
|
3
|
+
* The capsule is a 3D shape made of a cylinder
|
|
4
4
|
* and two hemispheres, all of radius 1.
|
|
5
5
|
* The roundness gives use the number of faces around the cylinder.
|
|
6
6
|
* Every vertex has 4 coordinates: x, y, z, and a number that will
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capsule.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/capsule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAI3C;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"capsule.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/capsule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAI3C;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAyC1D"}
|
|
@@ -2,7 +2,7 @@ import { TgdDataset } from "./../../dataset/index.js";
|
|
|
2
2
|
import { TgdGeometry } from "./../../geometry/index.js";
|
|
3
3
|
const TAU = 2 * Math.PI;
|
|
4
4
|
/**
|
|
5
|
-
* The capsule is a 3D shape
|
|
5
|
+
* The capsule is a 3D shape made of a cylinder
|
|
6
6
|
* and two hemispheres, all of radius 1.
|
|
7
7
|
* The roundness gives use the number of faces around the cylinder.
|
|
8
8
|
* Every vertex has 4 coordinates: x, y, z, and a number that will
|
|
@@ -14,22 +14,44 @@ export function makeCapsule(roundness) {
|
|
|
14
14
|
const tips = [];
|
|
15
15
|
const offset = [];
|
|
16
16
|
const elements = [];
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
17
|
+
const angleStepCylinder = makeCylinder(roundness, offset, tips, elements);
|
|
18
|
+
makeTip(roundness, angleStepCylinder, offset, tips, elements);
|
|
19
|
+
const capsule = new TgdDataset({
|
|
20
|
+
attTip: "float",
|
|
21
|
+
POSITION: "vec3",
|
|
22
|
+
NORMAL: "vec3",
|
|
23
|
+
});
|
|
24
|
+
capsule.set("POSITION", new Float32Array(offset));
|
|
25
|
+
capsule.set("attTip", new Float32Array(tips));
|
|
26
|
+
const geometry = new TgdGeometry({
|
|
27
|
+
dataset: capsule,
|
|
28
|
+
elements: new Uint16Array(elements),
|
|
29
|
+
computeNormalsIfMissing: true,
|
|
30
|
+
attPosition: "POSITION",
|
|
31
|
+
});
|
|
32
|
+
const { set, get } = capsule.getAttribAccessor("NORMAL");
|
|
33
|
+
// The cylinder must be really flat
|
|
34
|
+
for (let idx = 0; idx < roundness * 2; idx += 2) {
|
|
35
|
+
set(0, idx, 2);
|
|
36
|
+
set(0, idx + 1, 2);
|
|
37
|
+
const x = (get(idx, 0) + get(idx + 1, 0)) / 2;
|
|
38
|
+
const y = (get(idx, 1) + get(idx + 1, 1)) / 2;
|
|
39
|
+
set(x, idx, 0);
|
|
40
|
+
set(y, idx, 1);
|
|
41
|
+
set(x, idx + 1, 0);
|
|
42
|
+
set(y, idx + 1, 1);
|
|
43
|
+
}
|
|
44
|
+
// We collapse the cylinder because it will
|
|
45
|
+
// be instantiated with two tips points and radii.
|
|
46
|
+
for (let idx = 0; idx < tips.length; idx++) {
|
|
47
|
+
const shiftZ = tips[idx] === 0 ? +1 : -1;
|
|
48
|
+
offset[idx * 3 + 2] += shiftZ;
|
|
32
49
|
}
|
|
50
|
+
capsule.set("POSITION", new Float32Array(offset));
|
|
51
|
+
capsule.set("attTip", new Float32Array(tips));
|
|
52
|
+
return geometry;
|
|
53
|
+
}
|
|
54
|
+
function makeTip(roundness, angleStepCylinder, offset, tips, elements) {
|
|
33
55
|
const rings = Math.max(2, Math.ceil(roundness / 2));
|
|
34
56
|
const angleStepRing = (0.5 * Math.PI) / rings;
|
|
35
57
|
for (let ring = 1; ring < rings; ring++) {
|
|
@@ -37,7 +59,7 @@ export function makeCapsule(roundness) {
|
|
|
37
59
|
const z = Math.sin(phi);
|
|
38
60
|
const radius = Math.cos(phi);
|
|
39
61
|
for (let face1 = 0; face1 < roundness; face1++) {
|
|
40
|
-
const angle =
|
|
62
|
+
const angle = angleStepCylinder * face1;
|
|
41
63
|
const x = Math.cos(angle) * radius;
|
|
42
64
|
const y = Math.sin(angle) * radius;
|
|
43
65
|
offset.push(x, y, z + 1);
|
|
@@ -70,40 +92,24 @@ export function makeCapsule(roundness) {
|
|
|
70
92
|
elements.push(idx0 + 0, idx1 + 0, endIndex + 0);
|
|
71
93
|
elements.push(idx1 + 1, idx0 + 1, endIndex + 1);
|
|
72
94
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
set(0, idx, 2);
|
|
91
|
-
set(0, idx + 1, 2);
|
|
92
|
-
const x = (get(idx, 0) + get(idx + 1, 0)) / 2;
|
|
93
|
-
const y = (get(idx, 1) + get(idx + 1, 1)) / 2;
|
|
94
|
-
set(x, idx, 0);
|
|
95
|
-
set(y, idx, 1);
|
|
96
|
-
set(x, idx + 1, 0);
|
|
97
|
-
set(y, idx + 1, 1);
|
|
98
|
-
}
|
|
99
|
-
// We collapse the cylinder because it will
|
|
100
|
-
// be instantiated with two tips points and radii.
|
|
101
|
-
for (let idx = 0; idx < tips.length; idx++) {
|
|
102
|
-
const shiftZ = tips[idx] === 0 ? +1 : -1;
|
|
103
|
-
offset[idx * 3 + 2] += shiftZ;
|
|
95
|
+
}
|
|
96
|
+
function makeCylinder(roundness, offset, tips, elements) {
|
|
97
|
+
const angleStep = TAU / roundness;
|
|
98
|
+
for (let face = 0; face < roundness; face++) {
|
|
99
|
+
const angle = angleStep * face;
|
|
100
|
+
const x = Math.cos(angle);
|
|
101
|
+
const y = Math.sin(angle);
|
|
102
|
+
offset.push(x, y, +1);
|
|
103
|
+
tips.push(1);
|
|
104
|
+
offset.push(x, y, -1);
|
|
105
|
+
tips.push(0);
|
|
106
|
+
const top1 = face * 2;
|
|
107
|
+
const bottom1 = top1 + 1;
|
|
108
|
+
const top2 = ((face + 1) % roundness) * 2;
|
|
109
|
+
const bottom2 = top2 + 1;
|
|
110
|
+
elements.push(top2, top1, bottom1);
|
|
111
|
+
elements.push(top2, bottom1, bottom2);
|
|
104
112
|
}
|
|
105
|
-
|
|
106
|
-
capsule.set("attTip", new Float32Array(tips));
|
|
107
|
-
return geometry;
|
|
113
|
+
return angleStep;
|
|
108
114
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2Fwc3VsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYWludGVyL3NlZ21lbnRzL2NhcHN1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTNDLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFBO0FBRXZCOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsV0FBVyxDQUFDLFNBQWlCO0lBQ3pDLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNsQyxNQUFNLElBQUksR0FBYSxFQUFFLENBQUE7SUFDekIsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFBO0lBQzNCLE1BQU0sUUFBUSxHQUFhLEVBQUUsQ0FBQTtJQUM3QixNQUFNLGlCQUFpQixHQUFHLFlBQVksQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUN6RSxPQUFPLENBQUMsU0FBUyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFDN0QsTUFBTSxPQUFPLEdBQUcsSUFBSSxVQUFVLENBQUM7UUFDM0IsTUFBTSxFQUFFLE9BQU87UUFDZixRQUFRLEVBQUUsTUFBTTtRQUNoQixNQUFNLEVBQUUsTUFBTTtLQUNqQixDQUFDLENBQUE7SUFDRixPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDN0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxXQUFXLENB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments-morphing.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments-morphing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,eAAe,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAK3C,KAAK,aAAa,GAAG,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAA;AAEpD,MAAM,MAAM,iCAAiC,GAAG;IAC/C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;;OAGG;IACH,aAAa,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAA;CAC/C,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,0BAA2B,SAAQ,UAAU;IAsBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC3B,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACjB;IAzBF,SAAgB,OAAO,aAAmB;IACnC,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,SAAI;IACb,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAChB,aAAa,SAAI;IACxB;;;OAGG;IACI,GAAG,SAAI;IAEd,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKlB,OAAO,EAAE;QAC3B,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACjB,EACD,OAAO,EAAE,iCAAiC;
|
|
1
|
+
{"version":3,"file":"segments-morphing.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments-morphing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,eAAe,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAK3C,KAAK,aAAa,GAAG,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAA;AAEpD,MAAM,MAAM,iCAAiC,GAAG;IAC/C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;;OAGG;IACH,aAAa,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAA;CAC/C,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,0BAA2B,SAAQ,UAAU;IAsBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC3B,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACjB;IAzBF,SAAgB,OAAO,aAAmB;IACnC,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,SAAI;IACb,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAChB,aAAa,SAAI;IACxB;;;OAGG;IACI,GAAG,SAAI;IAEd,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKlB,OAAO,EAAE;QAC3B,EAAE,EAAE,sBAAsB,CAAA;QAC1B,WAAW,EAAE,WAAW,CAAA;QACxB,MAAM,EAAE,SAAS,CAAA;KACjB,EACD,OAAO,EAAE,iCAAiC;IAyK3C,MAAM,IAAI,IAAI;IAKd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IA0BxC,OAAO,KAAK,GAAG,GAEd;CACD"}
|
|
@@ -55,7 +55,7 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
55
55
|
const material = (_b = options.material) !== null && _b !== void 0 ? _b : new TgdMaterialFaceOrientation();
|
|
56
56
|
this.material = material;
|
|
57
57
|
material.attPosition = geometry.attPosition;
|
|
58
|
-
material.attNormal =
|
|
58
|
+
material.attNormal = "normal";
|
|
59
59
|
material.attUV =
|
|
60
60
|
"((mix(attUV0_A, attUV0_B, uniMix) + mix(attUV1_A, attUV1_B, uniMix)) * .5)";
|
|
61
61
|
this.minRadius = minRadius;
|
|
@@ -75,9 +75,9 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
75
75
|
})
|
|
76
76
|
.loadBitmap(tgdCanvasCreatePalette(["#f44", "#ff4", "#4f4", "#4ff", "#44f"]));
|
|
77
77
|
const vert = new TgdShaderVertex({
|
|
78
|
-
uniforms: Object.assign({ uniMix: "float", uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4",
|
|
78
|
+
uniforms: Object.assign({ uniMix: "float", uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4", uniPixelPerScreenUnit: "float", uniMinRadiusInPixel: "float", uniRadiusMultiplier: "float" }, material.uniforms),
|
|
79
79
|
attributes: {
|
|
80
|
-
[geometry.attPosition]: "
|
|
80
|
+
[geometry.attPosition]: "vec4",
|
|
81
81
|
[geometry.attNormal]: "vec3",
|
|
82
82
|
attTip: "float",
|
|
83
83
|
attXYZR0_A: "vec4",
|
|
@@ -89,30 +89,31 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
89
89
|
attUV1_A: "vec2",
|
|
90
90
|
attUV1_B: "vec2",
|
|
91
91
|
},
|
|
92
|
-
varying: Object.assign(
|
|
93
|
-
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), {
|
|
94
|
-
"void applyMaterial() {",
|
|
95
|
-
[material.vertexShaderCode],
|
|
96
|
-
"}",
|
|
97
|
-
], getPosition: [
|
|
92
|
+
varying: Object.assign({}, material.varyings),
|
|
93
|
+
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), { getPosition: [
|
|
98
94
|
"vec4 getPosition(vec4 pos) {",
|
|
99
95
|
[(_c = material.vertexShaderCodeForGetPosition) !== null && _c !== void 0 ? _c : "return pos;"],
|
|
100
96
|
"}",
|
|
97
|
+
], applyMaterial: [
|
|
98
|
+
"void applyMaterial(vec3 position, vec3 normal, vec2 uv) {",
|
|
99
|
+
[material.vertexShaderCode],
|
|
100
|
+
"}",
|
|
101
101
|
] }),
|
|
102
102
|
mainCode: [
|
|
103
103
|
"vec4 attXYZR0 = mix(attXYZR0_A, attXYZR0_B, uniMix);",
|
|
104
104
|
"vec4 attXYZR1 = mix(attXYZR1_A, attXYZR1_B, uniMix);",
|
|
105
105
|
"vec2 attUV0 = mix(attUV0_A, attUV0_B, uniMix);",
|
|
106
106
|
"vec2 attUV1 = mix(attUV1_A, attUV1_B, uniMix);",
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
`vec3 normal = ${geometry.attNormal};`,
|
|
108
|
+
`vec3 pos = getPosition(${geometry.attPosition}).xyz;`,
|
|
109
109
|
"vec4 xyzr = mix(attXYZR0, attXYZR1, attTip);",
|
|
110
110
|
"vec3 center = xyzr.xyz;",
|
|
111
|
+
"vec4 centerInCameraSpace = uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1);",
|
|
112
|
+
"vec4 centerInScreenSpace = uniProjectionMatrix * centerInCameraSpace;",
|
|
113
|
+
"float screenUnitPerCameraUnit = (uniProjectionMatrix * vec4(0, 1, centerInCameraSpace.z, 1)).y / centerInScreenSpace.w;",
|
|
114
|
+
"float minRadiusInCameraUnit = uniMinRadiusInPixel / (uniPixelPerScreenUnit * screenUnitPerCameraUnit);",
|
|
111
115
|
"float radius = max(",
|
|
112
|
-
[
|
|
113
|
-
"xyzr.w * uniRadiusMultiplier,",
|
|
114
|
-
"uniMinRadius * (uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1)).w",
|
|
115
|
-
],
|
|
116
|
+
["xyzr.w * uniRadiusMultiplier,", "minRadiusInCameraUnit"],
|
|
116
117
|
");",
|
|
117
118
|
"vec3 dir = attXYZR1.xyz - attXYZR0.xyz;",
|
|
118
119
|
"float len = length(dir);",
|
|
@@ -122,9 +123,10 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
122
123
|
[
|
|
123
124
|
"// Full capsule",
|
|
124
125
|
"vec3 Z = dir / len;",
|
|
125
|
-
"
|
|
126
|
-
"vec3
|
|
127
|
-
"vec3 X = cross(
|
|
126
|
+
"bool yUp = abs(Z.y) < 0.9;",
|
|
127
|
+
"vec3 fakeY = yUp ? vec3(0,1,0) : vec3(0,0,1);",
|
|
128
|
+
"vec3 X = cross(fakeY, Z);",
|
|
129
|
+
"vec3 Y = cross(Z, X);",
|
|
128
130
|
"mat3 mat = mat3(X, Y, Z);",
|
|
129
131
|
"pos *= radius;",
|
|
130
132
|
"pos = mat * pos + center.xyz;",
|
|
@@ -132,11 +134,11 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
132
134
|
],
|
|
133
135
|
"}",
|
|
134
136
|
"gl_Position = uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(pos, 1);",
|
|
135
|
-
|
|
136
|
-
"varNormal = normal;",
|
|
137
|
+
`applyMaterial(pos, normal, ${material.attUV}.xy);`,
|
|
137
138
|
],
|
|
138
139
|
}).code;
|
|
139
140
|
const frag = new TgdShaderFragment({
|
|
141
|
+
header: material.fragmentShaderHeader,
|
|
140
142
|
uniforms: material.uniforms,
|
|
141
143
|
outputs: { FragColor: "vec4" },
|
|
142
144
|
varying: material.varyings,
|
|
@@ -192,8 +194,9 @@ export class TgdPainterSegmentsMorphing extends TgdPainter {
|
|
|
192
194
|
prg.use();
|
|
193
195
|
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, { program: prg, context, time, delay });
|
|
194
196
|
prg.uniform1f("uniMix", this.mix);
|
|
197
|
+
prg.uniform1f("uniPixelPerScreenUnit", gl.drawingBufferHeight);
|
|
198
|
+
prg.uniform1f("uniMinRadiusInPixel", this.minRadius);
|
|
195
199
|
prg.uniform1f("uniRadiusMultiplier", this.radiusMultiplier);
|
|
196
|
-
prg.uniform1f("uniMinRadius", (this.minRadius * 2) / gl.drawingBufferHeight);
|
|
197
200
|
prg.uniformMatrix4fv("uniTransfoMatrix", this.transfo.matrix);
|
|
198
201
|
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
199
202
|
prg.uniformMatrix4fv("uniProjectionMatrix", camera.matrixProjection);
|
|
@@ -212,4 +215,4 @@ function extract(arg) {
|
|
|
212
215
|
return arg();
|
|
213
216
|
return arg;
|
|
214
217
|
}
|
|
215
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
218
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments-morphing.js","sourceRoot":"","sources":["../../../src/painter/segments/segments-morphing.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,6 +88,7 @@ export declare class TgdPainterSegments extends TgdPainter {
|
|
|
88
88
|
webglParams: WebglParams;
|
|
89
89
|
camera: TgdCamera;
|
|
90
90
|
}, options: TgdPainterSegmentsOptions);
|
|
91
|
+
debug(caption?: string): void;
|
|
91
92
|
getBuffer(): TgdBuffer | undefined;
|
|
92
93
|
delete(): void;
|
|
93
94
|
paint(time: number, delay: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
61
61
|
const material = (_b = options.material) !== null && _b !== void 0 ? _b : new TgdMaterialFaceOrientation();
|
|
62
62
|
this.material = material;
|
|
63
63
|
material.attPosition = geometry.attPosition;
|
|
64
|
-
material.attNormal = geometry.attNormal
|
|
64
|
+
material.attNormal = "normal"; // geometry.attNormal
|
|
65
65
|
material.attUV = "((attUV0 + attUV1) * .5)";
|
|
66
66
|
this.minRadius = minRadius;
|
|
67
67
|
if (roundness > 127) {
|
|
@@ -71,9 +71,9 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
71
71
|
throw new Error("[TgdPainterSegments] Min roundness is 0!");
|
|
72
72
|
}
|
|
73
73
|
const vert = new TgdShaderVertex({
|
|
74
|
-
uniforms: Object.assign({ uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4",
|
|
74
|
+
uniforms: Object.assign({ uniTransfoMatrix: "mat4", uniModelViewMatrix: "mat4", uniProjectionMatrix: "mat4", uniPixelPerScreenUnit: "float", uniMinRadiusInPixel: "float", uniRadiusMultiplier: "float" }, material.uniforms),
|
|
75
75
|
attributes: {
|
|
76
|
-
[geometry.attPosition]: "
|
|
76
|
+
[geometry.attPosition]: "vec4",
|
|
77
77
|
[geometry.attNormal]: "vec3",
|
|
78
78
|
attTip: "float",
|
|
79
79
|
attXYZR0: "vec4",
|
|
@@ -81,26 +81,27 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
81
81
|
attUV0: "vec2",
|
|
82
82
|
attUV1: "vec2",
|
|
83
83
|
},
|
|
84
|
-
varying: Object.assign(
|
|
85
|
-
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), {
|
|
86
|
-
"void applyMaterial() {",
|
|
87
|
-
[material.vertexShaderCode],
|
|
88
|
-
"}",
|
|
89
|
-
], getPosition: [
|
|
84
|
+
varying: Object.assign({}, material.varyings),
|
|
85
|
+
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), { getPosition: [
|
|
90
86
|
"vec4 getPosition(vec4 pos) {",
|
|
91
87
|
[(_c = material.vertexShaderCodeForGetPosition) !== null && _c !== void 0 ? _c : "return pos;"],
|
|
92
88
|
"}",
|
|
89
|
+
], applyMaterial: [
|
|
90
|
+
"void applyMaterial(vec3 position, vec3 normal, vec2 uv) {",
|
|
91
|
+
[material.vertexShaderCode],
|
|
92
|
+
"}",
|
|
93
93
|
] }),
|
|
94
94
|
mainCode: [
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
`vec3 normal = ${geometry.attNormal};`,
|
|
96
|
+
`vec3 pos = getPosition(${geometry.attPosition}).xyz;`,
|
|
97
97
|
"vec4 xyzr = mix(attXYZR0, attXYZR1, attTip);",
|
|
98
98
|
"vec3 center = xyzr.xyz;",
|
|
99
|
+
"vec4 centerInCameraSpace = uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1);",
|
|
100
|
+
"vec4 centerInScreenSpace = uniProjectionMatrix * centerInCameraSpace;",
|
|
101
|
+
"float screenUnitPerCameraUnit = (uniProjectionMatrix * vec4(0, 1, centerInCameraSpace.z, 1)).y / centerInScreenSpace.w;",
|
|
102
|
+
"float minRadiusInCameraUnit = uniMinRadiusInPixel / (uniPixelPerScreenUnit * screenUnitPerCameraUnit);",
|
|
99
103
|
"float radius = max(",
|
|
100
|
-
[
|
|
101
|
-
"xyzr.w * uniRadiusMultiplier,",
|
|
102
|
-
"uniMinRadius * (uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(center, 1)).w",
|
|
103
|
-
],
|
|
104
|
+
["xyzr.w * uniRadiusMultiplier,", "minRadiusInCameraUnit"],
|
|
104
105
|
");",
|
|
105
106
|
"vec3 dir = attXYZR1.xyz - attXYZR0.xyz;",
|
|
106
107
|
"float len = length(dir);",
|
|
@@ -110,9 +111,10 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
110
111
|
[
|
|
111
112
|
"// Full capsule",
|
|
112
113
|
"vec3 Z = dir / len;",
|
|
113
|
-
"
|
|
114
|
-
"vec3
|
|
115
|
-
"vec3 X = cross(
|
|
114
|
+
"bool yUp = abs(Z.y) < 0.9;",
|
|
115
|
+
"vec3 fakeY = yUp ? vec3(0,1,0) : vec3(0,0,1);",
|
|
116
|
+
"vec3 X = cross(fakeY, Z);",
|
|
117
|
+
"vec3 Y = cross(Z, X);",
|
|
116
118
|
"mat3 mat = mat3(X, Y, Z);",
|
|
117
119
|
"pos *= radius;",
|
|
118
120
|
"pos = mat * pos + center.xyz;",
|
|
@@ -120,14 +122,14 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
120
122
|
],
|
|
121
123
|
"}",
|
|
122
124
|
"gl_Position = uniProjectionMatrix * uniModelViewMatrix * uniTransfoMatrix * vec4(pos, 1);",
|
|
123
|
-
|
|
124
|
-
"varNormal = normal;",
|
|
125
|
+
`applyMaterial(pos, normal, ${material.attUV}.xy);`,
|
|
125
126
|
],
|
|
126
127
|
}).code;
|
|
127
128
|
const frag = new TgdShaderFragment({
|
|
129
|
+
header: material.fragmentShaderHeader,
|
|
128
130
|
uniforms: material.uniforms,
|
|
129
131
|
outputs: { FragColor: "vec4" },
|
|
130
|
-
varying: material.varyings,
|
|
132
|
+
varying: Object.assign({}, material.varyings),
|
|
131
133
|
functions: Object.assign(Object.assign({}, material.extraFragmentShaderFunctions), { applyMaterial: [
|
|
132
134
|
"vec4 applyMaterial() {",
|
|
133
135
|
[material.fragmentShaderCode],
|
|
@@ -168,6 +170,9 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
168
170
|
}
|
|
169
171
|
this.vertexCount = (_e = (_d = geometry.elements) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
|
|
170
172
|
}
|
|
173
|
+
debug(caption) {
|
|
174
|
+
this.prg.debug(caption !== null && caption !== void 0 ? caption : this.name);
|
|
175
|
+
}
|
|
171
176
|
getBuffer() {
|
|
172
177
|
return this.vao.getBuffer(1);
|
|
173
178
|
}
|
|
@@ -182,7 +187,8 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
182
187
|
gl.disable(gl.DITHER);
|
|
183
188
|
prg.use();
|
|
184
189
|
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, { program: prg, context, time, delay });
|
|
185
|
-
prg.uniform1f("
|
|
190
|
+
prg.uniform1f("uniPixelPerScreenUnit", gl.drawingBufferHeight);
|
|
191
|
+
prg.uniform1f("uniMinRadiusInPixel", this.minRadius);
|
|
186
192
|
prg.uniform1f("uniRadiusMultiplier", this.radiusMultiplier);
|
|
187
193
|
prg.uniformMatrix4fv("uniTransfoMatrix", this.transfo.matrix);
|
|
188
194
|
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
@@ -267,4 +273,4 @@ function extract(arg) {
|
|
|
267
273
|
return arg();
|
|
268
274
|
return arg;
|
|
269
275
|
}
|
|
270
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
|
276
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|