cavi 0.1.0 → 0.1.1

package/cavi.d.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export class Node {
+export class WasmNode {
     free(): void;
     [Symbol.dispose](): void;
     /**
@@ -11,15 +11,15 @@ export class Node {
     /**
      * Applies a force from a Point
      */
-    apply_force_point(force: Point): void;
+    apply_force_point(force: WasmPoint): void;
     /**
      * Returns the squared distance to another node (faster)
      */
-    distance_squared_to(other: Node): number;
+    distance_squared_to(other: WasmNode): number;
     /**
      * Returns the distance to another node
      */
-    distance_to(other: Node): number;
+    distance_to(other: WasmNode): number;
     /**
      * Returns the fixed value (0.0 = movable, 1.0 = fixed)
      */
@@ -27,7 +27,7 @@ export class Node {
     /**
      * Returns the current position as a Point
      */
-    get_position(): Point;
+    get_position(): WasmPoint;
     /**
      * Returns the speed (magnitude of velocity)
      */
@@ -35,7 +35,7 @@ export class Node {
     /**
      * Returns the velocity as a Point
      */
-    get_velocity(): Point;
+    get_velocity(): WasmPoint;
     /**
      * Returns the velocity x component
      */
@@ -68,15 +68,15 @@ export class Node {
      * Makes the node movable
      */
     make_movable(): void;
-    constructor(pos: Position, vel: Point, fix: boolean);
+    constructor(pos: WasmPosition, vel: WasmPoint, fix: boolean);
     /**
      * Creates a fixed Node at the given position
      */
-    static new_fixed(x: number, y: number): Node;
+    static new_fixed(x: number, y: number): WasmNode;
     /**
      * Creates a Node with no initial velocity
      */
-    static new_no_vel(x: number, y: number, fix: boolean): Node;
+    static new_no_vel(x: number, y: number, fix: boolean): WasmNode;
     /**
      * Converts to a string representation
      */
@@ -104,21 +104,21 @@ export class Node {
     /**
      * Updates the position based on velocity and acceleration
      */
-    update_position(dt: number, friction: number, acceleration: Point): void;
+    update_position(dt: number, friction: number, acceleration: WasmPoint): void;
     /**
      * Updates position with custom acceleration
      */
-    update_with_acceleration(acceleration: Point, dt: number, friction: number): void;
+    update_with_acceleration(acceleration: WasmPoint, dt: number, friction: number): void;
     /**
      * Creates a Node at origin with no velocity
      */
-    static zero(): Node;
+    static zero(): WasmNode;
     fixed: boolean;
-    position: Position;
-    velocity: Point;
+    position: WasmPosition;
+    velocity: WasmPoint;
 }
 
-export class Point {
+export class WasmPoint {
     free(): void;
     [Symbol.dispose](): void;
     /**
@@ -128,31 +128,31 @@ export class Point {
     /**
      * Returns the angle to another point in radians
      */
-    angle_to(other: Point): number;
+    angle_to(other: WasmPoint): number;
     /**
      * Returns true if this point is approximately equal to another
      */
-    approx_equal(other: Point, epsilon: number): boolean;
+    approx_equal(other: WasmPoint, epsilon: number): boolean;
     /**
      * Clamps the length of the vector to a maximum value
      */
-    clamped(max_length: number): Point;
+    clamped(max_length: number): WasmPoint;
     /**
      * Returns the cross product (z component) with another point
      */
-    cross(other: Point): number;
+    cross(other: WasmPoint): number;
     /**
      * Returns the squared distance to another point (avoids sqrt)
      */
-    distance_squared_to(other: Point): number;
+    distance_squared_to(other: WasmPoint): number;
     /**
      * Returns the distance to another point
      */
-    distance_to(other: Point): number;
+    distance_to(other: WasmPoint): number;
     /**
      * Returns the dot product with another point
      */
-    dot(other: Point): number;
+    dot(other: WasmPoint): number;
     /**
      * Returns the length (magnitude) of the vector
      */
@@ -164,7 +164,7 @@ export class Point {
     /**
      * Linear interpolation between this point and another
      */
-    lerp(other: Point, t: number): Point;
+    lerp(other: WasmPoint, t: number): WasmPoint;
     constructor(x: number, y: number);
     /**
      * Normalizes this point in place
@@ -173,19 +173,19 @@ export class Point {
     /**
      * Returns a normalized version of this point (unit vector)
      */
-    normalized(): Point;
+    normalized(): WasmPoint;
     /**
      * Returns a point with both components set to 1
      */
-    static one(): Point;
+    static one(): WasmPoint;
     /**
      * Returns a perpendicular vector (rotated 90 degrees CCW)
      */
-    perpendicular(): Point;
+    perpendicular(): WasmPoint;
     /**
      * Reflects this vector across a normal vector
      */
-    reflect(normal: Point): Point;
+    reflect(normal: WasmPoint): WasmPoint;
     /**
      * Rotates this point in place by the given angle (in radians)
      */
@@ -193,30 +193,30 @@ export class Point {
     /**
      * Returns a point rotated by the given angle (in radians)
      */
-    rotated(angle: number): Point;
+    rotated(angle: number): WasmPoint;
     /**
      * Returns a unit point in the X direction (1, 0)
      */
-    static unit_x(): Point;
+    static unit_x(): WasmPoint;
     /**
      * Returns a unit point in the Y direction (0, 1)
      */
-    static unit_y(): Point;
+    static unit_y(): WasmPoint;
     /**
      * Returns a zero point (0, 0)
      */
-    static zero(): Point;
+    static zero(): WasmPoint;
     x: number;
     y: number;
 }
 
-export class Position {
+export class WasmPosition {
     free(): void;
     [Symbol.dispose](): void;
     /**
      * Applies a constraint by moving the current position
      */
-    constrain(target: Point): void;
+    constrain(target: WasmPoint): void;
     /**
      * Returns the distance between current and old positions
      */
@@ -224,11 +224,11 @@ export class Position {
     /**
      * Creates a Position from two Points
      */
-    static from_points(curr: Point, old: Point): Position;
+    static from_points(curr: WasmPoint, old: WasmPoint): WasmPosition;
     /**
      * Returns the current position as a Point
      */
-    get_curr(): Point;
+    get_curr(): WasmPoint;
     /**
      * Returns the current x coordinate
      */
@@ -240,7 +240,7 @@ export class Position {
     /**
      * Returns the old position as a Point
      */
-    get_old(): Point;
+    get_old(): WasmPoint;
     /**
      * Returns the old x coordinate
      */
@@ -253,12 +253,12 @@ export class Position {
      * Integrates the position using Verlet integration
      * new_pos = curr + (curr - old) * damping + acceleration * dt^2
      */
-    integrate(acceleration: Point, dt: number, damping: number): void;
+    integrate(acceleration: WasmPoint, dt: number, damping: number): void;
     constructor(x: number, y: number);
     /**
      * Creates a Position with different current and old positions
      */
-    static new_with_old(curr_x: number, curr_y: number, old_x: number, old_y: number): Position;
+    static new_with_old(curr_x: number, curr_y: number, old_x: number, old_y: number): WasmPosition;
     /**
      * Resets old position to match current (stops motion)
      */
@@ -270,7 +270,7 @@ export class Position {
     /**
      * Sets the current position from a Point
      */
-    set_curr_point(point: Point): void;
+    set_curr_point(point: WasmPoint): void;
     /**
      * Sets the old position
      */
@@ -278,7 +278,7 @@ export class Position {
     /**
      * Sets the old position from a Point
      */
-    set_old_point(point: Point): void;
+    set_old_point(point: WasmPoint): void;
     /**
      * Returns the speed (magnitude of velocity)
      */
@@ -290,26 +290,34 @@ export class Position {
     /**
      * Updates the position from a Point
      */
-    update_point(point: Point): void;
+    update_point(point: WasmPoint): void;
     /**
      * Returns the velocity (difference between current and old positions)
      */
-    velocity(): Point;
-    curr: Point;
-    old: Point;
+    velocity(): WasmPoint;
+    curr: WasmPoint;
+    old: WasmPoint;
 }
 
-export class Wire {
+export class WasmWire {
     free(): void;
     [Symbol.dispose](): void;
+    /**
+     * Adds a new node at the specified position
+     */
+    add_node(x: number, y: number, fixed: boolean): void;
+    /**
+     * Adds a new node at a specific index
+     */
+    add_node_at(index: number, x: number, y: number, fixed: boolean): void;
     /**
      * Checks collision with a point and adjusts nodes
      */
-    check_collision(point: Point, pointer_radius: number): void;
+    check_collision(point: WasmPoint, pointer_radius: number): void;
     /**
      * Checks collision with mouse/pointer position
      */
-    check_mouse_collision(mouse: Point, mouse_radius: number): void;
+    check_mouse_collision(mouse: WasmPoint, mouse_radius: number): void;
     /**
      * Checks for collisions between wire elements
      */
@@ -317,11 +325,11 @@ export class Wire {
     /**
      * Gets the end point of the wire
      */
-    get_end(): Point;
+    get_end(): WasmPoint;
     /**
      * Gets a specific node by index
      */
-    get_node(index: number): Node | undefined;
+    get_node(index: number): WasmNode | undefined;
     /**
      * Gets the x coordinate of a node at the given index
      */
@@ -338,7 +346,7 @@ export class Wire {
     /**
      * Gets the start point of the wire
      */
-    get_start(): Point;
+    get_start(): WasmPoint;
     /**
      * Resets the iteration counter
      */
@@ -351,16 +359,20 @@ export class Wire {
     /**
      * Creates a wire between two points with specified radius
      */
-    static new_wire(xs: number, ys: number, xe: number, ye: number, radius: number): Wire;
+    static new_wire(xs: number, ys: number, xe: number, ye: number, radius: number): WasmWire;
     /**
      * Creates a wire with specific node count and link target distance
      */
-    static new_with_count(xs: number, ys: number, xe: number, ye: number, node_count: number, link_target: number, radius: number, render_type: number): Wire;
+    static new_with_count(xs: number, ys: number, xe: number, ye: number, node_count: number, link_target: number, radius: number, render_type: number): WasmWire;
     /**
      * Returns the number of nodes in the wire
      */
     node_count(): number;
-    static optimal_length(start: Point, end: Point, node_radius: number): number;
+    static optimal_length(start: WasmPoint, end: WasmPoint, node_radius: number): number;
+    /**
+     * Removes a node at the specified index
+     */
+    remove_node(index: number): boolean;
     /**
      * Sets the end point position (if it's fixed)
      */
@@ -374,6 +386,10 @@ export class Wire {
      * Sets the fixed state of a specific node
      */
     set_node_fixed(node_idx: number, fixed: boolean): void;
+    /**
+     * Sets the position of a specific node
+     */
+    set_node_position(node_idx: number, x: number, y: number): void;
     /**
      * Sets the radius of the wire
      */
@@ -389,14 +405,14 @@ export class Wire {
     /**
      * Updates the wire physics simulation
      */
-    update(dt: number, friction: number, acceleration: Point): void;
+    update(dt: number, friction: number, acceleration: WasmPoint): void;
     iterations: number;
     link_target_distance: number;
     radius: number;
     render_type: number;
 }
 
-export class World {
+export class WasmWorld {
     free(): void;
     [Symbol.dispose](): void;
     /**
@@ -407,14 +423,34 @@ export class World {
      * Adds a default wire to the world
      */
     add_wire_debug(): void;
+    /**
+     * Adds a node to a specific wire
+     */
+    add_wire_node(wire_idx: number, x: number, y: number, fixed: boolean): void;
+    /**
+     * Adds a node to a specific wire at a specific index
+     */
+    add_wire_node_at(wire_idx: number, node_idx: number, x: number, y: number, fixed: boolean): void;
     /**
      * Adds a wire with specific node count and link target distance
      */
     add_wire_with_count(xs: number, ys: number, xe: number, ye: number, node_count: number, link_target: number, radius: number, render_type: number): void;
+    /**
+     * Deletes a wire by index
+     */
+    delete_wire(index: number): boolean;
     /**
      * Gets the acceleration vector
      */
-    get_acceleration(): Point;
+    get_acceleration(): WasmPoint;
+    /**
+     * Gets the x component of acceleration
+     */
+    get_acceleration_x(): number;
+    /**
+     * Gets the y component of acceleration
+     */
+    get_acceleration_y(): number;
     /**
      * Gets the friction coefficient
      */
@@ -434,11 +470,11 @@ export class World {
     /**
      * Gets a specific wire by index
      */
-    get_wire(index: number): Wire | undefined;
+    get_wire(index: number): WasmWire | undefined;
     /**
      * Gets a node from a specific wire
      */
-    get_wire_node(wire_idx: number, node_idx: number): Node | undefined;
+    get_wire_node(wire_idx: number, node_idx: number): WasmNode | undefined;
     /**
      * Gets the number of nodes in a specific wire
      */
@@ -453,6 +489,10 @@ export class World {
     get_wire_node_y(wire_idx: number, node_idx: number): number;
     get_wire_radius(wire_idx: number): number;
     constructor();
+    /**
+     * Removes a node from a specific wire
+     */
+    remove_wire_node(wire_idx: number, node_idx: number): boolean;
     /**
      * Sets the acceleration vector
      */
@@ -489,6 +529,14 @@ export class World {
      * Sets the fixed state of a specific node in a wire
      */
     set_wire_node_fixed(wire_idx: number, node_idx: number, fixed: boolean): void;
+    /**
+     * Sets the position of a specific node in a wire
+     */
+    set_wire_node_position(wire_idx: number, node_idx: number, x: number, y: number): void;
+    /**
+     * Sets the radius of a specific wire
+     */
+    set_wire_radius(wire_idx: number, radius: number): void;
     /**
      * Sets the position of the first node (start) of a wire
      */
@@ -515,186 +563,3 @@ export class World {
      */
     static wire_optimal_length(start_x: number, start_y: number, end_x: number, end_y: number, radius: number): number;
 }
-
-export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
-
-export interface InitOutput {
-    readonly memory: WebAssembly.Memory;
-    readonly __wbg_get_wire_iterations: (a: number) => number;
-    readonly __wbg_get_wire_link_target_distance: (a: number) => number;
-    readonly __wbg_get_wire_radius: (a: number) => number;
-    readonly __wbg_get_wire_render_type: (a: number) => number;
-    readonly __wbg_set_wire_iterations: (a: number, b: number) => void;
-    readonly __wbg_set_wire_link_target_distance: (a: number, b: number) => void;
-    readonly __wbg_set_wire_radius: (a: number, b: number) => void;
-    readonly __wbg_set_wire_render_type: (a: number, b: number) => void;
-    readonly __wbg_wire_free: (a: number, b: number) => void;
-    readonly wire_check_collision: (a: number, b: number, c: number) => void;
-    readonly wire_check_mouse_collision: (a: number, b: number, c: number) => void;
-    readonly wire_check_wire_elements_collisions: (a: number, b: number) => void;
-    readonly wire_get_end: (a: number) => number;
-    readonly wire_get_node: (a: number, b: number) => number;
-    readonly wire_get_node_x: (a: number, b: number) => number;
-    readonly wire_get_node_y: (a: number, b: number) => number;
-    readonly wire_get_radius: (a: number) => number;
-    readonly wire_get_render_type: (a: number) => number;
-    readonly wire_get_start: (a: number) => number;
-    readonly wire_invalidate: (a: number) => void;
-    readonly wire_length: (a: number) => number;
-    readonly wire_new: () => number;
-    readonly wire_new_wire: (a: number, b: number, c: number, d: number, e: number) => number;
-    readonly wire_new_with_count: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
-    readonly wire_node_count: (a: number) => number;
-    readonly wire_optimal_length: (a: number, b: number, c: number) => number;
-    readonly wire_set_end: (a: number, b: number, c: number) => void;
-    readonly wire_set_node_count: (a: number, b: number) => void;
-    readonly wire_set_node_fixed: (a: number, b: number, c: number) => void;
-    readonly wire_set_radius: (a: number, b: number) => void;
-    readonly wire_set_render_type: (a: number, b: number) => void;
-    readonly wire_set_start: (a: number, b: number, c: number) => void;
-    readonly wire_update: (a: number, b: number, c: number, d: number) => void;
-    readonly __wbg_get_point_x: (a: number) => number;
-    readonly __wbg_get_point_y: (a: number) => number;
-    readonly __wbg_point_free: (a: number, b: number) => void;
-    readonly __wbg_set_point_x: (a: number, b: number) => void;
-    readonly __wbg_set_point_y: (a: number, b: number) => void;
-    readonly point_angle: (a: number) => number;
-    readonly point_angle_to: (a: number, b: number) => number;
-    readonly point_approx_equal: (a: number, b: number, c: number) => number;
-    readonly point_clamped: (a: number, b: number) => number;
-    readonly point_cross: (a: number, b: number) => number;
-    readonly point_distance_squared_to: (a: number, b: number) => number;
-    readonly point_distance_to: (a: number, b: number) => number;
-    readonly point_dot: (a: number, b: number) => number;
-    readonly point_length: (a: number) => number;
-    readonly point_length_squared: (a: number) => number;
-    readonly point_lerp: (a: number, b: number, c: number) => number;
-    readonly point_new: (a: number, b: number) => number;
-    readonly point_normalize: (a: number) => void;
-    readonly point_normalized: (a: number) => number;
-    readonly point_one: () => number;
-    readonly point_perpendicular: (a: number) => number;
-    readonly point_reflect: (a: number, b: number) => number;
-    readonly point_rotate: (a: number, b: number) => void;
-    readonly point_rotated: (a: number, b: number) => number;
-    readonly point_unit_x: () => number;
-    readonly point_unit_y: () => number;
-    readonly point_zero: () => number;
-    readonly __wbg_world_free: (a: number, b: number) => void;
-    readonly world_add_wire: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
-    readonly world_add_wire_debug: (a: number) => void;
-    readonly world_add_wire_with_count: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
-    readonly world_get_acceleration: (a: number) => number;
-    readonly world_get_friction: (a: number) => number;
-    readonly world_get_mouse_radius: (a: number) => number;
-    readonly world_get_pointer_radius: (a: number) => number;
-    readonly world_get_response_coef: (a: number) => number;
-    readonly world_get_wire: (a: number, b: number) => number;
-    readonly world_get_wire_node: (a: number, b: number, c: number) => number;
-    readonly world_get_wire_node_count: (a: number, b: number) => number;
-    readonly world_get_wire_node_x: (a: number, b: number, c: number) => number;
-    readonly world_get_wire_node_y: (a: number, b: number, c: number) => number;
-    readonly world_get_wire_radius: (a: number, b: number) => number;
-    readonly world_new: () => number;
-    readonly world_set_acceleration: (a: number, b: number, c: number) => void;
-    readonly world_set_friction: (a: number, b: number) => void;
-    readonly world_set_mouse: (a: number, b: number, c: number) => void;
-    readonly world_set_mouse_radius: (a: number, b: number) => void;
-    readonly world_set_pointer_radius: (a: number, b: number) => void;
-    readonly world_set_response_coef: (a: number, b: number) => void;
-    readonly world_set_wire_end: (a: number, b: number, c: number, d: number) => void;
-    readonly world_set_wire_node_count: (a: number, b: number, c: number) => void;
-    readonly world_set_wire_node_fixed: (a: number, b: number, c: number, d: number) => void;
-    readonly world_set_wire_start: (a: number, b: number, c: number, d: number) => void;
-    readonly world_update: (a: number) => void;
-    readonly world_wire_count: (a: number) => number;
-    readonly world_wire_data_len: (a: number) => number;
-    readonly world_wire_data_ptr: (a: number) => number;
-    readonly world_wire_optimal_length: (a: number, b: number, c: number, d: number, e: number) => number;
-    readonly __wbg_get_position_curr: (a: number) => number;
-    readonly __wbg_get_position_old: (a: number) => number;
-    readonly __wbg_position_free: (a: number, b: number) => void;
-    readonly __wbg_set_position_curr: (a: number, b: number) => void;
-    readonly __wbg_set_position_old: (a: number, b: number) => void;
-    readonly position_constrain: (a: number, b: number) => void;
-    readonly position_displacement: (a: number) => number;
-    readonly position_from_points: (a: number, b: number) => number;
-    readonly position_get_curr: (a: number) => number;
-    readonly position_get_curr_x: (a: number) => number;
-    readonly position_get_curr_y: (a: number) => number;
-    readonly position_get_old: (a: number) => number;
-    readonly position_get_old_x: (a: number) => number;
-    readonly position_get_old_y: (a: number) => number;
-    readonly position_integrate: (a: number, b: number, c: number, d: number) => void;
-    readonly position_new: (a: number, b: number) => number;
-    readonly position_new_with_old: (a: number, b: number, c: number, d: number) => number;
-    readonly position_reset_velocity: (a: number) => void;
-    readonly position_set_curr: (a: number, b: number, c: number) => void;
-    readonly position_set_curr_point: (a: number, b: number) => void;
-    readonly position_set_old: (a: number, b: number, c: number) => void;
-    readonly position_set_old_point: (a: number, b: number) => void;
-    readonly position_speed: (a: number) => number;
-    readonly position_update: (a: number, b: number, c: number) => void;
-    readonly position_update_point: (a: number, b: number) => void;
-    readonly position_velocity: (a: number) => number;
-    readonly __wbg_get_node_fixed: (a: number) => number;
-    readonly __wbg_get_node_position: (a: number) => number;
-    readonly __wbg_get_node_velocity: (a: number) => number;
-    readonly __wbg_node_free: (a: number, b: number) => void;
-    readonly __wbg_set_node_fixed: (a: number, b: number) => void;
-    readonly __wbg_set_node_position: (a: number, b: number) => void;
-    readonly __wbg_set_node_velocity: (a: number, b: number) => void;
-    readonly node_apply_force: (a: number, b: number, c: number) => void;
-    readonly node_apply_force_point: (a: number, b: number) => void;
-    readonly node_distance_squared_to: (a: number, b: number) => number;
-    readonly node_distance_to: (a: number, b: number) => number;
-    readonly node_get_fixed: (a: number) => number;
-    readonly node_get_position: (a: number) => number;
-    readonly node_get_speed: (a: number) => number;
-    readonly node_get_velocity: (a: number) => number;
-    readonly node_get_velocity_x: (a: number) => number;
-    readonly node_get_velocity_y: (a: number) => number;
-    readonly node_get_x: (a: number) => number;
-    readonly node_get_y: (a: number) => number;
-    readonly node_is_movable: (a: number) => number;
-    readonly node_make_fixed: (a: number) => void;
-    readonly node_make_movable: (a: number) => void;
-    readonly node_new: (a: number, b: number, c: number) => number;
-    readonly node_new_fixed: (a: number, b: number) => number;
-    readonly node_new_no_vel: (a: number, b: number, c: number) => number;
-    readonly node_print: (a: number) => [number, number];
-    readonly node_reset_velocity: (a: number) => void;
-    readonly node_set_fixed: (a: number, b: number) => void;
-    readonly node_set_position: (a: number, b: number, c: number) => void;
-    readonly node_set_velocity: (a: number, b: number, c: number) => void;
-    readonly node_translate: (a: number, b: number, c: number) => void;
-    readonly node_update_position: (a: number, b: number, c: number, d: number) => void;
-    readonly node_update_with_acceleration: (a: number, b: number, c: number, d: number) => void;
-    readonly node_zero: () => number;
-    readonly node_is_fixed: (a: number) => number;
-    readonly __wbindgen_externrefs: WebAssembly.Table;
-    readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-    readonly __wbindgen_start: () => void;
-}
-
-export type SyncInitInput = BufferSource | WebAssembly.Module;
-
-/**
- * Instantiates the given `module`, which can either be bytes or
- * a precompiled `WebAssembly.Module`.
- *
- * @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated.
- *
- * @returns {InitOutput}
- */
-export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput;
-
-/**
- * If `module_or_path` is {RequestInfo} or {URL}, makes a request and
- * for everything else, calls `WebAssembly.instantiate` directly.
- *
- * @param {{ module_or_path: InitInput | Promise<InitInput> }} module_or_path - Passing `InitInput` directly is deprecated.
- *
- * @returns {Promise<InitOutput>}
- */
-export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput> } | InitInput | Promise<InitInput>): Promise<InitOutput>;