diff --git a/.kubernetes/beepsort-cert.yml b/.kubernetes/beepsort-cert.yml new file mode 100644 index 0000000..72b790c --- /dev/null +++ b/.kubernetes/beepsort-cert.yml @@ -0,0 +1,13 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: beepsort-cert + namespace: beepsort +spec: + secretName: beepsort-cert + issuerRef: + name: acme-issuer + kind: ClusterIssuer + dnsNames: + - "beepsort.polsevev.dev" + diff --git a/.kubernetes/beepsort-deploy.yml b/.kubernetes/beepsort-deploy.yml new file mode 100644 index 0000000..e1f8d9a --- /dev/null +++ b/.kubernetes/beepsort-deploy.yml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: beepsort + namespace: beepsort +spec: + replicas: 1 + selector: + matchLabels: + app: beepsort + template: + metadata: + labels: + app: beepsort + name: beepsort + spec: + containers: + - name: beepsort + image: registry.lan.polsevev.dev/beepsort:v0.1.1 + ports: + - containerPort: 80 diff --git a/.kubernetes/beepsort-ingress.yml b/.kubernetes/beepsort-ingress.yml new file mode 100644 index 0000000..fbd7c62 --- /dev/null +++ b/.kubernetes/beepsort-ingress.yml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: beepsort-ingress + namespace: beepsort +spec: + rules: + - host: "beepsort.polsevev.dev" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: beepsort-service + port: + number: 99 + tls: + - hosts: + - beepsort.polsevev.dev + secretName: beepsort-cert diff --git a/.kubernetes/beepsort-service.yml b/.kubernetes/beepsort-service.yml new file mode 100644 index 0000000..0d611bf --- /dev/null +++ b/.kubernetes/beepsort-service.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: beepsort-service + namespace: beepsort +spec: + selector: + app: beepsort + type: LoadBalancer + ports: + - name: docker-port + protocol: TCP + port: 99 + targetPort: 80 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..33c43bb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine3.18 +COPY ./index.html /usr/share/nginx/html/ +COPY ./target/wasm32-unknown-unknown/release/BeepSortMacroQuad.wasm /usr/share/nginx/html/ diff --git a/src/GuiHookVec.rs b/src/GuiHookVec.rs index bc577ec..e016712 100644 --- a/src/GuiHookVec.rs +++ b/src/GuiHookVec.rs @@ -4,18 +4,18 @@ use async_trait::async_trait; #[derive(Clone, Debug)] pub struct GuiVec { pub list: Vec, - initialSize: usize, - pub lastTime: f64, - pub reads: i32, - pub writes: i32, - pub comps: i32, - isPaused: bool, - delay: f32, - pub done: bool, - renderSkip: i32, - skipped: i32, - lastTouched: Vec, - lastPlayed: f64, + initialSize:usize, + pub lastTime:f64, + pub reads:i32, + pub writes:i32, + pub comps:i32, + isPaused:bool, + delay:f32, + pub done:bool, + renderSkip:i32, + skipped:i32, + lastTouched:Vec, + lastPlayed:f64, } #[async_trait] pub trait SortingList { @@ -57,6 +57,7 @@ impl SortingList for GuiVec { list.push(Bar::new(i, (colorStep * i as f32) / 360.)); } +<<<<<<< HEAD //Generate sounds GuiVec { list, @@ -72,6 +73,24 @@ impl SortingList for GuiVec { skipped: 0, lastTouched: Vec::with_capacity(2), lastPlayed: 0., +======= + + + GuiVec{ + list, + initialSize:length as usize, + lastTime: 0.0 , + reads:0, + writes:0, + comps:0, + isPaused:false, + delay, + done:false, + renderSkip:1, + skipped:0, + lastTouched:Vec::with_capacity(2), + lastPlayed:0., +>>>>>>> master } } @@ -86,6 +105,12 @@ impl SortingList for GuiVec { self.reads += 2; self.list.swap(index1, index2); +<<<<<<< HEAD +======= + + + +>>>>>>> master self.lastTouched.clear(); self.lastTouched.push(index1); self.lastTouched.push(index2); @@ -130,7 +155,14 @@ impl SortingList for GuiVec { self.reads += 1; self.list[i] = elem; self.draw().await; +<<<<<<< HEAD +======= + if time::get_time() + 0.1 >= self.lastPlayed{ + + self.lastPlayed = time::get_time()+0.1; + } +>>>>>>> master self.lastTouched.clear(); self.lastTouched.push(i); self.done