Skip to content

Commit 0392fa2

Browse files
committed
bg adjust, working on new cv
1 parent 9c57033 commit 0392fa2

6 files changed

Lines changed: 40 additions & 49 deletions

File tree

src/components/css/main/index.module.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@
3333
justify-self: "center";
3434
flex-grow: 1;
3535
flex-shrink: 1;
36-
/* padding: 5vh 5vw 5vh 5vw; */
3736
margin: 0 auto;
38-
background: rgba(0, 0, 0, 0.2);
37+
background: rgba(0, 0, 0, 0.4);
38+
backdrop-filter: blur(3px);
39+
box-sizing: border-box;
40+
margin-top: 32px;
41+
padding: 32px 48px;
3942
}
4043

4144
.separator {
@@ -44,6 +47,10 @@
4447
}
4548

4649
@media screen and (min-width: 1200px) {
50+
.content {
51+
padding: 64px 96px;
52+
}
53+
4754
.responsiveDoubleCol {
4855
flex-direction: row;
4956
}

src/components/css/main/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ export const Main: React.FC = () => {
117117

118118
{!initialRenderComplete ? null : <Expandable expanded={showContent}>
119119
<div ref={contentRef} className={styles.content}>
120-
<div className="not-print" style={{ margin: '32px 24px', padding: '32px 0' }}>{selectedPage?.page}</div>
121-
<div className="print-only" style={{ margin: '32px 24px', marginBottom: 0 }}>{selectedPage?.page}</div>
120+
<div className="not-print">{selectedPage?.page}</div>
121+
<div className="print-only">{selectedPage?.page}</div>
122122
</div>
123123
</Expandable>}
124124

src/lib/feedbackRenderer/feedback_uv.frag

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ vec2 snoise32(vec3 pos){
2323
}
2424

2525
void main () {
26-
2726
vec2 mouseDist = (uv-mousePos)*aspect;
2827
float mouseLength = length(mouseDist);
2928
float mouseStrength = pow(max(1.0-mouseLength*1.0, 0.0), 5.0);
@@ -55,10 +54,10 @@ void main () {
5554
textureColor = blur(texture, textureUV, res, normalize(textureOffset)*max(0.3, min(1.0, length(textureOffset))));
5655

5756
vec2 outUv = textureColor.xy;
58-
outUv += pow(snoise32(vec3(uv*res*0.31232+vec2(1234.1232), t*10.323)), vec2(8.0))
59-
*0.3
60-
*speed
61-
*(1.0+1.0*pow(snoise3(vec3(aspectUv*0.8312, t*0.2581232)), 2.0) + pow(mouseStrength, 100.0)*1.5);
57+
outUv += pow(snoise32(vec3(uv*res*0.31232+vec2(1234.1232), t*5.323)), vec2(4.0))
58+
*0.07
59+
*speed;
60+
// *(1.0+1.0*pow(snoise3(vec3(aspectUv*0.8312, t*0.2581232)), 2.0) + pow(mouseStrength, 100.0)*1.5);
6261

6362
//alpha starts at 0
6463
outUv = mix(uv, outUv, (1.0-0.02*speed)*textureColor.a);

src/lib/feedbackRenderer/output.frag

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,20 @@ uniform vec2 mousePos;
99
uniform vec2 res;
1010
uniform vec2 aspect;
1111

12-
float modPeriod = 0.3;
12+
float modPeriod = 0.2;
1313

1414
void main () {
1515
vec4 textureColor = texture2D(texture, uv);
1616

1717
vec2 feedbackDiff = textureColor.rg-uv;
18-
float feedbackLength = min(1., length(feedbackDiff)*2.0);
18+
float feedbackLength = length(feedbackDiff)*3.0;
1919
// float feedbackLength = textureColor.r;
2020
float edges = mod(feedbackLength, modPeriod)/modPeriod;
2121

22-
vec3 hsv = vec3(edges*0.5-0.5+t*0.05, 0.4, 1);
22+
vec3 hsv = vec3(edges*0.4+t*0.02, 0.4, 1);
2323

2424
vec3 color = hsv2rgb(hsv);
25-
// vec3 color = vec3(textureColor.xy, 0.0);
26-
// float brightness = edges;
27-
float brightness = pow(feedbackLength, 2.5);
25+
float brightness = pow(min(1.0,feedbackLength), 4.0);
2826

2927
gl_FragColor = vec4(color, 1)*brightness;
30-
31-
vec2 mouseDiff = vec2(ivec2((mousePos-uv)*res+vec2(1.5, -1.5)));
32-
float mouseLength = abs(mouseDiff.x)+abs(mouseDiff.y);
33-
34-
float dirMask = step(mouseDiff.x, 0.0)*step(-mouseDiff.y, 0.0);
35-
36-
float distMask = step(mouseLength, 4.0);
37-
float mouseModX = 0.1;
38-
// float cursorMask = distMask*dirMask;
39-
float cursorMask = 0.0;
40-
41-
gl_FragColor = max(gl_FragColor*(1.0-cursorMask),(cursorMask-gl_FragColor));
42-
// gl_FragColor = textureColor;
43-
// gl_FragColor = vec4(0.0,0.0,0.0,0.0);
44-
// gl_FragColor = vec4(textureColor.xy, 0, 1);
45-
// gl_FragColor = vec4(mod(uv+textureColor.xy, vec2(1)), 0,1);
4628
}

src/markdown/cv.mdx

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,40 @@ import { Separator } from '../lib/separator'
66

77
# Skills
88

9-
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around' }}>
9+
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around', justifyContent: 'start' }}>
1010
<div style={{ width: '30%', minWidth: 200 }} >
11-
### Software Development
11+
### Software
1212
- Backend (AWS, Rust in lambda, Postgres)
1313
- Apps (Flutter, Android, iOS, Web)
1414
- Linux (systemd, nixos, Raspberry Pi)
1515
- C#, Go, Dart, Javascript, Kotlin, Python
1616
</div>
1717

1818
<div style={{ width: '30%', minWidth: 200 }} >
19-
### Team management
19+
### Teams
2020
- Leading multiple projects
21-
- Issues & project management
22-
- Balancing priorities between clients, developers, deadlines and quality
23-
- Knowing when to present a learning opportunity and when to step in
21+
- Coordinating stakeholder needs while maintaining development quality
22+
- Balancing learning opportunities with deadlines
2423
</div>
2524

2625
<div style={{ width: '30%', minWidth: 200 }} >
27-
### Rendering & Interaction
28-
- 3D Materials, Modelling & Maths
29-
- Live data & interaction
30-
- Projection hardware experience
31-
- Passion for experimental techniques
26+
### Product
27+
- Github Actions CI/CD
28+
- Passion for DX & Tooling
29+
- Mobile app store management
30+
- Scoping projects and managing backlog
31+
- Budget and time estimation
32+
- AI Prototyping
3233
</div>
3334
</div>
3435

3536
# Recent Experience
3637

3738
## Smart Access<span style={{ fontSize: 12, display: 'block' }}>Lead Developer | Mar 2023 - Today</span>
3839

39-
I joined Smart Access at the start of their software journey - they just had a prototype
40-
map app - a whitelabelled clone of an android map app. They have ownership over lots of Accessibility
41-
data with experience collecting it and wanted to build a platform to share it and grow.
40+
I joined Smart Access at the start of their software journey - they initially had only a prototype
41+
map application based on a white-labeled Android platform. The company possessed valuable accessibility
42+
data from years of collection efforts and sought to build a comprehensive platform to leverage and expand this data.
4243
Together we have expanded the company in many directions, including the following projects:
4344

4445
#### Smart Access Navigation ([Web](https://app.smartaccess.enterprises))
@@ -65,8 +66,8 @@ that speeds up and increases the accuracy of data collection.
6566
The app is a simple interface for collecting data with helpful UX and it integrates into the same backend.
6667

6768
The Smart Access platform is now flowing as a pipeline of data from users and clients the field to
68-
people with disabilities in the map app,
69-
with data annotation and intelligence in the backend.
69+
people with disabilities in the map app with data annotation and intelligence in the backend.
70+
<br/>
7071

7172
## My Life My Voice ([Web](https://app.mylifemyvoice.org.nz)) <span style={{ fontSize: 12, display: 'block' }}>Lead Developer | Feb 2023 - Today</span>
7273

@@ -81,6 +82,7 @@ The apps key audience included people with disabilities including intellectual a
8182
so we had to be extra mindful with our UX. In my time digging deep into flutter's accessibility features, I
8283
contributed back to the project by clearly communicating issues I found with reproducible examples.
8384

85+
<br/>
8486
## TASKA Prosthetics <span style={{ fontSize: 12, display: 'block' }}>Mobile Developer | Nov 2019 - Nov 2020</span>
8587
I joined TASKA as a mobile developer for their hand management app as a graduate developer.
8688
I contributed by prototyping options for expanding their app into multiple platforms, including iOS.
@@ -95,7 +97,7 @@ on either platform from the hand.
9597

9698
# History
9799

98-
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around' }}>
100+
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around', justifyContent: 'start' }}>
99101
{/* <div style={{ width: '30%', minWidth: 200 }} >
100102
### Smart Access <span style={{ fontSize: 12, display: 'block' }}>Mar 2023 - Today</span>
101103
_Accessibility mapping platform_
@@ -145,7 +147,7 @@ on either platform from the hand.
145147

146148
# Education
147149

148-
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around' }}>
150+
<div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-around', justifyContent: 'start' }}>
149151
<div style={{ width: '40%', minWidth: 300 }} >
150152
### Victoria University of Wellington <span style={{ fontSize: 14, display: 'block' }}>2017 - 2019</span>
151153
#### Bachelor of Design Innovation (Media Design)

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"jsx": "preserve",
1616
"baseUrl": ".",
1717
"paths": {
18+
"@/*": ["src/*"],
1819
"@markdown/*": ["src/markdown/*"],
1920
"@components/*": ["src/components/*"],
2021
"@components": ["src/components"],

0 commit comments

Comments
 (0)