Skip to content

Commit 7185848

Browse files
committed
minor fixes after rebase
1 parent a409d2c commit 7185848

4 files changed

Lines changed: 23 additions & 9 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ webgl2 = ["bevy/webgl2"]
3636
# need both, cdylib for wasm, rlib for main.rs
3737
crate-type = ["cdylib", "rlib"]
3838

39-
[[bin]]
40-
name = "vizmat-native"
41-
path = "src/main.rs"
42-
4339
# optimize for smaller WASM binary size
4440
[profile.release]
4541
lto = "thin"

assets/c6h6.xyz

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
12
2+
Benzene C6H6
3+
C 0.000000 1.396792 0.000000
4+
C 1.209657 0.698396 0.000000
5+
C 1.209657 -0.698396 0.000000
6+
C 0.000000 -1.396792 0.000000
7+
C -1.209657 -0.698396 0.000000
8+
C -1.209657 0.698396 0.000000
9+
H 0.000000 2.490291 0.000000
10+
H 2.156659 1.245145 0.000000
11+
H 2.156659 -1.245145 0.000000
12+
H 0.000000 -2.490291 0.000000
13+
H -2.156659 -1.245145 0.000000
14+
H -2.156659 1.245145 0.000000

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</style>
2020
</head>
2121
<body>
22-
<link data-trunk rel="rust" data-target-name="vizmat" />
22+
<!-- Trunk will inject the WASM bundle here -->
2323
</body>
2424
</html>
2525

src/lib.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ pub(crate) mod parse;
1010
pub(crate) mod structure;
1111

1212
use crate::client::{poll_websocket_stream, setup_websocket_stream};
13-
use crate::io::{handle_file_drag_drop, load_dropped_file, update_crystal_from_file, FileDragDrop};
13+
use crate::io::{
14+
handle_file_drag_drop, load_default_crystal, load_dropped_file, update_crystal_from_file,
15+
FileDragDrop,
16+
};
1417
use crate::structure::{update_crystal_system, UpdateStructure};
1518
use crate::ui::{
16-
camera_controls, handle_load_default_button, setup_camera, setup_file_ui, setup_scene,
17-
update_file_ui, update_scene,
19+
camera_controls, handle_load_default_button, refresh_atoms_system, setup_cameras,
20+
setup_file_ui, setup_scene, update_file_ui, update_scene,
1821
};
19-
use crate::ui::{camera_controls, refresh_atoms_system, setup_cameras, setup_scene};
2022
use crate::ui::{
2123
handle_toggle_events, reset_camera_button_interaction, toggle_button, ToggleEvent, ToggleStates,
2224
};
@@ -52,6 +54,8 @@ pub fn run_app() {
5254
setup_cameras,
5355
spawn_axis,
5456
setup_buttons,
57+
setup_file_ui,
58+
setup_scene,
5559
setup_websocket_stream,
5660
)
5761
.after(load_default_crystal),

0 commit comments

Comments
 (0)