Switch VM from Point2 to PackedPoint2

Author: object-Object

src/bin/mlog.rs

@@ -7,7 +7,7 @@ use mindustry_rs::{
         Building, BuildingData, HYPER_PROCESSOR, LOGIC_PROCESSOR, LogicVMBuilder, MEMORY_BANK,
         MEMORY_CELL, MESSAGE, MICRO_PROCESSOR, WORLD_PROCESSOR,
     },
-    types::{Object, Point2, ProcessorConfig, ProcessorLinkConfig},
+    types::{Object, ProcessorConfig, ProcessorLinkConfig},
 };
 use strum_macros::EnumString;
 use widestring::U16String;
@@ -67,7 +67,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     builder.add_buildings([
         Building::from_processor_config(
             cli.processor.name(),
-            Point2::new(0, 0),
+            (0, 0).into(),
             &ProcessorConfig {
                 code: cli.code.contents()?,
                 links: vec![
@@ -78,9 +78,9 @@ fn main() -> Result<(), Box<dyn Error>> {
             },
             &builder,
         )?,
-        Building::from_config(MESSAGE, Point2::new(3, 0), &Object::Null, &builder)?,
-        Building::from_config(MEMORY_CELL, Point2::new(4, 0), &Object::Null, &builder)?,
-        Building::from_config(MEMORY_BANK, Point2::new(5, 0), &Object::Null, &builder)?,
+        Building::from_config(MESSAGE, (3, 0).into(), &Object::Null, &builder)?,
+        Building::from_config(MEMORY_CELL, (4, 0).into(), &Object::Null, &builder)?,
+        Building::from_config(MEMORY_BANK, (5, 0).into(), &Object::Null, &builder)?,
     ]);
     let vm = builder.build()?;
 

src/bin/mlogv32.rs

@@ -24,7 +24,7 @@ use mindustry_rs::{
         Building, BuildingData, LValue, LogicVM, LogicVMBuilder, MEMORY_BANK, MESSAGE,
         MICRO_PROCESSOR, SWITCH, WORLD_PROCESSOR,
     },
-    types::{Object, Point2, ProcessorConfig, Schematic},
+    types::{Object, PackedPoint2, ProcessorConfig, Schematic},
 };
 use serde::Deserialize;
 use widestring::{U16String, u16str};
@@ -100,13 +100,13 @@ struct Metadata {
 }
 
 #[derive(Debug, Clone, Copy, Deserialize)]
-struct MetaPoint2(i32, i32);
+struct MetaPoint2(i16, i16);
 
 impl MetaPoint2 {
-    fn x(&self) -> i32 {
+    fn x(&self) -> i16 {
         self.0
     }
-    fn y(&self) -> i32 {
+    fn y(&self) -> i16 {
         self.1
     }
 }
@@ -117,7 +117,7 @@ impl Display for MetaPoint2 {
     }
 }
 
-impl From<MetaPoint2> for Point2 {
+impl From<MetaPoint2> for PackedPoint2 {
     fn from(MetaPoint2(x, y): MetaPoint2) -> Self {
         Self { x, y }
     }
@@ -477,10 +477,10 @@ fn main() -> Result<(), Box<dyn Error>> {
             .into_iter()
             .zip(schematic.tiles_mut().iter_mut().filter(|t| {
                 t.block == MICRO_PROCESSOR
-                    && (t.position.x as i32) >= meta.memory.x()
-                    && (t.position.x as i32) < meta.memory.x() + (meta.memory_width as i32)
-                    && (t.position.y as i32) >= meta.memory.y()
-                    && (t.position.y as i32) < meta.memory.y() + (meta.memory_height as i32)
+                    && t.position.x >= meta.memory.x()
+                    && t.position.x < meta.memory.x() + (meta.memory_width as i16)
+                    && t.position.y >= meta.memory.y()
+                    && t.position.y < meta.memory.y() + (meta.memory_height as i16)
             }))
             .progress_count(bar_count)
         {

src/logic/vm/buildings.rs

@@ -9,7 +9,7 @@ use super::{
     variables::LValue,
 };
 use crate::types::{
-    Object, Point2, ProcessorConfig, SchematicTile,
+    Object, PackedPoint2, ProcessorConfig, SchematicTile,
     content::{self, Block},
 };
 
@@ -34,12 +34,12 @@ const MESSAGE_MAX_LINES: usize = 24;
 #[derive(Debug, Clone)]
 pub struct Building {
     pub block: &'static Block,
-    pub position: Point2,
+    pub position: PackedPoint2,
     pub data: Rc<RefCell<BuildingData>>,
 }
 
 impl Building {
-    pub fn new(name: &str, position: Point2, data: BuildingData) -> VMLoadResult<Self> {
+    pub fn new(name: &str, position: PackedPoint2, data: BuildingData) -> VMLoadResult<Self> {
         let block = *content::blocks::FROM_NAME
             .get(name)
             .ok_or_else(|| VMLoadError::UnknownBlockType(name.to_string()))?;
@@ -53,7 +53,7 @@ impl Building {
 
     pub fn from_config(
         name: &str,
-        position: Point2,
+        position: PackedPoint2,
         config: &Object,
         builder: &LogicVMBuilder,
     ) -> VMLoadResult<Self> {
@@ -109,7 +109,7 @@ impl Building {
 
     pub fn from_processor_config(
         name: &str,
-        position: Point2,
+        position: PackedPoint2,
         config: &ProcessorConfig,
         builder: &LogicVMBuilder,
     ) -> VMLoadResult<Self> {
@@ -178,7 +178,7 @@ impl Building {
         }: &SchematicTile,
         builder: &LogicVMBuilder,
     ) -> VMLoadResult<Self> {
-        Self::from_config(name, (*position).into(), config, builder)
+        Self::from_config(name, *position, config, builder)
     }
 }
 

src/logic/vm/instructions.rs

@@ -20,7 +20,7 @@ use crate::{
         },
     },
     types::{
-        ContentType, LAccess, Point2, Team,
+        ContentType, LAccess, PackedPoint2, Team,
         colors::{self, f32_to_double_bits, f64_from_double_bits},
         content,
     },
@@ -1098,9 +1098,9 @@ pub(super) struct GetBlock {
 
 impl SimpleInstructionTrait for GetBlock {
     fn execute(&self, state: &mut ProcessorState, vm: &LogicVM) {
-        let result = match vm.building(Point2 {
-            x: self.x.get(state).numf().round() as i32,
-            y: self.y.get(state).numf().round() as i32,
+        let result = match vm.building(PackedPoint2 {
+            x: self.x.get(state).numf().round() as i16,
+            y: self.y.get(state).numf().round() as i16,
         }) {
             Some(building) => match self.layer {
                 TileLayer::Floor => Content::Block(&content::blocks::STONE).into(),