Merged with master
This commit is contained in:
commit
82e27fa4b2
6 changed files with 116 additions and 12 deletions
13
.kubernetes/beepsort-cert.yml
Normal file
13
.kubernetes/beepsort-cert.yml
Normal file
|
@ -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"
|
||||
|
21
.kubernetes/beepsort-deploy.yml
Normal file
21
.kubernetes/beepsort-deploy.yml
Normal file
|
@ -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
|
21
.kubernetes/beepsort-ingress.yml
Normal file
21
.kubernetes/beepsort-ingress.yml
Normal file
|
@ -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
|
14
.kubernetes/beepsort-service.yml
Normal file
14
.kubernetes/beepsort-service.yml
Normal file
|
@ -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
|
3
Dockerfile
Normal file
3
Dockerfile
Normal file
|
@ -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/
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue