Skip to content

Websys #444

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.

Sign up for GitHub

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

Merged
iceiix merged 34 commits into from
Dec 26, 2020
Merged

Websys #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f255b35
Use VirtualKeyCode from winit, not reexported from glutin
iceiix Dec 25, 2020
9b19ba8
Remove std_or_web wrapper package for now
iceiix Dec 25, 2020
2b53775
Update to glow with panicking tex_image_2d_multisample web-sys wrapper
iceiix Dec 25, 2020
285e121
Restore console_error_panic_hook, mistakingly removed in https://git…
iceiix Dec 25, 2020
19ffaa3
cargo fmt
iceiix Dec 25, 2020
07061cf
Refactor gl context initialization, pass glow::Context to gl::init fo…
iceiix Dec 25, 2020
6da26b2
Refactor handle_window_event to take a winit window, not glutin context
iceiix Dec 25, 2020
be605f4
Handle resize event outside of handle_window_event since it updates t…
iceiix Dec 25, 2020
babdbb5
Use winit events in handle_window_event not reexported glutin events
iceiix Dec 25, 2020
0583f3d
Refactor game loop handling into tick_all()
iceiix Dec 25, 2020
e56c1d7
Start on handling the web render loop
iceiix Dec 26, 2020
5c1e968
Create winit window for WebGL
iceiix Dec 26, 2020
c5c73e1
Use winit_window from glutin, and from winit for web
iceiix Dec 26, 2020
d6c1123
Use glow types in gl wrapper (integers in native, but Web*Key in web)
iceiix Dec 26, 2020
6bde99f
glow::UniformLocation doesn't implement Copy trait, and use glow::Ver…
iceiix Dec 26, 2020
2f03529
web-sys WebGlUniformLocation does not implement Copy trait, so glow::…
iceiix Dec 26, 2020
ff0dff8
Change target_os to target_arch
iceiix Dec 26, 2020
df4554b
Update www readme for status
iceiix Dec 26, 2020
9ed48c6
Revert "www: update README to remove wasm-pack; use cargo web start"
iceiix Dec 26, 2020
4281699
www: npm update
iceiix Dec 26, 2020
ed72c5d
www/index.js: fix wasm import path
iceiix Dec 26, 2020
9716b06
Remove force setting env RUST_BACKTRACE=1
iceiix Dec 26, 2020
84ee728
console: avoid loading fs:File on wasm
iceiix Dec 26, 2020
19cec57
Restore std_or_web wrapper for now
iceiix Dec 26, 2020
a4ad573
std_or_web: remove broken localstoragefs/stdweb, add File placeholder
iceiix Dec 26, 2020
6ee95f0
render: disable skin_thread on wasm since we don't have threads
iceiix Dec 26, 2020
fabca31
Use shader version in GLSL for WebGL; update to OpenGL 4.1 / OpenGL E…
iceiix Dec 26, 2020
dbc9a60
Restore OpenGL 3.2 native support, not using any OpenGL 4.1 features …
iceiix Dec 26, 2020
c505cd4
shaders: add explicit float/int type conversions
iceiix Dec 26, 2020
db173ae
shaders: specify mediump precision, required for WebGL
iceiix Dec 26, 2020
8fe1236
shader: refactor adding version and precision specifiers
iceiix Dec 26, 2020
a4d2d52
shaders: specify fragment shader output locations for WebGL
iceiix Dec 26, 2020
00188db
www: npm audit fix
iceiix Dec 26, 2020
636993f
www: update to link to https://github.com/iceiix/stevenarella/issues/446
iceiix Dec 26, 2020
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
175 changes: 19 additions & 156 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ opt-level = 1
[dependencies]
cfg-if = "1.0.0"
wasm-bindgen = "0.2.69"
glutin = "0.26.0"
glow = { git = "https://github.com/iceiix/glow", rev = "45c808678735e03737d5e1b9d6ed0e21070edcd9" }
winit = { version = "0.24.0", features = [ "web-sys" ]}
glow = { git = "https://github.com/iceiix/glow", rev = "b354346dee69ff0ca7ccef67f7580dfbb697423b" }
byteorder = "1.3.4"
serde = "1.0.118"
serde_json = "1.0.60"
Expand All @@ -42,10 +42,11 @@ clipboard = "0.5.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
reqwest = { version = "0.10.10", features = [ "blocking" ]}
glutin = "0.26.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
stdweb = "0.4.20"
winit = { version = "0.24.0", features = [ "stdweb" ]}
console_error_panic_hook = "0.1.6"
web-sys = "0.3.46"

[dependencies.steven_resources]
path = "./resources"
Expand Down
Loading