microbrick support

Author: Kmschr

.gitignore

@@ -14,4 +14,6 @@ Cargo.lock
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# End of https://www.toptal.com/developers/gitignore/api/rust
+# End of https://www.toptal.com/developers/gitignore/api/rust
+
+/models/

Cargo.toml

@@ -10,10 +10,9 @@ include = ["blank.brs"]
 
 [dependencies]
 structopt = { version = "0.3", default-features = false }
-
-brs = "0.2"
+brs = { git = "https://github.com/Brickadia/brs", branch = "0.3" }
 tobj = "2.0"
 cgmath = "0.17"
 image = "0.23"
 uuid = "0.7"
-chrono = "0.4"
+chrono = "0.4"

blank.brs

@@ -25,25 +25,25 @@ use structopt::StructOpt;
 struct Opt {
     #[structopt(parse(from_os_str))]
     file: PathBuf,
-
     #[structopt(parse(from_os_str))]
     output: PathBuf,
-
     #[structopt(long, possible_values = &["lossy", "lossless"], default_value = "lossy")]
     simplify: String,
-
     #[structopt(short, long, default_value = "1")]
-    scale: f32
+    scale: f32,
+    #[structopt(short, long, possible_values = &["micro", "normal"], default_value = "normal")]
+    bricktype: String,
 }
 
 fn main() {
     let opt = Opt::from_args();
+    println!("{:?}", opt);
     let mut octree = generate_octree(&opt);
 
     match opt.output.extension() {
         Some(extension) => {
             match extension.to_str() {
-                Some("brs") => write_brs_data(&mut octree, opt.output, opt.simplify),
+                Some("brs") => write_brs_data(&mut octree, opt.output, opt.simplify, opt.bricktype),
                 // Implement new file types
                 Some(extension) => panic!("Output file type {} is not supported", extension),
                 None => panic!("Invalid output file type")
@@ -105,23 +105,45 @@ fn generate_octree(opt: &Opt) -> VoxelTree<Vector4<u8>> {
     }
 
     println!("Voxelizing...");
-    voxelize(&mut models, &material_images, opt.scale)
+    voxelize(&mut models, &material_images, opt.scale, opt.bricktype.clone())
 }
 
-fn write_brs_data(mut octree: &mut VoxelTree::<Vector4::<u8>>, output: PathBuf, simplify_algo: String) {
-    let blank_data = match File::open("blank.brs") {
-        Err(e) => panic!("Error encountered when loading blank.brs file: {:}", e.to_string()),
+fn write_brs_data(mut octree: &mut VoxelTree::<Vector4::<u8>>, output: PathBuf, simplify_algo: String, bricktype: String) {
+    let reference_save = match File::open("reference.brs") {
+        Err(e) => panic!("Error encountered when loading microbrick.brs file: {:}", e.to_string()),
+        Ok(data) => data,
+    };
+
+    let reference_save = match brs::Reader::new(reference_save) {
+        Err(e) => panic!("Error encountered when reading microbrick.brs: {:}", e.to_string()),
         Ok(data) => data,
     };
 
-    let mut write_data = brs::Reader::new(blank_data).unwrap().read_header1().unwrap().read_header2().unwrap().into_write_data().unwrap();
-    write_data.bricks.clear();
+    let smallguy = brs::User {
+        name: "Smallguy".to_string(),
+        id: brs::uuid::Uuid::parse_str("8efaeb23-5e82-428e-b575-0dd30270146e").unwrap(),
+    };
+
+    let mut write_data = brs::WriteData {
+        author: smallguy.clone(),
+        brick_assets: reference_save.brick_assets().to_vec(),
+        brick_owners: vec![smallguy],
+        bricks: vec![],
+        colors: reference_save.colors().to_vec(),
+        description: "generated with obj2brs".to_string(),
+        map: reference_save.map().to_string(),
+        materials: reference_save.materials().to_vec(),
+        mods: vec![],
+        save_time: brs::chrono::DateTime::from(std::time::SystemTime::now()),
+    };
+
+    println!("{:?}", write_data.brick_assets);
 
     println!("Simplifying {:?}...", simplify_algo);
     if simplify_algo == "lossless" {
-        simplify_lossless(&mut octree, &mut write_data);
+        simplify_lossless(&mut octree, &mut write_data, bricktype);
     } else {
-        simplify(&mut octree, &mut write_data);
+        simplify(&mut octree, &mut write_data, bricktype);
     }
 
     // Write file

elf.brs

@@ -3,7 +3,7 @@ use crate::color::*;
 
 use cgmath::{ Vector3, Vector4 };
 
-pub fn simplify(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::WriteData) {
+pub fn simplify(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::WriteData, bricktype: String) {
     let colorset = convert_colorset_to_hsv(&write_data.colors);
 
     loop {
@@ -89,15 +89,17 @@ pub fn simplify(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::W
         let height = yp - y;
         let depth = zp - z;
 
+        let scales: (isize, isize, isize) = if bricktype == "micro" { (1, 1, 1) } else { (5, 5, 2) };
+
         write_data.bricks.push(
             brs::Brick {
-                asset_name_index: 0,
+                asset_name_index: if bricktype == "micro" { 0 } else { 1 },
                 // Coordinates are rotated
                 size: (5*width as u32, 5*depth as u32, 2*height as u32),
                 position: (
-                    (5*width + 10*x) as i32,
-                    (5*depth + 10*z) as i32,
-                    (2*height + 4*y) as i32
+                    (scales.0*width + 2*scales.0*x) as i32,
+                    (scales.1*depth + 2*scales.1*z) as i32,
+                    (scales.2*height + 2*scales.2*y) as i32
                 ),
                 direction: brs::Direction::ZPositive,
                 rotation: brs::Rotation::Deg0,
@@ -111,7 +113,7 @@ pub fn simplify(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::W
     }
 }
 
-pub fn simplify_lossless(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::WriteData) {
+pub fn simplify_lossless(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &mut brs::WriteData, bricktype: String) {
     let d: isize = 1 << octree.size;
     let len = d + 1;
 
@@ -204,15 +206,17 @@ pub fn simplify_lossless(octree: &mut VoxelTree::<Vector4::<u8>>, write_data: &m
         let height = yp - y;
         let depth = zp - z;
 
+        let scales: (isize, isize, isize) = if bricktype == "micro" { (1, 1, 1) } else { (5, 5, 2) };
+
         write_data.bricks.push(
             brs::Brick {
-                asset_name_index: 0,
+                asset_name_index: if bricktype == "micro" { 0 } else { 1 },
                 // Coordinates are rotated
-                size: (5*width as u32, 5*depth as u32, 2*height as u32),
+                size: ((scales.0*width) as u32, (scales.1*depth) as u32, (scales.2*height) as u32),
                 position: (
-                    (5*width + 10*x) as i32,
-                    (5*depth + 10*z) as i32,
-                    (2*height + 4*y) as i32
+                    (scales.0*width + 2*scales.0*x) as i32,
+                    (scales.1*depth + 2*scales.1*z) as i32,
+                    (scales.2*height + 2*scales.2*y) as i32
                 ),
                 direction: brs::Direction::ZPositive,
                 rotation: brs::Rotation::Deg0,

reference.brs

@@ -16,22 +16,23 @@ struct Triangle {
     uvs: Option::<[Vector2::<f32>; 3]>
 }
 
-pub fn voxelize(models: &mut Vec::<tobj::Model>, materials: &[RgbaImage], scale: f32) -> VoxelTree::<Vector4::<u8>> {
+pub fn voxelize(models: &mut Vec::<tobj::Model>, materials: &[RgbaImage], scale: f32, bricktype: String) -> VoxelTree::<Vector4::<u8>> {
     let mut octree = VoxelTree::<Vector4::<u8>>::new();
 
     // Determine model AABB to expand triangle octree to final size
     // Multiply y-coordinate by 2.5 to take into account plates
+    let yscale = if bricktype == "micro" { 1.0 } else { 2.5 };
 
     let u = &models[0].mesh.positions; // Guess initial
-    let mut min = Vector3::new(u[0] * scale, u[1] * 2.5 * scale, u[2] * scale);
+    let mut min = Vector3::new(u[0] * scale, u[1] * yscale * scale, u[2] * scale);
     let mut max = min;
 
     for m in models.iter_mut() {
         let p = &mut m.mesh.positions;
         for v in (0..p.len()).step_by(3) {
 
             p[v] *= scale;
-            p[v + 1] *= 2.5 * scale;
+            p[v + 1] *= yscale * scale;
             p[v + 2] *= scale;
 
             for m in 0 .. 3 {