Compare commits
3 Commits
7bc3a9eeae
...
133b725053
Author | SHA1 | Date | |
---|---|---|---|
|
133b725053 | ||
|
c5f09b99b3 | ||
|
b0bd31a9da |
@ -1,7 +1,7 @@
|
|||||||
use nalgebra::{DMatrix, DVector};
|
use nalgebra::{DMatrix, DVector};
|
||||||
use rustc_hash::FxHashMap;
|
use rustc_hash::FxHashMap;
|
||||||
use slab::Slab;
|
use slab::Slab;
|
||||||
use std::{cell::Cell, collections::BTreeSet};
|
use std::{collections::BTreeSet, sync::atomic::{AtomicU64, Ordering}};
|
||||||
use sycamore::prelude::*;
|
use sycamore::prelude::*;
|
||||||
use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
|
use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
|
||||||
|
|
||||||
@ -13,9 +13,12 @@ pub type ConstraintKey = usize;
|
|||||||
|
|
||||||
pub type ElementColor = [f32; 3];
|
pub type ElementColor = [f32; 3];
|
||||||
|
|
||||||
thread_local! {
|
/* KLUDGE */
|
||||||
static NEXT_ELEMENT_SERIAL: Cell<u64> = Cell::new(0);
|
// we should reconsider this design when we build a system for switching between
|
||||||
}
|
// assemblies. at that point, we might want to switch to hierarchical keys,
|
||||||
|
// where each each element has a key that identifies it within its assembly and
|
||||||
|
// each assembly has a key that identifies it within the sesssion
|
||||||
|
static NEXT_ELEMENT_SERIAL: AtomicU64 = AtomicU64::new(0);
|
||||||
|
|
||||||
#[derive(Clone, PartialEq)]
|
#[derive(Clone, PartialEq)]
|
||||||
pub struct Element {
|
pub struct Element {
|
||||||
@ -41,9 +44,16 @@ impl Element {
|
|||||||
color: ElementColor,
|
color: ElementColor,
|
||||||
representation: DVector<f64>
|
representation: DVector<f64>
|
||||||
) -> Element {
|
) -> Element {
|
||||||
// take the next serial number
|
// take the next serial number, panicking if that was the last number we
|
||||||
let serial = NEXT_ELEMENT_SERIAL.get();
|
// had left. the technique we use to panic on overflow is taken from
|
||||||
NEXT_ELEMENT_SERIAL.set(serial.wrapping_add(1));
|
// _Rust Atomics and Locks_, by Mara Bos
|
||||||
|
//
|
||||||
|
// https://marabos.nl/atomics/atomics.html#example-handle-overflow
|
||||||
|
//
|
||||||
|
let serial = NEXT_ELEMENT_SERIAL.fetch_update(
|
||||||
|
Ordering::SeqCst, Ordering::SeqCst,
|
||||||
|
|serial| serial.checked_add(1)
|
||||||
|
).expect("Out of serial numbers for elements");
|
||||||
|
|
||||||
Element {
|
Element {
|
||||||
id: id,
|
id: id,
|
||||||
|
Loading…
Reference in New Issue
Block a user