Compare commits
28 Commits
obj
...
script-upl
| Author | SHA1 | Date | |
|---|---|---|---|
| f1576076b5 | |||
| 6f3d3b170d | |||
| 79ba77e7d9 | |||
| 24f8b88ac5 | |||
| c9d58fb7ca | |||
| 684d7a1797 | |||
| 6d54927c88 | |||
| a2939fbc0f | |||
| c415ffbdab | |||
| cbc818bd03 | |||
| 53d2f7a5e8 | |||
| 96d1cc87a2 | |||
| 5915dd730f | |||
| e626131d95 | |||
| 69ffbf4837 | |||
| 167be8f587 | |||
| e92528ad83 | |||
| 8e9c76d6f8 | |||
| a5c48d4684 | |||
| 1b5eec9eaf | |||
| ef5703f282 | |||
| 9685301b30 | |||
| d2b455c87b | |||
| 9de2790cc8 | |||
| 47e93325ad | |||
| de9712b7a1 | |||
| c2d0a4487c | |||
| dc9fd2c442 |
2
.cargo/config.toml
Normal file
2
.cargo/config.toml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[registries.strafesnet]
|
||||||
|
index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
|
||||||
2226
Cargo.lock
generated
2226
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
32
Cargo.toml
32
Cargo.toml
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "map-tool"
|
name = "mapfixer"
|
||||||
version = "1.4.0"
|
version = "1.1.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
@@ -8,21 +8,17 @@ edition = "2021"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.75"
|
anyhow = "1.0.75"
|
||||||
clap = { version = "4.4.2", features = ["derive"] }
|
clap = { version = "4.4.2", features = ["derive"] }
|
||||||
flate2 = "1.0.27"
|
futures = "0.3.31"
|
||||||
image = "0.24.7"
|
|
||||||
image_dds = "0.1.1"
|
|
||||||
lazy-regex = "3.1.0"
|
lazy-regex = "3.1.0"
|
||||||
rbx_binary = "0.7.1"
|
rbx_binary = { version = "0.7.4", registry = "strafesnet"}
|
||||||
rbx_dom_weak = "2.5.0"
|
rbx_dom_weak = { version = "2.7.0", registry = "strafesnet"}
|
||||||
rbx_reflection_database = "0.2.7"
|
rbx_reflection_database = { version = "0.2.10", registry = "strafesnet"}
|
||||||
rbx_xml = "0.13.1"
|
rbx_xml = { version = "0.13.3", registry = "strafesnet"}
|
||||||
vbsp = "0.5.0"
|
siphasher = "1.0.1"
|
||||||
vmdl = "0.1.1"
|
submissions-api = { path = "../maps-service/validation/api", features = ["external"], default-features = false}
|
||||||
vmt-parser = "0.1.1"
|
tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "fs"] }
|
||||||
vpk = "0.2.0"
|
|
||||||
vtf = "0.2.1"
|
|
||||||
|
|
||||||
#[profile.release]
|
[profile.release]
|
||||||
#lto = true
|
lto = true
|
||||||
#strip = true
|
strip = true
|
||||||
#codegen-units = 1
|
codegen-units = 1
|
||||||
|
|||||||
967
src/main.rs
967
src/main.rs
File diff suppressed because it is too large
Load Diff
41
src/obj.rs
41
src/obj.rs
@@ -1,41 +0,0 @@
|
|||||||
|
|
||||||
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()
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user