language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Dir in APC offset calculation

Browse source
This commit is contained in:
Tad Hardesty 2019-11-17 15:22:22 -08:00
parent dac9293ac0
commit ecc08fd33d
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tools/render_passes/icon_smoothing.rs
View file

@ -1,6 +1,7 @@
//! Port of icon smoothing subsystem.
use dm::constants::Constant;
use dmi::{NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST};
use minimap::{Sprite, Context, Atom, GetVar, get_atom_list};
// (1 << N) where N is the usual value
@ -33,7 +34,6 @@ pub fn handle_smooth<'a>(output: &mut Vec<Sprite<'a>>, ctx: Context<'a>, loc: (u
}
fn calculate_adjacencies(ctx: Context, loc: (u32, u32), atom: &Atom, flags: i32) -> i32 {
use dmi::*;
// TODO: anchored check
let mut adjacencies = 0;
@ -237,7 +237,6 @@ fn diagonal_smooth<'a>(output: &mut Vec<Sprite<'a>>, ctx: Context<'a>, loc: (u32
}
fn offset(direction: i32) -> (i32, i32) {
use dmi::*;
match direction {
0 => (0, 0),
SOUTH => (0, 1),
@ -253,7 +252,6 @@ fn offset(direction: i32) -> (i32, i32) {
}
fn flip(direction: i32) -> i32 {
use dmi::*;
match direction {
0 => 0,
SOUTH => NORTH,
@ -269,7 +267,6 @@ fn flip(direction: i32) -> i32 {
}
fn reverse_ndir(ndir: i32) -> i32 {
use dmi::*;
const NW1: i32 = N_NORTH | N_WEST;
const NW2: i32 = NW1 | N_NORTHWEST;
const NE1: i32 = N_NORTH | N_EAST;
@ -293,7 +290,6 @@ fn reverse_ndir(ndir: i32) -> i32 {
}
fn left_45(dir: i32) -> i32 {
use dmi::*;
match dir {
NORTH => NORTHWEST,
NORTHEAST => NORTH,
@ -308,7 +304,6 @@ fn left_45(dir: i32) -> i32 {
}
fn right_45(dir: i32) -> i32 {
use dmi::*;
match dir {
NORTH => NORTHEAST,
NORTHEAST => EAST,

12
src/tools/render_passes/mod.rs
View file

@ -181,13 +181,15 @@ impl RenderPass for Overlays {
objtree: &'a ObjectTree,
_: &'a bumpalo::Bump,
) {
use dmi::Dir;
if atom.istype("/obj/machinery/power/apc/") {
// auto-set pixel location
match atom.get_var("dir", objtree) {
&Constant::Int(::dmi::NORTH) => sprite.ofs_y = 23,
&Constant::Int(::dmi::SOUTH) => sprite.ofs_y = -23,
&Constant::Int(::dmi::EAST) => sprite.ofs_x = 24,
&Constant::Int(::dmi::WEST) => sprite.ofs_x = -25,
match atom.get_var("dir", objtree).to_int().and_then(Dir::from_int) {
Some(Dir::North) => sprite.ofs_y = 23,
Some(Dir::South) => sprite.ofs_y = -23,
Some(Dir::East) => sprite.ofs_x = 24,
Some(Dir::West) => sprite.ofs_x = -25,
_ => {}
}
}