Refactored font.js, moved "addLabel" to method "label"

boytchev · boytchev · commit 67ba9484b53f · 2024-08-09T15:15:07.000+03:00
diff --git a/docs/example-ankle.html b/docs/example-ankle.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -21,9 +21,9 @@
 	var woman = new Female();
 	woman.position.x = 1;
 
-	addLabel( man.l_ankle, 'ankle.bend', -1, -0.95, 3, 1, 2, 0 );
-	addLabel( child.r_ankle, 'ankle.turn', 1, -1.7, 0.4, 1, 2, 0 ).scale.set( 1.5, 1.5, 1.5 );
-	addLabel( woman.r_ankle, 'ankle.tilt', 1, -1.2, 0.5, 1, 2, 0 );
+	man.l_ankle.label( 'ankle.bend', -1, -0.95, 3, 1, 2, 0 );
+	child.r_ankle.label( 'ankle.turn', 1, -1.7, 0.4, 1, 2, 0 ).scale.set( 1.5, 1.5, 1.5 );
+	woman.r_ankle.label( 'ankle.tilt', 1, -1.2, 0.5, 1, 2, 0 );
 
 	function animate( t ) {
 
diff --git a/docs/example-arm.html b/docs/example-arm.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -23,9 +23,9 @@
 	woman.l_arm.straddle = 15;
 	woman.r_arm.straddle = 15;
 
-	addLabel( man.l_arm, 'arm.raise', 0, -0.15, 0, 3, 1 );
-	addLabel( child.l_arm, 'arm.straddle', 0, -0.1, 0, 3, 1 ).scale.set( 1.5, 1.5, 1.5 );
-	addLabel( woman.l_arm, 'arm.turn', 0, -0.15, 0, 3, 1 );
+	man.l_arm.label( 'arm.raise', 0, -0.15, 0, 3, 1 );
+	child.l_arm.label( 'arm.straddle', 0, -0.1, 0, 3, 1 ).scale.set( 1.5, 1.5, 1.5 );
+	woman.l_arm.label( 'arm.turn', 0, -0.15, 0, 3, 1 );
 
 	function animate( t ) {
 
diff --git a/docs/example-body-parts.html b/docs/example-body-parts.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, createStage, Male } from 'mannequin';
+	import { createStage, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -28,29 +28,29 @@
 
 	man.stepOnGround();
 	
-	addLabel( man.body, 'body', -27, 1.5, 0 ).scale.set( 3, 3, 3 );
-	addLabel( man.head, 'head', 12 );
-	addLabel( man.neck, 'neck', 0, 0.5, 3 );
-	addLabel( man.torso, 'torso', 7, 0.5, 3 );
-	addLabel( man.pelvis, 'pelvis', 0, 0.5, 2 );
-
-	addLabel( man.l_arm, 'l_arm', 2, -0.3, 0, 3, 2 );
-	addLabel( man.l_elbow, 'l_elbow', 3, -0.15, 0, 3, 2 );
-	addLabel( man.l_wrist, 'l_wrist', 0, 0, 1, 2, 2 );
-	addLabel( man.l_fingers, 'l_fingers', 1, 0, 1, 2, 2 ).scale.set( 0.75, 0.75, 0.75 );
-
-	addLabel( man.r_arm, 'r_arm', 2, 1.3, 0, 3, 2 );
-	addLabel( man.r_elbow, 'r_elbow', 3, 1.2, 0, 3, 2 );
-	addLabel( man.r_wrist, 'r_wrist', 0, 0, 11.5, 0, 2 );
-	addLabel( man.r_fingers, 'r_fingers', 1, 0, 10.5, 0, 2 ).scale.set( 0.75, 0.75, 0.75 );
-
-	addLabel( man.l_leg, 'l_leg', 5, 0.5, 0, 1, 1.98 );
-	addLabel( man.l_knee, 'l_knee', 4, 0.25, 0, 1, 1.92 );
-	addLabel( man.l_ankle, 'l_ankle', 1, 0.3, -1, 1, 2, 0 );
-
-	addLabel( man.r_leg, 'r_leg', 5, -1.55, 0, 1, 2.02 );
-	addLabel( man.r_knee, 'r_knee', 4, -1.25, 0, 1, 2.08 );
-	addLabel( man.r_ankle, 'r_ankle', 1, -1.2, -1, 1, 2, 0 );
+	man.body.label( 'body', -27, 1.5, 0 ).scale.set( 3, 3, 3 );
+	man.head.label( 'head', 12 );
+	man.neck.label( 'neck', 0, 0.5, 3 );
+	man.torso.label( 'torso', 7, 0.5, 3 );
+	man.pelvis.label( 'pelvis', 0, 0.5, 2 );
+
+	man.l_arm.label( 'l_arm', 2, -0.3, 0, 3, 2 );
+	man.l_elbow.label( 'l_elbow', 3, -0.15, 0, 3, 2 );
+	man.l_wrist.label( 'l_wrist', 0, 0, 1, 2, 2 );
+	man.l_fingers.label( 'l_fingers', 1, 0, 1, 2, 2 ).scale.set( 0.75, 0.75, 0.75 );
+
+	man.r_arm.label( 'r_arm', 2, 1.3, 0, 3, 2 );
+	man.r_elbow.label( 'r_elbow', 3, 1.2, 0, 3, 2 );
+	man.r_wrist.label( 'r_wrist', 0, 0, 11.5, 0, 2 );
+	man.r_fingers.label( 'r_fingers', 1, 0, 10.5, 0, 2 ).scale.set( 0.75, 0.75, 0.75 );
+
+	man.l_leg.label( 'l_leg', 5, 0.5, 0, 1, 1.98 );
+	man.l_knee.label( 'l_knee', 4, 0.25, 0, 1, 1.92 );
+	man.l_ankle.label( 'l_ankle', 1, 0.3, -1, 1, 2, 0 );
+
+	man.r_leg.label( 'r_leg', 5, -1.55, 0, 1, 2.02 );
+	man.r_knee.label( 'r_knee', 4, -1.25, 0, 1, 2.08 );
+	man.r_ankle.label( 'r_ankle', 1, -1.2, -1, 1, 2, 0 );
 
 	function animate( t ) {
 
diff --git a/docs/example-body.html b/docs/example-body.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -21,9 +21,9 @@
 	var woman = new Female();
 	woman.position.x = 1;
 
-	addLabel( man.head, 'body.bend', 12, 0.5 );
-	addLabel( child.head, 'body.turn', 12, 0.5 );
-	addLabel( woman.head, 'body.tilt', 12, 0.5 );
+	man.head.label( 'body.bend', 12, 0.5 );
+	child.head.label( 'body.turn', 12, 0.5 );
+	woman.head.label( 'body.tilt', 12, 0.5 );
 
 	function animate( t ) {
 
diff --git a/docs/example-dynamic.html b/docs/example-dynamic.html
@@ -10,7 +10,7 @@
 	<script type="module">
 
 	import * as THREE from 'three';
-	import { Child, createStage, getStage, getGroundLevel } from 'mannequin';
+	import { Child, createStage, getGroundLevel, getStage } from 'mannequin';
 
 	createStage( animate );
 
diff --git a/docs/example-elbow.html b/docs/example-elbow.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -21,8 +21,8 @@
 	var woman = new Female();
 	woman.position.x = 1;
 
-	addLabel( man.l_elbow, 'elbow.bend', 0, -0.1, 0, 3, 1 );
-	addLabel( woman.r_elbow, 'elbow.bend', 17, 0.1, 0, 3, 3 );
+	man.l_elbow.label( 'elbow.bend', 0, -0.1, 0, 3, 1 );
+	woman.r_elbow.label( 'elbow.bend', 17, 0.1, 0, 3, 3 );
 
 	function animate( t ) {
 
diff --git a/docs/example-finger-bend.html b/docs/example-finger-bend.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, createStage, Male } from 'mannequin';
+	import { createStage, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -32,9 +32,9 @@
 
 	man.r_arm.straddle = 15;
 
-	addLabel( man.l_finger_1, 'finger_1.bend', 0, 0, 8.5, 2, 0, 0 ).scale.set( 0.4, 0.4, 0.4 );
-	addLabel( man.l_finger_1.mid, 'finger_1.mid.bend', 0, 0, 8.4, 2, 0, 0 ).scale.set( 0.3, 0.3, 0.3 );
-	addLabel( man.l_finger_1.tip, 'finger_1.tip.bend', 0, 0, 6.1, 2, 0, 0 ).scale.set( 0.23, 0.23, 0.23 );
+	man.l_finger_1.label( 'finger_1.bend', 0, 0, 8.5, 2, 0, 0 ).scale.set( 0.4, 0.4, 0.4 );
+	man.l_finger_1.mid.label( 'finger_1.mid.bend', 0, 0, 8.4, 2, 0, 0 ).scale.set( 0.3, 0.3, 0.3 );
+	man.l_finger_1.tip.label( 'finger_1.tip.bend', 0, 0, 6.1, 2, 0, 0 ).scale.set( 0.23, 0.23, 0.23 );
 
 	function animate( t ) {
 
diff --git a/docs/example-finger-straddle.html b/docs/example-finger-straddle.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, createStage, Male } from 'mannequin';
+	import { createStage, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -26,10 +26,10 @@
 
 	man.r_arm.straddle = 15;
 
-	addLabel( man.l_finger_1.tip, 'finger_1.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
-	addLabel( man.l_finger_2.tip, 'finger_2.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
-	addLabel( man.l_finger_3.tip, 'finger_3.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
-	addLabel( man.l_finger_4.tip, 'finger_4.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
+	man.l_finger_1.tip.label( 'finger_1.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
+	man.l_finger_2.tip.label( 'finger_2.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
+	man.l_finger_3.tip.label( 'finger_3.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
+	man.l_finger_4.tip.label( 'finger_4.straddle', 5.6, 0.005, 0, 1, 0, 3 ).scale.set( 0.2, 0.2, 0.2 );
 
 	function animate( t ) {
 
diff --git a/docs/example-fingers.html b/docs/example-fingers.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -27,8 +27,8 @@
 	woman.l_arm.straddle = 15;
 	woman.r_arm.straddle = 15;
 
-	addLabel( man.l_fingers, 'fingers.bend', -8, 0.3, 0, 2, 1 );
-	addLabel( woman.r_fingers, 'fingers.bend', 10, -0.3, 0, 4, 3 );
+	man.l_fingers.label( 'fingers.bend', -8, 0.3, 0, 2, 1 );
+	woman.r_fingers.label( 'fingers.bend', 10, -0.3, 0, 4, 3 );
 
 	function animate( t ) {
 
diff --git a/docs/example-head.html b/docs/example-head.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -24,9 +24,9 @@
 	woman.turnRight = 90;
 	woman.position.x = 1;
 
-	addLabel( man.head, 'head.nod', 12, 0.5 );
-	addLabel( child.head, 'head.turn', 12, 0.5 );
-	addLabel( woman.head, 'head.tilt', 12, 0.5 );
+	man.head.label( 'head.nod', 12, 0.5 );
+	child.head.label( 'head.turn', 12, 0.5 );
+	woman.head.label( 'head.tilt', 12, 0.5 );
 
 	function animate( t ) {
 
diff --git a/docs/example-knee.html b/docs/example-knee.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -27,8 +27,8 @@
 	woman.l_leg.raise = 20;
 	woman.r_leg.raise = 20;
 
-	addLabel( man.l_knee, 'knee.bend', 0, 0.15, 0, 1, 1 );
-	addLabel( woman.r_knee, 'knee.bend', 15, -0.15, 0, 1, 3 );
+	man.l_knee.label( 'knee.bend', 0, 0.15, 0, 1, 1 );
+	woman.r_knee.label( 'knee.bend', 15, -0.15, 0, 1, 3 );
 
 	function animate( t ) {
 
diff --git a/docs/example-leg.html b/docs/example-leg.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -24,9 +24,9 @@
 	woman.position.x = 1;
 	woman.r_arm.straddle = 20;
 
-	addLabel( man.l_leg, 'leg.raise', 2, 0.4, 0, 1, 0.9 );
-	addLabel( child.l_leg, 'leg.straddle', 1, 0.3, 0, 1, 0.95 ).scale.set( 1.4, 1.4, 1.4 );
-	addLabel( woman.r_leg, 'leg.turn', 12, -0.3, 0, 1, 3.07 );
+	man.l_leg.label( 'leg.raise', 2, 0.4, 0, 1, 0.9 );
+	child.l_leg.label( 'leg.straddle', 1, 0.3, 0, 1, 0.95 ).scale.set( 1.4, 1.4, 1.4 );
+	woman.r_leg.label( 'leg.turn', 12, -0.3, 0, 1, 3.07 );
 
 	function animate( t ) {
 
diff --git a/docs/example-scene.html b/docs/example-scene.html
@@ -10,7 +10,7 @@
 	<script type="module">
 
 	import * as THREE from 'three';
-	import { createStage, getStage, Female, Male } from 'mannequin';
+	import { createStage, Female, getStage, Male } from 'mannequin';
 	import { LimbShape } from "mannequin/shapes/LimbShape.js";
 
 	createStage( animate );
diff --git a/docs/example-torso.html b/docs/example-torso.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -21,9 +21,9 @@
 	var woman = new Female();
 	woman.position.x = 1;
 
-	addLabel( man.torso, 'torso.bend', 10, 0.5, 4 );
-	addLabel( child.torso, 'torso.turn', 10, 0.75, 4 ).scale.set( 1.5, 1.5, 1.5 );
-	addLabel( woman.torso, 'torso.tilt', 10, 0.5, 4.5 );
+	man.torso.label( 'torso.bend', 10, 0.5, 4 );
+	child.torso.label( 'torso.turn', 10, 0.75, 4 ).scale.set( 1.5, 1.5, 1.5 );
+	woman.torso.label( 'torso.tilt', 10, 0.5, 4.5 );
 
 	function animate( t ) {
 
diff --git a/docs/example-vr.html b/docs/example-vr.html
@@ -11,7 +11,7 @@
 
 	import * as THREE from 'three';
 	import { VRButton } from 'three/addons/webxr/VRButton.js';
-	import { blend, createStage, getStage, Female, Male } from 'mannequin';
+	import { blend, createStage, Female, getStage, Male } from 'mannequin';
 
 	createStage( animate );
 	
diff --git a/docs/example-wrist.html b/docs/example-wrist.html
@@ -9,7 +9,7 @@
 <body>
 	<script type="module">
 
-	import { addLabel, Child, createStage, Female, Male } from 'mannequin';
+	import { Child, createStage, Female, Male } from 'mannequin';
 
 	createStage( animate );
 
@@ -26,9 +26,9 @@
 	woman.r_arm.turn = 90;
 	woman.r_elbow.bend = 120;
 
-	addLabel( man.l_wrist, 'wrist.bend', -1, 0.5, 0, 2, 1 );
-	addLabel( child.l_wrist, 'wrist.turn', -1, 0, 1, 2, 1 ).scale.set( 1.5, 1.5, 1.5 );
-	addLabel( woman.r_wrist, 'wrist.tilt', 10 + 2, 0.15, 0, 3, 3 );
+	man.l_wrist.label( 'wrist.bend', -1, 0.5, 0, 2, 1 );
+	child.l_wrist.label( 'wrist.turn', -1, 0, 1, 2, 1 ).scale.set( 1.5, 1.5, 1.5 );
+	woman.r_wrist.label( 'wrist.tilt', 10 + 2, 0.15, 0, 3, 3 );
 
 	function animate( t ) {
 
diff --git a/docs/userguide-bg.md b/docs/userguide-bg.md
@@ -92,7 +92,6 @@ var kid = new Child();
 * `getPostureVersion()` &ndash; функция, текущата версия на формата на данните, описващи поза
 * `getGroundLevel()` &ndash; функция, вертикалното положение на земята в метри
 * `blend(p,q,k)` &ndash; функция, смесена поза на пози *p* и *q* с коефициент *k*
-* `addLabel(...)` &ndash; функция, закача 3D текст към става на фигура
 * `createStage(animationLoop)` &ndash; функция, създава сцена със земя и светлини
 * `getStage()` &ndash; функция, текущата сцене
 
diff --git a/docs/userguide.md b/docs/userguide.md
@@ -91,7 +91,6 @@ The library mannequin.js defines the following functions and classes:
 * `getPostureVersion()` &ndash; function, current version of posture data format
 * `getGroundLevel()` &ndash; function, vertical position of the ground in meters
 * `blend(p,q,k)` &ndash; function, blended posture of postures *p* and *q* with coefficient *k*
-* `addLabel(...)` &ndash; function, attaches a 3D label to a joint
 * `createStage(animationLoop)` &ndash; function, create a stage with ground and lights
 * `getStage()` &ndash; function, current stage
 
diff --git a/src/font.js b/src/font.js
diff --git a/src/label.js b/src/label.js
diff --git a/src/mannequin.js b/src/mannequin.js
@@ -82,4 +82,3 @@ export * from './bodies/Male.js';
 export * from './bodies/Child.js';
 export { createStage, getStage } from './scene.js';
 export { getVersion, getPostureVersion, getGroundLevel, blend };
-export { addLabel } from './label.js';
diff --git a/src/organs/Joint.js b/src/organs/Joint.js
diff --git a/src/scene.js b/src/scene.js
