forked from StrafesNET/strafe-client
rewrite data structures, implement texture_loader
This commit is contained in:
parent
69bab269db
commit
93eeb3354f
284
Cargo.lock
generated
284
Cargo.lock
generated
@ -82,21 +82,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "approx"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "array-init"
|
|
||||||
version = "2.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arrayref"
|
name = "arrayref"
|
||||||
version = "0.3.7"
|
version = "0.3.7"
|
||||||
@ -142,30 +127,6 @@ version = "0.13.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "binrw"
|
|
||||||
version = "0.13.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "173901312e9850391d4d7c1318c4e099fdc037d61870fca427429830efdb4e5f"
|
|
||||||
dependencies = [
|
|
||||||
"array-init",
|
|
||||||
"binrw_derive",
|
|
||||||
"bytemuck",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "binrw_derive"
|
|
||||||
version = "0.13.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cb515fdd6f8d3a357c8e19b8ec59ef53880807864329b1cb1cba5c53bf76557e"
|
|
||||||
dependencies = [
|
|
||||||
"either",
|
|
||||||
"owo-colors",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bit-set"
|
name = "bit-set"
|
||||||
version = "0.5.3"
|
version = "0.5.3"
|
||||||
@ -237,15 +198,6 @@ version = "3.14.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
|
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bv"
|
|
||||||
version = "0.11.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340"
|
|
||||||
dependencies = [
|
|
||||||
"feature-probe",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytemuck"
|
name = "bytemuck"
|
||||||
version = "1.14.1"
|
version = "1.14.1"
|
||||||
@ -266,12 +218,6 @@ dependencies = [
|
|||||||
"syn 2.0.48",
|
"syn 2.0.48",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "byteorder"
|
|
||||||
version = "0.5.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
@ -338,16 +284,6 @@ version = "0.1.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cgmath"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
|
|
||||||
dependencies = [
|
|
||||||
"approx",
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "codespan-reporting"
|
name = "codespan-reporting"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
@ -460,30 +396,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crc"
|
|
||||||
version = "3.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
|
|
||||||
dependencies = [
|
|
||||||
"crc-catalog",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crc-catalog"
|
|
||||||
version = "2.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crc32fast"
|
|
||||||
version = "1.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-utils"
|
name = "crossbeam-utils"
|
||||||
version = "0.8.19"
|
version = "0.8.19"
|
||||||
@ -514,7 +426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "479dfe1e6737aa9e96c6ac7b69689dc4c32da8383f2c12744739d76afa8b66c4"
|
checksum = "479dfe1e6737aa9e96c6ac7b69689dc4c32da8383f2c12744739d76afa8b66c4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.4.2",
|
"bitflags 2.4.2",
|
||||||
"byteorder 1.5.0",
|
"byteorder",
|
||||||
"enum-primitive-derive",
|
"enum-primitive-derive",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
@ -540,12 +452,6 @@ version = "1.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "either"
|
|
||||||
version = "1.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "enum-primitive-derive"
|
name = "enum-primitive-derive"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
@ -573,12 +479,6 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "feature-probe"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "foreign-types"
|
name = "foreign-types"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@ -759,6 +659,16 @@ dependencies = [
|
|||||||
"objc2",
|
"objc2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "id"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://git.itzana.me/Quaternions/id?rev=1f710976cc786c8853dab73d6e1cee53158deeb0#1f710976cc786c8853dab73d6e1cee53158deeb0"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.48",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "2.2.1"
|
version = "2.2.1"
|
||||||
@ -769,15 +679,6 @@ dependencies = [
|
|||||||
"hashbrown",
|
"hashbrown",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "itertools"
|
|
||||||
version = "0.12.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
|
|
||||||
dependencies = [
|
|
||||||
"either",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "jni"
|
name = "jni"
|
||||||
version = "0.21.1"
|
version = "0.21.1"
|
||||||
@ -943,25 +844,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lzma"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "782ba3f542e8bc1349386c15e9dc3119ae6da96479f96b3863cc7a88bbdfd4e4"
|
|
||||||
dependencies = [
|
|
||||||
"byteorder 0.5.3",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lzma-rs"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
|
|
||||||
dependencies = [
|
|
||||||
"byteorder 1.5.0",
|
|
||||||
"crc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "malloc_buf"
|
name = "malloc_buf"
|
||||||
version = "0.0.6"
|
version = "0.0.6"
|
||||||
@ -1081,12 +963,6 @@ dependencies = [
|
|||||||
"syn 2.0.48",
|
"syn 2.0.48",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "obj"
|
|
||||||
version = "0.10.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "059c95245738cdc7b40078cdd51a23200252a4c0a0a6dd005136152b3f467a4a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "objc"
|
name = "objc"
|
||||||
version = "0.2.7"
|
version = "0.2.7"
|
||||||
@ -1152,12 +1028,6 @@ dependencies = [
|
|||||||
"ttf-parser",
|
"ttf-parser",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "owo-colors"
|
|
||||||
version = "3.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot"
|
name = "parking_lot"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@ -1266,9 +1136,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "profiling-procmacros"
|
name = "profiling-procmacros"
|
||||||
version = "1.0.13"
|
version = "1.0.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4b322d7d65c1ab449be3c890fcbd0db6e1092d0dd05d79dba2dd28032cebeb05"
|
checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.48",
|
"syn 2.0.48",
|
||||||
@ -1470,7 +1340,7 @@ version = "0.8.12"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
|
checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder 1.5.0",
|
"byteorder",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"paste",
|
"paste",
|
||||||
]
|
]
|
||||||
@ -1481,7 +1351,7 @@ version = "1.1.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
|
checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder 1.5.0",
|
"byteorder",
|
||||||
"rmp",
|
"rmp",
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
@ -1640,17 +1510,12 @@ dependencies = [
|
|||||||
"configparser",
|
"configparser",
|
||||||
"ddsfile",
|
"ddsfile",
|
||||||
"glam",
|
"glam",
|
||||||
"lazy-regex",
|
"id",
|
||||||
"obj",
|
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"pollster",
|
"pollster",
|
||||||
"rbx_binary",
|
|
||||||
"rbx_dom_weak",
|
|
||||||
"rbx_reflection_database",
|
|
||||||
"rbx_xml",
|
|
||||||
"strafesnet_common",
|
"strafesnet_common",
|
||||||
"vbsp",
|
"strafesnet_rbx_loader",
|
||||||
"vmdl",
|
"strafesnet_texture_loader",
|
||||||
"wgpu",
|
"wgpu",
|
||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
@ -1658,9 +1523,33 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "strafesnet_common"
|
name = "strafesnet_common"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://git.itzana.me/StrafesNET/common?rev=434ca29aef7e3015c9ca1ed45de8fef42e33fdfb#434ca29aef7e3015c9ca1ed45de8fef42e33fdfb"
|
source = "git+https://git.itzana.me/StrafesNET/common?rev=47cdea0c8a5d10a2440ca6270a975d560aa3642d#47cdea0c8a5d10a2440ca6270a975d560aa3642d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glam",
|
"glam",
|
||||||
|
"id",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strafesnet_rbx_loader"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://git.itzana.me/StrafesNET/rbx_loader?rev=93bc4dc0fb2175af8ded235c7a4b47af7235790a#93bc4dc0fb2175af8ded235c7a4b47af7235790a"
|
||||||
|
dependencies = [
|
||||||
|
"glam",
|
||||||
|
"lazy-regex",
|
||||||
|
"rbx_binary",
|
||||||
|
"rbx_dom_weak",
|
||||||
|
"rbx_reflection_database",
|
||||||
|
"rbx_xml",
|
||||||
|
"strafesnet_common",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strafesnet_texture_loader"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://git.itzana.me/StrafesNET/texture_loader?rev=c182e46001a095b245fe80e5c9912e58f51b0276#c182e46001a095b245fe80e5c9912e58f51b0276"
|
||||||
|
dependencies = [
|
||||||
|
"lazy-regex",
|
||||||
|
"strafesnet_common",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1691,17 +1580,6 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn_util"
|
|
||||||
version = "0.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6754c4559b79657554e9d8a0d56e65e490c76d382b9c23108364ec4125dea23c"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "termcolor"
|
name = "termcolor"
|
||||||
version = "1.4.1"
|
version = "1.4.1"
|
||||||
@ -1780,29 +1658,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
|
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"tracing-attributes",
|
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tracing-attributes"
|
|
||||||
version = "0.1.27"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.48",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-core"
|
name = "tracing-core"
|
||||||
version = "0.1.32"
|
version = "0.1.32"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
|
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
|
||||||
dependencies = [
|
|
||||||
"once_cell",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ttf-parser"
|
name = "ttf-parser"
|
||||||
@ -1834,61 +1697,12 @@ version = "0.2.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
|
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vbsp"
|
|
||||||
version = "0.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d9267540dab0c93bb5201c40ba3b2d027e2717bf355a8f9bf25377b06a5b32f6"
|
|
||||||
dependencies = [
|
|
||||||
"ahash",
|
|
||||||
"arrayvec",
|
|
||||||
"binrw",
|
|
||||||
"bitflags 2.4.2",
|
|
||||||
"bv",
|
|
||||||
"cgmath",
|
|
||||||
"itertools",
|
|
||||||
"lzma-rs",
|
|
||||||
"num_enum",
|
|
||||||
"static_assertions",
|
|
||||||
"thiserror",
|
|
||||||
"vbsp-derive",
|
|
||||||
"zip-lzma",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vbsp-derive"
|
|
||||||
version = "0.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7ade687fadf34b1b7502387fc9eb7b4032ddc9b93022d31356e9984c957abaad"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
"syn_util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version_check"
|
name = "version_check"
|
||||||
version = "0.9.4"
|
version = "0.9.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vmdl"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "892922743c4c107372331efd8f67c57282590f8c18c26b4465c4b0e1e6678664"
|
|
||||||
dependencies = [
|
|
||||||
"arrayvec",
|
|
||||||
"bitflags 2.4.2",
|
|
||||||
"bytemuck",
|
|
||||||
"cgmath",
|
|
||||||
"itertools",
|
|
||||||
"static_assertions",
|
|
||||||
"thiserror",
|
|
||||||
"tracing",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "walkdir"
|
name = "walkdir"
|
||||||
version = "2.4.0"
|
version = "2.4.0"
|
||||||
@ -2599,15 +2413,3 @@ dependencies = [
|
|||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.48",
|
"syn 2.0.48",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "zip-lzma"
|
|
||||||
version = "0.6.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b480cb31fccfb2786565c0e0712865fd6f1ea0ea850c50316f643c3948196e63"
|
|
||||||
dependencies = [
|
|
||||||
"byteorder 1.5.0",
|
|
||||||
"crc32fast",
|
|
||||||
"crossbeam-utils",
|
|
||||||
"lzma",
|
|
||||||
]
|
|
||||||
|
|||||||
13
Cargo.toml
13
Cargo.toml
@ -10,17 +10,12 @@ bytemuck = { version = "1.13.1", features = ["derive"] }
|
|||||||
configparser = "3.0.2"
|
configparser = "3.0.2"
|
||||||
ddsfile = "0.5.1"
|
ddsfile = "0.5.1"
|
||||||
glam = "0.25.0"
|
glam = "0.25.0"
|
||||||
lazy-regex = "3.0.2"
|
id = { git = "https://git.itzana.me/Quaternions/id", rev = "1f710976cc786c8853dab73d6e1cee53158deeb0" }
|
||||||
obj = "0.10.2"
|
|
||||||
parking_lot = "0.12.1"
|
parking_lot = "0.12.1"
|
||||||
pollster = "0.3.0"
|
pollster = "0.3.0"
|
||||||
rbx_binary = "0.7.1"
|
strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "47cdea0c8a5d10a2440ca6270a975d560aa3642d" }
|
||||||
rbx_dom_weak = "2.5.0"
|
strafesnet_rbx_loader = { git = "https://git.itzana.me/StrafesNET/rbx_loader", rev = "93bc4dc0fb2175af8ded235c7a4b47af7235790a" }
|
||||||
rbx_reflection_database = "0.2.7"
|
strafesnet_texture_loader = { git = "https://git.itzana.me/StrafesNET/texture_loader", rev = "c182e46001a095b245fe80e5c9912e58f51b0276", features = ["legacy"] }
|
||||||
rbx_xml = "0.13.1"
|
|
||||||
strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "434ca29aef7e3015c9ca1ed45de8fef42e33fdfb" }
|
|
||||||
vbsp = "0.5.0"
|
|
||||||
vmdl = "0.1.1"
|
|
||||||
wgpu = "0.19.0"
|
wgpu = "0.19.0"
|
||||||
winit = "0.29.2"
|
winit = "0.29.2"
|
||||||
|
|
||||||
|
|||||||
354
src/graphics.rs
354
src/graphics.rs
@ -1,7 +1,10 @@
|
|||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
|
use std::collections::{HashSet,HashMap};
|
||||||
|
use strafesnet_common::map;
|
||||||
use strafesnet_common::integer;
|
use strafesnet_common::integer;
|
||||||
|
use strafesnet_common::model::{self, ColorId, NormalId, PolygonIter, PositionId, RenderConfigId, TextureCoordinateId, VertexId};
|
||||||
use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
|
use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
|
||||||
use crate::model_graphics::{GraphicsVertex,GraphicsModelColor4,GraphicsModelInstance,GraphicsModelSingleTexture,IndexedGraphicsModelSingleTexture,IndexedGroupFixedTexture};
|
use crate::model_graphics::{self,IndexedGraphicsMeshOwnedRenderConfig,IndexedGraphicsMeshOwnedRenderConfigId,GraphicsMeshOwnedRenderConfig,GraphicsModelColor4,GraphicsModelOwned,GraphicsVertex};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct GraphicsModelUpdate{
|
pub struct GraphicsModelUpdate{
|
||||||
@ -9,52 +12,51 @@ pub struct GraphicsModelUpdate{
|
|||||||
color:Option<glam::Vec4>,
|
color:Option<glam::Vec4>,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Entity{
|
struct Indices{
|
||||||
index_count:u32,
|
count:u32,
|
||||||
index_buf:wgpu::Buffer,
|
buf:wgpu::Buffer,
|
||||||
|
format:wgpu::IndexFormat,
|
||||||
}
|
}
|
||||||
fn create_entities<T:bytemuck::Pod>(device:&wgpu::Device,entities:&Vec<Vec<T>>)->Vec<Entity>{
|
impl Indices{
|
||||||
entities.iter().map(|indices|{
|
fn new<T:bytemuck::Pod>(device:&wgpu::Device,indices:&Vec<T>,format:wgpu::IndexFormat)->Self{
|
||||||
let index_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
|
Self{
|
||||||
|
buf:device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
|
||||||
label:Some("Index"),
|
label:Some("Index"),
|
||||||
contents:bytemuck::cast_slice(indices),
|
contents:bytemuck::cast_slice(indices),
|
||||||
usage:wgpu::BufferUsages::INDEX,
|
usage:wgpu::BufferUsages::INDEX,
|
||||||
});
|
}),
|
||||||
Entity{
|
count:indices.len() as u32,
|
||||||
index_buf,
|
format,
|
||||||
index_count:indices.len() as u32,
|
}
|
||||||
}
|
}
|
||||||
}).collect()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct GraphicsModel{
|
struct GraphicsModel{
|
||||||
entities:Vec<Entity>,
|
indices:Indices,
|
||||||
model_buf:wgpu::Buffer,
|
model_buf:wgpu::Buffer,
|
||||||
vertex_buf:wgpu::Buffer,
|
vertex_buf:wgpu::Buffer,
|
||||||
bind_group:wgpu::BindGroup,
|
bind_group:wgpu::BindGroup,
|
||||||
index_format:wgpu::IndexFormat,
|
instance_count:u32,
|
||||||
instances:Vec<GraphicsModelInstance>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct GraphicsSamplers{
|
struct GraphicsSamplers{
|
||||||
repeat:wgpu::Sampler,
|
repeat:wgpu::Sampler,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct GraphicsBindGroupLayouts{
|
struct GraphicsBindGroupLayouts{
|
||||||
model:wgpu::BindGroupLayout,
|
model:wgpu::BindGroupLayout,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct GraphicsBindGroups {
|
struct GraphicsBindGroups{
|
||||||
camera:wgpu::BindGroup,
|
camera:wgpu::BindGroup,
|
||||||
skybox_texture:wgpu::BindGroup,
|
skybox_texture:wgpu::BindGroup,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct GraphicsPipelines{
|
struct GraphicsPipelines{
|
||||||
skybox:wgpu::RenderPipeline,
|
skybox:wgpu::RenderPipeline,
|
||||||
model:wgpu::RenderPipeline,
|
model:wgpu::RenderPipeline,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct GraphicsCamera{
|
struct GraphicsCamera{
|
||||||
screen_size:glam::UVec2,
|
screen_size:glam::UVec2,
|
||||||
fov:glam::Vec2,//slope
|
fov:glam::Vec2,//slope
|
||||||
//camera angles and such are extrapolated and passed in every time
|
//camera angles and such are extrapolated and passed in every time
|
||||||
@ -145,27 +147,10 @@ impl GraphicsState{
|
|||||||
pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
|
pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
|
||||||
self.camera.fov=user_settings.calculate_fov(1.0,&self.camera.screen_size).as_vec2();
|
self.camera.fov=user_settings.calculate_fov(1.0,&self.camera.screen_size).as_vec2();
|
||||||
}
|
}
|
||||||
pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,indexed_models:crate::model::IndexedModelInstances){
|
pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap,textures:strafesnet_texture_loader::texture_loader::Textures){
|
||||||
//generate texture view per texture
|
//generate texture view per texture
|
||||||
|
let texture_views:Vec<wgpu::TextureView>=textures.into_iter().map(|(texture_id,texture_data)|{
|
||||||
//idk how to do this gooder lol
|
let image=ddsfile::Dds::read(std::io::Cursor::new(texture_data)).unwrap();
|
||||||
let mut double_map=std::collections::HashMap::<u32,u32>::new();
|
|
||||||
let mut texture_loading_threads=Vec::new();
|
|
||||||
let num_textures=indexed_models.textures.len();
|
|
||||||
for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
|
|
||||||
let path=std::path::PathBuf::from(format!("textures/{}.dds",texture_id));
|
|
||||||
if let Ok(mut file)=std::fs::File::open(path.as_path()){
|
|
||||||
double_map.insert(i as u32, texture_loading_threads.len() as u32);
|
|
||||||
texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
|
|
||||||
ddsfile::Dds::read(&mut file).unwrap()
|
|
||||||
})));
|
|
||||||
}else{
|
|
||||||
//println!("missing texture path={:?}",path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let texture_views:Vec<wgpu::TextureView>=texture_loading_threads.into_iter().map(|(texture_id,thread)|{
|
|
||||||
let image=thread.join().unwrap();
|
|
||||||
|
|
||||||
let (mut width,mut height)=(image.get_width(),image.get_height());
|
let (mut width,mut height)=(image.get_width(),image.get_height());
|
||||||
|
|
||||||
@ -201,68 +186,88 @@ impl GraphicsState{
|
|||||||
dimension:wgpu::TextureDimension::D2,
|
dimension:wgpu::TextureDimension::D2,
|
||||||
format,
|
format,
|
||||||
usage:wgpu::TextureUsages::TEXTURE_BINDING|wgpu::TextureUsages::COPY_DST,
|
usage:wgpu::TextureUsages::TEXTURE_BINDING|wgpu::TextureUsages::COPY_DST,
|
||||||
label: Some(format!("Texture{}",texture_id).as_str()),
|
label:Some(format!("Texture{}",texture_id.get()).as_str()),
|
||||||
view_formats:&[],
|
view_formats:&[],
|
||||||
},
|
},
|
||||||
wgpu::util::TextureDataOrder::LayerMajor,
|
wgpu::util::TextureDataOrder::LayerMajor,
|
||||||
&image.data,
|
&image.data,
|
||||||
);
|
);
|
||||||
texture.create_view(&wgpu::TextureViewDescriptor{
|
texture.create_view(&wgpu::TextureViewDescriptor{
|
||||||
label: Some(format!("Texture{} View",texture_id).as_str()),
|
label:Some(format!("Texture{} View",texture_id.get()).as_str()),
|
||||||
dimension:Some(wgpu::TextureViewDimension::D2),
|
dimension:Some(wgpu::TextureViewDimension::D2),
|
||||||
..wgpu::TextureViewDescriptor::default()
|
..wgpu::TextureViewDescriptor::default()
|
||||||
})
|
})
|
||||||
}).collect();
|
}).collect();
|
||||||
|
let num_textures=texture_views.len();
|
||||||
|
|
||||||
//split groups with different textures into separate models
|
//split groups with different textures into separate models
|
||||||
//the models received here are supposed to be tightly packed,i.e. no code needs to check if two models are using the same groups.
|
//the models received here are supposed to be tightly packed,i.e. no code needs to check if two models are using the same groups.
|
||||||
let indexed_models_len=indexed_models.models.len();
|
let indexed_models_len=map.models.len();
|
||||||
let mut unique_texture_models=Vec::with_capacity(indexed_models_len);
|
//models split into graphics_group.RenderConfigId
|
||||||
for model in indexed_models.models.into_iter(){
|
let mut owned_mesh_id_from_mesh_id_render_config_id:HashMap<model::MeshId,HashMap<RenderConfigId,IndexedGraphicsMeshOwnedRenderConfigId>>=HashMap::new();
|
||||||
//convert ModelInstance into GraphicsModelInstance
|
let mut unique_render_config_models:Vec<IndexedGraphicsMeshOwnedRenderConfig>=Vec::with_capacity(indexed_models_len);
|
||||||
let instances:Vec<GraphicsModelInstance>=model.instances.into_iter().filter_map(|instance|{
|
for model in &map.models{
|
||||||
if instance.color.w==0.0&&!model.groups.iter().any(|g|g.texture.is_some()){
|
//wow
|
||||||
None
|
let instance=GraphicsModelOwned{
|
||||||
}else{
|
transform:model.transform.into(),
|
||||||
Some(GraphicsModelInstance{
|
normal_transform:Into::<glam::Mat3>::into(model.transform.matrix3).inverse().transpose(),
|
||||||
transform: instance.transform.into(),
|
color:GraphicsModelColor4::new(model.color),
|
||||||
normal_transform: Into::<glam::Mat3>::into(instance.transform.matrix3).inverse().transpose(),
|
};
|
||||||
color:GraphicsModelColor4::from(instance.color),
|
//get or create owned mesh map
|
||||||
})
|
if let Some(owned_mesh_map)=owned_mesh_id_from_mesh_id_render_config_id.get(&model.mesh){
|
||||||
|
//the mesh has already been split into a set of unique renderconfig meshes
|
||||||
|
//simply add one instance to each of them
|
||||||
|
for owned_mesh_id in owned_mesh_map.values(){
|
||||||
|
let owned_mesh=unique_render_config_models.get_mut(owned_mesh_id.get() as usize).unwrap();
|
||||||
|
owned_mesh.instances.push(instance.clone());
|
||||||
}
|
}
|
||||||
}).collect();
|
}else{
|
||||||
//skip pushing a model if all instances are invisible
|
let mut owned_mesh_map=HashMap::new();
|
||||||
if instances.len()==0{
|
//add mesh if renderid never before seen for this model
|
||||||
|
//add instance
|
||||||
|
//convert Model into GraphicsModelOwned
|
||||||
|
//check each group, if it's using a new render config then make a new clone of the model
|
||||||
|
if let Some(mesh)=map.meshes.get(model.mesh.get() as usize){
|
||||||
|
for graphics_group in mesh.graphics_groups.iter(){
|
||||||
|
let render_config=&map.render_configs[graphics_group.render.get() as usize];
|
||||||
|
if model.color.w==0.0&&render_config.texture.is_none(){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//check each group, if it's using a new texture then make a new clone of the model
|
//get or create owned mesh
|
||||||
let id=unique_texture_models.len();
|
let owned_mesh_id=if let Some(&owned_mesh_id)=owned_mesh_map.get(&graphics_group.render){
|
||||||
let mut unique_textures=Vec::new();
|
owned_mesh_id
|
||||||
for group in model.groups.into_iter(){
|
|
||||||
//ignore zero copy optimization for now
|
|
||||||
let texture_index=if let Some(texture_index)=unique_textures.iter().position(|&texture|texture==group.texture){
|
|
||||||
texture_index
|
|
||||||
}else{
|
}else{
|
||||||
//create new texture_index
|
//create
|
||||||
let texture_index=unique_textures.len();
|
let owned_mesh_id=IndexedGraphicsMeshOwnedRenderConfigId::new(unique_render_config_models.len() as u32);
|
||||||
unique_textures.push(group.texture);
|
owned_mesh_map.insert(graphics_group.render,owned_mesh_id);
|
||||||
unique_texture_models.push(IndexedGraphicsModelSingleTexture{
|
unique_render_config_models.push(IndexedGraphicsMeshOwnedRenderConfig{
|
||||||
unique_pos:model.unique_pos.iter().map(|&v|*Into::<glam::Vec3>::into(v).as_ref()).collect(),
|
unique_pos:mesh.unique_pos.iter().map(|&v|*Into::<glam::Vec3>::into(v).as_ref()).collect(),
|
||||||
unique_tex:model.unique_tex.iter().map(|v|*v.as_ref()).collect(),
|
unique_tex:mesh.unique_tex.iter().map(|v|*v.as_ref()).collect(),
|
||||||
unique_normal:model.unique_normal.iter().map(|&v|*Into::<glam::Vec3>::into(v).as_ref()).collect(),
|
unique_normal:mesh.unique_normal.iter().map(|&v|*Into::<glam::Vec3>::into(v).as_ref()).collect(),
|
||||||
unique_color:model.unique_color.iter().map(|v|*v.as_ref()).collect(),
|
unique_color:mesh.unique_color.iter().map(|v|*v.as_ref()).collect(),
|
||||||
unique_vertices:model.unique_vertices.clone(),
|
unique_vertices:mesh.unique_vertices.clone(),
|
||||||
texture:group.texture,
|
render_config:graphics_group.render,
|
||||||
groups:Vec::new(),
|
polys:model::PolygonGroup::PolygonList(model::PolygonList::new(Vec::new())),
|
||||||
instances:instances.clone(),
|
instances:vec![instance.clone()],
|
||||||
});
|
});
|
||||||
texture_index
|
owned_mesh_id
|
||||||
};
|
};
|
||||||
unique_texture_models[id+texture_index].groups.push(IndexedGroupFixedTexture{
|
let owned_mesh=unique_render_config_models.get_mut(owned_mesh_id.get() as usize).unwrap();
|
||||||
polys:group.polys,
|
match &mut owned_mesh.polys{
|
||||||
});
|
model::PolygonGroup::PolygonList(polygon_list)=>polygon_list.extend(
|
||||||
|
graphics_group.groups.iter().flat_map(|polygon_group_id|{
|
||||||
|
mesh.polygon_groups[polygon_group_id.get() as usize].polys()
|
||||||
|
})
|
||||||
|
.map(|vertex_id_slice|
|
||||||
|
vertex_id_slice.to_vec()
|
||||||
|
)
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
owned_mesh_id_from_mesh_id_render_config_id.insert(model.mesh,owned_mesh_map);
|
||||||
|
};
|
||||||
|
}
|
||||||
//check every model to see if it's using the same (texture,color) but has few instances,if it is combine it into one model
|
//check every model to see if it's using the same (texture,color) but has few instances,if it is combine it into one model
|
||||||
//1. collect unique instances of texture and color,note model id
|
//1. collect unique instances of texture and color,note model id
|
||||||
//2. for each model id,check if removing it from the pool decreases both the model count and instance count by more than one
|
//2. for each model id,check if removing it from the pool decreases both the model count and instance count by more than one
|
||||||
@ -273,20 +278,20 @@ impl GraphicsState{
|
|||||||
|
|
||||||
//for now:just deduplicate single models...
|
//for now:just deduplicate single models...
|
||||||
let mut deduplicated_models=Vec::with_capacity(indexed_models_len);//use indexed_models_len because the list will likely get smaller instead of bigger
|
let mut deduplicated_models=Vec::with_capacity(indexed_models_len);//use indexed_models_len because the list will likely get smaller instead of bigger
|
||||||
let mut unique_texture_color=std::collections::HashMap::new();//texture->color->vec![(model_id,instance_id)]
|
let mut unique_texture_color=HashMap::new();//texture->color->vec![(model_id,instance_id)]
|
||||||
for (model_id,model) in unique_texture_models.iter().enumerate(){
|
for (model_id,model) in unique_render_config_models.iter().enumerate(){
|
||||||
//for now:filter out models with more than one instance
|
//for now:filter out models with more than one instance
|
||||||
if 1<model.instances.len(){
|
if 1<model.instances.len(){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//populate hashmap
|
//populate hashmap
|
||||||
let unique_color=if let Some(unique_color)=unique_texture_color.get_mut(&model.texture){
|
let unique_color=if let Some(unique_color)=unique_texture_color.get_mut(&model.render_config){
|
||||||
unique_color
|
unique_color
|
||||||
}else{
|
}else{
|
||||||
//make new hashmap
|
//make new hashmap
|
||||||
let unique_color=std::collections::HashMap::new();
|
let unique_color=HashMap::new();
|
||||||
unique_texture_color.insert(model.texture,unique_color);
|
unique_texture_color.insert(model.render_config,unique_color);
|
||||||
unique_texture_color.get_mut(&model.texture).unwrap()
|
unique_texture_color.get_mut(&model.render_config).unwrap()
|
||||||
};
|
};
|
||||||
//separate instances by color
|
//separate instances by color
|
||||||
for (instance_id,instance) in model.instances.iter().enumerate(){
|
for (instance_id,instance) in model.instances.iter().enumerate(){
|
||||||
@ -304,22 +309,22 @@ impl GraphicsState{
|
|||||||
}
|
}
|
||||||
//populate a hashset of models selected for transposition
|
//populate a hashset of models selected for transposition
|
||||||
//construct transposed models
|
//construct transposed models
|
||||||
let mut selected_model_instances=std::collections::HashSet::new();
|
let mut selected_model_instances=HashSet::new();
|
||||||
for (texture,unique_color) in unique_texture_color.into_iter(){
|
for (render_config,unique_color) in unique_texture_color.into_iter(){
|
||||||
for (color,model_instance_list) in unique_color.into_iter(){
|
for (color,model_instance_list) in unique_color.into_iter(){
|
||||||
//world transforming one model does not meet the definition of deduplicaiton
|
//world transforming one model does not meet the definition of deduplicaiton
|
||||||
if 1<model_instance_list.len(){
|
if 1<model_instance_list.len(){
|
||||||
//create model
|
//create model
|
||||||
let mut unique_pos=Vec::new();
|
let mut unique_pos=Vec::new();
|
||||||
let mut pos_id_from=std::collections::HashMap::new();
|
let mut pos_id_from=HashMap::new();
|
||||||
let mut unique_tex=Vec::new();
|
let mut unique_tex=Vec::new();
|
||||||
let mut tex_id_from=std::collections::HashMap::new();
|
let mut tex_id_from=HashMap::new();
|
||||||
let mut unique_normal=Vec::new();
|
let mut unique_normal=Vec::new();
|
||||||
let mut normal_id_from=std::collections::HashMap::new();
|
let mut normal_id_from=HashMap::new();
|
||||||
let mut unique_color=Vec::new();
|
let mut unique_color=Vec::new();
|
||||||
let mut color_id_from=std::collections::HashMap::new();
|
let mut color_id_from=HashMap::new();
|
||||||
let mut unique_vertices=Vec::new();
|
let mut unique_vertices=Vec::new();
|
||||||
let mut vertex_id_from=std::collections::HashMap::new();
|
let mut vertex_id_from=HashMap::new();
|
||||||
|
|
||||||
let mut polys=Vec::new();
|
let mut polys=Vec::new();
|
||||||
//transform instance vertices
|
//transform instance vertices
|
||||||
@ -327,91 +332,89 @@ impl GraphicsState{
|
|||||||
//populate hashset to prevent these models from being copied
|
//populate hashset to prevent these models from being copied
|
||||||
selected_model_instances.insert(model_id);
|
selected_model_instances.insert(model_id);
|
||||||
//there is only one instance per model
|
//there is only one instance per model
|
||||||
let model=&unique_texture_models[model_id];
|
let model=&unique_render_config_models[model_id];
|
||||||
let instance=&model.instances[instance_id];
|
let instance=&model.instances[instance_id];
|
||||||
//just hash word slices LOL
|
//just hash word slices LOL
|
||||||
let map_pos_id:Vec<u32>=model.unique_pos.iter().map(|untransformed_pos|{
|
let map_pos_id:Vec<PositionId>=model.unique_pos.iter().map(|untransformed_pos|{
|
||||||
let pos=instance.transform.transform_point3(glam::Vec3::from_array(untransformed_pos.clone())).to_array();
|
let pos=instance.transform.transform_point3(glam::Vec3::from_array(untransformed_pos.clone())).to_array();
|
||||||
let h=pos.map(|v|bytemuck::cast::<f32,u32>(v));
|
let h=bytemuck::cast::<[f32;3],[u32;3]>(pos);
|
||||||
(if let Some(&pos_id)=pos_id_from.get(&h){
|
PositionId::new((if let Some(&pos_id)=pos_id_from.get(&h){
|
||||||
pos_id
|
pos_id
|
||||||
}else{
|
}else{
|
||||||
let pos_id=unique_pos.len();
|
let pos_id=unique_pos.len();
|
||||||
unique_pos.push(pos.clone());
|
unique_pos.push(pos);
|
||||||
pos_id_from.insert(h,pos_id);
|
pos_id_from.insert(h,pos_id);
|
||||||
pos_id
|
pos_id
|
||||||
}) as u32
|
}) as u32)
|
||||||
}).collect();
|
}).collect();
|
||||||
let map_tex_id:Vec<u32>=model.unique_tex.iter().map(|tex|{
|
let map_tex_id:Vec<TextureCoordinateId>=model.unique_tex.iter().map(|&tex|{
|
||||||
let h=tex.map(|v|bytemuck::cast::<f32,u32>(v));
|
let h=bytemuck::cast::<[f32;2],[u32;2]>(tex);
|
||||||
(if let Some(&tex_id)=tex_id_from.get(&h){
|
TextureCoordinateId::new((if let Some(&tex_id)=tex_id_from.get(&h){
|
||||||
tex_id
|
tex_id
|
||||||
}else{
|
}else{
|
||||||
let tex_id=unique_tex.len();
|
let tex_id=unique_tex.len();
|
||||||
unique_tex.push(tex.clone());
|
unique_tex.push(tex);
|
||||||
tex_id_from.insert(h,tex_id);
|
tex_id_from.insert(h,tex_id);
|
||||||
tex_id
|
tex_id
|
||||||
}) as u32
|
}) as u32)
|
||||||
}).collect();
|
}).collect();
|
||||||
let map_normal_id:Vec<u32>=model.unique_normal.iter().map(|untransformed_normal|{
|
let map_normal_id:Vec<NormalId>=model.unique_normal.iter().map(|untransformed_normal|{
|
||||||
let normal=(instance.normal_transform*glam::Vec3::from_array(untransformed_normal.clone())).to_array();
|
let normal=(instance.normal_transform*glam::Vec3::from_array(untransformed_normal.clone())).to_array();
|
||||||
let h=normal.map(|v|bytemuck::cast::<f32,u32>(v));
|
let h=bytemuck::cast::<[f32;3],[u32;3]>(normal);
|
||||||
(if let Some(&normal_id)=normal_id_from.get(&h){
|
NormalId::new((if let Some(&normal_id)=normal_id_from.get(&h){
|
||||||
normal_id
|
normal_id
|
||||||
}else{
|
}else{
|
||||||
let normal_id=unique_normal.len();
|
let normal_id=unique_normal.len();
|
||||||
unique_normal.push(normal.clone());
|
unique_normal.push(normal);
|
||||||
normal_id_from.insert(h,normal_id);
|
normal_id_from.insert(h,normal_id);
|
||||||
normal_id
|
normal_id
|
||||||
}) as u32
|
}) as u32)
|
||||||
}).collect();
|
}).collect();
|
||||||
let map_color_id:Vec<u32>=model.unique_color.iter().map(|color|{
|
let map_color_id:Vec<ColorId>=model.unique_color.iter().map(|&color|{
|
||||||
let h=color.map(|v|bytemuck::cast::<f32,u32>(v));
|
let h=bytemuck::cast::<[f32;4],[u32;4]>(color);
|
||||||
(if let Some(&color_id)=color_id_from.get(&h){
|
ColorId::new((if let Some(&color_id)=color_id_from.get(&h){
|
||||||
color_id
|
color_id
|
||||||
}else{
|
}else{
|
||||||
let color_id=unique_color.len();
|
let color_id=unique_color.len();
|
||||||
unique_color.push(color.clone());
|
unique_color.push(color);
|
||||||
color_id_from.insert(h,color_id);
|
color_id_from.insert(h,color_id);
|
||||||
color_id
|
color_id
|
||||||
}) as u32
|
}) as u32)
|
||||||
}).collect();
|
}).collect();
|
||||||
//map the indexed vertices onto new indices
|
//map the indexed vertices onto new indices
|
||||||
//creating the vertex map is slightly different because the vertices are directly hashable
|
//creating the vertex map is slightly different because the vertices are directly hashable
|
||||||
let map_vertex_id:Vec<u32>=model.unique_vertices.iter().map(|unmapped_vertex|{
|
let map_vertex_id:Vec<VertexId>=model.unique_vertices.iter().map(|unmapped_vertex|{
|
||||||
let vertex=crate::model::IndexedVertex{
|
let vertex=model::IndexedVertex{
|
||||||
pos:map_pos_id[unmapped_vertex.pos as usize],
|
pos:map_pos_id[unmapped_vertex.pos.get() as usize],
|
||||||
tex:map_tex_id[unmapped_vertex.tex as usize],
|
tex:map_tex_id[unmapped_vertex.tex.get() as usize],
|
||||||
normal:map_normal_id[unmapped_vertex.normal as usize],
|
normal:map_normal_id[unmapped_vertex.normal.get() as usize],
|
||||||
color:map_color_id[unmapped_vertex.color as usize],
|
color:map_color_id[unmapped_vertex.color.get() as usize],
|
||||||
};
|
};
|
||||||
(if let Some(&vertex_id)=vertex_id_from.get(&vertex){
|
VertexId::new((if let Some(&vertex_id)=vertex_id_from.get(&vertex){
|
||||||
vertex_id
|
vertex_id
|
||||||
}else{
|
}else{
|
||||||
let vertex_id=unique_vertices.len();
|
let vertex_id=unique_vertices.len();
|
||||||
unique_vertices.push(vertex.clone());
|
unique_vertices.push(vertex.clone());
|
||||||
vertex_id_from.insert(vertex,vertex_id);
|
vertex_id_from.insert(vertex,vertex_id);
|
||||||
vertex_id
|
vertex_id
|
||||||
}) as u32
|
}) as u32)
|
||||||
}).collect();
|
}).collect();
|
||||||
for group in &model.groups{
|
polys.extend(model.polys.polys().map(|poly|
|
||||||
for poly in &group.polys{
|
poly.iter().map(|vertex_id|
|
||||||
polys.push(crate::model::IndexedPolygon{vertices:poly.vertices.iter().map(|&vertex_id|map_vertex_id[vertex_id as usize]).collect()});
|
map_vertex_id[vertex_id.get() as usize]
|
||||||
}
|
).collect()
|
||||||
}
|
));
|
||||||
}
|
}
|
||||||
//push model into dedup
|
//push model into dedup
|
||||||
deduplicated_models.push(IndexedGraphicsModelSingleTexture{
|
deduplicated_models.push(IndexedGraphicsMeshOwnedRenderConfig{
|
||||||
unique_pos,
|
unique_pos,
|
||||||
unique_tex,
|
unique_tex,
|
||||||
unique_normal,
|
unique_normal,
|
||||||
unique_color,
|
unique_color,
|
||||||
unique_vertices,
|
unique_vertices,
|
||||||
texture,
|
render_config,
|
||||||
groups:vec![IndexedGroupFixedTexture{
|
polys:model::PolygonGroup::PolygonList(model::PolygonList::new(polys)),
|
||||||
polys
|
instances:vec![GraphicsModelOwned{
|
||||||
}],
|
|
||||||
instances:vec![GraphicsModelInstance{
|
|
||||||
transform:glam::Mat4::IDENTITY,
|
transform:glam::Mat4::IDENTITY,
|
||||||
normal_transform:glam::Mat3::IDENTITY,
|
normal_transform:glam::Mat3::IDENTITY,
|
||||||
color
|
color
|
||||||
@ -421,7 +424,7 @@ impl GraphicsState{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//fill untouched models
|
//fill untouched models
|
||||||
for (model_id,model) in unique_texture_models.into_iter().enumerate(){
|
for (model_id,model) in unique_render_config_models.into_iter().enumerate(){
|
||||||
if !selected_model_instances.contains(&model_id){
|
if !selected_model_instances.contains(&model_id){
|
||||||
deduplicated_models.push(model);
|
deduplicated_models.push(model);
|
||||||
}
|
}
|
||||||
@ -429,26 +432,25 @@ impl GraphicsState{
|
|||||||
|
|
||||||
//de-index models
|
//de-index models
|
||||||
let deduplicated_models_len=deduplicated_models.len();
|
let deduplicated_models_len=deduplicated_models.len();
|
||||||
let models:Vec<GraphicsModelSingleTexture>=deduplicated_models.into_iter().map(|model|{
|
let models:Vec<GraphicsMeshOwnedRenderConfig>=deduplicated_models.into_iter().map(|model|{
|
||||||
let mut vertices=Vec::new();
|
let mut vertices=Vec::new();
|
||||||
let mut index_from_vertex = std::collections::HashMap::new();//::<IndexedVertex,usize>
|
let mut index_from_vertex=HashMap::new();//::<IndexedVertex,usize>
|
||||||
//this mut be combined in a more complex way if the models use different render patterns per group
|
//this mut be combined in a more complex way if the models use different render patterns per group
|
||||||
let mut indices=Vec::new();
|
let mut indices=Vec::new();
|
||||||
for group in model.groups {
|
for poly in model.polys.polys(){
|
||||||
for poly in group.polys {
|
for end_index in 2..poly.len(){
|
||||||
for end_index in 2..poly.vertices.len() {
|
for index in [0,end_index-1,end_index]{
|
||||||
for &index in &[0, end_index - 1, end_index] {
|
let vertex_index=poly[index];
|
||||||
let vertex_index = poly.vertices[index];
|
|
||||||
if let Some(&i)=index_from_vertex.get(&vertex_index){
|
if let Some(&i)=index_from_vertex.get(&vertex_index){
|
||||||
indices.push(i);
|
indices.push(i);
|
||||||
}else{
|
}else{
|
||||||
let i=vertices.len();
|
let i=vertices.len();
|
||||||
let vertex=&model.unique_vertices[vertex_index as usize];
|
let vertex=&model.unique_vertices[vertex_index.get() as usize];
|
||||||
vertices.push(GraphicsVertex{
|
vertices.push(GraphicsVertex{
|
||||||
pos: model.unique_pos[vertex.pos as usize],
|
pos:model.unique_pos[vertex.pos.get() as usize],
|
||||||
tex: model.unique_tex[vertex.tex as usize],
|
tex:model.unique_tex[vertex.tex.get() as usize],
|
||||||
normal: model.unique_normal[vertex.normal as usize],
|
normal:model.unique_normal[vertex.normal.get() as usize],
|
||||||
color:model.unique_color[vertex.color as usize],
|
color:model.unique_color[vertex.color.get() as usize],
|
||||||
});
|
});
|
||||||
index_from_vertex.insert(vertex_index,i);
|
index_from_vertex.insert(vertex_index,i);
|
||||||
indices.push(i);
|
indices.push(i);
|
||||||
@ -456,18 +458,17 @@ impl GraphicsState{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
GraphicsMeshOwnedRenderConfig{
|
||||||
GraphicsModelSingleTexture{
|
|
||||||
instances:model.instances,
|
instances:model.instances,
|
||||||
entities:if (u32::MAX as usize)<vertices.len(){
|
indices:if (u32::MAX as usize)<vertices.len(){
|
||||||
panic!("Model has too many vertices!")
|
panic!("Model has too many vertices!")
|
||||||
}else if (u16::MAX as usize)<vertices.len(){
|
}else if (u16::MAX as usize)<vertices.len(){
|
||||||
crate::model_graphics::Entities::U32(vec![indices.into_iter().map(|vertex_id|vertex_id as u32).collect()])
|
model_graphics::Indices::U32(indices.into_iter().map(|vertex_idx|vertex_idx as u32).collect())
|
||||||
}else{
|
}else{
|
||||||
crate::model_graphics::Entities::U16(vec![indices.into_iter().map(|vertex_id|vertex_id as u16).collect()])
|
model_graphics::Indices::U16(indices.into_iter().map(|vertex_idx|vertex_idx as u16).collect())
|
||||||
},
|
},
|
||||||
vertices,
|
vertices,
|
||||||
texture:model.texture,
|
render_config:model.render_config,
|
||||||
}
|
}
|
||||||
}).collect();
|
}).collect();
|
||||||
//.into_iter() the modeldata vec so entities can be /moved/ to models.entities
|
//.into_iter() the modeldata vec so entities can be /moved/ to models.entities
|
||||||
@ -486,16 +487,12 @@ impl GraphicsState{
|
|||||||
contents:bytemuck::cast_slice(&model_uniforms),
|
contents:bytemuck::cast_slice(&model_uniforms),
|
||||||
usage:wgpu::BufferUsages::UNIFORM|wgpu::BufferUsages::COPY_DST,
|
usage:wgpu::BufferUsages::UNIFORM|wgpu::BufferUsages::COPY_DST,
|
||||||
});
|
});
|
||||||
let texture_view=match model.texture{
|
let render_config=&map.render_configs[model.render_config.get() as usize];
|
||||||
Some(texture_id)=>{
|
let texture_view=match render_config.texture{
|
||||||
match double_map.get(&texture_id){
|
Some(texture_id)=>&texture_views[texture_id.get() as usize],
|
||||||
Some(&mapped_texture_id)=>&texture_views[mapped_texture_id as usize],
|
|
||||||
None=>&self.temp_squid_texture_view,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
None=>&self.temp_squid_texture_view,
|
None=>&self.temp_squid_texture_view,
|
||||||
};
|
};
|
||||||
let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
|
let bind_group=device.create_bind_group(&wgpu::BindGroupDescriptor{
|
||||||
layout:&self.bind_group_layouts.model,
|
layout:&self.bind_group_layouts.model,
|
||||||
entries:&[
|
entries:&[
|
||||||
wgpu::BindGroupEntry{
|
wgpu::BindGroupEntry{
|
||||||
@ -520,17 +517,13 @@ impl GraphicsState{
|
|||||||
});
|
});
|
||||||
//all of these are being moved here
|
//all of these are being moved here
|
||||||
self.models.push(GraphicsModel{
|
self.models.push(GraphicsModel{
|
||||||
instances:instances_chunk.to_vec(),
|
instance_count:instances_chunk.len() as u32,
|
||||||
vertex_buf,
|
vertex_buf,
|
||||||
index_format:match &model.entities{
|
indices:match &model.indices{
|
||||||
crate::model_graphics::Entities::U32(_)=>wgpu::IndexFormat::Uint32,
|
model_graphics::Indices::U32(indices)=>Indices::new(device,indices,wgpu::IndexFormat::Uint32),
|
||||||
crate::model_graphics::Entities::U16(_)=>wgpu::IndexFormat::Uint16,
|
model_graphics::Indices::U16(indices)=>Indices::new(device,indices,wgpu::IndexFormat::Uint16),
|
||||||
},
|
},
|
||||||
entities:match &model.entities{
|
bind_group,
|
||||||
crate::model_graphics::Entities::U32(entities)=>create_entities(device,entities),
|
|
||||||
crate::model_graphics::Entities::U16(entities)=>create_entities(device,entities),
|
|
||||||
},
|
|
||||||
bind_group: model_bind_group,
|
|
||||||
model_buf,
|
model_buf,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -908,8 +901,7 @@ impl GraphicsState{
|
|||||||
){
|
){
|
||||||
//TODO:use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
|
//TODO:use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
|
||||||
|
|
||||||
let mut encoder =
|
let mut encoder=device.create_command_encoder(&wgpu::CommandEncoderDescriptor{label:None});
|
||||||
device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
|
|
||||||
|
|
||||||
// update rotation
|
// update rotation
|
||||||
let camera_uniforms=self.camera.to_uniform_data(physics_output.extrapolate(mouse_pos,predicted_time));
|
let camera_uniforms=self.camera.to_uniform_data(physics_output.extrapolate(mouse_pos,predicted_time));
|
||||||
@ -971,14 +963,12 @@ impl GraphicsState{
|
|||||||
rpass.set_bind_group(1,&self.bind_groups.skybox_texture,&[]);
|
rpass.set_bind_group(1,&self.bind_groups.skybox_texture,&[]);
|
||||||
|
|
||||||
rpass.set_pipeline(&self.pipelines.model);
|
rpass.set_pipeline(&self.pipelines.model);
|
||||||
for model in self.models.iter() {
|
for model in &self.models{
|
||||||
rpass.set_bind_group(2,&model.bind_group,&[]);
|
rpass.set_bind_group(2,&model.bind_group,&[]);
|
||||||
rpass.set_vertex_buffer(0,model.vertex_buf.slice(..));
|
rpass.set_vertex_buffer(0,model.vertex_buf.slice(..));
|
||||||
|
rpass.set_index_buffer(model.indices.buf.slice(..),model.indices.format);
|
||||||
for entity in model.entities.iter(){
|
//TODO: loop over triangle strips
|
||||||
rpass.set_index_buffer(entity.index_buf.slice(..),model.index_format);
|
rpass.draw_indexed(0..model.indices.count,0,0..model.instance_count);
|
||||||
rpass.draw_indexed(0..entity.index_count,0,0..model.instances.len() as u32);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
rpass.set_pipeline(&self.pipelines.skybox);
|
rpass.set_pipeline(&self.pipelines.skybox);
|
||||||
@ -992,10 +982,9 @@ impl GraphicsState{
|
|||||||
}
|
}
|
||||||
const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4;//let size=std::mem::size_of::<ModelInstance>();
|
const MODEL_BUFFER_SIZE:usize=4*4 + 12 + 4;//let size=std::mem::size_of::<ModelInstance>();
|
||||||
const MODEL_BUFFER_SIZE_BYTES:usize=MODEL_BUFFER_SIZE*4;
|
const MODEL_BUFFER_SIZE_BYTES:usize=MODEL_BUFFER_SIZE*4;
|
||||||
fn get_instances_buffer_data(instances:&[GraphicsModelInstance]) -> Vec<f32> {
|
fn get_instances_buffer_data(instances:&[GraphicsModelOwned])->Vec<f32>{
|
||||||
let mut raw=Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
|
let mut raw=Vec::with_capacity(MODEL_BUFFER_SIZE*instances.len());
|
||||||
for (i,mi) in instances.iter().enumerate(){
|
for mi in instances{
|
||||||
let mut v = raw.split_off(MODEL_BUFFER_SIZE*i);
|
|
||||||
//model transform
|
//model transform
|
||||||
raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
|
raw.extend_from_slice(&AsRef::<[f32; 4*4]>::as_ref(&mi.transform)[..]);
|
||||||
//normal transform
|
//normal transform
|
||||||
@ -1007,7 +996,6 @@ fn get_instances_buffer_data(instances:&[GraphicsModelInstance]) -> Vec<f32> {
|
|||||||
raw.extend_from_slice(&[0.0]);
|
raw.extend_from_slice(&[0.0]);
|
||||||
//color
|
//color
|
||||||
raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color.get()));
|
raw.extend_from_slice(AsRef::<[f32; 4]>::as_ref(&mi.color.get()));
|
||||||
raw.append(&mut v);
|
|
||||||
}
|
}
|
||||||
raw
|
raw
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,7 +4,7 @@ pub enum Instruction{
|
|||||||
Render(crate::physics::PhysicsOutputState,integer::Time,glam::IVec2),
|
Render(crate::physics::PhysicsOutputState,integer::Time,glam::IVec2),
|
||||||
//UpdateModel(crate::graphics::GraphicsModelUpdate),
|
//UpdateModel(crate::graphics::GraphicsModelUpdate),
|
||||||
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
||||||
GenerateModels(crate::model::IndexedModelInstances),
|
GenerateModels(strafesnet_common::map::CompleteMap,strafesnet_texture_loader::texture_loader::Textures),
|
||||||
ClearModels,
|
ClearModels,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,8 +27,8 @@ pub fn new<'a>(
|
|||||||
let mut resize=None;
|
let mut resize=None;
|
||||||
crate::compat_worker::INWorker::new(move |ins:Instruction|{
|
crate::compat_worker::INWorker::new(move |ins:Instruction|{
|
||||||
match ins{
|
match ins{
|
||||||
Instruction::GenerateModels(indexed_model_instances)=>{
|
Instruction::GenerateModels(map,textures)=>{
|
||||||
graphics.generate_models(&device,&queue,indexed_model_instances);
|
graphics.generate_models(&device,&queue,&map,textures);
|
||||||
},
|
},
|
||||||
Instruction::ClearModels=>{
|
Instruction::ClearModels=>{
|
||||||
graphics.clear();
|
graphics.clear();
|
||||||
|
|||||||
232
src/load_bsp.rs
232
src/load_bsp.rs
@ -1,232 +0,0 @@
|
|||||||
use strafesnet_common::integer;
|
|
||||||
|
|
||||||
const VALVE_SCALE:f32=1.0/16.0;
|
|
||||||
fn valve_transform(v:[f32;3])->integer::Planar64Vec3{
|
|
||||||
integer::Planar64Vec3::try_from([v[0]*VALVE_SCALE,v[2]*VALVE_SCALE,-v[1]*VALVE_SCALE]).unwrap()
|
|
||||||
}
|
|
||||||
pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{
|
|
||||||
let mut s=Vec::new();
|
|
||||||
|
|
||||||
match input.read_to_end(&mut s){
|
|
||||||
Ok(_)=>(),
|
|
||||||
Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
|
|
||||||
}
|
|
||||||
|
|
||||||
match vbsp::Bsp::read(s.as_slice()){
|
|
||||||
Ok(bsp)=>{
|
|
||||||
let mut spawn_point=integer::Planar64Vec3::ZERO;
|
|
||||||
|
|
||||||
let mut name_from_texture_id=Vec::new();
|
|
||||||
let mut texture_id_from_name=std::collections::HashMap::new();
|
|
||||||
|
|
||||||
let mut models=bsp.models().map(|world_model|{
|
|
||||||
//non-deduplicated
|
|
||||||
let mut spam_pos=Vec::new();
|
|
||||||
let mut spam_tex=Vec::new();
|
|
||||||
let mut spam_normal=Vec::new();
|
|
||||||
let mut spam_vertices=Vec::new();
|
|
||||||
let groups=world_model.faces()
|
|
||||||
.filter(|face| face.is_visible())//TODO: look at this
|
|
||||||
.map(|face|{
|
|
||||||
let face_texture=face.texture();
|
|
||||||
let face_texture_data=face_texture.texture_data();
|
|
||||||
let (texture_u,texture_v)=(glam::Vec3A::from_slice(&face_texture.texture_transforms_u[0..3]),glam::Vec3A::from_slice(&face_texture.texture_transforms_v[0..3]));
|
|
||||||
let texture_offset=glam::vec2(face_texture.texture_transforms_u[3],face_texture.texture_transforms_v[3]);
|
|
||||||
let texture_size=glam::vec2(face_texture_data.width as f32,face_texture_data.height as f32);
|
|
||||||
|
|
||||||
//texture
|
|
||||||
let texture_id=if let Some(&texture_id)=texture_id_from_name.get(face_texture_data.name()){
|
|
||||||
texture_id
|
|
||||||
}else{
|
|
||||||
let texture_id=name_from_texture_id.len() as u32;
|
|
||||||
texture_id_from_name.insert(face_texture_data.name().to_string(),texture_id);
|
|
||||||
name_from_texture_id.push(face_texture_data.name().to_string());
|
|
||||||
texture_id
|
|
||||||
};
|
|
||||||
|
|
||||||
//normal
|
|
||||||
let normal=face.normal();
|
|
||||||
let normal_idx=spam_normal.len() as u32;
|
|
||||||
spam_normal.push(valve_transform(<[f32;3]>::from(normal)));
|
|
||||||
let mut vertices:Vec<u32>=face.vertex_positions().map(|vertex_pos|{
|
|
||||||
let vertex_xyz=<[f32;3]>::from(vertex_pos);
|
|
||||||
let pos=glam::Vec3A::from_array(vertex_xyz);
|
|
||||||
let pos_idx=spam_pos.len();
|
|
||||||
spam_pos.push(valve_transform(vertex_xyz));
|
|
||||||
|
|
||||||
//calculate texture coordinates
|
|
||||||
let tex=(glam::vec2(pos.dot(texture_u),pos.dot(texture_v))+texture_offset)/texture_size;
|
|
||||||
let tex_idx=spam_tex.len() as u32;
|
|
||||||
spam_tex.push(tex);
|
|
||||||
|
|
||||||
let i=spam_vertices.len() as u32;
|
|
||||||
spam_vertices.push(crate::model::IndexedVertex{
|
|
||||||
pos: pos_idx as u32,
|
|
||||||
tex: tex_idx as u32,
|
|
||||||
normal: normal_idx,
|
|
||||||
color: 0,
|
|
||||||
});
|
|
||||||
i
|
|
||||||
}).collect();
|
|
||||||
vertices.reverse();
|
|
||||||
crate::model::IndexedGroup{
|
|
||||||
texture:Some(texture_id),
|
|
||||||
polys:vec![crate::model::IndexedPolygon{vertices}],
|
|
||||||
}
|
|
||||||
}).collect();
|
|
||||||
crate::model::IndexedModel{
|
|
||||||
unique_pos:spam_pos,
|
|
||||||
unique_tex:spam_tex,
|
|
||||||
unique_normal:spam_normal,
|
|
||||||
unique_color:vec![glam::Vec4::ONE],
|
|
||||||
unique_vertices:spam_vertices,
|
|
||||||
groups,
|
|
||||||
instances:vec![crate::model::ModelInstance{
|
|
||||||
attributes:crate::model::CollisionAttributes::Decoration,
|
|
||||||
transform:integer::Planar64Affine3::new(
|
|
||||||
integer::Planar64Mat3::default(),
|
|
||||||
valve_transform(<[f32;3]>::from(world_model.origin))
|
|
||||||
),
|
|
||||||
..Default::default()
|
|
||||||
}],
|
|
||||||
}
|
|
||||||
}).collect();
|
|
||||||
|
|
||||||
//dedupe prop models
|
|
||||||
let mut model_dedupe=std::collections::HashSet::new();
|
|
||||||
for prop in bsp.static_props(){
|
|
||||||
model_dedupe.insert(prop.model());
|
|
||||||
}
|
|
||||||
|
|
||||||
//generate unique meshes
|
|
||||||
let mut model_map=std::collections::HashMap::with_capacity(model_dedupe.len());
|
|
||||||
let mut prop_models=Vec::new();
|
|
||||||
for model_name in model_dedupe{
|
|
||||||
let model_name_lower=model_name.to_lowercase();
|
|
||||||
//.mdl, .vvd, .dx90.vtx
|
|
||||||
let mut path=std::path::PathBuf::from(model_name_lower.as_str());
|
|
||||||
let file_name=std::path::PathBuf::from(path.file_stem().unwrap());
|
|
||||||
path.pop();
|
|
||||||
path.push(file_name);
|
|
||||||
let mut vvd_path=path.clone();
|
|
||||||
let mut vtx_path=path.clone();
|
|
||||||
vvd_path.set_extension("vvd");
|
|
||||||
vtx_path.set_extension("dx90.vtx");
|
|
||||||
match (bsp.pack.get(model_name_lower.as_str()),bsp.pack.get(vvd_path.as_os_str().to_str().unwrap()),bsp.pack.get(vtx_path.as_os_str().to_str().unwrap())){
|
|
||||||
(Ok(Some(mdl_file)),Ok(Some(vvd_file)),Ok(Some(vtx_file)))=>{
|
|
||||||
match (vmdl::mdl::Mdl::read(mdl_file.as_ref()),vmdl::vvd::Vvd::read(vvd_file.as_ref()),vmdl::vtx::Vtx::read(vtx_file.as_ref())){
|
|
||||||
(Ok(mdl),Ok(vvd),Ok(vtx))=>{
|
|
||||||
let model=vmdl::Model::from_parts(mdl,vtx,vvd);
|
|
||||||
let texture_paths=model.texture_directories();
|
|
||||||
if texture_paths.len()!=1{
|
|
||||||
println!("WARNING: multiple texture paths");
|
|
||||||
}
|
|
||||||
let skin=model.skin_tables().nth(0).unwrap();
|
|
||||||
|
|
||||||
let mut spam_pos=Vec::with_capacity(model.vertices().len());
|
|
||||||
let mut spam_normal=Vec::with_capacity(model.vertices().len());
|
|
||||||
let mut spam_tex=Vec::with_capacity(model.vertices().len());
|
|
||||||
let mut spam_vertices=Vec::with_capacity(model.vertices().len());
|
|
||||||
for (i,vertex) in model.vertices().iter().enumerate(){
|
|
||||||
spam_pos.push(valve_transform(<[f32;3]>::from(vertex.position)));
|
|
||||||
spam_normal.push(valve_transform(<[f32;3]>::from(vertex.normal)));
|
|
||||||
spam_tex.push(glam::Vec2::from_array(vertex.texture_coordinates));
|
|
||||||
spam_vertices.push(crate::model::IndexedVertex{
|
|
||||||
pos:i as u32,
|
|
||||||
tex:i as u32,
|
|
||||||
normal:i as u32,
|
|
||||||
color:0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let model_id=prop_models.len();
|
|
||||||
model_map.insert(model_name,model_id);
|
|
||||||
prop_models.push(crate::model::IndexedModel{
|
|
||||||
unique_pos:spam_pos,
|
|
||||||
unique_normal:spam_normal,
|
|
||||||
unique_tex:spam_tex,
|
|
||||||
unique_color:vec![glam::Vec4::ONE],
|
|
||||||
unique_vertices:spam_vertices,
|
|
||||||
groups:model.meshes().map(|mesh|{
|
|
||||||
let texture=if let (Some(texture_path),Some(texture_name))=(texture_paths.get(0),skin.texture(mesh.material_index())){
|
|
||||||
let mut path=std::path::PathBuf::from(texture_path.as_str());
|
|
||||||
path.push(texture_name);
|
|
||||||
let texture_location=path.as_os_str().to_str().unwrap();
|
|
||||||
let texture_id=if let Some(&texture_id)=texture_id_from_name.get(texture_location){
|
|
||||||
texture_id
|
|
||||||
}else{
|
|
||||||
println!("texture! {}",texture_location);
|
|
||||||
let texture_id=name_from_texture_id.len() as u32;
|
|
||||||
texture_id_from_name.insert(texture_location.to_string(),texture_id);
|
|
||||||
name_from_texture_id.push(texture_location.to_string());
|
|
||||||
texture_id
|
|
||||||
};
|
|
||||||
Some(texture_id)
|
|
||||||
}else{
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
crate::model::IndexedGroup{
|
|
||||||
texture,
|
|
||||||
polys:{
|
|
||||||
//looking at the code, it would seem that the strips are pre-deindexed into triangle lists when calling this function
|
|
||||||
mesh.vertex_strip_indices().map(|strip|{
|
|
||||||
strip.collect::<Vec<usize>>().chunks(3).map(|tri|{
|
|
||||||
crate::model::IndexedPolygon{vertices:vec![tri[0] as u32,tri[1] as u32,tri[2] as u32]}
|
|
||||||
}).collect::<Vec<crate::model::IndexedPolygon>>()
|
|
||||||
}).flatten().collect()
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}).collect(),
|
|
||||||
instances:Vec::new(),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
_=>println!("model_name={} error",model_name),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_=>println!("no model name={}",model_name),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//generate model instances
|
|
||||||
for prop in bsp.static_props(){
|
|
||||||
let placement=prop.as_prop_placement();
|
|
||||||
if let Some(&model_index)=model_map.get(placement.model){
|
|
||||||
prop_models[model_index].instances.push(crate::model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::new(
|
|
||||||
integer::Planar64Mat3::try_from(
|
|
||||||
glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale))
|
|
||||||
//TODO: figure this out
|
|
||||||
*glam::Mat3A::from_quat(glam::Quat::from_xyzw(
|
|
||||||
placement.rotation.v.x,//b
|
|
||||||
placement.rotation.v.y,//c
|
|
||||||
placement.rotation.v.z,//d
|
|
||||||
placement.rotation.s,//a
|
|
||||||
))
|
|
||||||
).unwrap(),
|
|
||||||
valve_transform(<[f32;3]>::from(placement.origin)),
|
|
||||||
),
|
|
||||||
attributes:crate::model::CollisionAttributes::Decoration,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
}else{
|
|
||||||
//println!("model not found {}",placement.model);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//actually add the prop models
|
|
||||||
prop_models.append(&mut models);
|
|
||||||
|
|
||||||
Ok(crate::model::IndexedModelInstances{
|
|
||||||
textures:name_from_texture_id,
|
|
||||||
models:prop_models,
|
|
||||||
spawn_point,
|
|
||||||
modes:Vec::new(),
|
|
||||||
})
|
|
||||||
},
|
|
||||||
Err(e)=>{
|
|
||||||
println!("rotten {:?}",e);
|
|
||||||
Err(e)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,523 +0,0 @@
|
|||||||
use crate::primitives;
|
|
||||||
use strafesnet_common::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
|
|
||||||
|
|
||||||
fn class_is_a(class: &str, superclass: &str) -> bool {
|
|
||||||
if class==superclass {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
let class_descriptor=rbx_reflection_database::get().classes.get(class);
|
|
||||||
if let Some(descriptor) = &class_descriptor {
|
|
||||||
if let Some(class_super) = &descriptor.superclass {
|
|
||||||
return class_is_a(&class_super, superclass)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
fn recursive_collect_superclass(objects: &mut std::vec::Vec<rbx_dom_weak::types::Ref>,dom: &rbx_dom_weak::WeakDom, instance: &rbx_dom_weak::Instance, superclass: &str){
|
|
||||||
let mut stack=vec![instance];
|
|
||||||
while let Some(item)=stack.pop(){
|
|
||||||
for &referent in item.children(){
|
|
||||||
if let Some(c)=dom.get_by_ref(referent){
|
|
||||||
if class_is_a(c.class.as_str(),superclass){
|
|
||||||
objects.push(c.referent());//copy ref
|
|
||||||
}
|
|
||||||
stack.push(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Planar64Affine3{
|
|
||||||
Planar64Affine3::new(
|
|
||||||
Planar64Mat3::from_cols(
|
|
||||||
Planar64Vec3::try_from([cf.orientation.x.x,cf.orientation.y.x,cf.orientation.z.x]).unwrap()
|
|
||||||
*Planar64::try_from(size.x/2.0).unwrap(),
|
|
||||||
Planar64Vec3::try_from([cf.orientation.x.y,cf.orientation.y.y,cf.orientation.z.y]).unwrap()
|
|
||||||
*Planar64::try_from(size.y/2.0).unwrap(),
|
|
||||||
Planar64Vec3::try_from([cf.orientation.x.z,cf.orientation.y.z,cf.orientation.z.z]).unwrap()
|
|
||||||
*Planar64::try_from(size.z/2.0).unwrap(),
|
|
||||||
),
|
|
||||||
Planar64Vec3::try_from([cf.position.x,cf.position.y,cf.position.z]).unwrap()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,force_intersecting:bool)->crate::model::CollisionAttributes{
|
|
||||||
let mut general=crate::model::GameMechanicAttributes::default();
|
|
||||||
let mut intersecting=crate::model::IntersectingAttributes::default();
|
|
||||||
let mut contacting=crate::model::ContactingAttributes::default();
|
|
||||||
let mut force_can_collide=can_collide;
|
|
||||||
match name{
|
|
||||||
"Water"=>{
|
|
||||||
force_can_collide=false;
|
|
||||||
//TODO: read stupid CustomPhysicalProperties
|
|
||||||
intersecting.water=Some(crate::model::IntersectingWater{density:Planar64::ONE,viscosity:Planar64::ONE/10,velocity});
|
|
||||||
},
|
|
||||||
"Accelerator"=>{
|
|
||||||
//although the new game supports collidable accelerators, this is a roblox compatability map loader
|
|
||||||
force_can_collide=false;
|
|
||||||
general.accelerator=Some(crate::model::GameMechanicAccelerator{acceleration:velocity});
|
|
||||||
},
|
|
||||||
// "UnorderedCheckpoint"=>general.teleport_behaviour=Some(crate::model::TeleportBehaviour::StageElement(crate::model::GameMechanicStageElement{
|
|
||||||
// mode_id:0,
|
|
||||||
// stage_id:0,
|
|
||||||
// force:false,
|
|
||||||
// behaviour:crate::model::StageElementBehaviour::Unordered
|
|
||||||
// })),
|
|
||||||
"SetVelocity"=>general.trajectory=Some(crate::model::GameMechanicSetTrajectory::Velocity(velocity)),
|
|
||||||
"MapFinish"=>{force_can_collide=false;general.zone=Some(crate::model::GameMechanicZone{mode_id:0,behaviour:crate::model::ZoneBehaviour::Finish})},
|
|
||||||
"MapAnticheat"=>{force_can_collide=false;general.zone=Some(crate::model::GameMechanicZone{mode_id:0,behaviour:crate::model::ZoneBehaviour::Anitcheat})},
|
|
||||||
"Platform"=>general.teleport_behaviour=Some(crate::model::TeleportBehaviour::StageElement(crate::model::GameMechanicStageElement{
|
|
||||||
mode_id:0,
|
|
||||||
stage_id:0,
|
|
||||||
force:false,
|
|
||||||
behaviour:crate::model::StageElementBehaviour::Platform,
|
|
||||||
})),
|
|
||||||
other=>{
|
|
||||||
if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
|
|
||||||
.captures(other){
|
|
||||||
general.teleport_behaviour=Some(crate::model::TeleportBehaviour::StageElement(crate::model::GameMechanicStageElement{
|
|
||||||
mode_id:0,
|
|
||||||
stage_id:captures[3].parse::<u32>().unwrap(),
|
|
||||||
force:match captures.get(1){
|
|
||||||
Some(m)=>m.as_str()=="Force",
|
|
||||||
None=>false,
|
|
||||||
},
|
|
||||||
behaviour:match &captures[2]{
|
|
||||||
"Spawn"|"SpawnAt"=>crate::model::StageElementBehaviour::SpawnAt,
|
|
||||||
//cancollide false so you don't hit the side
|
|
||||||
//NOT a decoration
|
|
||||||
"Trigger"=>{force_can_collide=false;crate::model::StageElementBehaviour::Trigger},
|
|
||||||
"Teleport"=>{force_can_collide=false;crate::model::StageElementBehaviour::Teleport},
|
|
||||||
"Platform"=>crate::model::StageElementBehaviour::Platform,
|
|
||||||
_=>panic!("regex1[2] messed up bad"),
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Jump)(\d+)$")
|
|
||||||
.captures(other){
|
|
||||||
general.teleport_behaviour=Some(crate::model::TeleportBehaviour::StageElement(crate::model::GameMechanicStageElement{
|
|
||||||
mode_id:0,
|
|
||||||
stage_id:0,
|
|
||||||
force:match captures.get(1){
|
|
||||||
Some(m)=>m.as_str()=="Force",
|
|
||||||
None=>false,
|
|
||||||
},
|
|
||||||
behaviour:match &captures[2]{
|
|
||||||
"Jump"=>crate::model::StageElementBehaviour::JumpLimit(captures[3].parse::<u32>().unwrap()),
|
|
||||||
_=>panic!("regex4[1] messed up bad"),
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
|
|
||||||
.captures(other){
|
|
||||||
force_can_collide=false;
|
|
||||||
match &captures[1]{
|
|
||||||
"Finish"=>general.zone=Some(crate::model::GameMechanicZone{mode_id:captures[2].parse::<u32>().unwrap(),behaviour:crate::model::ZoneBehaviour::Finish}),
|
|
||||||
"Anticheat"=>general.zone=Some(crate::model::GameMechanicZone{mode_id:captures[2].parse::<u32>().unwrap(),behaviour:crate::model::ZoneBehaviour::Anitcheat}),
|
|
||||||
_=>panic!("regex2[1] messed up bad"),
|
|
||||||
}
|
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(WormholeIn)(\d+)$")
|
|
||||||
.captures(other){
|
|
||||||
force_can_collide=false;
|
|
||||||
match &captures[1]{
|
|
||||||
"WormholeIn"=>general.teleport_behaviour=Some(crate::model::TeleportBehaviour::Wormhole(crate::model::GameMechanicWormhole{destination_model_id:captures[2].parse::<u32>().unwrap()})),
|
|
||||||
_=>panic!("regex3[1] messed up bad"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// else if let Some(captures)=lazy_regex::regex!(r"^(OrderedCheckpoint)(\d+)$")
|
|
||||||
// .captures(other){
|
|
||||||
// match &captures[1]{
|
|
||||||
// "OrderedCheckpoint"=>general.checkpoint=Some(crate::model::GameMechanicCheckpoint::Ordered{mode_id:0,checkpoint_id:captures[2].parse::<u32>().unwrap()}),
|
|
||||||
// _=>panic!("regex3[1] messed up bad"),
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//need some way to skip this
|
|
||||||
if velocity!=Planar64Vec3::ZERO{
|
|
||||||
general.booster=Some(crate::model::GameMechanicBooster::Velocity(velocity));
|
|
||||||
}
|
|
||||||
match force_can_collide{
|
|
||||||
true=>{
|
|
||||||
match name{
|
|
||||||
"Bounce"=>contacting.contact_behaviour=Some(crate::model::ContactingBehaviour::Elastic(u32::MAX)),
|
|
||||||
"Surf"=>contacting.contact_behaviour=Some(crate::model::ContactingBehaviour::Surf),
|
|
||||||
"Ladder"=>contacting.contact_behaviour=Some(crate::model::ContactingBehaviour::Ladder(crate::model::ContactingLadder{sticky:true})),
|
|
||||||
_=>(),
|
|
||||||
}
|
|
||||||
crate::model::CollisionAttributes::Contact{contacting,general}
|
|
||||||
},
|
|
||||||
false=>if force_intersecting
|
|
||||||
||general.any()
|
|
||||||
||intersecting.any()
|
|
||||||
{
|
|
||||||
crate::model::CollisionAttributes::Intersect{intersecting,general}
|
|
||||||
}else{
|
|
||||||
crate::model::CollisionAttributes::Decoration
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct RobloxAssetId(u64);
|
|
||||||
struct RobloxAssetIdParseErr;
|
|
||||||
impl std::str::FromStr for RobloxAssetId {
|
|
||||||
type Err=RobloxAssetIdParseErr;
|
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err>{
|
|
||||||
let regman=lazy_regex::regex!(r"(\d+)$");
|
|
||||||
if let Some(captures) = regman.captures(s) {
|
|
||||||
if captures.len()==2{//captures[0] is all captures concatenated, and then each individual capture
|
|
||||||
if let Ok(id) = captures[0].parse::<u64>() {
|
|
||||||
return Ok(Self(id));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(RobloxAssetIdParseErr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Clone,Copy,PartialEq)]
|
|
||||||
struct RobloxTextureTransform{
|
|
||||||
offset_u:f32,
|
|
||||||
offset_v:f32,
|
|
||||||
scale_u:f32,
|
|
||||||
scale_v:f32,
|
|
||||||
}
|
|
||||||
impl std::cmp::Eq for RobloxTextureTransform{}//????
|
|
||||||
impl std::default::Default for RobloxTextureTransform{
|
|
||||||
fn default() -> Self {
|
|
||||||
Self{offset_u:0.0,offset_v:0.0,scale_u:1.0,scale_v:1.0}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl std::hash::Hash for RobloxTextureTransform {
|
|
||||||
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
|
|
||||||
self.offset_u.to_ne_bytes().hash(state);
|
|
||||||
self.offset_v.to_ne_bytes().hash(state);
|
|
||||||
self.scale_u.to_ne_bytes().hash(state);
|
|
||||||
self.scale_v.to_ne_bytes().hash(state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Clone,PartialEq)]
|
|
||||||
struct RobloxFaceTextureDescription{
|
|
||||||
texture:u32,
|
|
||||||
color:glam::Vec4,
|
|
||||||
transform:RobloxTextureTransform,
|
|
||||||
}
|
|
||||||
impl std::cmp::Eq for RobloxFaceTextureDescription{}//????
|
|
||||||
impl std::hash::Hash for RobloxFaceTextureDescription {
|
|
||||||
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
|
|
||||||
self.texture.hash(state);
|
|
||||||
self.transform.hash(state);
|
|
||||||
for &el in self.color.as_ref().iter() {
|
|
||||||
el.to_ne_bytes().hash(state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl RobloxFaceTextureDescription{
|
|
||||||
fn to_face_description(&self)->primitives::FaceDescription{
|
|
||||||
primitives::FaceDescription{
|
|
||||||
texture:Some(self.texture),
|
|
||||||
transform:glam::Affine2::from_translation(
|
|
||||||
glam::vec2(self.transform.offset_u,self.transform.offset_v)
|
|
||||||
)
|
|
||||||
*glam::Affine2::from_scale(
|
|
||||||
glam::vec2(self.transform.scale_u,self.transform.scale_v)
|
|
||||||
),
|
|
||||||
color:self.color,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type RobloxPartDescription=[Option<RobloxFaceTextureDescription>;6];
|
|
||||||
type RobloxWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
|
|
||||||
type RobloxCornerWedgeDescription=[Option<RobloxFaceTextureDescription>;5];
|
|
||||||
#[derive(Clone,Eq,Hash,PartialEq)]
|
|
||||||
enum RobloxBasePartDescription{
|
|
||||||
Sphere(RobloxPartDescription),
|
|
||||||
Part(RobloxPartDescription),
|
|
||||||
Cylinder(RobloxPartDescription),
|
|
||||||
Wedge(RobloxWedgeDescription),
|
|
||||||
CornerWedge(RobloxCornerWedgeDescription),
|
|
||||||
}
|
|
||||||
pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::IndexedModelInstances{
|
|
||||||
//IndexedModelInstances includes textures
|
|
||||||
let mut spawn_point=Planar64Vec3::ZERO;
|
|
||||||
|
|
||||||
let mut indexed_models=Vec::new();
|
|
||||||
let mut model_id_from_description=std::collections::HashMap::<RobloxBasePartDescription,usize>::new();
|
|
||||||
|
|
||||||
let mut texture_id_from_asset_id=std::collections::HashMap::<u64,u32>::new();
|
|
||||||
let mut asset_id_from_texture_id=Vec::new();
|
|
||||||
|
|
||||||
let mut object_refs=Vec::new();
|
|
||||||
let mut temp_objects=Vec::new();
|
|
||||||
recursive_collect_superclass(&mut object_refs, &dom, dom.root(),"BasePart");
|
|
||||||
for object_ref in object_refs {
|
|
||||||
if let Some(object)=dom.get_by_ref(object_ref){
|
|
||||||
if let (
|
|
||||||
Some(rbx_dom_weak::types::Variant::CFrame(cf)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Vector3(size)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Vector3(velocity)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(transparency)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Color3uint8(color3)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Bool(can_collide)),
|
|
||||||
) = (
|
|
||||||
object.properties.get("CFrame"),
|
|
||||||
object.properties.get("Size"),
|
|
||||||
object.properties.get("Velocity"),
|
|
||||||
object.properties.get("Transparency"),
|
|
||||||
object.properties.get("Color"),
|
|
||||||
object.properties.get("CanCollide"),
|
|
||||||
)
|
|
||||||
{
|
|
||||||
let model_transform=planar64_affine3_from_roblox(cf,size);
|
|
||||||
|
|
||||||
if model_transform.matrix3.determinant()==Planar64::ZERO{
|
|
||||||
let mut parent_ref=object.parent();
|
|
||||||
let mut full_path=object.name.clone();
|
|
||||||
while let Some(parent)=dom.get_by_ref(parent_ref){
|
|
||||||
full_path=format!("{}.{}",parent.name,full_path);
|
|
||||||
parent_ref=parent.parent();
|
|
||||||
}
|
|
||||||
println!("Zero determinant CFrame at location {}",full_path);
|
|
||||||
println!("matrix3:{}",model_transform.matrix3);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
//push TempIndexedAttributes
|
|
||||||
let mut force_intersecting=false;
|
|
||||||
let mut temp_indexing_attributes=Vec::new();
|
|
||||||
if let Some(attr)=match &object.name[..]{
|
|
||||||
"MapStart"=>{
|
|
||||||
spawn_point=model_transform.transform_point3(Planar64Vec3::ZERO)+Planar64Vec3::Y*5/2;
|
|
||||||
Some(crate::model::TempIndexedAttributes::Start(crate::model::TempAttrStart{mode_id:0}))
|
|
||||||
},
|
|
||||||
other=>{
|
|
||||||
let regman=lazy_regex::regex!(r"^(BonusStart|Spawn|ForceSpawn|WormholeOut)(\d+)$");
|
|
||||||
if let Some(captures) = regman.captures(other) {
|
|
||||||
match &captures[1]{
|
|
||||||
"BonusStart"=>Some(crate::model::TempIndexedAttributes::Start(crate::model::TempAttrStart{mode_id:captures[2].parse::<u32>().unwrap()})),
|
|
||||||
"Spawn"|"ForceSpawn"=>Some(crate::model::TempIndexedAttributes::Spawn(crate::model::TempAttrSpawn{mode_id:0,stage_id:captures[2].parse::<u32>().unwrap()})),
|
|
||||||
"WormholeOut"=>Some(crate::model::TempIndexedAttributes::Wormhole(crate::model::TempAttrWormhole{wormhole_id:captures[2].parse::<u32>().unwrap()})),
|
|
||||||
_=>None,
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}{
|
|
||||||
force_intersecting=true;
|
|
||||||
temp_indexing_attributes.push(attr);
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: also detect "CylinderMesh" etc here
|
|
||||||
let shape=match &object.class[..]{
|
|
||||||
"Part"=>{
|
|
||||||
if let Some(rbx_dom_weak::types::Variant::Enum(shape))=object.properties.get("Shape"){
|
|
||||||
match shape.to_u32(){
|
|
||||||
0=>primitives::Primitives::Sphere,
|
|
||||||
1=>primitives::Primitives::Cube,
|
|
||||||
2=>primitives::Primitives::Cylinder,
|
|
||||||
3=>primitives::Primitives::Wedge,
|
|
||||||
4=>primitives::Primitives::CornerWedge,
|
|
||||||
_=>panic!("Funky roblox PartType={};",shape.to_u32()),
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
panic!("Part has no Shape!");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"TrussPart"=>primitives::Primitives::Cube,
|
|
||||||
"WedgePart"=>primitives::Primitives::Wedge,
|
|
||||||
"CornerWedgePart"=>primitives::Primitives::CornerWedge,
|
|
||||||
_=>{
|
|
||||||
println!("Unsupported BasePart ClassName={}; defaulting to cube",object.class);
|
|
||||||
primitives::Primitives::Cube
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
//use the biggest one and cut it down later...
|
|
||||||
let mut part_texture_description:RobloxPartDescription=[None,None,None,None,None,None];
|
|
||||||
temp_objects.clear();
|
|
||||||
recursive_collect_superclass(&mut temp_objects, &dom, object,"Decal");
|
|
||||||
for &decal_ref in &temp_objects{
|
|
||||||
if let Some(decal)=dom.get_by_ref(decal_ref){
|
|
||||||
if let (
|
|
||||||
Some(rbx_dom_weak::types::Variant::Content(content)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Enum(normalid)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
|
|
||||||
) = (
|
|
||||||
decal.properties.get("Texture"),
|
|
||||||
decal.properties.get("Face"),
|
|
||||||
decal.properties.get("Color3"),
|
|
||||||
decal.properties.get("Transparency"),
|
|
||||||
) {
|
|
||||||
if let Ok(asset_id)=content.clone().into_string().parse::<RobloxAssetId>(){
|
|
||||||
let texture_id=if let Some(&texture_id)=texture_id_from_asset_id.get(&asset_id.0){
|
|
||||||
texture_id
|
|
||||||
}else{
|
|
||||||
let texture_id=asset_id_from_texture_id.len() as u32;
|
|
||||||
texture_id_from_asset_id.insert(asset_id.0,texture_id);
|
|
||||||
asset_id_from_texture_id.push(asset_id.0);
|
|
||||||
texture_id
|
|
||||||
};
|
|
||||||
let normal_id=normalid.to_u32();
|
|
||||||
if normal_id<6{
|
|
||||||
let (roblox_texture_color,roblox_texture_transform)=if decal.class=="Texture"{
|
|
||||||
//generate tranform
|
|
||||||
if let (
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(ox)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(oy)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(sx)),
|
|
||||||
Some(rbx_dom_weak::types::Variant::Float32(sy)),
|
|
||||||
) = (
|
|
||||||
decal.properties.get("OffsetStudsU"),
|
|
||||||
decal.properties.get("OffsetStudsV"),
|
|
||||||
decal.properties.get("StudsPerTileU"),
|
|
||||||
decal.properties.get("StudsPerTileV"),
|
|
||||||
)
|
|
||||||
{
|
|
||||||
let (size_u,size_v)=match normal_id{
|
|
||||||
0=>(size.z,size.y),//right
|
|
||||||
1=>(size.x,size.z),//top
|
|
||||||
2=>(size.x,size.y),//back
|
|
||||||
3=>(size.z,size.y),//left
|
|
||||||
4=>(size.x,size.z),//bottom
|
|
||||||
5=>(size.x,size.y),//front
|
|
||||||
_=>panic!("unreachable"),
|
|
||||||
};
|
|
||||||
(
|
|
||||||
glam::vec4(decal_color3.r,decal_color3.g,decal_color3.b,1.0-*decal_transparency),
|
|
||||||
RobloxTextureTransform{
|
|
||||||
offset_u:*ox/(*sx),offset_v:*oy/(*sy),
|
|
||||||
scale_u:size_u/(*sx),scale_v:size_v/(*sy),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}else{
|
|
||||||
(glam::Vec4::ONE,RobloxTextureTransform::default())
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
(glam::Vec4::ONE,RobloxTextureTransform::default())
|
|
||||||
};
|
|
||||||
part_texture_description[normal_id as usize]=Some(RobloxFaceTextureDescription{
|
|
||||||
texture:texture_id,
|
|
||||||
color:roblox_texture_color,
|
|
||||||
transform:roblox_texture_transform,
|
|
||||||
});
|
|
||||||
}else{
|
|
||||||
println!("NormalId={} unsupported for shape={:?}",normal_id,shape);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//obscure rust syntax "slice pattern"
|
|
||||||
let [
|
|
||||||
f0,//Cube::Right
|
|
||||||
f1,//Cube::Top
|
|
||||||
f2,//Cube::Back
|
|
||||||
f3,//Cube::Left
|
|
||||||
f4,//Cube::Bottom
|
|
||||||
f5,//Cube::Front
|
|
||||||
]=part_texture_description;
|
|
||||||
let basepart_texture_description=match shape{
|
|
||||||
primitives::Primitives::Sphere=>RobloxBasePartDescription::Sphere([f0,f1,f2,f3,f4,f5]),
|
|
||||||
primitives::Primitives::Cube=>RobloxBasePartDescription::Part([f0,f1,f2,f3,f4,f5]),
|
|
||||||
primitives::Primitives::Cylinder=>RobloxBasePartDescription::Cylinder([f0,f1,f2,f3,f4,f5]),
|
|
||||||
//use front face texture first and use top face texture as a fallback
|
|
||||||
primitives::Primitives::Wedge=>RobloxBasePartDescription::Wedge([
|
|
||||||
f0,//Cube::Right->Wedge::Right
|
|
||||||
if f5.is_some(){f5}else{f1},//Cube::Front|Cube::Top->Wedge::TopFront
|
|
||||||
f2,//Cube::Back->Wedge::Back
|
|
||||||
f3,//Cube::Left->Wedge::Left
|
|
||||||
f4,//Cube::Bottom->Wedge::Bottom
|
|
||||||
]),
|
|
||||||
//TODO: fix Left+Back texture coordinates to match roblox when not overwridden by Top
|
|
||||||
primitives::Primitives::CornerWedge=>RobloxBasePartDescription::CornerWedge([
|
|
||||||
f0,//Cube::Right->CornerWedge::Right
|
|
||||||
if f2.is_some(){f2}else{f1.clone()},//Cube::Back|Cube::Top->CornerWedge::TopBack
|
|
||||||
if f3.is_some(){f3}else{f1},//Cube::Left|Cube::Top->CornerWedge::TopLeft
|
|
||||||
f4,//Cube::Bottom->CornerWedge::Bottom
|
|
||||||
f5,//Cube::Front->CornerWedge::Front
|
|
||||||
]),
|
|
||||||
};
|
|
||||||
//make new model if unit cube has not been created before
|
|
||||||
let model_id=if let Some(&model_id)=model_id_from_description.get(&basepart_texture_description){
|
|
||||||
//push to existing texture model
|
|
||||||
model_id
|
|
||||||
}else{
|
|
||||||
let model_id=indexed_models.len();
|
|
||||||
model_id_from_description.insert(basepart_texture_description.clone(),model_id);//borrow checker going crazy
|
|
||||||
indexed_models.push(match basepart_texture_description{
|
|
||||||
RobloxBasePartDescription::Sphere(part_texture_description)
|
|
||||||
|RobloxBasePartDescription::Cylinder(part_texture_description)
|
|
||||||
|RobloxBasePartDescription::Part(part_texture_description)=>{
|
|
||||||
let mut cube_face_description=primitives::CubeFaceDescription::default();
|
|
||||||
for (face_id,roblox_face_description) in part_texture_description.iter().enumerate(){
|
|
||||||
cube_face_description.insert(
|
|
||||||
match face_id{
|
|
||||||
0=>primitives::CubeFace::Right,
|
|
||||||
1=>primitives::CubeFace::Top,
|
|
||||||
2=>primitives::CubeFace::Back,
|
|
||||||
3=>primitives::CubeFace::Left,
|
|
||||||
4=>primitives::CubeFace::Bottom,
|
|
||||||
5=>primitives::CubeFace::Front,
|
|
||||||
_=>panic!("unreachable"),
|
|
||||||
},
|
|
||||||
match roblox_face_description{
|
|
||||||
Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
|
|
||||||
None=>primitives::FaceDescription::default(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
primitives::generate_partial_unit_cube(cube_face_description)
|
|
||||||
},
|
|
||||||
RobloxBasePartDescription::Wedge(wedge_texture_description)=>{
|
|
||||||
let mut wedge_face_description=primitives::WedgeFaceDescription::default();
|
|
||||||
for (face_id,roblox_face_description) in wedge_texture_description.iter().enumerate(){
|
|
||||||
wedge_face_description.insert(
|
|
||||||
match face_id{
|
|
||||||
0=>primitives::WedgeFace::Right,
|
|
||||||
1=>primitives::WedgeFace::TopFront,
|
|
||||||
2=>primitives::WedgeFace::Back,
|
|
||||||
3=>primitives::WedgeFace::Left,
|
|
||||||
4=>primitives::WedgeFace::Bottom,
|
|
||||||
_=>panic!("unreachable"),
|
|
||||||
},
|
|
||||||
match roblox_face_description{
|
|
||||||
Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
|
|
||||||
None=>primitives::FaceDescription::default(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
primitives::generate_partial_unit_wedge(wedge_face_description)
|
|
||||||
},
|
|
||||||
RobloxBasePartDescription::CornerWedge(cornerwedge_texture_description)=>{
|
|
||||||
let mut cornerwedge_face_description=primitives::CornerWedgeFaceDescription::default();
|
|
||||||
for (face_id,roblox_face_description) in cornerwedge_texture_description.iter().enumerate(){
|
|
||||||
cornerwedge_face_description.insert(
|
|
||||||
match face_id{
|
|
||||||
0=>primitives::CornerWedgeFace::Right,
|
|
||||||
1=>primitives::CornerWedgeFace::TopBack,
|
|
||||||
2=>primitives::CornerWedgeFace::TopLeft,
|
|
||||||
3=>primitives::CornerWedgeFace::Bottom,
|
|
||||||
4=>primitives::CornerWedgeFace::Front,
|
|
||||||
_=>panic!("unreachable"),
|
|
||||||
},
|
|
||||||
match roblox_face_description{
|
|
||||||
Some(roblox_texture_transform)=>roblox_texture_transform.to_face_description(),
|
|
||||||
None=>primitives::FaceDescription::default(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
primitives::generate_partial_unit_cornerwedge(cornerwedge_face_description)
|
|
||||||
},
|
|
||||||
});
|
|
||||||
model_id
|
|
||||||
};
|
|
||||||
indexed_models[model_id].instances.push(crate::model::ModelInstance {
|
|
||||||
transform:model_transform,
|
|
||||||
color:glam::vec4(color3.r as f32/255f32, color3.g as f32/255f32, color3.b as f32/255f32, 1.0-*transparency),
|
|
||||||
attributes:get_attributes(&object.name,*can_collide,Planar64Vec3::try_from([velocity.x,velocity.y,velocity.z]).unwrap(),force_intersecting),
|
|
||||||
temp_indexing:temp_indexing_attributes,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
crate::model::IndexedModelInstances{
|
|
||||||
textures:asset_id_from_texture_id.iter().map(|t|t.to_string()).collect(),
|
|
||||||
models:indexed_models,
|
|
||||||
spawn_point,
|
|
||||||
modes:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
102
src/main.rs
102
src/main.rs
@ -1,15 +1,9 @@
|
|||||||
use strafesnet_common::integer;
|
|
||||||
|
|
||||||
mod model;
|
|
||||||
mod setup;
|
mod setup;
|
||||||
mod window;
|
mod window;
|
||||||
mod worker;
|
mod worker;
|
||||||
mod physics;
|
mod physics;
|
||||||
mod graphics;
|
mod graphics;
|
||||||
mod settings;
|
mod settings;
|
||||||
mod primitives;
|
|
||||||
mod load_bsp;
|
|
||||||
mod load_roblox;
|
|
||||||
mod face_crawler;
|
mod face_crawler;
|
||||||
mod compat_worker;
|
mod compat_worker;
|
||||||
mod model_physics;
|
mod model_physics;
|
||||||
@ -17,102 +11,6 @@ mod model_graphics;
|
|||||||
mod physics_worker;
|
mod physics_worker;
|
||||||
mod graphics_worker;
|
mod graphics_worker;
|
||||||
|
|
||||||
fn load_file(path: std::path::PathBuf)->Option<model::IndexedModelInstances>{
|
|
||||||
println!("Loading file: {:?}", &path);
|
|
||||||
//oh boy! let's load the map!
|
|
||||||
if let Ok(file)=std::fs::File::open(path){
|
|
||||||
let mut input = std::io::BufReader::new(file);
|
|
||||||
let mut first_8=[0u8;8];
|
|
||||||
//.rbxm roblox binary = "<roblox!"
|
|
||||||
//.rbxmx roblox xml = "<roblox "
|
|
||||||
//.bsp = "VBSP"
|
|
||||||
//.vmf =
|
|
||||||
//.snf = "SNMF"
|
|
||||||
//.snf = "SNBF"
|
|
||||||
if let (Ok(()),Ok(()))=(std::io::Read::read_exact(&mut input, &mut first_8),std::io::Seek::rewind(&mut input)){
|
|
||||||
match &first_8[0..4]{
|
|
||||||
b"<rob"=>{
|
|
||||||
match match &first_8[4..8]{
|
|
||||||
b"lox!"=>rbx_binary::from_reader(input).map_err(|e|format!("{:?}",e)),
|
|
||||||
b"lox "=>rbx_xml::from_reader(input,rbx_xml::DecodeOptions::default()).map_err(|e|format!("{:?}",e)),
|
|
||||||
other=>Err(format!("Unknown Roblox file type {:?}",other)),
|
|
||||||
}{
|
|
||||||
Ok(dom)=>Some(load_roblox::generate_indexed_models(dom)),
|
|
||||||
Err(e)=>{
|
|
||||||
println!("Error loading roblox file:{:?}",e);
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
b"VBSP"=>load_bsp::generate_indexed_models(&mut input).ok(),
|
|
||||||
//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
|
|
||||||
//b"SNFB"=>Some(sniffer::load_bot(input)),
|
|
||||||
other=>{
|
|
||||||
println!("loser file {:?}",other);
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
println!("Failed to read first 8 bytes and seek back to beginning of file.");
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
println!("Could not open file");
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn default_models()->model::IndexedModelInstances{
|
|
||||||
let mut indexed_models = Vec::new();
|
|
||||||
indexed_models.push(primitives::unit_sphere());
|
|
||||||
indexed_models.push(primitives::unit_cylinder());
|
|
||||||
indexed_models.push(primitives::unit_cube());
|
|
||||||
println!("models.len = {:?}", indexed_models.len());
|
|
||||||
//quad monkeys
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(10.,5.,10.))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(20.,5.,10.))).unwrap(),
|
|
||||||
color:glam::vec4(1.0,0.0,0.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(10.,5.,20.))).unwrap(),
|
|
||||||
color:glam::vec4(0.0,1.0,0.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(20.,5.,20.))).unwrap(),
|
|
||||||
color:glam::vec4(0.0,0.0,1.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//decorative monkey
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(15.,10.,15.))).unwrap(),
|
|
||||||
color:glam::vec4(0.5,0.5,0.5,0.5),
|
|
||||||
attributes:model::CollisionAttributes::Decoration,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//teapot
|
|
||||||
indexed_models[1].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_scale_rotation_translation(glam::vec3(0.5, 1.0, 0.2),glam::quat(-0.22248298016985793,-0.839457167990537,-0.05603504040830783,-0.49261857546227916),glam::vec3(-10.,7.,10.))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//ground
|
|
||||||
indexed_models[2].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(0.,0.,0.))*glam::Affine3A::from_scale(glam::vec3(160.0, 1.0, 160.0))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
model::IndexedModelInstances{
|
|
||||||
textures:Vec::new(),
|
|
||||||
models:indexed_models,
|
|
||||||
spawn_point:integer::Planar64Vec3::Y*50,
|
|
||||||
modes:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main(){
|
fn main(){
|
||||||
setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
|
setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
|
||||||
}
|
}
|
||||||
|
|||||||
321
src/model.rs
321
src/model.rs
@ -1,321 +0,0 @@
|
|||||||
use strafesnet_common::integer::{Time,Planar64,Planar64Vec3,Planar64Affine3};
|
|
||||||
pub type TextureCoordinate=glam::Vec2;
|
|
||||||
pub type Color4=glam::Vec4;
|
|
||||||
#[derive(Clone,Hash,PartialEq,Eq)]
|
|
||||||
pub struct IndexedVertex{
|
|
||||||
pub pos:u32,
|
|
||||||
pub tex:u32,
|
|
||||||
pub normal:u32,
|
|
||||||
pub color:u32,
|
|
||||||
}
|
|
||||||
pub struct IndexedPolygon{
|
|
||||||
pub vertices:Vec<u32>,
|
|
||||||
}
|
|
||||||
pub struct IndexedGroup{
|
|
||||||
pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
|
|
||||||
pub polys:Vec<IndexedPolygon>,
|
|
||||||
}
|
|
||||||
pub struct IndexedModel{
|
|
||||||
pub unique_pos:Vec<Planar64Vec3>,
|
|
||||||
pub unique_normal:Vec<Planar64Vec3>,
|
|
||||||
pub unique_tex:Vec<TextureCoordinate>,
|
|
||||||
pub unique_color:Vec<Color4>,
|
|
||||||
pub unique_vertices:Vec<IndexedVertex>,
|
|
||||||
pub groups: Vec<IndexedGroup>,
|
|
||||||
pub instances:Vec<ModelInstance>,
|
|
||||||
}
|
|
||||||
pub struct ModelInstance{
|
|
||||||
//pub id:u64,//this does not actually help with map fixes resimulating bots, they must always be resimulated
|
|
||||||
pub transform:Planar64Affine3,
|
|
||||||
pub color:Color4,//transparency is in here
|
|
||||||
pub attributes:CollisionAttributes,
|
|
||||||
pub temp_indexing:Vec<TempIndexedAttributes>,
|
|
||||||
}
|
|
||||||
impl std::default::Default for ModelInstance{
|
|
||||||
fn default() -> Self {
|
|
||||||
Self{
|
|
||||||
color:Color4::ONE,
|
|
||||||
transform:Default::default(),
|
|
||||||
attributes:Default::default(),
|
|
||||||
temp_indexing:Default::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub struct IndexedModelInstances{
|
|
||||||
pub textures:Vec<String>,//RenderPattern
|
|
||||||
pub models:Vec<IndexedModel>,
|
|
||||||
//may make this into an object later.
|
|
||||||
pub modes:Vec<ModeDescription>,
|
|
||||||
pub spawn_point:Planar64Vec3,
|
|
||||||
}
|
|
||||||
//stage description referencing flattened ids is spooky, but the map loading is meant to be deterministic.
|
|
||||||
pub struct ModeDescription{
|
|
||||||
//TODO: put "default" style modifiers in mode
|
|
||||||
//pub style:StyleModifiers,
|
|
||||||
pub start:usize,//start=model_id
|
|
||||||
pub spawns:Vec<usize>,//spawns[spawn_id]=model_id
|
|
||||||
pub spawn_from_stage_id:std::collections::HashMap::<u32,usize>,
|
|
||||||
pub ordered_checkpoint_from_checkpoint_id:std::collections::HashMap::<u32,usize>,
|
|
||||||
}
|
|
||||||
impl ModeDescription{
|
|
||||||
pub fn get_spawn_model_id(&self,stage_id:u32)->Option<&usize>{
|
|
||||||
self.spawns.get(*self.spawn_from_stage_id.get(&stage_id)?)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//I don't want this code to exist!
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct TempAttrStart{
|
|
||||||
pub mode_id:u32,
|
|
||||||
}
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct TempAttrSpawn{
|
|
||||||
pub mode_id:u32,
|
|
||||||
pub stage_id:u32,
|
|
||||||
}
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct TempAttrWormhole{
|
|
||||||
pub wormhole_id:u32,
|
|
||||||
}
|
|
||||||
pub enum TempIndexedAttributes{
|
|
||||||
Start(TempAttrStart),
|
|
||||||
Spawn(TempAttrSpawn),
|
|
||||||
Wormhole(TempAttrWormhole),
|
|
||||||
}
|
|
||||||
|
|
||||||
//you have this effect while in contact
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct ContactingLadder{
|
|
||||||
pub sticky:bool
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum ContactingBehaviour{
|
|
||||||
Surf,
|
|
||||||
Cling,//usable as a zipline, or other weird and wonderful things
|
|
||||||
Ladder(ContactingLadder),
|
|
||||||
Elastic(u32),//[1/2^32,1] 0=None (elasticity+1)/2^32
|
|
||||||
}
|
|
||||||
//you have this effect while intersecting
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct IntersectingWater{
|
|
||||||
pub viscosity:Planar64,
|
|
||||||
pub density:Planar64,
|
|
||||||
pub velocity:Planar64Vec3,
|
|
||||||
}
|
|
||||||
//All models can be given these attributes
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct GameMechanicAccelerator{
|
|
||||||
pub acceleration:Planar64Vec3
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum GameMechanicBooster{
|
|
||||||
Affine(Planar64Affine3),//capable of SetVelocity,DotVelocity,normal booster,bouncy part,redirect velocity, and much more
|
|
||||||
Velocity(Planar64Vec3),//straight up boost velocity adds to your current velocity
|
|
||||||
Energy{direction:Planar64Vec3,energy:Planar64},//increase energy in direction
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum TrajectoryChoice{
|
|
||||||
HighArcLongDuration,//underhand lob at target: less horizontal speed and more air time
|
|
||||||
LowArcShortDuration,//overhand throw at target: more horizontal speed and less air time
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum GameMechanicSetTrajectory{
|
|
||||||
//Speed-type SetTrajectory
|
|
||||||
AirTime(Time),//air time (relative to gravity direction) is invariant across mass and gravity changes
|
|
||||||
Height(Planar64),//boost height (relative to gravity direction) is invariant across mass and gravity changes
|
|
||||||
DotVelocity{direction:Planar64Vec3,dot:Planar64},//set your velocity in a specific direction without touching other directions
|
|
||||||
//Velocity-type SetTrajectory
|
|
||||||
TargetPointTime{//launch on a trajectory that will land at a target point in a set amount of time
|
|
||||||
target_point:Planar64Vec3,
|
|
||||||
time:Time,//short time = fast and direct, long time = launch high in the air, negative time = wrong way
|
|
||||||
},
|
|
||||||
TargetPointSpeed{//launch at a fixed speed and land at a target point
|
|
||||||
target_point:Planar64Vec3,
|
|
||||||
speed:Planar64,//if speed is too low this will fail to reach the target. The closest-passing trajectory will be chosen instead
|
|
||||||
trajectory_choice:TrajectoryChoice,
|
|
||||||
},
|
|
||||||
Velocity(Planar64Vec3),//SetVelocity
|
|
||||||
}
|
|
||||||
impl GameMechanicSetTrajectory{
|
|
||||||
fn is_velocity(&self)->bool{
|
|
||||||
match self{
|
|
||||||
GameMechanicSetTrajectory::AirTime(_)
|
|
||||||
|GameMechanicSetTrajectory::Height(_)
|
|
||||||
|GameMechanicSetTrajectory::DotVelocity{direction:_,dot:_}=>false,
|
|
||||||
GameMechanicSetTrajectory::TargetPointTime{target_point:_,time:_}
|
|
||||||
|GameMechanicSetTrajectory::TargetPointSpeed{target_point:_,speed:_,trajectory_choice:_}
|
|
||||||
|GameMechanicSetTrajectory::Velocity(_)=>true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum ZoneBehaviour{
|
|
||||||
//Start is indexed
|
|
||||||
//Checkpoints are indexed
|
|
||||||
Finish,
|
|
||||||
Anitcheat,
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct GameMechanicZone{
|
|
||||||
pub mode_id:u32,
|
|
||||||
pub behaviour:ZoneBehaviour,
|
|
||||||
}
|
|
||||||
// enum TrapCondition{
|
|
||||||
// FasterThan(Planar64),
|
|
||||||
// SlowerThan(Planar64),
|
|
||||||
// InRange(Planar64,Planar64),
|
|
||||||
// OutsideRange(Planar64,Planar64),
|
|
||||||
// }
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum StageElementBehaviour{
|
|
||||||
//Spawn,//The behaviour of stepping on a spawn setting the spawnid
|
|
||||||
SpawnAt,//must be standing on top to get effect. except cancollide false
|
|
||||||
Trigger,
|
|
||||||
Teleport,
|
|
||||||
Platform,
|
|
||||||
//Checkpoint acts like a trigger if you haven't hit all the checkpoints yet.
|
|
||||||
//Note that all stage elements act like this for the next stage.
|
|
||||||
Checkpoint,
|
|
||||||
//OrderedCheckpoint. You must pass through all of these in ascending order.
|
|
||||||
//If you hit them out of order it acts like a trigger.
|
|
||||||
//Do not support backtracking at all for now.
|
|
||||||
Ordered{
|
|
||||||
checkpoint_id:u32,
|
|
||||||
},
|
|
||||||
//UnorderedCheckpoint. You must pass through all of these in any order.
|
|
||||||
Unordered,
|
|
||||||
//If you get reset by a jump limit
|
|
||||||
JumpLimit(u32),
|
|
||||||
//Speedtrap(TrapCondition),//Acts as a trigger with a speed condition
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct GameMechanicStageElement{
|
|
||||||
pub mode_id:u32,
|
|
||||||
pub stage_id:u32,//which spawn to send to
|
|
||||||
pub force:bool,//allow setting to lower spawn id i.e. 7->3
|
|
||||||
pub behaviour:StageElementBehaviour
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct GameMechanicWormhole{
|
|
||||||
//destination does not need to be another wormhole
|
|
||||||
//this defines a one way portal to a destination model transform
|
|
||||||
//two of these can create a two way wormhole
|
|
||||||
pub destination_model_id:u32,
|
|
||||||
//(position,angles)*=origin.transform.inverse()*destination.transform
|
|
||||||
}
|
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub enum TeleportBehaviour{
|
|
||||||
StageElement(GameMechanicStageElement),
|
|
||||||
Wormhole(GameMechanicWormhole),
|
|
||||||
}
|
|
||||||
//attributes listed in order of handling
|
|
||||||
#[derive(Default,Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct GameMechanicAttributes{
|
|
||||||
pub zone:Option<GameMechanicZone>,
|
|
||||||
pub booster:Option<GameMechanicBooster>,
|
|
||||||
pub trajectory:Option<GameMechanicSetTrajectory>,
|
|
||||||
pub teleport_behaviour:Option<TeleportBehaviour>,
|
|
||||||
pub accelerator:Option<GameMechanicAccelerator>,
|
|
||||||
}
|
|
||||||
impl GameMechanicAttributes{
|
|
||||||
pub fn any(&self)->bool{
|
|
||||||
self.zone.is_some()
|
|
||||||
||self.booster.is_some()
|
|
||||||
||self.trajectory.is_some()
|
|
||||||
||self.teleport_behaviour.is_some()
|
|
||||||
||self.accelerator.is_some()
|
|
||||||
}
|
|
||||||
pub fn is_wrcp(&self,current_mode_id:u32)->bool{
|
|
||||||
self.trajectory.as_ref().map_or(false,|t|t.is_velocity())
|
|
||||||
&&match &self.teleport_behaviour{
|
|
||||||
Some(TeleportBehaviour::StageElement(
|
|
||||||
GameMechanicStageElement{
|
|
||||||
mode_id,
|
|
||||||
stage_id:_,
|
|
||||||
force:true,
|
|
||||||
behaviour:StageElementBehaviour::Trigger|StageElementBehaviour::Teleport
|
|
||||||
}
|
|
||||||
))=>current_mode_id==*mode_id,
|
|
||||||
_=>false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Default,Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct ContactingAttributes{
|
|
||||||
//friction?
|
|
||||||
pub contact_behaviour:Option<ContactingBehaviour>,
|
|
||||||
}
|
|
||||||
impl ContactingAttributes{
|
|
||||||
pub fn any(&self)->bool{
|
|
||||||
self.contact_behaviour.is_some()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Default,Clone,Hash,Eq,PartialEq)]
|
|
||||||
pub struct IntersectingAttributes{
|
|
||||||
pub water:Option<IntersectingWater>,
|
|
||||||
}
|
|
||||||
impl IntersectingAttributes{
|
|
||||||
pub fn any(&self)->bool{
|
|
||||||
self.water.is_some()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//Spawn(u32) NO! spawns are indexed in the map header instead of marked with attibutes
|
|
||||||
pub enum CollisionAttributes{
|
|
||||||
Decoration,//visual only
|
|
||||||
Contact{//track whether you are contacting the object
|
|
||||||
contacting:ContactingAttributes,
|
|
||||||
general:GameMechanicAttributes,
|
|
||||||
},
|
|
||||||
Intersect{//track whether you are intersecting the object
|
|
||||||
intersecting:IntersectingAttributes,
|
|
||||||
general:GameMechanicAttributes,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
impl std::default::Default for CollisionAttributes{
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::Contact{
|
|
||||||
contacting:ContactingAttributes::default(),
|
|
||||||
general:GameMechanicAttributes::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_indexed_model_list_from_obj(data:obj::ObjData,color:Color4)->Vec<IndexedModel>{
|
|
||||||
let mut unique_vertex_index = std::collections::HashMap::<obj::IndexTuple,u32>::new();
|
|
||||||
return data.objects.iter().map(|object|{
|
|
||||||
unique_vertex_index.clear();
|
|
||||||
let mut unique_vertices = Vec::new();
|
|
||||||
let groups = object.groups.iter().map(|group|{
|
|
||||||
IndexedGroup{
|
|
||||||
texture:None,
|
|
||||||
polys:group.polys.iter().map(|poly|{
|
|
||||||
IndexedPolygon{
|
|
||||||
vertices:poly.0.iter().map(|&tup|{
|
|
||||||
if let Some(&i)=unique_vertex_index.get(&tup){
|
|
||||||
i
|
|
||||||
}else{
|
|
||||||
let i=unique_vertices.len() as u32;
|
|
||||||
unique_vertices.push(IndexedVertex{
|
|
||||||
pos: tup.0 as u32,
|
|
||||||
tex: tup.1.unwrap() as u32,
|
|
||||||
normal: tup.2.unwrap() as u32,
|
|
||||||
color: 0,
|
|
||||||
});
|
|
||||||
unique_vertex_index.insert(tup,i);
|
|
||||||
i
|
|
||||||
}
|
|
||||||
}).collect()
|
|
||||||
}
|
|
||||||
}).collect()
|
|
||||||
}
|
|
||||||
}).collect();
|
|
||||||
IndexedModel{
|
|
||||||
unique_pos: data.position.iter().map(|&v|Planar64Vec3::try_from(v).unwrap()).collect(),
|
|
||||||
unique_tex: data.texture.iter().map(|&v|TextureCoordinate::from_array(v)).collect(),
|
|
||||||
unique_normal: data.normal.iter().map(|&v|Planar64Vec3::try_from(v).unwrap()).collect(),
|
|
||||||
unique_color: vec![color],
|
|
||||||
unique_vertices,
|
|
||||||
groups,
|
|
||||||
instances:Vec::new(),
|
|
||||||
}
|
|
||||||
}).collect()
|
|
||||||
}
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
use bytemuck::{Pod,Zeroable};
|
use bytemuck::{Pod,Zeroable};
|
||||||
use crate::model::{IndexedVertex,IndexedPolygon};
|
use strafesnet_common::model::{IndexedVertex,PolygonGroup,RenderConfigId};
|
||||||
#[derive(Clone,Copy,Pod,Zeroable)]
|
#[derive(Clone,Copy,Pod,Zeroable)]
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct GraphicsVertex{
|
pub struct GraphicsVertex{
|
||||||
@ -8,41 +8,30 @@ pub struct GraphicsVertex {
|
|||||||
pub normal:[f32;3],
|
pub normal:[f32;3],
|
||||||
pub color:[f32;4],
|
pub color:[f32;4],
|
||||||
}
|
}
|
||||||
pub struct IndexedGroupFixedTexture{
|
#[derive(Clone,Copy,id::Id)]
|
||||||
pub polys:Vec<IndexedPolygon>,
|
pub struct IndexedGraphicsMeshOwnedRenderConfigId(u32);
|
||||||
}
|
pub struct IndexedGraphicsMeshOwnedRenderConfig{
|
||||||
pub struct IndexedGraphicsModelSingleTexture{
|
|
||||||
pub unique_pos:Vec<[f32;3]>,
|
pub unique_pos:Vec<[f32;3]>,
|
||||||
pub unique_tex:Vec<[f32;2]>,
|
pub unique_tex:Vec<[f32;2]>,
|
||||||
pub unique_normal:Vec<[f32;3]>,
|
pub unique_normal:Vec<[f32;3]>,
|
||||||
pub unique_color:Vec<[f32;4]>,
|
pub unique_color:Vec<[f32;4]>,
|
||||||
pub unique_vertices:Vec<IndexedVertex>,
|
pub unique_vertices:Vec<IndexedVertex>,
|
||||||
pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
|
pub render_config:RenderConfigId,
|
||||||
pub groups: Vec<IndexedGroupFixedTexture>,
|
pub polys:PolygonGroup,
|
||||||
pub instances:Vec<GraphicsModelInstance>,
|
pub instances:Vec<GraphicsModelOwned>,
|
||||||
}
|
}
|
||||||
pub enum Entities{
|
pub enum Indices{
|
||||||
U32(Vec<Vec<u32>>),
|
U32(Vec<u32>),
|
||||||
U16(Vec<Vec<u16>>),
|
U16(Vec<u16>),
|
||||||
}
|
}
|
||||||
pub struct GraphicsModelSingleTexture{
|
pub struct GraphicsMeshOwnedRenderConfig{
|
||||||
pub instances:Vec<GraphicsModelInstance>,
|
|
||||||
pub vertices:Vec<GraphicsVertex>,
|
pub vertices:Vec<GraphicsVertex>,
|
||||||
pub entities:Entities,
|
pub indices:Indices,
|
||||||
pub texture:Option<u32>,
|
pub render_config:RenderConfigId,
|
||||||
|
pub instances:Vec<GraphicsModelOwned>,
|
||||||
}
|
}
|
||||||
#[derive(Clone,PartialEq)]
|
#[derive(Clone,Copy,PartialEq,id::Id)]
|
||||||
pub struct GraphicsModelColor4(glam::Vec4);
|
pub struct GraphicsModelColor4(glam::Vec4);
|
||||||
impl GraphicsModelColor4{
|
|
||||||
pub const fn get(&self)->glam::Vec4{
|
|
||||||
self.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<glam::Vec4> for GraphicsModelColor4{
|
|
||||||
fn from(value:glam::Vec4)->Self{
|
|
||||||
Self(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl std::hash::Hash for GraphicsModelColor4{
|
impl std::hash::Hash for GraphicsModelColor4{
|
||||||
fn hash<H:std::hash::Hasher>(&self,state:&mut H) {
|
fn hash<H:std::hash::Hasher>(&self,state:&mut H) {
|
||||||
for &f in self.0.as_ref(){
|
for &f in self.0.as_ref(){
|
||||||
@ -52,7 +41,7 @@ impl std::hash::Hash for GraphicsModelColor4{
|
|||||||
}
|
}
|
||||||
impl Eq for GraphicsModelColor4{}
|
impl Eq for GraphicsModelColor4{}
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct GraphicsModelInstance{
|
pub struct GraphicsModelOwned{
|
||||||
pub transform:glam::Mat4,
|
pub transform:glam::Mat4,
|
||||||
pub normal_transform:glam::Mat3,
|
pub normal_transform:glam::Mat3,
|
||||||
pub color:GraphicsModelColor4,
|
pub color:GraphicsModelColor4,
|
||||||
|
|||||||
@ -1,21 +1,13 @@
|
|||||||
use std::borrow::{Borrow,Cow};
|
use std::borrow::{Borrow,Cow};
|
||||||
|
use std::collections::{HashSet,HashMap};
|
||||||
|
use strafesnet_common::model::{self,MeshId,PolygonIter};
|
||||||
use strafesnet_common::zeroes;
|
use strafesnet_common::zeroes;
|
||||||
use strafesnet_common::integer::{self,Planar64,Planar64Vec3};
|
use strafesnet_common::integer::{self,Planar64,Planar64Vec3};
|
||||||
|
|
||||||
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
|
||||||
pub struct VertId(usize);
|
|
||||||
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
|
||||||
pub struct EdgeId(usize);
|
|
||||||
pub trait UndirectedEdge{
|
pub trait UndirectedEdge{
|
||||||
type DirectedEdge:Copy+DirectedEdge;
|
type DirectedEdge:Copy+DirectedEdge;
|
||||||
fn as_directed(&self,parity:bool)->Self::DirectedEdge;
|
fn as_directed(&self,parity:bool)->Self::DirectedEdge;
|
||||||
}
|
}
|
||||||
impl UndirectedEdge for EdgeId{
|
|
||||||
type DirectedEdge=DirectedEdgeId;
|
|
||||||
fn as_directed(&self,parity:bool)->DirectedEdgeId{
|
|
||||||
DirectedEdgeId(self.0|((parity as usize)<<(usize::BITS-1)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub trait DirectedEdge{
|
pub trait DirectedEdge{
|
||||||
type UndirectedEdge:Copy+UndirectedEdge;
|
type UndirectedEdge:Copy+UndirectedEdge;
|
||||||
fn as_undirected(&self)->Self::UndirectedEdge;
|
fn as_undirected(&self)->Self::UndirectedEdge;
|
||||||
@ -25,20 +17,37 @@ pub trait DirectedEdge{
|
|||||||
self.as_undirected().as_directed(!self.parity())
|
self.as_undirected().as_directed(!self.parity())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct MeshVertId(u32);
|
||||||
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct MeshFaceId(u32);
|
||||||
|
|
||||||
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct SubmeshVertId(u32);
|
||||||
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct SubmeshEdgeId(u32);
|
||||||
/// DirectedEdgeId refers to an EdgeId when undirected.
|
/// DirectedEdgeId refers to an EdgeId when undirected.
|
||||||
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
pub struct DirectedEdgeId(usize);
|
pub struct SubmeshDirectedEdgeId(u32);
|
||||||
impl DirectedEdge for DirectedEdgeId{
|
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
type UndirectedEdge=EdgeId;
|
pub struct SubmeshFaceId(u32);
|
||||||
fn as_undirected(&self)->EdgeId{
|
|
||||||
EdgeId(self.0&!(1<<(usize::BITS-1)))
|
impl UndirectedEdge for SubmeshEdgeId{
|
||||||
|
type DirectedEdge=SubmeshDirectedEdgeId;
|
||||||
|
fn as_directed(&self,parity:bool)->SubmeshDirectedEdgeId{
|
||||||
|
SubmeshDirectedEdgeId(self.0|((parity as u32)<<(u32::BITS-1)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl DirectedEdge for SubmeshDirectedEdgeId{
|
||||||
|
type UndirectedEdge=SubmeshEdgeId;
|
||||||
|
fn as_undirected(&self)->SubmeshEdgeId{
|
||||||
|
SubmeshEdgeId(self.0&!(1<<(u32::BITS-1)))
|
||||||
}
|
}
|
||||||
fn parity(&self)->bool{
|
fn parity(&self)->bool{
|
||||||
self.0&(1<<(usize::BITS-1))!=0
|
self.0&(1<<(u32::BITS-1))!=0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
|
||||||
pub struct FaceId(usize);
|
|
||||||
|
|
||||||
//Vertex <-> Edge <-> Face -> Collide
|
//Vertex <-> Edge <-> Face -> Collide
|
||||||
pub enum FEV<F,E:DirectedEdge,V>{
|
pub enum FEV<F,E:DirectedEdge,V>{
|
||||||
@ -48,6 +57,7 @@ pub enum FEV<F,E:DirectedEdge,V>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
//use Unit32 #[repr(C)] for map files
|
//use Unit32 #[repr(C)] for map files
|
||||||
|
#[derive(Clone,Hash,Eq,PartialEq)]
|
||||||
struct Face{
|
struct Face{
|
||||||
normal:Planar64Vec3,
|
normal:Planar64Vec3,
|
||||||
dot:Planar64,
|
dot:Planar64,
|
||||||
@ -71,34 +81,170 @@ pub trait MeshQuery<FACE:Clone,EDGE:Clone+DirectedEdge,VERT:Clone>{
|
|||||||
fn vert_faces(&self,vert_id:VERT)->Cow<Vec<FACE>>;
|
fn vert_faces(&self,vert_id:VERT)->Cow<Vec<FACE>>;
|
||||||
}
|
}
|
||||||
struct FaceRefs{
|
struct FaceRefs{
|
||||||
edges:Vec<DirectedEdgeId>,
|
edges:Vec<SubmeshDirectedEdgeId>,
|
||||||
//verts:Vec<VertId>,
|
//verts:Vec<VertId>,
|
||||||
}
|
}
|
||||||
struct EdgeRefs{
|
struct EdgeRefs{
|
||||||
faces:[FaceId;2],//left, right
|
faces:[SubmeshFaceId;2],//left, right
|
||||||
verts:[VertId;2],//bottom, top
|
verts:[SubmeshVertId;2],//bottom, top
|
||||||
}
|
}
|
||||||
struct VertRefs{
|
struct VertRefs{
|
||||||
faces:Vec<FaceId>,
|
faces:Vec<SubmeshFaceId>,
|
||||||
edges:Vec<DirectedEdgeId>,
|
edges:Vec<SubmeshDirectedEdgeId>,
|
||||||
}
|
}
|
||||||
pub struct PhysicsMesh{
|
pub struct PhysicsMeshData{
|
||||||
faces:Vec<Face>,
|
//this contains all real and virtual faces used in both the complete mesh and convex submeshes
|
||||||
verts:Vec<Vert>,
|
//faces are sorted such that all faces that belong to the complete mesh appear first, and then
|
||||||
|
//all remaining faces are virtual to operate internal logic of the face crawler
|
||||||
|
//and cannot be part of a physics collision
|
||||||
|
//virtual faces are only used in convex submeshes.
|
||||||
|
faces:Vec<Face>,//MeshFaceId indexes this list
|
||||||
|
verts:Vec<Vert>,//MeshVertId indexes this list
|
||||||
|
}
|
||||||
|
pub struct PhysicsMeshTopology{
|
||||||
|
//mapping of local ids to PhysicsMeshData ids
|
||||||
|
faces:Vec<MeshFaceId>,//SubmeshFaceId indexes this list
|
||||||
|
verts:Vec<MeshVertId>,//SubmeshVertId indexes this list
|
||||||
|
//all ids here are local to this object
|
||||||
face_topology:Vec<FaceRefs>,
|
face_topology:Vec<FaceRefs>,
|
||||||
edge_topology:Vec<EdgeRefs>,
|
edge_topology:Vec<EdgeRefs>,
|
||||||
vert_topology:Vec<VertRefs>,
|
vert_topology:Vec<VertRefs>,
|
||||||
}
|
}
|
||||||
|
#[derive(Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct PhysicsMeshId(u32);
|
||||||
|
impl Into<MeshId> for PhysicsMeshId{
|
||||||
|
fn into(self)->MeshId{
|
||||||
|
MeshId::new(self.0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<MeshId> for PhysicsMeshId{
|
||||||
|
fn from(value:MeshId)->Self{
|
||||||
|
Self::new(value.get())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Debug,Default,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
|
||||||
|
pub struct PhysicsSubmeshId(u32);
|
||||||
|
pub struct PhysicsMesh{
|
||||||
|
data:PhysicsMeshData,
|
||||||
|
complete_mesh:PhysicsMeshTopology,
|
||||||
|
//Most objects in roblox maps are already convex, so the list length is 0
|
||||||
|
//as soon as the mesh is divided into 2 submeshes, the list length jumps to 2.
|
||||||
|
//length 1 is unnecessary since the complete mesh would be a duplicate of the only submesh, but would still function properly
|
||||||
|
submeshes:Vec<PhysicsMeshTopology>,
|
||||||
|
}
|
||||||
|
impl PhysicsMesh{
|
||||||
|
pub fn unit_cube()->Self{
|
||||||
|
//go go gadget debug print mesh
|
||||||
|
let data=PhysicsMeshData{
|
||||||
|
faces:vec![
|
||||||
|
Face{normal:Planar64Vec3::raw( 4294967296, 0, 0),dot:Planar64::raw(4294967296)},
|
||||||
|
Face{normal:Planar64Vec3::raw( 0, 4294967296, 0),dot:Planar64::raw(4294967296)},
|
||||||
|
Face{normal:Planar64Vec3::raw( 0, 0, 4294967296),dot:Planar64::raw(4294967296)},
|
||||||
|
Face{normal:Planar64Vec3::raw(-4294967296, 0, 0),dot:Planar64::raw(4294967296)},
|
||||||
|
Face{normal:Planar64Vec3::raw( 0,-4294967296, 0),dot:Planar64::raw(4294967296)},
|
||||||
|
Face{normal:Planar64Vec3::raw( 0, 0,-4294967296),dot:Planar64::raw(4294967296)}
|
||||||
|
],
|
||||||
|
verts:vec![
|
||||||
|
Vert(Planar64Vec3::raw( 4294967296,-4294967296,-4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw( 4294967296, 4294967296,-4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw( 4294967296, 4294967296, 4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw( 4294967296,-4294967296, 4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw(-4294967296, 4294967296,-4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw(-4294967296, 4294967296, 4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw(-4294967296,-4294967296, 4294967296)),
|
||||||
|
Vert(Planar64Vec3::raw(-4294967296,-4294967296,-4294967296))
|
||||||
|
]
|
||||||
|
};
|
||||||
|
let mesh_topology=PhysicsMeshTopology{
|
||||||
|
faces:(0..data.faces.len() as u32).map(MeshFaceId::new).collect(),
|
||||||
|
verts:(0..data.verts.len() as u32).map(MeshVertId::new).collect(),
|
||||||
|
face_topology:vec![
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId((9223372036854775808u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775809u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775810u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(3)]},
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId((9223372036854775812u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775813u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(6),SubmeshDirectedEdgeId(1)]},
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId(7),SubmeshDirectedEdgeId(2),SubmeshDirectedEdgeId((9223372036854775814u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775816u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId(8),SubmeshDirectedEdgeId(5),SubmeshDirectedEdgeId((9223372036854775817u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(10)]},
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId((9223372036854775815u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775818u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(11),SubmeshDirectedEdgeId((9223372036854775811u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
FaceRefs{edges:vec![SubmeshDirectedEdgeId(4),SubmeshDirectedEdgeId(0),SubmeshDirectedEdgeId((9223372036854775819u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(9)]}
|
||||||
|
],
|
||||||
|
edge_topology:vec![
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(5)],verts:[SubmeshVertId(0),SubmeshVertId(1)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(1)],verts:[SubmeshVertId(1),SubmeshVertId(2)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(0),SubmeshFaceId(2)],verts:[SubmeshVertId(2),SubmeshVertId(3)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(0)],verts:[SubmeshVertId(0),SubmeshVertId(3)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(5)],verts:[SubmeshVertId(1),SubmeshVertId(4)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(1),SubmeshFaceId(3)],verts:[SubmeshVertId(4),SubmeshVertId(5)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(1)],verts:[SubmeshVertId(2),SubmeshVertId(5)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(2)],verts:[SubmeshVertId(3),SubmeshVertId(6)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(2),SubmeshFaceId(3)],verts:[SubmeshVertId(5),SubmeshVertId(6)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(3),SubmeshFaceId(5)],verts:[SubmeshVertId(4),SubmeshVertId(7)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(4),SubmeshFaceId(3)],verts:[SubmeshVertId(6),SubmeshVertId(7)]},
|
||||||
|
EdgeRefs{faces:[SubmeshFaceId(5),SubmeshFaceId(4)],verts:[SubmeshVertId(0),SubmeshVertId(7)]}
|
||||||
|
],
|
||||||
|
vert_topology:vec![
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(0),SubmeshFaceId(4),SubmeshFaceId(5)],edges:vec![SubmeshDirectedEdgeId((9223372036854775811u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775819u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775808u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(0),SubmeshFaceId(5),SubmeshFaceId(1)],edges:vec![SubmeshDirectedEdgeId((9223372036854775812u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId(0),SubmeshDirectedEdgeId((9223372036854775809u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(0),SubmeshFaceId(2),SubmeshFaceId(1)],edges:vec![SubmeshDirectedEdgeId(1),SubmeshDirectedEdgeId((9223372036854775810u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775814u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(0),SubmeshFaceId(2),SubmeshFaceId(4)],edges:vec![SubmeshDirectedEdgeId(2),SubmeshDirectedEdgeId(3),SubmeshDirectedEdgeId((9223372036854775815u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(3),SubmeshFaceId(5),SubmeshFaceId(1)],edges:vec![SubmeshDirectedEdgeId(4),SubmeshDirectedEdgeId((9223372036854775817u64-(1<<63)+(1<<31)) as u32),SubmeshDirectedEdgeId((9223372036854775813u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(2),SubmeshFaceId(3),SubmeshFaceId(1)],edges:vec![SubmeshDirectedEdgeId(5),SubmeshDirectedEdgeId(6),SubmeshDirectedEdgeId((9223372036854775816u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(2),SubmeshFaceId(3),SubmeshFaceId(4)],edges:vec![SubmeshDirectedEdgeId(7),SubmeshDirectedEdgeId(8),SubmeshDirectedEdgeId((9223372036854775818u64-(1<<63)+(1<<31)) as u32)]},
|
||||||
|
VertRefs{faces:vec![SubmeshFaceId(4),SubmeshFaceId(3),SubmeshFaceId(5)],edges:vec![SubmeshDirectedEdgeId(10),SubmeshDirectedEdgeId(11),SubmeshDirectedEdgeId(9)]}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
Self{
|
||||||
|
data,
|
||||||
|
complete_mesh:mesh_topology,
|
||||||
|
submeshes:Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn unit_cylinder()->Self{
|
||||||
|
Self::unit_cube()
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub const fn complete_mesh(&self)->&PhysicsMeshTopology{
|
||||||
|
&self.complete_mesh
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub const fn complete_mesh_view(&self)->PhysicsMeshView{
|
||||||
|
PhysicsMeshView{
|
||||||
|
data:&self.data,
|
||||||
|
topology:self.complete_mesh(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub fn submeshes(&self)->&[PhysicsMeshTopology]{
|
||||||
|
//the complete mesh is already a convex mesh when len()==0, len()==1 is invalid but will still work
|
||||||
|
if self.submeshes.len()==0{
|
||||||
|
std::slice::from_ref(&self.complete_mesh)
|
||||||
|
}else{
|
||||||
|
&self.submeshes.as_slice()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub fn submesh_view(&self,submesh_id:PhysicsSubmeshId)->PhysicsMeshView{
|
||||||
|
PhysicsMeshView{
|
||||||
|
data:&self.data,
|
||||||
|
topology:&self.submeshes()[submesh_id.get() as usize],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn submesh_views(&self)->impl Iterator<Item=PhysicsMeshView>{
|
||||||
|
self.submeshes().iter().map(|topology|PhysicsMeshView{
|
||||||
|
data:&self.data,
|
||||||
|
topology,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//mesh builder code
|
||||||
#[derive(Default,Clone)]
|
#[derive(Default,Clone)]
|
||||||
struct VertRefGuy{
|
struct VertRefGuy{
|
||||||
edges:std::collections::HashSet<DirectedEdgeId>,
|
edges:HashSet<SubmeshDirectedEdgeId>,
|
||||||
faces:std::collections::HashSet<FaceId>,
|
faces:HashSet<SubmeshFaceId>,
|
||||||
}
|
}
|
||||||
#[derive(Clone,Hash,Eq,PartialEq)]
|
#[derive(Clone,Hash,Eq,PartialEq)]
|
||||||
struct EdgeRefVerts([VertId;2]);
|
struct EdgeRefVerts([SubmeshVertId;2]);
|
||||||
impl EdgeRefVerts{
|
impl EdgeRefVerts{
|
||||||
fn new(v0:VertId,v1:VertId)->(Self,bool){
|
const fn new(v0:SubmeshVertId,v1:SubmeshVertId)->(Self,bool){
|
||||||
(if v0.0<v1.0{
|
(if v0.0<v1.0{
|
||||||
Self([v0,v1])
|
Self([v0,v1])
|
||||||
}else{
|
}else{
|
||||||
@ -106,71 +252,96 @@ impl EdgeRefVerts{
|
|||||||
},v0.0<v1.0)
|
},v0.0<v1.0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct EdgeRefFaces([FaceId;2]);
|
struct EdgeRefFaces([SubmeshFaceId;2]);
|
||||||
impl EdgeRefFaces{
|
impl EdgeRefFaces{
|
||||||
fn new()->Self{
|
const fn new()->Self{
|
||||||
Self([FaceId(0);2])
|
Self([SubmeshFaceId(0);2])
|
||||||
}
|
}
|
||||||
fn push(&mut self,i:usize,face_id:FaceId){
|
fn push(&mut self,i:usize,face_id:SubmeshFaceId){
|
||||||
self.0[i]=face_id;
|
self.0[i]=face_id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct FaceRefEdges(Vec<DirectedEdgeId>);
|
struct FaceRefEdges(Vec<SubmeshDirectedEdgeId>);
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct EdgePool{
|
struct EdgePool{
|
||||||
edge_guys:Vec<(EdgeRefVerts,EdgeRefFaces)>,
|
edge_guys:Vec<(EdgeRefVerts,EdgeRefFaces)>,
|
||||||
edge_id_from_guy:std::collections::HashMap<EdgeRefVerts,usize>,
|
edge_id_from_guy:HashMap<EdgeRefVerts,SubmeshEdgeId>,
|
||||||
}
|
}
|
||||||
impl EdgePool{
|
impl EdgePool{
|
||||||
fn push(&mut self,edge_ref_verts:EdgeRefVerts)->(&mut EdgeRefFaces,EdgeId){
|
fn push(&mut self,edge_ref_verts:EdgeRefVerts)->(&mut EdgeRefFaces,SubmeshEdgeId){
|
||||||
let edge_id=if let Some(&edge_id)=self.edge_id_from_guy.get(&edge_ref_verts){
|
let edge_id=if let Some(&edge_id)=self.edge_id_from_guy.get(&edge_ref_verts){
|
||||||
edge_id
|
edge_id
|
||||||
}else{
|
}else{
|
||||||
let edge_id=self.edge_guys.len();
|
let edge_id=SubmeshEdgeId::new(self.edge_guys.len() as u32);
|
||||||
self.edge_guys.push((edge_ref_verts.clone(),EdgeRefFaces::new()));
|
self.edge_guys.push((edge_ref_verts.clone(),EdgeRefFaces::new()));
|
||||||
self.edge_id_from_guy.insert(edge_ref_verts,edge_id);
|
self.edge_id_from_guy.insert(edge_ref_verts,edge_id);
|
||||||
edge_id
|
edge_id
|
||||||
};
|
};
|
||||||
(&mut unsafe{self.edge_guys.get_unchecked_mut(edge_id)}.1,EdgeId(edge_id))
|
(&mut unsafe{self.edge_guys.get_unchecked_mut(edge_id.get() as usize)}.1,edge_id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl From<&crate::model::IndexedModel> for PhysicsMesh{
|
impl From<&model::Mesh> for PhysicsMesh{
|
||||||
fn from(indexed_model:&crate::model::IndexedModel)->Self{
|
fn from(mesh:&model::Mesh)->Self{
|
||||||
assert!(indexed_model.unique_pos.len()!=0,"Mesh cannot have 0 vertices");
|
assert!(mesh.unique_pos.len()!=0,"Mesh cannot have 0 vertices");
|
||||||
let verts=indexed_model.unique_pos.iter().map(|v|Vert(v.clone())).collect();
|
let verts=mesh.unique_pos.iter().copied().map(Vert).collect();
|
||||||
let mut vert_ref_guys=vec![VertRefGuy::default();indexed_model.unique_pos.len()];
|
//TODO: fix submeshes
|
||||||
let mut edge_pool=EdgePool::default();
|
//flat map mesh.physics_groups[$1].groups.polys()[$2] as face_id
|
||||||
let mut face_i=0;
|
//lower face_id points to upper face_id
|
||||||
|
//the same face is not allowed to be in multiple polygon groups
|
||||||
let mut faces=Vec::new();
|
let mut faces=Vec::new();
|
||||||
|
let mut face_id_from_face=HashMap::new();
|
||||||
|
let mut mesh_topologies:Vec<PhysicsMeshTopology>=mesh.physics_groups.iter().map(|physics_group|{
|
||||||
|
//construct submesh
|
||||||
|
let mut submesh_faces=Vec::new();//these contain a map from submeshId->meshId
|
||||||
|
let mut submesh_verts=Vec::new();
|
||||||
|
let mut submesh_vert_id_from_mesh_vert_id=HashMap::<MeshVertId,SubmeshVertId>::new();
|
||||||
|
//lazy closure
|
||||||
|
let mut get_submesh_vert_id=|vert_id:MeshVertId|{
|
||||||
|
if let Some(&submesh_vert_id)=submesh_vert_id_from_mesh_vert_id.get(&vert_id){
|
||||||
|
submesh_vert_id
|
||||||
|
}else{
|
||||||
|
let submesh_vert_id=SubmeshVertId::new(submesh_verts.len() as u32);
|
||||||
|
submesh_verts.push(vert_id);
|
||||||
|
submesh_vert_id_from_mesh_vert_id.insert(vert_id,submesh_vert_id);
|
||||||
|
submesh_vert_id
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let mut edge_pool=EdgePool::default();
|
||||||
|
let mut vert_ref_guys=vec![VertRefGuy::default();mesh.unique_pos.len()];
|
||||||
let mut face_ref_guys=Vec::new();
|
let mut face_ref_guys=Vec::new();
|
||||||
for group in indexed_model.groups.iter(){for poly in group.polys.iter(){
|
for polygon_group_id in &physics_group.groups{
|
||||||
let face_id=FaceId(face_i);
|
let polygon_group=&mesh.polygon_groups[polygon_group_id.get() as usize];
|
||||||
|
for poly_vertices in polygon_group.polys(){
|
||||||
|
let submesh_face_id=SubmeshFaceId::new(submesh_faces.len() as u32);
|
||||||
//one face per poly
|
//one face per poly
|
||||||
let mut normal=Planar64Vec3::ZERO;
|
let mut normal=Planar64Vec3::ZERO;
|
||||||
let len=poly.vertices.len();
|
let len=poly_vertices.len();
|
||||||
let face_edges=poly.vertices.iter().enumerate().map(|(i,&vert_id)|{
|
let face_edges=poly_vertices.into_iter().enumerate().map(|(i,vert_id)|{
|
||||||
let vert0_id=indexed_model.unique_vertices[vert_id as usize].pos as usize;
|
let vert0_id=MeshVertId::new(mesh.unique_vertices[vert_id.get() as usize].pos.get() as u32);
|
||||||
let vert1_id=indexed_model.unique_vertices[poly.vertices[(i+1)%len] as usize].pos as usize;
|
let vert1_id=MeshVertId::new(mesh.unique_vertices[poly_vertices[(i+1)%len].get() as usize].pos.get() as u32);
|
||||||
|
//index submesh verts
|
||||||
|
let submesh_vert0_id=get_submesh_vert_id(vert0_id);
|
||||||
|
let submesh_vert1_id=get_submesh_vert_id(vert1_id);
|
||||||
//https://www.khronos.org/opengl/wiki/Calculating_a_Surface_Normal (Newell's Method)
|
//https://www.khronos.org/opengl/wiki/Calculating_a_Surface_Normal (Newell's Method)
|
||||||
let v0=indexed_model.unique_pos[vert0_id];
|
let v0=mesh.unique_pos[vert0_id.get() as usize];
|
||||||
let v1=indexed_model.unique_pos[vert1_id];
|
let v1=mesh.unique_pos[vert1_id.get() as usize];
|
||||||
normal+=Planar64Vec3::new(
|
normal+=Planar64Vec3::new(
|
||||||
(v0.y()-v1.y())*(v0.z()+v1.z()),
|
(v0.y()-v1.y())*(v0.z()+v1.z()),
|
||||||
(v0.z()-v1.z())*(v0.x()+v1.x()),
|
(v0.z()-v1.z())*(v0.x()+v1.x()),
|
||||||
(v0.x()-v1.x())*(v0.y()+v1.y()),
|
(v0.x()-v1.x())*(v0.y()+v1.y()),
|
||||||
);
|
);
|
||||||
//get/create edge and push face into it
|
//get/create edge and push face into it
|
||||||
let (edge_ref_verts,is_sorted)=EdgeRefVerts::new(VertId(vert0_id),VertId(vert1_id));
|
let (edge_ref_verts,is_sorted)=EdgeRefVerts::new(submesh_vert0_id,submesh_vert1_id);
|
||||||
let (edge_ref_faces,edge_id)=edge_pool.push(edge_ref_verts);
|
let (edge_ref_faces,edge_id)=edge_pool.push(edge_ref_verts);
|
||||||
//polygon vertices as assumed to be listed clockwise
|
//polygon vertices as assumed to be listed clockwise
|
||||||
//populate the edge face on the left or right depending on how the edge vertices got sorted
|
//populate the edge face on the left or right depending on how the edge vertices got sorted
|
||||||
edge_ref_faces.push(!is_sorted as usize,face_id);
|
edge_ref_faces.push(!is_sorted as usize,submesh_face_id);
|
||||||
//index edges & face into vertices
|
//index edges & face into vertices
|
||||||
{
|
{
|
||||||
let vert_ref_guy=unsafe{vert_ref_guys.get_unchecked_mut(vert0_id)};
|
let vert_ref_guy=unsafe{vert_ref_guys.get_unchecked_mut(submesh_vert0_id.get() as usize)};
|
||||||
vert_ref_guy.edges.insert(edge_id.as_directed(is_sorted));
|
vert_ref_guy.edges.insert(edge_id.as_directed(is_sorted));
|
||||||
vert_ref_guy.faces.insert(face_id);
|
vert_ref_guy.faces.insert(submesh_face_id);
|
||||||
unsafe{vert_ref_guys.get_unchecked_mut(vert1_id)}.edges.insert(edge_id.as_directed(!is_sorted));
|
unsafe{vert_ref_guys.get_unchecked_mut(submesh_vert1_id.get() as usize)}.edges.insert(edge_id.as_directed(!is_sorted));
|
||||||
}
|
}
|
||||||
//return directed_edge_id
|
//return directed_edge_id
|
||||||
edge_id.as_directed(is_sorted)
|
edge_id.as_directed(is_sorted)
|
||||||
@ -178,17 +349,27 @@ impl From<&crate::model::IndexedModel> for PhysicsMesh{
|
|||||||
//choose precision loss randomly idk
|
//choose precision loss randomly idk
|
||||||
normal=normal/len as i64;
|
normal=normal/len as i64;
|
||||||
let mut dot=Planar64::ZERO;
|
let mut dot=Planar64::ZERO;
|
||||||
for &v in poly.vertices.iter(){
|
for &v in poly_vertices{
|
||||||
dot+=normal.dot(indexed_model.unique_pos[indexed_model.unique_vertices[v as usize].pos as usize]);
|
dot+=normal.dot(mesh.unique_pos[mesh.unique_vertices[v.get() as usize].pos.get() as usize]);
|
||||||
}
|
}
|
||||||
faces.push(Face{normal,dot:dot/len as i64});
|
//assume face hash is stable, and there are no flush faces...
|
||||||
|
let face=Face{normal,dot:dot/len as i64};
|
||||||
|
let face_id=match face_id_from_face.get(&face){
|
||||||
|
Some(&face_id)=>face_id,
|
||||||
|
None=>{
|
||||||
|
let face_id=MeshFaceId::new(faces.len() as u32);
|
||||||
|
face_id_from_face.insert(face.clone(),face_id);
|
||||||
|
faces.push(face);
|
||||||
|
face_id
|
||||||
|
}
|
||||||
|
};
|
||||||
|
submesh_faces.push(face_id);
|
||||||
face_ref_guys.push(FaceRefEdges(face_edges));
|
face_ref_guys.push(FaceRefEdges(face_edges));
|
||||||
face_i+=1;
|
}
|
||||||
}}
|
}
|
||||||
//conceivably faces, edges, and vertices exist now
|
PhysicsMeshTopology{
|
||||||
Self{
|
faces:submesh_faces,
|
||||||
faces,
|
verts:submesh_verts,
|
||||||
verts,
|
|
||||||
face_topology:face_ref_guys.into_iter().map(|face_ref_guy|{
|
face_topology:face_ref_guys.into_iter().map(|face_ref_guy|{
|
||||||
FaceRefs{edges:face_ref_guy.0}
|
FaceRefs{edges:face_ref_guy.0}
|
||||||
}).collect(),
|
}).collect(),
|
||||||
@ -202,102 +383,125 @@ impl From<&crate::model::IndexedModel> for PhysicsMesh{
|
|||||||
}
|
}
|
||||||
).collect(),
|
).collect(),
|
||||||
}
|
}
|
||||||
|
}).collect();
|
||||||
|
Self{
|
||||||
|
data:PhysicsMeshData{
|
||||||
|
faces,
|
||||||
|
verts,
|
||||||
|
},
|
||||||
|
complete_mesh:mesh_topologies.pop().unwrap(),
|
||||||
|
submeshes:mesh_topologies,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PhysicsMesh{
|
pub struct PhysicsMeshView<'a>{
|
||||||
pub fn verts<'a>(&'a self)->impl Iterator<Item=Planar64Vec3>+'a{
|
data:&'a PhysicsMeshData,
|
||||||
self.verts.iter().map(|Vert(pos)|*pos)
|
topology:&'a PhysicsMeshTopology,
|
||||||
}
|
}
|
||||||
}
|
impl MeshQuery<SubmeshFaceId,SubmeshDirectedEdgeId,SubmeshVertId> for PhysicsMeshView<'_>{
|
||||||
impl MeshQuery<FaceId,DirectedEdgeId,VertId> for PhysicsMesh{
|
fn face_nd(&self,face_id:SubmeshFaceId)->(Planar64Vec3,Planar64){
|
||||||
fn face_nd(&self,face_id:FaceId)->(Planar64Vec3,Planar64){
|
let face_idx=self.topology.faces[face_id.get() as usize].get() as usize;
|
||||||
(self.faces[face_id.0].normal,self.faces[face_id.0].dot)
|
(self.data.faces[face_idx].normal,self.data.faces[face_idx].dot)
|
||||||
}
|
}
|
||||||
//ideally I never calculate the vertex position, but I have to for the graphical meshes...
|
//ideally I never calculate the vertex position, but I have to for the graphical meshes...
|
||||||
fn vert(&self,vert_id:VertId)->Planar64Vec3{
|
fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
|
||||||
self.verts[vert_id.0].0
|
let vert_idx=self.topology.verts[vert_id.get() as usize].get() as usize;
|
||||||
|
self.data.verts[vert_idx].0
|
||||||
}
|
}
|
||||||
fn face_edges(&self,face_id:FaceId)->Cow<Vec<DirectedEdgeId>>{
|
fn face_edges(&self,face_id:SubmeshFaceId)->Cow<Vec<SubmeshDirectedEdgeId>>{
|
||||||
Cow::Borrowed(&self.face_topology[face_id.0].edges)
|
Cow::Borrowed(&self.topology.face_topology[face_id.get() as usize].edges)
|
||||||
}
|
}
|
||||||
fn edge_faces(&self,edge_id:EdgeId)->Cow<[FaceId;2]>{
|
fn edge_faces(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshFaceId;2]>{
|
||||||
Cow::Borrowed(&self.edge_topology[edge_id.0].faces)
|
Cow::Borrowed(&self.topology.edge_topology[edge_id.get() as usize].faces)
|
||||||
}
|
}
|
||||||
fn edge_verts(&self,edge_id:EdgeId)->Cow<[VertId;2]>{
|
fn edge_verts(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshVertId;2]>{
|
||||||
Cow::Borrowed(&self.edge_topology[edge_id.0].verts)
|
Cow::Borrowed(&self.topology.edge_topology[edge_id.get() as usize].verts)
|
||||||
}
|
}
|
||||||
fn vert_edges(&self,vert_id:VertId)->Cow<Vec<DirectedEdgeId>>{
|
fn vert_edges(&self,vert_id:SubmeshVertId)->Cow<Vec<SubmeshDirectedEdgeId>>{
|
||||||
Cow::Borrowed(&self.vert_topology[vert_id.0].edges)
|
Cow::Borrowed(&self.topology.vert_topology[vert_id.get() as usize].edges)
|
||||||
|
}
|
||||||
|
fn vert_faces(&self,vert_id:SubmeshVertId)->Cow<Vec<SubmeshFaceId>>{
|
||||||
|
Cow::Borrowed(&self.topology.vert_topology[vert_id.get() as usize].faces)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct PhysicsMeshTransform{
|
||||||
|
pub vertex:integer::Planar64Affine3,
|
||||||
|
pub normal:integer::Planar64Mat3,
|
||||||
|
pub det:Planar64,
|
||||||
|
}
|
||||||
|
impl PhysicsMeshTransform{
|
||||||
|
pub const fn new(transform:integer::Planar64Affine3)->Self{
|
||||||
|
Self{
|
||||||
|
normal:transform.matrix3.inverse_times_det().transpose(),
|
||||||
|
det:transform.matrix3.determinant(),
|
||||||
|
vertex:transform,
|
||||||
}
|
}
|
||||||
fn vert_faces(&self,vert_id:VertId)->Cow<Vec<FaceId>>{
|
|
||||||
Cow::Borrowed(&self.vert_topology[vert_id.0].faces)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TransformedMesh<'a>{
|
pub struct TransformedMesh<'a>{
|
||||||
mesh:&'a PhysicsMesh,
|
view:PhysicsMeshView<'a>,
|
||||||
transform:&'a integer::Planar64Affine3,
|
transform:&'a PhysicsMeshTransform,
|
||||||
normal_transform:&'a integer::Planar64Mat3,
|
|
||||||
transform_det:Planar64,
|
|
||||||
}
|
}
|
||||||
impl TransformedMesh<'_>{
|
impl TransformedMesh<'_>{
|
||||||
pub fn new<'a>(
|
pub fn new<'a>(
|
||||||
mesh:&'a PhysicsMesh,
|
view:PhysicsMeshView<'a>,
|
||||||
transform:&'a integer::Planar64Affine3,
|
transform:&'a PhysicsMeshTransform,
|
||||||
normal_transform:&'a integer::Planar64Mat3,
|
|
||||||
transform_det:Planar64,
|
|
||||||
)->TransformedMesh<'a>{
|
)->TransformedMesh<'a>{
|
||||||
TransformedMesh{
|
TransformedMesh{
|
||||||
mesh,
|
view,
|
||||||
transform,
|
transform,
|
||||||
normal_transform,
|
|
||||||
transform_det,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn farthest_vert(&self,dir:Planar64Vec3)->VertId{
|
pub fn verts<'a>(&'a self)->impl Iterator<Item=Planar64Vec3>+'a{
|
||||||
|
self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
|
||||||
|
}
|
||||||
|
fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
|
||||||
let mut best_dot=Planar64::MIN;
|
let mut best_dot=Planar64::MIN;
|
||||||
let mut best_vert=VertId(0);
|
let mut best_vert=SubmeshVertId(0);
|
||||||
for (i,vert) in self.mesh.verts.iter().enumerate(){
|
//this happens to be well-defined. there are no virtual virtices
|
||||||
let p=self.transform.transform_point3(vert.0);
|
for (i,vert_id) in self.view.topology.verts.iter().enumerate(){
|
||||||
|
let p=self.transform.vertex.transform_point3(self.view.data.verts[vert_id.get() as usize].0);
|
||||||
let d=dir.dot(p);
|
let d=dir.dot(p);
|
||||||
if best_dot<d{
|
if best_dot<d{
|
||||||
best_dot=d;
|
best_dot=d;
|
||||||
best_vert=VertId(i);
|
best_vert=SubmeshVertId::new(i as u32);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
best_vert
|
best_vert
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl MeshQuery<FaceId,DirectedEdgeId,VertId> for TransformedMesh<'_>{
|
impl MeshQuery<SubmeshFaceId,SubmeshDirectedEdgeId,SubmeshVertId> for TransformedMesh<'_>{
|
||||||
fn face_nd(&self,face_id:FaceId)->(Planar64Vec3,Planar64){
|
fn face_nd(&self,face_id:SubmeshFaceId)->(Planar64Vec3,Planar64){
|
||||||
let (n,d)=self.mesh.face_nd(face_id);
|
let (n,d)=self.view.face_nd(face_id);
|
||||||
let transformed_n=*self.normal_transform*n;
|
let transformed_n=self.transform.normal*n;
|
||||||
let transformed_d=d+transformed_n.dot(self.transform.translation)/self.transform_det;
|
let transformed_d=d+transformed_n.dot(self.transform.vertex.translation)/self.transform.det;
|
||||||
(transformed_n/self.transform_det,transformed_d)
|
(transformed_n/self.transform.det,transformed_d)
|
||||||
}
|
}
|
||||||
fn vert(&self,vert_id:VertId)->Planar64Vec3{
|
fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
|
||||||
self.transform.transform_point3(self.mesh.vert(vert_id))
|
self.transform.vertex.transform_point3(self.view.vert(vert_id))
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn face_edges(&self,face_id:FaceId)->Cow<Vec<DirectedEdgeId>>{
|
fn face_edges(&self,face_id:SubmeshFaceId)->Cow<Vec<SubmeshDirectedEdgeId>>{
|
||||||
self.mesh.face_edges(face_id)
|
self.view.face_edges(face_id)
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn edge_faces(&self,edge_id:EdgeId)->Cow<[FaceId;2]>{
|
fn edge_faces(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshFaceId;2]>{
|
||||||
self.mesh.edge_faces(edge_id)
|
self.view.edge_faces(edge_id)
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn edge_verts(&self,edge_id:EdgeId)->Cow<[VertId;2]>{
|
fn edge_verts(&self,edge_id:SubmeshEdgeId)->Cow<[SubmeshVertId;2]>{
|
||||||
self.mesh.edge_verts(edge_id)
|
self.view.edge_verts(edge_id)
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn vert_edges(&self,vert_id:VertId)->Cow<Vec<DirectedEdgeId>>{
|
fn vert_edges(&self,vert_id:SubmeshVertId)->Cow<Vec<SubmeshDirectedEdgeId>>{
|
||||||
self.mesh.vert_edges(vert_id)
|
self.view.vert_edges(vert_id)
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn vert_faces(&self,vert_id:VertId)->Cow<Vec<FaceId>>{
|
fn vert_faces(&self,vert_id:SubmeshVertId)->Cow<Vec<SubmeshFaceId>>{
|
||||||
self.mesh.vert_faces(vert_id)
|
self.view.vert_faces(vert_id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,12 +511,12 @@ impl MeshQuery<FaceId,DirectedEdgeId,VertId> for TransformedMesh<'_>{
|
|||||||
//(vertex,face)
|
//(vertex,face)
|
||||||
#[derive(Clone,Copy)]
|
#[derive(Clone,Copy)]
|
||||||
pub enum MinkowskiVert{
|
pub enum MinkowskiVert{
|
||||||
VertVert(VertId,VertId),
|
VertVert(SubmeshVertId,SubmeshVertId),
|
||||||
}
|
}
|
||||||
#[derive(Clone,Copy)]
|
#[derive(Clone,Copy)]
|
||||||
pub enum MinkowskiEdge{
|
pub enum MinkowskiEdge{
|
||||||
VertEdge(VertId,EdgeId),
|
VertEdge(SubmeshVertId,SubmeshEdgeId),
|
||||||
EdgeVert(EdgeId,VertId),
|
EdgeVert(SubmeshEdgeId,SubmeshVertId),
|
||||||
//EdgeEdge when edges are parallel
|
//EdgeEdge when edges are parallel
|
||||||
}
|
}
|
||||||
impl UndirectedEdge for MinkowskiEdge{
|
impl UndirectedEdge for MinkowskiEdge{
|
||||||
@ -326,8 +530,8 @@ impl UndirectedEdge for MinkowskiEdge{
|
|||||||
}
|
}
|
||||||
#[derive(Clone,Copy)]
|
#[derive(Clone,Copy)]
|
||||||
pub enum MinkowskiDirectedEdge{
|
pub enum MinkowskiDirectedEdge{
|
||||||
VertEdge(VertId,DirectedEdgeId),
|
VertEdge(SubmeshVertId,SubmeshDirectedEdgeId),
|
||||||
EdgeVert(DirectedEdgeId,VertId),
|
EdgeVert(SubmeshDirectedEdgeId,SubmeshVertId),
|
||||||
//EdgeEdge when edges are parallel
|
//EdgeEdge when edges are parallel
|
||||||
}
|
}
|
||||||
impl DirectedEdge for MinkowskiDirectedEdge{
|
impl DirectedEdge for MinkowskiDirectedEdge{
|
||||||
@ -347,17 +551,17 @@ impl DirectedEdge for MinkowskiDirectedEdge{
|
|||||||
}
|
}
|
||||||
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
#[derive(Debug,Clone,Copy,Hash,Eq,PartialEq)]
|
||||||
pub enum MinkowskiFace{
|
pub enum MinkowskiFace{
|
||||||
VertFace(VertId,FaceId),
|
VertFace(SubmeshVertId,SubmeshFaceId),
|
||||||
EdgeEdge(EdgeId,EdgeId,bool),
|
EdgeEdge(SubmeshEdgeId,SubmeshEdgeId,bool),
|
||||||
FaceVert(FaceId,VertId),
|
FaceVert(SubmeshFaceId,SubmeshVertId),
|
||||||
//EdgeFace
|
//EdgeFace
|
||||||
//FaceEdge
|
//FaceEdge
|
||||||
//FaceFace
|
//FaceFace
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct MinkowskiMesh<'a>{
|
pub struct MinkowskiMesh<'a>{
|
||||||
mesh0:&'a TransformedMesh<'a>,
|
mesh0:TransformedMesh<'a>,
|
||||||
mesh1:&'a TransformedMesh<'a>,
|
mesh1:TransformedMesh<'a>,
|
||||||
}
|
}
|
||||||
|
|
||||||
//infinity fev algorithm state transition
|
//infinity fev algorithm state transition
|
||||||
@ -371,7 +575,7 @@ enum EV{
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl MinkowskiMesh<'_>{
|
impl MinkowskiMesh<'_>{
|
||||||
pub fn minkowski_sum<'a>(mesh0:&'a TransformedMesh,mesh1:&'a TransformedMesh)->MinkowskiMesh<'a>{
|
pub fn minkowski_sum<'a>(mesh0:TransformedMesh<'a>,mesh1:TransformedMesh<'a>)->MinkowskiMesh<'a>{
|
||||||
MinkowskiMesh{
|
MinkowskiMesh{
|
||||||
mesh0,
|
mesh0,
|
||||||
mesh1,
|
mesh1,
|
||||||
@ -739,7 +943,6 @@ fn test_is_empty_volume(){
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn build_me_a_cube(){
|
fn build_me_a_cube(){
|
||||||
let unit_cube=crate::primitives::unit_cube();
|
let mesh=PhysicsMesh::unit_cube();
|
||||||
let mesh=PhysicsMesh::from(&unit_cube);
|
|
||||||
//println!("mesh={:?}",mesh);
|
//println!("mesh={:?}",mesh);
|
||||||
}
|
}
|
||||||
1307
src/physics.rs
1307
src/physics.rs
File diff suppressed because it is too large
Load Diff
@ -18,14 +18,14 @@ pub enum Instruction{
|
|||||||
Input(InputInstruction),
|
Input(InputInstruction),
|
||||||
Render,
|
Render,
|
||||||
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
||||||
GenerateModels(crate::model::IndexedModelInstances),
|
GenerateModels(strafesnet_common::map::CompleteMap,strafesnet_texture_loader::texture_loader::Textures),
|
||||||
ClearModels,
|
ClearModels,
|
||||||
//Graphics(crate::graphics_worker::Instruction),
|
//Graphics(crate::graphics_worker::Instruction),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new(mut physics:crate::physics::PhysicsState,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{
|
pub fn new(mut physics:crate::physics::PhysicsContext,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{
|
||||||
let mut mouse_blocking=true;
|
let mut mouse_blocking=true;
|
||||||
let mut last_mouse_time=physics.next_mouse.time;
|
let mut last_mouse_time=physics.state.next_mouse.time;
|
||||||
let mut timeline=std::collections::VecDeque::new();
|
let mut timeline=std::collections::VecDeque::new();
|
||||||
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
|
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
|
||||||
if if let Some(phys_input)=match &ins.instruction{
|
if if let Some(phys_input)=match &ins.instruction{
|
||||||
@ -43,7 +43,7 @@ pub enum Instruction{
|
|||||||
timeline.push_front(TimedInstruction{
|
timeline.push_front(TimedInstruction{
|
||||||
time:last_mouse_time,
|
time:last_mouse_time,
|
||||||
instruction:PhysicsInputInstruction::ReplaceMouse(
|
instruction:PhysicsInputInstruction::ReplaceMouse(
|
||||||
MouseState{time:last_mouse_time,pos:physics.next_mouse.pos},
|
MouseState{time:last_mouse_time,pos:physics.state.next_mouse.pos},
|
||||||
MouseState{time:ins.time,pos:m}
|
MouseState{time:ins.time,pos:m}
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
@ -63,7 +63,7 @@ pub enum Instruction{
|
|||||||
&InputInstruction::Zoom(s)=>Some(PhysicsInputInstruction::SetZoom(s)),
|
&InputInstruction::Zoom(s)=>Some(PhysicsInputInstruction::SetZoom(s)),
|
||||||
InputInstruction::Reset=>Some(PhysicsInputInstruction::Reset),
|
InputInstruction::Reset=>Some(PhysicsInputInstruction::Reset),
|
||||||
},
|
},
|
||||||
Instruction::GenerateModels(_)=>Some(PhysicsInputInstruction::Idle),
|
Instruction::GenerateModels(_,_)=>Some(PhysicsInputInstruction::Idle),
|
||||||
Instruction::ClearModels=>Some(PhysicsInputInstruction::Idle),
|
Instruction::ClearModels=>Some(PhysicsInputInstruction::Idle),
|
||||||
Instruction::Resize(_,_)=>Some(PhysicsInputInstruction::Idle),
|
Instruction::Resize(_,_)=>Some(PhysicsInputInstruction::Idle),
|
||||||
Instruction::Render=>Some(PhysicsInputInstruction::Idle),
|
Instruction::Render=>Some(PhysicsInputInstruction::Idle),
|
||||||
@ -79,11 +79,11 @@ pub enum Instruction{
|
|||||||
//shitty mice are 125Hz which is 8ms so this should cover that.
|
//shitty mice are 125Hz which is 8ms so this should cover that.
|
||||||
//setting this to 100us still doesn't print even though it's 10x lower than the polling rate,
|
//setting this to 100us still doesn't print even though it's 10x lower than the polling rate,
|
||||||
//so mouse events are probably not handled separately from drawing and fire right before it :(
|
//so mouse events are probably not handled separately from drawing and fire right before it :(
|
||||||
if Time::from_millis(10)<ins.time-physics.next_mouse.time{
|
if Time::from_millis(10)<ins.time-physics.state.next_mouse.time{
|
||||||
//push an event to extrapolate no movement from
|
//push an event to extrapolate no movement from
|
||||||
timeline.push_front(TimedInstruction{
|
timeline.push_front(TimedInstruction{
|
||||||
time:last_mouse_time,
|
time:last_mouse_time,
|
||||||
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:physics.next_mouse.pos}),
|
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:physics.state.next_mouse.pos}),
|
||||||
});
|
});
|
||||||
last_mouse_time=ins.time;
|
last_mouse_time=ins.time;
|
||||||
//stop blocking. the mouse is not moving so the physics does not need to live in the past and wait for interpolation targets.
|
//stop blocking. the mouse is not moving so the physics does not need to live in the past and wait for interpolation targets.
|
||||||
@ -113,18 +113,18 @@ pub enum Instruction{
|
|||||||
}
|
}
|
||||||
match ins.instruction{
|
match ins.instruction{
|
||||||
Instruction::Render=>{
|
Instruction::Render=>{
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::Render(physics.output(),ins.time,physics.next_mouse.pos)).unwrap();
|
graphics_worker.send(crate::graphics_worker::Instruction::Render(physics.state.output(),ins.time,physics.state.next_mouse.pos)).unwrap();
|
||||||
},
|
},
|
||||||
Instruction::Resize(size,user_settings)=>{
|
Instruction::Resize(size,user_settings)=>{
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::Resize(size,user_settings)).unwrap();
|
graphics_worker.send(crate::graphics_worker::Instruction::Resize(size,user_settings)).unwrap();
|
||||||
},
|
},
|
||||||
Instruction::GenerateModels(indexed_model_instances)=>{
|
Instruction::GenerateModels(map,textures)=>{
|
||||||
physics.generate_models(&indexed_model_instances);
|
physics.generate_models(&map);
|
||||||
physics.spawn(indexed_model_instances.spawn_point);
|
physics.spawn();
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::GenerateModels(indexed_model_instances)).unwrap();
|
graphics_worker.send(crate::graphics_worker::Instruction::GenerateModels(map,textures)).unwrap();
|
||||||
},
|
},
|
||||||
Instruction::ClearModels=>{
|
Instruction::ClearModels=>{
|
||||||
physics.clear();
|
physics.state.clear();
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::ClearModels).unwrap();
|
graphics_worker.send(crate::graphics_worker::Instruction::ClearModels).unwrap();
|
||||||
},
|
},
|
||||||
_=>(),
|
_=>(),
|
||||||
|
|||||||
@ -1,493 +0,0 @@
|
|||||||
use crate::model::{Color4,TextureCoordinate,IndexedModel,IndexedPolygon,IndexedGroup,IndexedVertex};
|
|
||||||
use strafesnet_common::integer::Planar64Vec3;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum Primitives{
|
|
||||||
Sphere,
|
|
||||||
Cube,
|
|
||||||
Cylinder,
|
|
||||||
Wedge,
|
|
||||||
CornerWedge,
|
|
||||||
}
|
|
||||||
#[derive(Hash,PartialEq,Eq)]
|
|
||||||
pub enum CubeFace{
|
|
||||||
Right,
|
|
||||||
Top,
|
|
||||||
Back,
|
|
||||||
Left,
|
|
||||||
Bottom,
|
|
||||||
Front,
|
|
||||||
}
|
|
||||||
const CUBE_DEFAULT_TEXTURE_COORDS:[TextureCoordinate;4]=[
|
|
||||||
TextureCoordinate::new(0.0,0.0),
|
|
||||||
TextureCoordinate::new(1.0,0.0),
|
|
||||||
TextureCoordinate::new(1.0,1.0),
|
|
||||||
TextureCoordinate::new(0.0,1.0),
|
|
||||||
];
|
|
||||||
const CUBE_DEFAULT_VERTICES:[Planar64Vec3;8]=[
|
|
||||||
Planar64Vec3::int(-1,-1, 1),//0 left bottom back
|
|
||||||
Planar64Vec3::int( 1,-1, 1),//1 right bottom back
|
|
||||||
Planar64Vec3::int( 1, 1, 1),//2 right top back
|
|
||||||
Planar64Vec3::int(-1, 1, 1),//3 left top back
|
|
||||||
Planar64Vec3::int(-1, 1,-1),//4 left top front
|
|
||||||
Planar64Vec3::int( 1, 1,-1),//5 right top front
|
|
||||||
Planar64Vec3::int( 1,-1,-1),//6 right bottom front
|
|
||||||
Planar64Vec3::int(-1,-1,-1),//7 left bottom front
|
|
||||||
];
|
|
||||||
const CUBE_DEFAULT_NORMALS:[Planar64Vec3;6]=[
|
|
||||||
Planar64Vec3::int( 1, 0, 0),//CubeFace::Right
|
|
||||||
Planar64Vec3::int( 0, 1, 0),//CubeFace::Top
|
|
||||||
Planar64Vec3::int( 0, 0, 1),//CubeFace::Back
|
|
||||||
Planar64Vec3::int(-1, 0, 0),//CubeFace::Left
|
|
||||||
Planar64Vec3::int( 0,-1, 0),//CubeFace::Bottom
|
|
||||||
Planar64Vec3::int( 0, 0,-1),//CubeFace::Front
|
|
||||||
];
|
|
||||||
const CUBE_DEFAULT_POLYS:[[[u32;3];4];6]=[
|
|
||||||
// right (1, 0, 0)
|
|
||||||
[
|
|
||||||
[6,2,0],//[vertex,tex,norm]
|
|
||||||
[5,1,0],
|
|
||||||
[2,0,0],
|
|
||||||
[1,3,0],
|
|
||||||
],
|
|
||||||
// top (0, 1, 0)
|
|
||||||
[
|
|
||||||
[5,3,1],
|
|
||||||
[4,2,1],
|
|
||||||
[3,1,1],
|
|
||||||
[2,0,1],
|
|
||||||
],
|
|
||||||
// back (0, 0, 1)
|
|
||||||
[
|
|
||||||
[0,3,2],
|
|
||||||
[1,2,2],
|
|
||||||
[2,1,2],
|
|
||||||
[3,0,2],
|
|
||||||
],
|
|
||||||
// left (-1, 0, 0)
|
|
||||||
[
|
|
||||||
[0,2,3],
|
|
||||||
[3,1,3],
|
|
||||||
[4,0,3],
|
|
||||||
[7,3,3],
|
|
||||||
],
|
|
||||||
// bottom (0,-1, 0)
|
|
||||||
[
|
|
||||||
[1,1,4],
|
|
||||||
[0,0,4],
|
|
||||||
[7,3,4],
|
|
||||||
[6,2,4],
|
|
||||||
],
|
|
||||||
// front (0, 0,-1)
|
|
||||||
[
|
|
||||||
[4,1,5],
|
|
||||||
[5,0,5],
|
|
||||||
[6,3,5],
|
|
||||||
[7,2,5],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
#[derive(Hash,PartialEq,Eq)]
|
|
||||||
pub enum WedgeFace{
|
|
||||||
Right,
|
|
||||||
TopFront,
|
|
||||||
Back,
|
|
||||||
Left,
|
|
||||||
Bottom,
|
|
||||||
}
|
|
||||||
const WEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
|
|
||||||
Planar64Vec3::int( 1, 0, 0),//Wedge::Right
|
|
||||||
Planar64Vec3::int( 0, 1,-1),//Wedge::TopFront
|
|
||||||
Planar64Vec3::int( 0, 0, 1),//Wedge::Back
|
|
||||||
Planar64Vec3::int(-1, 0, 0),//Wedge::Left
|
|
||||||
Planar64Vec3::int( 0,-1, 0),//Wedge::Bottom
|
|
||||||
];
|
|
||||||
/*
|
|
||||||
local cornerWedgeVerticies = {
|
|
||||||
Vector3.new(-1/2,-1/2,-1/2),7
|
|
||||||
Vector3.new(-1/2,-1/2, 1/2),0
|
|
||||||
Vector3.new( 1/2,-1/2,-1/2),6
|
|
||||||
Vector3.new( 1/2,-1/2, 1/2),1
|
|
||||||
Vector3.new( 1/2, 1/2,-1/2),5
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
#[derive(Hash,PartialEq,Eq)]
|
|
||||||
pub enum CornerWedgeFace{
|
|
||||||
Right,
|
|
||||||
TopBack,
|
|
||||||
TopLeft,
|
|
||||||
Bottom,
|
|
||||||
Front,
|
|
||||||
}
|
|
||||||
const CORNERWEDGE_DEFAULT_NORMALS:[Planar64Vec3;5]=[
|
|
||||||
Planar64Vec3::int( 1, 0, 0),//CornerWedge::Right
|
|
||||||
Planar64Vec3::int( 0, 1, 1),//CornerWedge::BackTop
|
|
||||||
Planar64Vec3::int(-1, 1, 0),//CornerWedge::LeftTop
|
|
||||||
Planar64Vec3::int( 0,-1, 0),//CornerWedge::Bottom
|
|
||||||
Planar64Vec3::int( 0, 0,-1),//CornerWedge::Front
|
|
||||||
];
|
|
||||||
pub fn unit_sphere()->crate::model::IndexedModel{
|
|
||||||
unit_cube()
|
|
||||||
}
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct CubeFaceDescription([Option<FaceDescription>;6]);
|
|
||||||
impl CubeFaceDescription{
|
|
||||||
pub fn insert(&mut self,index:CubeFace,value:FaceDescription){
|
|
||||||
self.0[index as usize]=Some(value);
|
|
||||||
}
|
|
||||||
pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,6>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
|
|
||||||
self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn unit_cube()->crate::model::IndexedModel{
|
|
||||||
let mut t=CubeFaceDescription::default();
|
|
||||||
t.insert(CubeFace::Right,FaceDescription::default());
|
|
||||||
t.insert(CubeFace::Top,FaceDescription::default());
|
|
||||||
t.insert(CubeFace::Back,FaceDescription::default());
|
|
||||||
t.insert(CubeFace::Left,FaceDescription::default());
|
|
||||||
t.insert(CubeFace::Bottom,FaceDescription::default());
|
|
||||||
t.insert(CubeFace::Front,FaceDescription::default());
|
|
||||||
generate_partial_unit_cube(t)
|
|
||||||
}
|
|
||||||
pub fn unit_cylinder()->crate::model::IndexedModel{
|
|
||||||
unit_cube()
|
|
||||||
}
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct WedgeFaceDescription([Option<FaceDescription>;5]);
|
|
||||||
impl WedgeFaceDescription{
|
|
||||||
pub fn insert(&mut self,index:WedgeFace,value:FaceDescription){
|
|
||||||
self.0[index as usize]=Some(value);
|
|
||||||
}
|
|
||||||
pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,5>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
|
|
||||||
self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn unit_wedge()->crate::model::IndexedModel{
|
|
||||||
let mut t=WedgeFaceDescription::default();
|
|
||||||
t.insert(WedgeFace::Right,FaceDescription::default());
|
|
||||||
t.insert(WedgeFace::TopFront,FaceDescription::default());
|
|
||||||
t.insert(WedgeFace::Back,FaceDescription::default());
|
|
||||||
t.insert(WedgeFace::Left,FaceDescription::default());
|
|
||||||
t.insert(WedgeFace::Bottom,FaceDescription::default());
|
|
||||||
generate_partial_unit_wedge(t)
|
|
||||||
}
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct CornerWedgeFaceDescription([Option<FaceDescription>;5]);
|
|
||||||
impl CornerWedgeFaceDescription{
|
|
||||||
pub fn insert(&mut self,index:CornerWedgeFace,value:FaceDescription){
|
|
||||||
self.0[index as usize]=Some(value);
|
|
||||||
}
|
|
||||||
pub fn pairs(self)->std::iter::FilterMap<std::iter::Enumerate<std::array::IntoIter<Option<FaceDescription>,5>>,impl FnMut((usize,Option<FaceDescription>))->Option<(usize,FaceDescription)>>{
|
|
||||||
self.0.into_iter().enumerate().filter_map(|v|v.1.map(|u|(v.0,u)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn unit_cornerwedge()->crate::model::IndexedModel{
|
|
||||||
let mut t=CornerWedgeFaceDescription::default();
|
|
||||||
t.insert(CornerWedgeFace::Right,FaceDescription::default());
|
|
||||||
t.insert(CornerWedgeFace::TopBack,FaceDescription::default());
|
|
||||||
t.insert(CornerWedgeFace::TopLeft,FaceDescription::default());
|
|
||||||
t.insert(CornerWedgeFace::Bottom,FaceDescription::default());
|
|
||||||
t.insert(CornerWedgeFace::Front,FaceDescription::default());
|
|
||||||
generate_partial_unit_cornerwedge(t)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct FaceDescription{
|
|
||||||
pub texture:Option<u32>,
|
|
||||||
pub transform:glam::Affine2,
|
|
||||||
pub color:Color4,
|
|
||||||
}
|
|
||||||
impl std::default::Default for FaceDescription{
|
|
||||||
fn default()->Self {
|
|
||||||
Self{
|
|
||||||
texture:None,
|
|
||||||
transform:glam::Affine2::IDENTITY,
|
|
||||||
color:Color4::new(1.0,1.0,1.0,0.0),//zero alpha to hide the default texture
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//TODO: it's probably better to use a shared vertex buffer between all primitives and use indexed rendering instead of generating a unique vertex buffer for each primitive.
|
|
||||||
//implementation: put all roblox primitives into one model.groups <- this won't work but I forget why
|
|
||||||
pub fn generate_partial_unit_cube(face_descriptions:CubeFaceDescription)->crate::model::IndexedModel{
|
|
||||||
let mut generated_pos=Vec::new();
|
|
||||||
let mut generated_tex=Vec::new();
|
|
||||||
let mut generated_normal=Vec::new();
|
|
||||||
let mut generated_color=Vec::new();
|
|
||||||
let mut generated_vertices=Vec::new();
|
|
||||||
let mut groups=Vec::new();
|
|
||||||
let mut transforms=Vec::new();
|
|
||||||
//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
|
|
||||||
for (face_id,face_description) in face_descriptions.pairs(){
|
|
||||||
//assume that scanning short lists is faster than hashing.
|
|
||||||
let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
|
|
||||||
transform_index
|
|
||||||
}else{
|
|
||||||
//create new transform_index
|
|
||||||
let transform_index=transforms.len();
|
|
||||||
transforms.push(face_description.transform);
|
|
||||||
for tex in CUBE_DEFAULT_TEXTURE_COORDS{
|
|
||||||
generated_tex.push(face_description.transform.transform_point2(tex));
|
|
||||||
}
|
|
||||||
transform_index
|
|
||||||
} as u32;
|
|
||||||
let color_index=if let Some(color_index)=generated_color.iter().position(|&color|color==face_description.color){
|
|
||||||
color_index
|
|
||||||
}else{
|
|
||||||
//create new color_index
|
|
||||||
let color_index=generated_color.len();
|
|
||||||
generated_color.push(face_description.color);
|
|
||||||
color_index
|
|
||||||
} as u32;
|
|
||||||
//always push normal
|
|
||||||
let normal_index=generated_normal.len() as u32;
|
|
||||||
generated_normal.push(CUBE_DEFAULT_NORMALS[face_id]);
|
|
||||||
//push vertices as they are needed
|
|
||||||
groups.push(IndexedGroup{
|
|
||||||
texture:face_description.texture,
|
|
||||||
polys:vec![IndexedPolygon{
|
|
||||||
vertices:CUBE_DEFAULT_POLYS[face_id].map(|tup|{
|
|
||||||
let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
|
|
||||||
let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
|
|
||||||
pos_index
|
|
||||||
}else{
|
|
||||||
//create new pos_index
|
|
||||||
let pos_index=generated_pos.len();
|
|
||||||
generated_pos.push(pos);
|
|
||||||
pos_index
|
|
||||||
} as u32;
|
|
||||||
//always push vertex
|
|
||||||
let vertex=IndexedVertex{
|
|
||||||
pos:pos_index,
|
|
||||||
tex:tup[1]+4*transform_index,
|
|
||||||
normal:normal_index,
|
|
||||||
color:color_index,
|
|
||||||
};
|
|
||||||
let vert_index=generated_vertices.len();
|
|
||||||
generated_vertices.push(vertex);
|
|
||||||
vert_index as u32
|
|
||||||
}).to_vec(),
|
|
||||||
}],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
IndexedModel{
|
|
||||||
unique_pos:generated_pos,
|
|
||||||
unique_tex:generated_tex,
|
|
||||||
unique_normal:generated_normal,
|
|
||||||
unique_color:generated_color,
|
|
||||||
unique_vertices:generated_vertices,
|
|
||||||
groups,
|
|
||||||
instances:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//don't think too hard about the copy paste because this is all going into the map tool eventually...
|
|
||||||
pub fn generate_partial_unit_wedge(face_descriptions:WedgeFaceDescription)->crate::model::IndexedModel{
|
|
||||||
let wedge_default_polys=vec![
|
|
||||||
// right (1, 0, 0)
|
|
||||||
vec![
|
|
||||||
[6,2,0],//[vertex,tex,norm]
|
|
||||||
[2,0,0],
|
|
||||||
[1,3,0],
|
|
||||||
],
|
|
||||||
// FrontTop (0, 1, -1)
|
|
||||||
vec![
|
|
||||||
[3,1,1],
|
|
||||||
[2,0,1],
|
|
||||||
[6,3,1],
|
|
||||||
[7,2,1],
|
|
||||||
],
|
|
||||||
// back (0, 0, 1)
|
|
||||||
vec![
|
|
||||||
[0,3,2],
|
|
||||||
[1,2,2],
|
|
||||||
[2,1,2],
|
|
||||||
[3,0,2],
|
|
||||||
],
|
|
||||||
// left (-1, 0, 0)
|
|
||||||
vec![
|
|
||||||
[0,2,3],
|
|
||||||
[3,1,3],
|
|
||||||
[7,3,3],
|
|
||||||
],
|
|
||||||
// bottom (0,-1, 0)
|
|
||||||
vec![
|
|
||||||
[1,1,4],
|
|
||||||
[0,0,4],
|
|
||||||
[7,3,4],
|
|
||||||
[6,2,4],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
let mut generated_pos=Vec::new();
|
|
||||||
let mut generated_tex=Vec::new();
|
|
||||||
let mut generated_normal=Vec::new();
|
|
||||||
let mut generated_color=Vec::new();
|
|
||||||
let mut generated_vertices=Vec::new();
|
|
||||||
let mut groups=Vec::new();
|
|
||||||
let mut transforms=Vec::new();
|
|
||||||
//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
|
|
||||||
for (face_id,face_description) in face_descriptions.pairs(){
|
|
||||||
//assume that scanning short lists is faster than hashing.
|
|
||||||
let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
|
|
||||||
transform_index
|
|
||||||
}else{
|
|
||||||
//create new transform_index
|
|
||||||
let transform_index=transforms.len();
|
|
||||||
transforms.push(face_description.transform);
|
|
||||||
for tex in CUBE_DEFAULT_TEXTURE_COORDS{
|
|
||||||
generated_tex.push(face_description.transform.transform_point2(tex));
|
|
||||||
}
|
|
||||||
transform_index
|
|
||||||
} as u32;
|
|
||||||
let color_index=if let Some(color_index)=generated_color.iter().position(|&color|color==face_description.color){
|
|
||||||
color_index
|
|
||||||
}else{
|
|
||||||
//create new color_index
|
|
||||||
let color_index=generated_color.len();
|
|
||||||
generated_color.push(face_description.color);
|
|
||||||
color_index
|
|
||||||
} as u32;
|
|
||||||
//always push normal
|
|
||||||
let normal_index=generated_normal.len() as u32;
|
|
||||||
generated_normal.push(WEDGE_DEFAULT_NORMALS[face_id]);
|
|
||||||
//push vertices as they are needed
|
|
||||||
groups.push(IndexedGroup{
|
|
||||||
texture:face_description.texture,
|
|
||||||
polys:vec![IndexedPolygon{
|
|
||||||
vertices:wedge_default_polys[face_id].iter().map(|tup|{
|
|
||||||
let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
|
|
||||||
let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
|
|
||||||
pos_index
|
|
||||||
}else{
|
|
||||||
//create new pos_index
|
|
||||||
let pos_index=generated_pos.len();
|
|
||||||
generated_pos.push(pos);
|
|
||||||
pos_index
|
|
||||||
} as u32;
|
|
||||||
//always push vertex
|
|
||||||
let vertex=IndexedVertex{
|
|
||||||
pos:pos_index,
|
|
||||||
tex:tup[1]+4*transform_index,
|
|
||||||
normal:normal_index,
|
|
||||||
color:color_index,
|
|
||||||
};
|
|
||||||
let vert_index=generated_vertices.len();
|
|
||||||
generated_vertices.push(vertex);
|
|
||||||
vert_index as u32
|
|
||||||
}).collect(),
|
|
||||||
}],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
IndexedModel{
|
|
||||||
unique_pos:generated_pos,
|
|
||||||
unique_tex:generated_tex,
|
|
||||||
unique_normal:generated_normal,
|
|
||||||
unique_color:generated_color,
|
|
||||||
unique_vertices:generated_vertices,
|
|
||||||
groups,
|
|
||||||
instances:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_partial_unit_cornerwedge(face_descriptions:CornerWedgeFaceDescription)->crate::model::IndexedModel{
|
|
||||||
let cornerwedge_default_polys=vec![
|
|
||||||
// right (1, 0, 0)
|
|
||||||
vec![
|
|
||||||
[6,2,0],//[vertex,tex,norm]
|
|
||||||
[5,1,0],
|
|
||||||
[1,3,0],
|
|
||||||
],
|
|
||||||
// BackTop (0, 1, 1)
|
|
||||||
vec![
|
|
||||||
[5,3,1],
|
|
||||||
[0,1,1],
|
|
||||||
[1,0,1],
|
|
||||||
],
|
|
||||||
// LeftTop (-1, 1, 0)
|
|
||||||
vec![
|
|
||||||
[5,3,2],
|
|
||||||
[7,2,2],
|
|
||||||
[0,1,2],
|
|
||||||
],
|
|
||||||
// bottom (0,-1, 0)
|
|
||||||
vec![
|
|
||||||
[1,1,3],
|
|
||||||
[0,0,3],
|
|
||||||
[7,3,3],
|
|
||||||
[6,2,3],
|
|
||||||
],
|
|
||||||
// front (0, 0,-1)
|
|
||||||
vec![
|
|
||||||
[5,0,4],
|
|
||||||
[6,3,4],
|
|
||||||
[7,2,4],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
let mut generated_pos=Vec::new();
|
|
||||||
let mut generated_tex=Vec::new();
|
|
||||||
let mut generated_normal=Vec::new();
|
|
||||||
let mut generated_color=Vec::new();
|
|
||||||
let mut generated_vertices=Vec::new();
|
|
||||||
let mut groups=Vec::new();
|
|
||||||
let mut transforms=Vec::new();
|
|
||||||
//note that on a cube every vertex is guaranteed to be unique, so there's no need to hash them against existing vertices.
|
|
||||||
for (face_id,face_description) in face_descriptions.pairs(){
|
|
||||||
//assume that scanning short lists is faster than hashing.
|
|
||||||
let transform_index=if let Some(transform_index)=transforms.iter().position(|&transform|transform==face_description.transform){
|
|
||||||
transform_index
|
|
||||||
}else{
|
|
||||||
//create new transform_index
|
|
||||||
let transform_index=transforms.len();
|
|
||||||
transforms.push(face_description.transform);
|
|
||||||
for tex in CUBE_DEFAULT_TEXTURE_COORDS{
|
|
||||||
generated_tex.push(face_description.transform.transform_point2(tex));
|
|
||||||
}
|
|
||||||
transform_index
|
|
||||||
} as u32;
|
|
||||||
let color_index=if let Some(color_index)=generated_color.iter().position(|&color|color==face_description.color){
|
|
||||||
color_index
|
|
||||||
}else{
|
|
||||||
//create new color_index
|
|
||||||
let color_index=generated_color.len();
|
|
||||||
generated_color.push(face_description.color);
|
|
||||||
color_index
|
|
||||||
} as u32;
|
|
||||||
//always push normal
|
|
||||||
let normal_index=generated_normal.len() as u32;
|
|
||||||
generated_normal.push(CORNERWEDGE_DEFAULT_NORMALS[face_id]);
|
|
||||||
//push vertices as they are needed
|
|
||||||
groups.push(IndexedGroup{
|
|
||||||
texture:face_description.texture,
|
|
||||||
polys:vec![IndexedPolygon{
|
|
||||||
vertices:cornerwedge_default_polys[face_id].iter().map(|tup|{
|
|
||||||
let pos=CUBE_DEFAULT_VERTICES[tup[0] as usize];
|
|
||||||
let pos_index=if let Some(pos_index)=generated_pos.iter().position(|&p|p==pos){
|
|
||||||
pos_index
|
|
||||||
}else{
|
|
||||||
//create new pos_index
|
|
||||||
let pos_index=generated_pos.len();
|
|
||||||
generated_pos.push(pos);
|
|
||||||
pos_index
|
|
||||||
} as u32;
|
|
||||||
//always push vertex
|
|
||||||
let vertex=IndexedVertex{
|
|
||||||
pos:pos_index,
|
|
||||||
tex:tup[1]+4*transform_index,
|
|
||||||
normal:normal_index,
|
|
||||||
color:color_index,
|
|
||||||
};
|
|
||||||
let vert_index=generated_vertices.len();
|
|
||||||
generated_vertices.push(vertex);
|
|
||||||
vert_index as u32
|
|
||||||
}).collect(),
|
|
||||||
}],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
IndexedModel{
|
|
||||||
unique_pos:generated_pos,
|
|
||||||
unique_tex:generated_tex,
|
|
||||||
unique_normal:generated_normal,
|
|
||||||
unique_color:generated_color,
|
|
||||||
unique_vertices:generated_vertices,
|
|
||||||
groups,
|
|
||||||
instances:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
11
src/setup.rs
11
src/setup.rs
@ -214,7 +214,16 @@ pub fn setup_and_start(title:String){
|
|||||||
|
|
||||||
let window=crate::window::WindowContextSetup::new(&setup_context,&window);
|
let window=crate::window::WindowContextSetup::new(&setup_context,&window);
|
||||||
//the thread that spawns the physics thread
|
//the thread that spawns the physics thread
|
||||||
let window_thread=window.into_worker(setup_context);
|
let mut window_thread=window.into_worker(setup_context);
|
||||||
|
|
||||||
|
let args:Vec<String>=std::env::args().collect();
|
||||||
|
if args.len()==2{
|
||||||
|
let path=std::path::PathBuf::from(&args[1]);
|
||||||
|
window_thread.send(TimedInstruction{
|
||||||
|
time:integer::Time::ZERO,
|
||||||
|
instruction:WindowInstruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)),
|
||||||
|
}).unwrap();
|
||||||
|
};
|
||||||
|
|
||||||
println!("Entering event loop...");
|
println!("Entering event loop...");
|
||||||
let root_time=std::time::Instant::now();
|
let root_time=std::time::Instant::now();
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
use crate::physics_worker::InputInstruction;
|
use crate::physics_worker::InputInstruction;
|
||||||
use strafesnet_common::integer;
|
use strafesnet_common::integer;
|
||||||
use strafesnet_common::instruction::TimedInstruction;
|
use strafesnet_common::instruction::TimedInstruction;
|
||||||
|
use strafesnet_texture_loader::texture_loader::TextureLoaderTrait;
|
||||||
|
|
||||||
pub enum WindowInstruction{
|
pub enum WindowInstruction{
|
||||||
Resize(winit::dpi::PhysicalSize<u32>),
|
Resize(winit::dpi::PhysicalSize<u32>),
|
||||||
@ -27,10 +28,39 @@ impl WindowContext<'_>{
|
|||||||
fn window_event(&mut self,time:integer::Time,event: winit::event::WindowEvent) {
|
fn window_event(&mut self,time:integer::Time,event: winit::event::WindowEvent) {
|
||||||
match event {
|
match event {
|
||||||
winit::event::WindowEvent::DroppedFile(path)=>{
|
winit::event::WindowEvent::DroppedFile(path)=>{
|
||||||
|
let path=path.as_path();
|
||||||
//blocking because it's simpler...
|
//blocking because it's simpler...
|
||||||
if let Some(indexed_model_instances)=crate::load_file(path){
|
if let Ok(file)=std::fs::File::open(path){
|
||||||
|
// match strafesnet_snf::read_snf(std::io::BufReader::new(file)){
|
||||||
|
// Ok(strafesnet_snf::SNF::Map(streamable_map))=>{
|
||||||
|
// if let Ok(indexed_model_instances)=streamable_map.load_all(){
|
||||||
|
// self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::ClearModels}).unwrap();
|
||||||
|
// self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::GenerateModels(indexed_model_instances)}).unwrap();
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
// Ok(strafesnet_snf::SNF::Bot(streamable_map))=>println!("File type not yet supported"),
|
||||||
|
// Ok(strafesnet_snf::SNF::Demo(streamable_map))=>println!("File type not yet supported"),
|
||||||
|
// Err(e)=>println!("Error reading file: {e:?}"),
|
||||||
|
// }
|
||||||
|
let mut texture_loader=strafesnet_texture_loader::legacy();
|
||||||
|
match (strafesnet_rbx_loader::read(file,|name|{
|
||||||
|
match texture_loader.acquire_id(name){
|
||||||
|
Ok(texture_id)=>Some(texture_id),
|
||||||
|
Err(e)=>{
|
||||||
|
println!("there was error: {e}");
|
||||||
|
None
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}),texture_loader.load()){
|
||||||
|
(Ok(map),Ok(textures))=>{
|
||||||
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::ClearModels}).unwrap();
|
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::ClearModels}).unwrap();
|
||||||
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::GenerateModels(indexed_model_instances)}).unwrap();
|
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::GenerateModels(map,textures)}).unwrap();
|
||||||
|
},
|
||||||
|
(Err(e),_)=>println!("Error reading file: {e:?}"),
|
||||||
|
(_,Err(e))=>println!("Error loading textures: {e:?}"),
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
println!("Failed to open file {path:?}");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
winit::event::WindowEvent::Focused(_state)=>{
|
winit::event::WindowEvent::Focused(_state)=>{
|
||||||
@ -162,30 +192,19 @@ impl WindowContext<'_>{
|
|||||||
pub struct WindowContextSetup<'a>{
|
pub struct WindowContextSetup<'a>{
|
||||||
user_settings:crate::settings::UserSettings,
|
user_settings:crate::settings::UserSettings,
|
||||||
window:&'a winit::window::Window,
|
window:&'a winit::window::Window,
|
||||||
physics:crate::physics::PhysicsState,
|
physics:crate::physics::PhysicsContext,
|
||||||
graphics:crate::graphics::GraphicsState,
|
graphics:crate::graphics::GraphicsState,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> WindowContextSetup<'a>{
|
impl<'a> WindowContextSetup<'a>{
|
||||||
pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{
|
pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{
|
||||||
//wee
|
|
||||||
let user_settings=crate::settings::read_user_settings();
|
let user_settings=crate::settings::read_user_settings();
|
||||||
|
|
||||||
let args:Vec<String>=std::env::args().collect();
|
let mut physics=crate::physics::PhysicsContext::default();
|
||||||
let indexed_model_instances=if args.len()==2{
|
physics.state.load_user_settings(&user_settings);
|
||||||
crate::load_file(std::path::PathBuf::from(&args[1]))
|
|
||||||
}else{
|
|
||||||
None
|
|
||||||
}.unwrap_or(crate::default_models());
|
|
||||||
|
|
||||||
let mut physics=crate::physics::PhysicsState::default();
|
|
||||||
physics.load_user_settings(&user_settings);
|
|
||||||
physics.generate_models(&indexed_model_instances);
|
|
||||||
physics.spawn(indexed_model_instances.spawn_point);
|
|
||||||
|
|
||||||
let mut graphics=crate::graphics::GraphicsState::new(&context.device,&context.queue,&context.config);
|
let mut graphics=crate::graphics::GraphicsState::new(&context.device,&context.queue,&context.config);
|
||||||
graphics.load_user_settings(&user_settings);
|
graphics.load_user_settings(&user_settings);
|
||||||
graphics.generate_models(&context.device,&context.queue,indexed_model_instances);
|
|
||||||
|
|
||||||
Self{
|
Self{
|
||||||
user_settings,
|
user_settings,
|
||||||
|
|||||||
@ -173,19 +173,24 @@ impl<'a,Task:Send+'a> INWorker<'a,Task>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test{
|
||||||
|
use super::{thread,QRWorker};
|
||||||
|
use crate::physics;
|
||||||
|
use strafesnet_common::{integer,instruction};
|
||||||
#[test]//How to run this test with printing: cargo test --release -- --nocapture
|
#[test]//How to run this test with printing: cargo test --release -- --nocapture
|
||||||
fn test_worker() {
|
fn test_worker() {
|
||||||
// Create the worker thread
|
// Create the worker thread
|
||||||
let test_body=crate::physics::Body::new(crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Time::ZERO);
|
let test_body=physics::Body::new(integer::Planar64Vec3::ONE,integer::Planar64Vec3::ONE,integer::Planar64Vec3::ONE,integer::Time::ZERO);
|
||||||
let worker=QRWorker::new(crate::physics::Body::default(),
|
let worker=QRWorker::new(physics::Body::default(),
|
||||||
|_|crate::physics::Body::new(crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Time::ZERO)
|
|_|physics::Body::new(integer::Planar64Vec3::ONE,integer::Planar64Vec3::ONE,integer::Planar64Vec3::ONE,integer::Time::ZERO)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Send tasks to the worker
|
// Send tasks to the worker
|
||||||
for _ in 0..5 {
|
for _ in 0..5 {
|
||||||
let task = strafesnet_common::instruction::TimedInstruction{
|
let task = instruction::TimedInstruction{
|
||||||
time:strafesnet_common::integer::Time::ZERO,
|
time:integer::Time::ZERO,
|
||||||
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
instruction:physics::PhysicsInstruction::StrafeTick,
|
||||||
};
|
};
|
||||||
worker.send(task).unwrap();
|
worker.send(task).unwrap();
|
||||||
}
|
}
|
||||||
@ -197,9 +202,9 @@ fn test_worker() {
|
|||||||
thread::sleep(std::time::Duration::from_millis(10));
|
thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
|
||||||
// Send a new task
|
// Send a new task
|
||||||
let task = strafesnet_common::instruction::TimedInstruction{
|
let task = instruction::TimedInstruction{
|
||||||
time:strafesnet_common::integer::Time::ZERO,
|
time:integer::Time::ZERO,
|
||||||
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
instruction:physics::PhysicsInstruction::StrafeTick,
|
||||||
};
|
};
|
||||||
worker.send(task).unwrap();
|
worker.send(task).unwrap();
|
||||||
|
|
||||||
@ -208,3 +213,4 @@ fn test_worker() {
|
|||||||
// wait long enough to see print from final task
|
// wait long enough to see print from final task
|
||||||
thread::sleep(std::time::Duration::from_millis(10));
|
thread::sleep(std::time::Duration::from_millis(10));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user