Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
0012394
Rust restart
haydn-jones Jul 2, 2021
432a0c8
Working pong example from Amethyst
haydn-jones Jul 7, 2021
21a3275
Piston2d again
haydn-jones Jul 15, 2021
bffd208
Moved a lot into window struct
haydn-jones Jul 17, 2021
b4b30e4
GGEZ and Imgui
haydn-jones Jul 17, 2021
4bcb2a4
Added mint feature to glam. Builds.
haydn-jones Jul 19, 2021
6307a41
More updates
haydn-jones Jul 19, 2021
b41086f
More stuff
haydn-jones Jul 19, 2021
672c849
Updates
haydn-jones Jul 19, 2021
5dabc08
fun
benpm Jul 20, 2021
1f1dbd5
Added a camera
haydn-jones Jul 20, 2021
62033d0
Drawing module
haydn-jones Jul 20, 2021
a72b766
camera panning n zoomin
benpm Jul 21, 2021
2ed94e2
Split up rendering
haydn-jones Jul 22, 2021
c487acd
Update title
haydn-jones Jul 22, 2021
ce96b1b
Rename
haydn-jones Jul 22, 2021
94af543
Update ggez ver
haydn-jones Jul 22, 2021
b4222c3
Split rendering and updating
haydn-jones Jul 22, 2021
3a579d0
Vroom vroom faster mesh
haydn-jones Jul 23, 2021
51f3f8a
Huge vroom
haydn-jones Jul 23, 2021
b95a474
Rayon
haydn-jones Jul 23, 2021
33512da
Broke the camera
haydn-jones Jul 25, 2021
55aecb1
Now only zoom broken
haydn-jones Jul 25, 2021
4af1435
fix camera
benpm Jul 25, 2021
8544c6d
init
benpm Jul 26, 2021
aa75e74
Update gitignore
haydn-jones Jul 30, 2021
cd9ec57
Remove spirv compiled shaders
haydn-jones Jul 30, 2021
ed74047
Auto compile shaders
haydn-jones Jul 30, 2021
c01681f
Moved shaders
haydn-jones Aug 3, 2021
0d576bf
Updates
haydn-jones Aug 3, 2021
ba6ef5e
Changed file hierarchy
haydn-jones Aug 4, 2021
9d5811b
More changes
haydn-jones Aug 4, 2021
1ee90f4
shoved in sim code from other branch
benpm Aug 5, 2021
6bc7fd3
All working now
haydn-jones Aug 6, 2021
b14d141
Limit rendering, not sim
haydn-jones Aug 6, 2021
7015e5b
Using shaderc
haydn-jones Aug 6, 2021
921bbfc
Reuse vertex buffer
haydn-jones Aug 6, 2021
df44557
Clean up
haydn-jones Aug 6, 2021
b8d6fcf
staging belt
benpm Aug 6, 2021
7524a92
slow now
benpm Aug 6, 2021
e1f7883
Fixed staging belt
haydn-jones Aug 6, 2021
5314d1f
Broken gui added
haydn-jones Aug 8, 2021
4b7c363
combined render passes
benpm Aug 8, 2021
5b63997
okay fix sim render missing
benpm Aug 8, 2021
ded7445
Fixed resizing
haydn-jones Aug 10, 2021
cb5dc83
Back to two render passes
haydn-jones Aug 10, 2021
9810f94
Broke egui lol
haydn-jones Aug 10, 2021
3cd0038
run fix
benpm Aug 10, 2021
c542f68
camera but mouse interaction not working
benpm Aug 11, 2021
202ef0a
fix camera mouse pan
benpm Aug 11, 2021
5e45cd8
gui debug info window
benpm Aug 11, 2021
fb273ae
Cleaned some deps
haydn-jones Aug 18, 2021
da3cc7b
Cleaned repaint signal
haydn-jones Aug 18, 2021
b8c307e
Moved debug window to app
haydn-jones Aug 18, 2021
b1352c6
Update to wgpu 0.10.1
haydn-jones Aug 19, 2021
d8c77cd
Temporarily removed staging belt
haydn-jones Aug 23, 2021
65058d4
Small cleanup
haydn-jones Aug 23, 2021
5c88445
Side panel
haydn-jones Aug 23, 2021
e502e24
Restructure
haydn-jones Aug 24, 2021
7afd3d2
Restructure progress
haydn-jones Aug 25, 2021
131acd2
Restructure
haydn-jones Aug 25, 2021
0d98c18
Stats struct
haydn-jones Aug 25, 2021
aa081f9
Moved stuff into resources
haydn-jones Aug 25, 2021
a93426e
Deleted empty file
haydn-jones Aug 25, 2021
edcf8dc
Changed stat app
haydn-jones Aug 27, 2021
84c4da5
Updated dependencies
haydn-jones Aug 27, 2021
c5f39bd
More restructure
haydn-jones Aug 27, 2021
35119c3
Camera position
haydn-jones Aug 27, 2021
accfb35
Removed mut
haydn-jones Aug 27, 2021
0dfad61
Broke the camera more
haydn-jones Aug 28, 2021
c83c33f
Weird shit
haydn-jones Aug 28, 2021
10d86b0
Small change
haydn-jones Aug 28, 2021
5e62770
progress on cam transform in vert shader
benpm Aug 28, 2021
68be9be
another fix but still not working
benpm Aug 28, 2021
fd2fae1
okay cam translation in vertex shader is working
benpm Aug 28, 2021
a9fa777
Fixed a lot of problems with camera
haydn-jones Aug 29, 2021
902c954
Removed unused dep
haydn-jones Aug 29, 2021
136db9f
Removed more deps
haydn-jones Aug 29, 2021
dd3b19f
teensy changes
benpm Aug 29, 2021
04bb84d
camera zoom - but it no worky yet
benpm Aug 29, 2021
2c6da2a
yaya camera is centered now and should support zoom
benpm Aug 29, 2021
24c1e26
zooming with mouse wheel
benpm Aug 29, 2021
fba6c4e
mouse panning was really easy somehow
benpm Aug 29, 2021
49a520a
panning works perfectly now
benpm Aug 29, 2021
ea92c6a
added sim world boundaries
benpm Aug 29, 2021
49f8e71
Add rust format
haydn-jones Aug 30, 2021
d72a545
some reorg for mouse
benpm Aug 30, 2021
46835ed
Merge branch 'wgpu' of github.com:haydn-jones/Petri into wgpu
benpm Aug 30, 2021
22034d2
Formatting
haydn-jones Aug 30, 2021
bd35703
Updated event handling
haydn-jones Aug 30, 2021
89a0cc2
fixed Camera screen2world
benpm Aug 30, 2021
74022bf
tiny additional coordinates fix
benpm Aug 30, 2021
e89e377
comments
benpm Aug 30, 2021
30626fb
last cam fix
benpm Aug 30, 2021
4fff563
Grid almost working
haydn-jones Aug 30, 2021
a68e27a
fix biggo not wokringng
benpm Aug 30, 2021
fe29a2d
better now
benpm Aug 31, 2021
78982ad
Split graph app
haydn-jones Aug 31, 2021
dcf5974
Oops
haydn-jones Aug 31, 2021
a4cf6b8
System
haydn-jones Sep 1, 2021
bbabaed
grid
benpm Sep 2, 2021
c345146
collision resolution (no restitution yet)
benpm Sep 2, 2021
ae0fed4
elastic cols
benpm Sep 2, 2021
dbc506b
Formatting
haydn-jones Sep 2, 2021
95e6dbd
fix particles getting stuck on boundary
benpm Sep 2, 2021
102acc3
Merge branch 'wgpu' of github.com:haydn-jones/Petri into wgpu
benpm Sep 2, 2021
4440f5e
Bit faster
haydn-jones Sep 2, 2021
1c17871
Clippy
haydn-jones Sep 2, 2021
ec0112e
Correct Physics
haydn-jones Sep 3, 2021
174bea4
Removed unused value
haydn-jones Sep 3, 2021
1e510f8
Removed unused import
haydn-jones Sep 3, 2021
d4313ad
Physics file
haydn-jones Sep 3, 2021
c43b083
Stole flat_spatial lol
haydn-jones Sep 3, 2021
b4c9a00
Fast spatial grid
haydn-jones Sep 4, 2021
569ac26
2fast5me
benpm Sep 4, 2021
3131c5e
Added really shitty ugly timing
haydn-jones Sep 4, 2021
6a6a9e4
Merge remote-tracking branch 'origin/wgpu' into wgpu
haydn-jones Sep 4, 2021
851bbc7
removed bounds checking with fuckery, beeg speed
benpm Sep 5, 2021
5f8a772
faster?
benpm Sep 5, 2021
1ac9343
Vroom
haydn-jones Sep 5, 2021
6208121
Updates
haydn-jones Sep 5, 2021
f7c4d40
Clippy stuff
haydn-jones Sep 5, 2021
6e85c1e
More optimizations
haydn-jones Sep 5, 2021
04c8b3b
Unsafe collision resolution
haydn-jones Sep 5, 2021
76418e1
Timing macro
haydn-jones Sep 6, 2021
b749762
Parallel grid insert
haydn-jones Sep 7, 2021
1f5a9d6
More convenient timing. More sus
haydn-jones Sep 7, 2021
17d8330
Updates
haydn-jones Sep 7, 2021
81002d9
Timer cleanup
haydn-jones Sep 8, 2021
e16ed30
Grid index iterator
haydn-jones Sep 8, 2021
7112c0e
Removed padding, now not needed
haydn-jones Sep 8, 2021
3b80049
fasterer
benpm Sep 8, 2021
e9bf82a
format
haydn-jones Sep 8, 2021
3986545
cleaned up
benpm Sep 8, 2021
84690d3
readme
benpm Sep 9, 2021
9266b00
Removed unused deps
haydn-jones Sep 9, 2021
f9754ba
Vec2 struct for small perf increase
haydn-jones Sep 12, 2021
96bf819
Moved cell
haydn-jones Sep 14, 2021
ca5df0f
Timing updates
haydn-jones Sep 16, 2021
5b0200e
Dependency updates
haydn-jones Nov 1, 2021
f32f7b6
Switch to spin locks
haydn-jones Nov 20, 2021
699da50
Dep updates
haydn-jones Dec 16, 2021
bede5c1
Dep updates
haydn-jones Dec 21, 2021
09665d9
Lotta random stuff
haydn-jones Dec 23, 2021
70b36db
Removed configs
haydn-jones Dec 23, 2021
99e9e1e
Fixed config, fmt
haydn-jones Dec 23, 2021
ded6d5f
Lotta updates
haydn-jones Dec 24, 2021
10aeffc
More cleaning
haydn-jones Dec 24, 2021
9a2045a
Fixed double ticking
haydn-jones Dec 24, 2021
1c13773
UI updates
haydn-jones Dec 28, 2021
27bd606
Updated egui. Zooming broken
haydn-jones Jan 1, 2022
e23e038
Dep updates
haydn-jones Jan 22, 2022
2293406
Dep updates
haydn-jones Jan 21, 2023
f7ed62b
Full dep updates
haydn-jones Jan 21, 2023
ac20fa4
Minor perf updates
haydn-jones Jan 22, 2023
95e4b43
Some updates to performance UI
haydn-jones Jan 22, 2023
ec4395d
Thanks clippy
haydn-jones Jan 22, 2023
a44b114
Move dep to gui
haydn-jones Jan 22, 2023
bb0e007
Remove nightly req
haydn-jones Jan 22, 2023
3047621
I think this isnt working but I commit
haydn-jones Jan 24, 2023
5112d1b
Working again
haydn-jones Jan 26, 2023
f601861
More updates
haydn-jones Jan 26, 2023
5281361
More updates
haydn-jones Jan 27, 2023
826550b
Misc stuff
haydn-jones Jan 30, 2023
f5df5ca
Remove unused thing
haydn-jones Jan 30, 2023
c119710
Temporarily broke sim render
haydn-jones Feb 2, 2023
1388297
clippy stuff
haydn-jones Feb 2, 2023
fe4bf12
Closer
haydn-jones Feb 4, 2023
be34210
oops
haydn-jones Feb 4, 2023
d2f7b3b
Dep updates
haydn-jones Feb 9, 2023
48e77f8
Faster spatial hash
haydn-jones Feb 10, 2023
52a7139
more progress
haydn-jones Feb 14, 2023
0c8ac04
fix shader
benpm Feb 14, 2023
6286706
soft balls
benpm Feb 14, 2023
3701ab2
Updates
Feb 15, 2023
e60595c
dep updates
Apr 25, 2023
806b91d
Fix collision at cell boundaries
haydn-jones May 27, 2023
86e2105
updates
Jun 7, 2023
344ebfa
Fixed bevy 0.10 issues
Jun 7, 2023
7066464
Merge branch 'bevy_ecs_port' of https://github.com/TheFutureGadgetsLa…
Jun 7, 2023
8af8fa1
small stuff
haydn-jones Jun 9, 2023
4732d07
idk what im doing
haydn-jones Jun 9, 2023
f0bc430
asdfasdf
haydn-jones Jun 9, 2023
5da3971
Random updates
haydn-jones Jul 11, 2023
a167e55
Update deps but stuff broke
haydn-jones Nov 6, 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
2 changes: 2 additions & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build]
rustflags = ["-C", "link-arg=-fuse-ld=lld", "-C", "target-cpu=native"]
66 changes: 13 additions & 53 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,60 +1,20 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
# Generated by Cargo
# will have compiled files and executables
debug/
target/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# Autogenerated Jetbrains Rider plugin
[Aa]ssets/Plugins/Editor/JetBrains*
# These are backup files generated by rustfmt
**/*.rs.bk

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
.assets_db

# Crashlytics generated file
crashlytics-build.properties
imgui.ini

**/*.spv
52 changes: 1 addition & 51 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,6 @@
{
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
111 changes: 0 additions & 111 deletions Assets/BigSim.preset

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/BigSim.preset.meta

This file was deleted.

111 changes: 0 additions & 111 deletions Assets/DefaultSim.preset

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/DefaultSim.preset.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Resources.meta

This file was deleted.

Loading