cosmol-viewer 0.1.2.dev1__tar.gz → 0.1.2.dev2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of cosmol-viewer might be problematic. Click here for more details.

Files changed (26) hide show
  1. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/Cargo.lock +33 -187
  2. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/Cargo.toml +3 -6
  3. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/PKG-INFO +1 -1
  4. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/Cargo.toml +5 -0
  5. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/lib.rs +24 -86
  6. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/Cargo.toml +4 -3
  7. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/src/lib.rs +0 -3
  8. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/pyproject.toml +1 -1
  9. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/parser/mod.rs +0 -0
  10. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/parser/sdf.rs +0 -0
  11. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/scene.rs +0 -0
  12. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/bg_fragment.glsl +0 -0
  13. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/bg_vertex.glsl +0 -0
  14. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/canvas.rs +0 -0
  15. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/fragment.glsl +0 -0
  16. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/mod.rs +0 -0
  17. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shader/vertex.glsl +0 -0
  18. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shapes/mod.rs +0 -0
  19. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shapes/molecules.rs +0 -0
  20. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shapes/sphere.rs +0 -0
  21. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/shapes/stick.rs +0 -0
  22. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/core/src/utils.rs +0 -0
  23. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/README.md +0 -0
  24. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/build.rs +0 -0
  25. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/src/parser.rs +0 -0
  26. {cosmol_viewer-0.1.2.dev1 → cosmol_viewer-0.1.2.dev2}/crates/python/src/shapes.rs +0 -0
@@ -90,8 +90,8 @@ dependencies = [
90
90
  "accesskit_consumer",
91
91
  "hashbrown",
92
92
  "static_assertions",
93
- "windows 0.61.3",
94
- "windows-core 0.61.2",
93
+ "windows",
94
+ "windows-core",
95
95
  ]
96
96
 
97
97
  [[package]]
@@ -393,15 +393,6 @@ version = "0.22.1"
393
393
  source = "registry+https://github.com/rust-lang/crates.io-index"
394
394
  checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
395
395
 
396
- [[package]]
397
- name = "bincode"
398
- version = "1.3.3"
399
- source = "registry+https://github.com/rust-lang/crates.io-index"
400
- checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
401
- dependencies = [
402
- "serde",
403
- ]
404
-
405
396
  [[package]]
406
397
  name = "bit-set"
407
398
  version = "0.8.0"
@@ -695,11 +686,8 @@ dependencies = [
695
686
  "cosmol_viewer_core",
696
687
  "eframe",
697
688
  "egui_extras",
698
- "hex",
699
- "ipc-channel",
700
689
  "pyo3",
701
690
  "serde_json",
702
- "sha2",
703
691
  "uuid",
704
692
  "wasm-bindgen",
705
693
  ]
@@ -735,15 +723,6 @@ dependencies = [
735
723
  "cfg-if",
736
724
  ]
737
725
 
738
- [[package]]
739
- name = "crossbeam-channel"
740
- version = "0.5.15"
741
- source = "registry+https://github.com/rust-lang/crates.io-index"
742
- checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
743
- dependencies = [
744
- "crossbeam-utils",
745
- ]
746
-
747
726
  [[package]]
748
727
  name = "crossbeam-utils"
749
728
  version = "0.8.21"
@@ -842,7 +821,8 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
842
821
  [[package]]
843
822
  name = "ecolor"
844
823
  version = "0.32.0"
845
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
824
+ source = "registry+https://github.com/rust-lang/crates.io-index"
825
+ checksum = "4a631732d995184114016fab22fc7e3faf73d6841c2d7650395fe251fbcd9285"
846
826
  dependencies = [
847
827
  "bytemuck",
848
828
  "emath",
@@ -851,7 +831,8 @@ dependencies = [
851
831
  [[package]]
852
832
  name = "eframe"
853
833
  version = "0.32.0"
854
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
834
+ source = "registry+https://github.com/rust-lang/crates.io-index"
835
+ checksum = "0c790ccfbb3dd556588342463454b2b2b13909e5fdce5bc2a1432a8aa69c8b7a"
855
836
  dependencies = [
856
837
  "ahash",
857
838
  "bytemuck",
@@ -886,7 +867,8 @@ dependencies = [
886
867
  [[package]]
887
868
  name = "egui"
888
869
  version = "0.32.0"
889
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
870
+ source = "registry+https://github.com/rust-lang/crates.io-index"
871
+ checksum = "8470210c95a42cc985d9ffebfd5067eea55bdb1c3f7611484907db9639675e28"
890
872
  dependencies = [
891
873
  "accesskit",
892
874
  "ahash",
@@ -903,7 +885,8 @@ dependencies = [
903
885
  [[package]]
904
886
  name = "egui-wgpu"
905
887
  version = "0.32.0"
906
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
888
+ source = "registry+https://github.com/rust-lang/crates.io-index"
889
+ checksum = "14de9942d8b9e99e2d830403c208ab1a6e052e925a7456a4f6f66d567d90de1d"
907
890
  dependencies = [
908
891
  "ahash",
909
892
  "bytemuck",
@@ -922,7 +905,8 @@ dependencies = [
922
905
  [[package]]
923
906
  name = "egui-winit"
924
907
  version = "0.32.0"
925
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
908
+ source = "registry+https://github.com/rust-lang/crates.io-index"
909
+ checksum = "c490804a035cec9c826082894a3e1ecf4198accd3817deb10f7919108ebafab0"
926
910
  dependencies = [
927
911
  "accesskit_winit",
928
912
  "ahash",
@@ -941,7 +925,8 @@ dependencies = [
941
925
  [[package]]
942
926
  name = "egui_extras"
943
927
  version = "0.32.0"
944
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
928
+ source = "registry+https://github.com/rust-lang/crates.io-index"
929
+ checksum = "0f791a5937f518249016b276b3639ad2aa3824048b6f2161ec2b431ab325880a"
945
930
  dependencies = [
946
931
  "ahash",
947
932
  "egui",
@@ -954,7 +939,8 @@ dependencies = [
954
939
  [[package]]
955
940
  name = "egui_glow"
956
941
  version = "0.32.0"
957
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
942
+ source = "registry+https://github.com/rust-lang/crates.io-index"
943
+ checksum = "d44f3fd4fdc5f960c9e9ef7327c26647edc3141abf96102980647129d49358e6"
958
944
  dependencies = [
959
945
  "ahash",
960
946
  "bytemuck",
@@ -971,7 +957,8 @@ dependencies = [
971
957
  [[package]]
972
958
  name = "emath"
973
959
  version = "0.32.0"
974
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
960
+ source = "registry+https://github.com/rust-lang/crates.io-index"
961
+ checksum = "45f057b141e7e46340c321400be74b793543b1b213036f0f989c35d35957c32e"
975
962
  dependencies = [
976
963
  "bytemuck",
977
964
  ]
@@ -1026,7 +1013,8 @@ dependencies = [
1026
1013
  [[package]]
1027
1014
  name = "epaint"
1028
1015
  version = "0.32.0"
1029
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
1016
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1017
+ checksum = "94cca02195f0552c17cabdc02f39aa9ab6fbd815dac60ab1cd3d5b0aa6f9551c"
1030
1018
  dependencies = [
1031
1019
  "ab_glyph",
1032
1020
  "ahash",
@@ -1043,7 +1031,8 @@ dependencies = [
1043
1031
  [[package]]
1044
1032
  name = "epaint_default_fonts"
1045
1033
  version = "0.32.0"
1046
- source = "git+https://github.com/950288/egui?branch=main#597f2f8a71d54a1dbd7295fd699ab045b920e2bf"
1034
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1035
+ checksum = "e8495e11ed527dff39663b8c36b6c2b2799d7e4287fb90556e455d72eca0b4d3"
1047
1036
 
1048
1037
  [[package]]
1049
1038
  name = "equivalent"
@@ -1113,12 +1102,6 @@ dependencies = [
1113
1102
  "miniz_oxide",
1114
1103
  ]
1115
1104
 
1116
- [[package]]
1117
- name = "fnv"
1118
- version = "1.0.7"
1119
- source = "registry+https://github.com/rust-lang/crates.io-index"
1120
- checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
1121
-
1122
1105
  [[package]]
1123
1106
  name = "foldhash"
1124
1107
  version = "0.1.5"
@@ -1246,7 +1229,7 @@ dependencies = [
1246
1229
  "cfg-if",
1247
1230
  "libc",
1248
1231
  "r-efi",
1249
- "wasi 0.14.2+wasi-0.2.4",
1232
+ "wasi",
1250
1233
  ]
1251
1234
 
1252
1235
  [[package]]
@@ -1527,24 +1510,6 @@ version = "2.0.6"
1527
1510
  source = "registry+https://github.com/rust-lang/crates.io-index"
1528
1511
  checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
1529
1512
 
1530
- [[package]]
1531
- name = "ipc-channel"
1532
- version = "0.20.0"
1533
- source = "registry+https://github.com/rust-lang/crates.io-index"
1534
- checksum = "5b1c98b70019c830a1fc39cecfe1f60ff99c4122f0a189697c810c90ec545c14"
1535
- dependencies = [
1536
- "bincode",
1537
- "crossbeam-channel",
1538
- "fnv",
1539
- "libc",
1540
- "mio",
1541
- "rand 0.9.1",
1542
- "serde",
1543
- "tempfile",
1544
- "uuid",
1545
- "windows 0.58.0",
1546
- ]
1547
-
1548
1513
  [[package]]
1549
1514
  name = "itoa"
1550
1515
  version = "1.0.15"
@@ -1730,17 +1695,6 @@ dependencies = [
1730
1695
  "simd-adler32",
1731
1696
  ]
1732
1697
 
1733
- [[package]]
1734
- name = "mio"
1735
- version = "1.0.4"
1736
- source = "registry+https://github.com/rust-lang/crates.io-index"
1737
- checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
1738
- dependencies = [
1739
- "libc",
1740
- "wasi 0.11.1+wasi-snapshot-preview1",
1741
- "windows-sys 0.59.0",
1742
- ]
1743
-
1744
1698
  [[package]]
1745
1699
  name = "naga"
1746
1700
  version = "25.0.1"
@@ -2203,7 +2157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2203
2157
  checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
2204
2158
  dependencies = [
2205
2159
  "phf_shared",
2206
- "rand 0.8.5",
2160
+ "rand",
2207
2161
  ]
2208
2162
 
2209
2163
  [[package]]
@@ -2322,15 +2276,6 @@ dependencies = [
2322
2276
  "zerovec",
2323
2277
  ]
2324
2278
 
2325
- [[package]]
2326
- name = "ppv-lite86"
2327
- version = "0.2.21"
2328
- source = "registry+https://github.com/rust-lang/crates.io-index"
2329
- checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
2330
- dependencies = [
2331
- "zerocopy",
2332
- ]
2333
-
2334
2279
  [[package]]
2335
2280
  name = "proc-macro-crate"
2336
2281
  version = "3.3.0"
@@ -2457,27 +2402,7 @@ version = "0.8.5"
2457
2402
  source = "registry+https://github.com/rust-lang/crates.io-index"
2458
2403
  checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
2459
2404
  dependencies = [
2460
- "rand_core 0.6.4",
2461
- ]
2462
-
2463
- [[package]]
2464
- name = "rand"
2465
- version = "0.9.1"
2466
- source = "registry+https://github.com/rust-lang/crates.io-index"
2467
- checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
2468
- dependencies = [
2469
- "rand_chacha",
2470
- "rand_core 0.9.3",
2471
- ]
2472
-
2473
- [[package]]
2474
- name = "rand_chacha"
2475
- version = "0.9.0"
2476
- source = "registry+https://github.com/rust-lang/crates.io-index"
2477
- checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
2478
- dependencies = [
2479
- "ppv-lite86",
2480
- "rand_core 0.9.3",
2405
+ "rand_core",
2481
2406
  ]
2482
2407
 
2483
2408
  [[package]]
@@ -2486,15 +2411,6 @@ version = "0.6.4"
2486
2411
  source = "registry+https://github.com/rust-lang/crates.io-index"
2487
2412
  checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
2488
2413
 
2489
- [[package]]
2490
- name = "rand_core"
2491
- version = "0.9.3"
2492
- source = "registry+https://github.com/rust-lang/crates.io-index"
2493
- checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
2494
- dependencies = [
2495
- "getrandom",
2496
- ]
2497
-
2498
2414
  [[package]]
2499
2415
  name = "raw-window-handle"
2500
2416
  version = "0.6.2"
@@ -3086,12 +3002,6 @@ dependencies = [
3086
3002
  "winapi-util",
3087
3003
  ]
3088
3004
 
3089
- [[package]]
3090
- name = "wasi"
3091
- version = "0.11.1+wasi-snapshot-preview1"
3092
- source = "registry+https://github.com/rust-lang/crates.io-index"
3093
- checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
3094
-
3095
3005
  [[package]]
3096
3006
  name = "wasi"
3097
3007
  version = "0.14.2+wasi-0.2.4"
@@ -3451,16 +3361,6 @@ version = "0.4.0"
3451
3361
  source = "registry+https://github.com/rust-lang/crates.io-index"
3452
3362
  checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
3453
3363
 
3454
- [[package]]
3455
- name = "windows"
3456
- version = "0.58.0"
3457
- source = "registry+https://github.com/rust-lang/crates.io-index"
3458
- checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
3459
- dependencies = [
3460
- "windows-core 0.58.0",
3461
- "windows-targets 0.52.6",
3462
- ]
3463
-
3464
3364
  [[package]]
3465
3365
  name = "windows"
3466
3366
  version = "0.61.3"
@@ -3468,7 +3368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
3468
3368
  checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
3469
3369
  dependencies = [
3470
3370
  "windows-collections",
3471
- "windows-core 0.61.2",
3371
+ "windows-core",
3472
3372
  "windows-future",
3473
3373
  "windows-link",
3474
3374
  "windows-numerics",
@@ -3480,20 +3380,7 @@ version = "0.2.0"
3480
3380
  source = "registry+https://github.com/rust-lang/crates.io-index"
3481
3381
  checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
3482
3382
  dependencies = [
3483
- "windows-core 0.61.2",
3484
- ]
3485
-
3486
- [[package]]
3487
- name = "windows-core"
3488
- version = "0.58.0"
3489
- source = "registry+https://github.com/rust-lang/crates.io-index"
3490
- checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
3491
- dependencies = [
3492
- "windows-implement 0.58.0",
3493
- "windows-interface 0.58.0",
3494
- "windows-result 0.2.0",
3495
- "windows-strings 0.1.0",
3496
- "windows-targets 0.52.6",
3383
+ "windows-core",
3497
3384
  ]
3498
3385
 
3499
3386
  [[package]]
@@ -3502,11 +3389,11 @@ version = "0.61.2"
3502
3389
  source = "registry+https://github.com/rust-lang/crates.io-index"
3503
3390
  checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
3504
3391
  dependencies = [
3505
- "windows-implement 0.60.0",
3506
- "windows-interface 0.59.1",
3392
+ "windows-implement",
3393
+ "windows-interface",
3507
3394
  "windows-link",
3508
- "windows-result 0.3.4",
3509
- "windows-strings 0.4.2",
3395
+ "windows-result",
3396
+ "windows-strings",
3510
3397
  ]
3511
3398
 
3512
3399
  [[package]]
@@ -3515,22 +3402,11 @@ version = "0.2.1"
3515
3402
  source = "registry+https://github.com/rust-lang/crates.io-index"
3516
3403
  checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
3517
3404
  dependencies = [
3518
- "windows-core 0.61.2",
3405
+ "windows-core",
3519
3406
  "windows-link",
3520
3407
  "windows-threading",
3521
3408
  ]
3522
3409
 
3523
- [[package]]
3524
- name = "windows-implement"
3525
- version = "0.58.0"
3526
- source = "registry+https://github.com/rust-lang/crates.io-index"
3527
- checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
3528
- dependencies = [
3529
- "proc-macro2",
3530
- "quote",
3531
- "syn",
3532
- ]
3533
-
3534
3410
  [[package]]
3535
3411
  name = "windows-implement"
3536
3412
  version = "0.60.0"
@@ -3542,17 +3418,6 @@ dependencies = [
3542
3418
  "syn",
3543
3419
  ]
3544
3420
 
3545
- [[package]]
3546
- name = "windows-interface"
3547
- version = "0.58.0"
3548
- source = "registry+https://github.com/rust-lang/crates.io-index"
3549
- checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
3550
- dependencies = [
3551
- "proc-macro2",
3552
- "quote",
3553
- "syn",
3554
- ]
3555
-
3556
3421
  [[package]]
3557
3422
  name = "windows-interface"
3558
3423
  version = "0.59.1"
@@ -3576,19 +3441,10 @@ version = "0.2.0"
3576
3441
  source = "registry+https://github.com/rust-lang/crates.io-index"
3577
3442
  checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
3578
3443
  dependencies = [
3579
- "windows-core 0.61.2",
3444
+ "windows-core",
3580
3445
  "windows-link",
3581
3446
  ]
3582
3447
 
3583
- [[package]]
3584
- name = "windows-result"
3585
- version = "0.2.0"
3586
- source = "registry+https://github.com/rust-lang/crates.io-index"
3587
- checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
3588
- dependencies = [
3589
- "windows-targets 0.52.6",
3590
- ]
3591
-
3592
3448
  [[package]]
3593
3449
  name = "windows-result"
3594
3450
  version = "0.3.4"
@@ -3598,16 +3454,6 @@ dependencies = [
3598
3454
  "windows-link",
3599
3455
  ]
3600
3456
 
3601
- [[package]]
3602
- name = "windows-strings"
3603
- version = "0.1.0"
3604
- source = "registry+https://github.com/rust-lang/crates.io-index"
3605
- checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
3606
- dependencies = [
3607
- "windows-result 0.2.0",
3608
- "windows-targets 0.52.6",
3609
- ]
3610
-
3611
3457
  [[package]]
3612
3458
  name = "windows-strings"
3613
3459
  version = "0.4.2"
@@ -16,12 +16,9 @@ members = ["crates/python"]
16
16
  cosmol_viewer = { version = "0.1.2-nightly.1", path = "cosmol_viewer"}
17
17
  cosmol_viewer_core = { version = "0.1.2-nightly.1", path = "crates/core" }
18
18
 
19
- eframe = { git = "https://github.com/950288/egui", branch = "main" }
20
- egui-winit = { git = "https://github.com/950288/egui", branch = "main" }
21
- egui_extras = { git = "https://github.com/950288/egui", branch = "main" }
22
- # eframe = { path = "D://Github//egui//crates//eframe"}
23
- # egui-winit = { path = "D://Github//egui//crates//egui-winit"}
24
- # egui_extras = { path = "D://Github//egui//crates//egui_extras"}
19
+ eframe = { version = "0.32.0", features = ["wayland","x11"] }
20
+ egui-winit = { version = "0.32.0", features = ["wayland","x11"] }
21
+ egui_extras = { version = "0.32.0" }
25
22
  serde = { version = "1.0.219" , features = ["derive"] }
26
23
  serde_json = "1.0.140"
27
24
  sha2 = "0.10.9"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cosmol-viewer
3
- Version: 0.1.2.dev1
3
+ Version: 0.1.2.dev2
4
4
  Summary: Molecular visualization tools
5
5
  Author-email: 95028 <wjt@cosmol.org>
6
6
  Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
@@ -20,3 +20,8 @@ once_cell = "1.21.3"
20
20
 
21
21
  [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
22
22
  egui-winit.workspace = true
23
+
24
+ [features]
25
+ default = []
26
+ wayland = []
27
+ x11 = []
@@ -1,18 +1,10 @@
1
1
  mod shader;
2
- #[cfg(not(target_arch = "wasm32"))]
3
- use egui_winit::winit::{self, event_loop::EventLoop};
4
2
  use std::sync::{Arc, Mutex};
5
3
 
6
- #[cfg(not(target_arch = "wasm32"))]
7
- use eframe::native::winit_integration::WinitApp;
8
-
9
4
  pub mod parser;
10
5
  pub mod utils;
11
6
  pub use eframe::egui;
12
7
 
13
- #[cfg(not(target_arch = "wasm32"))]
14
- use eframe::{AppCreator, Error, NativeOptions, Renderer, UserEvent, native::run::WinitAppWrapper};
15
-
16
8
  use eframe::egui::{Color32, Stroke};
17
9
 
18
10
  use shader::Canvas;
@@ -99,9 +91,33 @@ impl NativeGuiViewer {
99
91
  let scene = Arc::new(Mutex::new(scene.clone()));
100
92
 
101
93
  thread::spawn(move || {
94
+ use eframe::{EventLoopBuilderHook, run_native};
95
+ let event_loop_builder: Option<EventLoopBuilderHook> =
96
+ Some(Box::new(|event_loop_builder| {
97
+ #[cfg(target_family = "windows")]
98
+ {
99
+ use egui_winit::winit::platform::windows::EventLoopBuilderExtWindows;
100
+ event_loop_builder.with_any_thread(true);
101
+ println!("Running on windows")
102
+ }
103
+ #[cfg(feature = "wayland")]
104
+ {
105
+ use egui_winit::winit::platform::wayland::EventLoopBuilderExtWayland;
106
+ event_loop_builder.with_any_thread(true);
107
+ println!("Running on wayland")
108
+ }
109
+ #[cfg(feature = "x11")]
110
+ {
111
+ use egui_winit::winit::platform::x11::EventLoopBuilderExtX11;
112
+ event_loop_builder.with_any_thread(true);
113
+ println!("Running on X11")
114
+ }
115
+ }));
116
+
102
117
  let native_options = NativeOptions {
103
118
  viewport: ViewportBuilder::default().with_inner_size(Vec2::new(800.0, 500.0)),
104
119
  depth_buffer: 24,
120
+ event_loop_builder,
105
121
  ..Default::default()
106
122
  };
107
123
 
@@ -128,81 +144,3 @@ impl NativeGuiViewer {
128
144
  }
129
145
  }
130
146
  }
131
-
132
- #[cfg(not(target_arch = "wasm32"))]
133
- pub fn run_native(
134
- app_name: &str,
135
- mut native_options: NativeOptions,
136
- app_creator: AppCreator<'_>,
137
- ) -> Result {
138
- if native_options.viewport.title.is_none() {
139
- native_options.viewport.title = Some(app_name.to_owned());
140
- }
141
-
142
- let renderer = native_options.renderer;
143
-
144
- {
145
- match renderer {
146
- Renderer::Glow => "glow",
147
- };
148
- }
149
-
150
- match renderer {
151
- Renderer::Glow => run_glow(app_name, native_options, app_creator),
152
- }
153
- }
154
-
155
- #[cfg(not(target_arch = "wasm32"))]
156
- pub type Result<T = (), E = Error> = std::result::Result<T, E>;
157
-
158
- #[cfg(not(target_arch = "wasm32"))]
159
- pub fn run_glow(
160
- app_name: &str,
161
- mut native_options: NativeOptions,
162
- app_creator: AppCreator<'_>,
163
- ) -> Result {
164
- #![allow(clippy::needless_return_with_question_mark)] // False positive
165
-
166
- use eframe::native::glow_integration::GlowWinitApp;
167
-
168
- let event_loop = create_event_loop(&mut native_options)?;
169
- let glow_eframe = GlowWinitApp::new(&event_loop, app_name, native_options, app_creator);
170
- run_and_exit(event_loop, glow_eframe)
171
- }
172
-
173
- #[cfg(not(target_arch = "wasm32"))]
174
- fn create_event_loop(native_options: &mut NativeOptions) -> Result<EventLoop<UserEvent>> {
175
- let mut builder = winit::event_loop::EventLoop::with_user_event();
176
- #[cfg(all(unix, not(target_vendor = "apple")))]
177
- {
178
- #[cfg(feature = "wayland")]
179
- {
180
- use winit::platform::wayland::EventLoopBuilderExtWayland;
181
- builder.with_any_thread(true);
182
- }
183
- #[cfg(feature = "x11")]
184
- {
185
- use winit::platform::x11::EventLoopBuilderExtX11;
186
- builder.with_any_thread(true);
187
- }
188
- }
189
- #[cfg(target_family = "windows")]
190
- {
191
- use winit::platform::windows::EventLoopBuilderExtWindows;
192
- builder.with_any_thread(true);
193
- }
194
-
195
- if let Some(hook) = std::mem::take(&mut native_options.event_loop_builder) {
196
- hook(&mut builder);
197
- }
198
-
199
- Ok(builder.build()?)
200
- }
201
-
202
- #[cfg(not(target_arch = "wasm32"))]
203
- fn run_and_exit(event_loop: EventLoop<UserEvent>, winit_app: impl WinitApp) -> Result {
204
- let mut app = WinitAppWrapper::new(winit_app, false);
205
- event_loop.run_app(&mut app)?;
206
-
207
- Ok(())
208
- }
@@ -14,11 +14,12 @@ base64 = "0.22.1"
14
14
  uuid = { version = "1.17.0", features = [
15
15
  "v4",
16
16
  ]}
17
- ipc-channel = "0.20.0"
18
- sha2.workspace = true
19
- hex.workspace = true
20
17
 
21
18
  [lib]
22
19
  name = "cosmol_viewer"
23
20
  crate-type = ["cdylib"]
24
21
 
22
+ [features]
23
+ default = []
24
+ wayland = ["cosmol_viewer_core/wayland"]
25
+ x11 = ["cosmol_viewer_core/x11"]
@@ -1,8 +1,5 @@
1
1
  use base64::Engine as _;
2
- use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
3
2
  use pyo3::{ffi::c_str, prelude::*};
4
- use sha2::{Digest, Sha256};
5
- use std::{env, fs::File, io::Write};
6
3
  use uuid::Uuid;
7
4
 
8
5
  use crate::{
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "cosmol-viewer"
3
- version = "0.1.2.dev1"
3
+ version = "0.1.2.dev2"
4
4
  description = "Molecular visualization tools"
5
5
  authors = [{name = "95028", email = "wjt@cosmol.org"}]
6
6