Skip to content

Kyra Clark Design Doc #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 81 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
20ce988
Update README.md almost
kyraSclark Nov 3, 2023
bef3c76
Update README.md
kyraSclark Nov 7, 2023
028270b
Update README.md
kyraSclark Nov 8, 2023
8274675
Design Doc done
kyraSclark Nov 8, 2023
7e1b561
initial commit
Nov 8, 2023
fde54eb
Update README.md
kyraSclark Nov 8, 2023
dce8905
Update README.md
kyraSclark Nov 8, 2023
d3ca9a2
Update README.md
kyraSclark Nov 8, 2023
6af79de
Particle class done
Nov 8, 2023
2d099cf
particle vertex and frag shaders done
Nov 9, 2023
a6b7b48
rendering works - CHECKPOINT
Nov 9, 2023
42fa61d
shader and drawable
Nov 9, 2023
6f9eb37
camera, shader, renderer
Nov 9, 2023
be40725
added color
Nov 9, 2023
432219d
square + DOESN'T BREAK
Nov 9, 2023
70c3d4e
transform feedback shader
Nov 9, 2023
32d8af6
add tf to particle
Nov 12, 2023
6ad1eea
transform particles + 1 particle!
Nov 12, 2023
3b50e3f
some cleaning
Nov 12, 2023
5958960
added time
Nov 12, 2023
31abe3b
added offsets
Nov 12, 2023
08d8d3d
WORKING PARTICLES
Nov 12, 2023
6b02034
remove offsets
Nov 12, 2023
06be747
clean up color
Nov 12, 2023
96675a8
milestone 1
Nov 12, 2023
854679b
Update README.md
kyraSclark Nov 12, 2023
052affa
Merge branch 'milestone1'
Nov 12, 2023
b4071d4
live demo not working :((((((
kyraSclark Nov 12, 2023
86d3f32
set up texture and FBO
Nov 13, 2023
0e44541
obstacle shaders
Nov 13, 2023
e28712c
Update build-and-deploy.yml
kyraSclark Nov 13, 2023
71ff3b7
Update README.md
kyraSclark Nov 13, 2023
5eb2560
Update README.md
kyraSclark Nov 13, 2023
ffe7d6e
Update main.ts
kyraSclark Nov 13, 2023
f7fe8f6
Update index.html
kyraSclark Nov 13, 2023
8d78022
Update README.md
kyraSclark Nov 13, 2023
ace9cb6
obstacle render code + mouse events
Nov 13, 2023
a94b773
lock camera
Nov 13, 2023
2e5a5c2
last obstacle shader
Nov 13, 2023
b720ea5
obstacle size
Nov 13, 2023
00e3f0d
debuggin no fix
Nov 13, 2023
19acf07
OBSTACLES APPEAR HAALELUUJAH
Nov 14, 2023
73d722e
collisions attempt 1
Nov 14, 2023
7415b19
bug fix. local girl doesn't know how to read
Nov 14, 2023
ca8e9c4
milestone 2 read me
Nov 14, 2023
c3a3de3
spelling errosr
Nov 14, 2023
8233623
Update README.md
kyraSclark Nov 14, 2023
af3c5bb
Merge branch 'main' into Milestone2
Nov 17, 2023
39e3467
merge with main
Nov 17, 2023
1a6fbc9
Update README.md
kyraSclark Nov 17, 2023
f158a39
Update main.ts
kyraSclark Nov 17, 2023
4d17aeb
show obstacles implemented
Nov 17, 2023
3229616
particle size
Nov 17, 2023
9fd0d9f
optimize particle
Nov 17, 2023
e5ea981
opt main
Nov 17, 2023
7fef248
gravity bug
Nov 17, 2023
9f7e268
fbm not working
Nov 20, 2023
7548e63
fbm working :)
Nov 20, 2023
257a3b8
customizable num particles
Nov 20, 2023
4c22291
CRITIQUE: wind and normal
Nov 27, 2023
8a75b0b
not working almost done noisy wind
Nov 29, 2023
998730b
start of noise wind, it's a little messy
Nov 29, 2023
49e3535
oops
Nov 29, 2023
9e13120
learning more about obs shaders
Nov 29, 2023
93f2136
star obstacle
Nov 29, 2023
6197d91
better noisy wind
Nov 29, 2023
1941d11
remove obsolete shader
Nov 29, 2023
8b90a5d
Update README.md
kyraSclark Nov 29, 2023
c0651bf
Update README.md
kyraSclark Nov 29, 2023
cfd357b
Update README.md
kyraSclark Nov 29, 2023
d20da17
clean up
Nov 30, 2023
7f9d63b
Merge branch 'Milestone3' of https://github.com/kyraSclark/final-proj…
Nov 30, 2023
f6fbd21
post mortem
kyraSclark Nov 30, 2023
f7cfa85
final description
kyraSclark Nov 30, 2023
7c454c3
Update README.md
kyraSclark Nov 30, 2023
a8f9cec
spell check
Nov 30, 2023
0f728da
Merge branch 'main' of https://github.com/kyraSclark/final-project
Nov 30, 2023
58d8c7f
Update README.md
kyraSclark Dec 1, 2023
65ef126
Update README.md
kyraSclark Dec 1, 2023
23295ce
add photos and captions
kyraSclark Dec 1, 2023
5570fd9
fix captions
kyraSclark Dec 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build and Deploy
on:
push:
branches:
- main
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/[email protected]
with:
persist-credentials: false

- uses: actions/setup-node@v2-beta
with:
node-version: "15.x"

- uses: actions/cache@v2
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ hashFiles('**/package-lock.json') }}

- name: Install and Build 🔧
run: |
npm ci
export NODE_ENV=production
npm run-script build
touch dist/.nojekyll
- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: dist
CLEAN: true
64 changes: 64 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

dist/bundle.js
dist/bundle.js.map
251 changes: 161 additions & 90 deletions README.md

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!doctype html>
<html>
<head>
<title>Final Project: Particle Waterfall | CIS 566</title>
<style>
html, body {
margin: 0;
overflow: hidden;
}
#canvas {
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<canvas id="canvas"></canvas>
<script type="text/javascript" src="bundle.js"></script>
</body>
</html>
Loading