mirror of
https://github.com/Noratrieb/game-wip-dontplay.git
synced 2026-01-17 04:45:02 +01:00
manual
This commit is contained in:
parent
851d491846
commit
59c63ab233
2 changed files with 30 additions and 228 deletions
127
src/tiles.rs
127
src/tiles.rs
|
|
@ -42,60 +42,19 @@ pub enum Fg {}
|
||||||
|
|
||||||
impl Bg {
|
impl Bg {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_bg"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: (),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Mid {
|
impl Mid {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_mid"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: MidDef {
|
|
||||||
platform: true,
|
|
||||||
bb: Some(TileBb {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 32,
|
|
||||||
h: 32,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Fg {
|
impl Fg {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_fg"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: (),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -164,12 +123,7 @@ where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.debug_struct("TileDef")
|
loop {}
|
||||||
.field("light", &self.light)
|
|
||||||
.field("graphic_name", &self.graphic_name)
|
|
||||||
.field("tex_rect", &self.tex_rect)
|
|
||||||
.field("layer", &self.layer)
|
|
||||||
.finish()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,13 +132,7 @@ where
|
||||||
Layer::SpecificDef: Default + Debug + Inspect,
|
Layer::SpecificDef: Default + Debug + Inspect,
|
||||||
{
|
{
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
loop {}
|
||||||
light: Default::default(),
|
|
||||||
graphic_name: Default::default(),
|
|
||||||
tex_rect: Default::default(),
|
|
||||||
layer: Layer::SpecificDef::default(),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -215,14 +163,7 @@ pub struct TileDb {
|
||||||
|
|
||||||
impl Default for TileDb {
|
impl Default for TileDb {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
loop {}
|
||||||
unknown_bg: Bg::unknown_def(),
|
|
||||||
unknown_mid: Mid::unknown_def(),
|
|
||||||
unknown_fg: Fg::unknown_def(),
|
|
||||||
bg: vec![],
|
|
||||||
mid: vec![],
|
|
||||||
fg: vec![],
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -230,9 +171,7 @@ impl Index<BgTileId> for TileDb {
|
||||||
type Output = TileDef<Bg>;
|
type Output = TileDef<Bg>;
|
||||||
|
|
||||||
fn index(&self, index: BgTileId) -> &Self::Output {
|
fn index(&self, index: BgTileId) -> &Self::Output {
|
||||||
self.bg
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_bg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -240,9 +179,7 @@ impl Index<MidTileId> for TileDb {
|
||||||
type Output = TileDef<Mid>;
|
type Output = TileDef<Mid>;
|
||||||
|
|
||||||
fn index(&self, index: MidTileId) -> &Self::Output {
|
fn index(&self, index: MidTileId) -> &Self::Output {
|
||||||
self.mid
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_mid)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -250,9 +187,7 @@ impl Index<FgTileId> for TileDb {
|
||||||
type Output = TileDef<Fg>;
|
type Output = TileDef<Fg>;
|
||||||
|
|
||||||
fn index(&self, index: FgTileId) -> &Self::Output {
|
fn index(&self, index: FgTileId) -> &Self::Output {
|
||||||
self.fg
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_fg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -260,37 +195,14 @@ const PATH: &str = "tiles.dat";
|
||||||
|
|
||||||
impl TileDb {
|
impl TileDb {
|
||||||
pub fn load_or_default() -> Self {
|
pub fn load_or_default() -> Self {
|
||||||
match std::fs::read(PATH) {
|
loop {}
|
||||||
Ok(data) => match rmp_serde::from_slice(&data) {
|
|
||||||
Ok(db) => db,
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to load tile database: {e}\nCreating default.");
|
|
||||||
Default::default()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to load tile database: {e}\nCreating default.");
|
|
||||||
Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
pub fn try_save(&self) {
|
pub fn try_save(&self) {
|
||||||
match rmp_serde::to_vec(self) {
|
loop {}
|
||||||
Ok(vec) => match std::fs::write(PATH, vec) {
|
|
||||||
Ok(()) => {}
|
|
||||||
Err(e) => log::warn!("Failed to save tile db: {e}"),
|
|
||||||
},
|
|
||||||
Err(e) => log::warn!("Failed to save tile db: {e}"),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn update_rects(&mut self, rects: &RectMap) {
|
pub(crate) fn update_rects(&mut self, rects: &RectMap) {
|
||||||
update_rect_def(&mut self.unknown_bg, rects);
|
loop {}
|
||||||
update_rect_def(&mut self.unknown_mid, rects);
|
|
||||||
update_rect_def(&mut self.unknown_fg, rects);
|
|
||||||
update_rect_db(&mut self.bg, rects);
|
|
||||||
update_rect_db(&mut self.mid, rects);
|
|
||||||
update_rect_db(&mut self.fg, rects);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,9 +210,7 @@ fn update_rect_db<Layer: TileLayer>(db: &mut Vec<TileDef<Layer>>, rects: &RectMa
|
||||||
where
|
where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
for def in db {
|
loop {}
|
||||||
update_rect_def(def, rects);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn update_rect_def<Layer: TileLayer>(
|
fn update_rect_def<Layer: TileLayer>(
|
||||||
|
|
@ -309,14 +219,5 @@ fn update_rect_def<Layer: TileLayer>(
|
||||||
) where
|
) where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
if !def.graphic_name.is_empty() {
|
loop {}
|
||||||
if let Some(rect) = rects.get(def.graphic_name.as_str()) {
|
|
||||||
def.tex_rect = *rect;
|
|
||||||
log::info!("Updated rect for {}: {:?}", def.graphic_name.as_str(), rect);
|
|
||||||
} else {
|
|
||||||
log::error!("Missing texture for {:?}", def.graphic_name.as_str());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log::warn!("Empty graphic name!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
131
tiles.rs
131
tiles.rs
|
|
@ -22,13 +22,13 @@ impl<Layer> Clone for TileId<Layer> {
|
||||||
}
|
}
|
||||||
impl<Layer> Debug for TileId<Layer> {
|
impl<Layer> Debug for TileId<Layer> {
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.debug_tuple("TileId").field(&self.0).finish()
|
loop {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Layer> TileId<Layer> {
|
impl<Layer> TileId<Layer> {
|
||||||
pub fn empty(&self) -> bool {
|
pub fn empty(&self) -> bool {
|
||||||
self.0 == 0
|
loop {}
|
||||||
}
|
}
|
||||||
pub const EMPTY: Self = Self(0, PhantomData);
|
pub const EMPTY: Self = Self(0, PhantomData);
|
||||||
}
|
}
|
||||||
|
|
@ -42,60 +42,19 @@ pub enum Fg {}
|
||||||
|
|
||||||
impl Bg {
|
impl Bg {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_bg"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: (),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Mid {
|
impl Mid {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_mid"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: MidDef {
|
|
||||||
platform: true,
|
|
||||||
bb: Some(TileBb {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 32,
|
|
||||||
h: 32,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Fg {
|
impl Fg {
|
||||||
pub fn unknown_def() -> TileDef<Self> {
|
pub fn unknown_def() -> TileDef<Self> {
|
||||||
TileDef {
|
loop {}
|
||||||
light: Some(ScreenVec { x: 0, y: 0 }),
|
|
||||||
graphic_name: String::from("tiles/unknown_fg"),
|
|
||||||
tex_rect: IntRect {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 0,
|
|
||||||
h: 0,
|
|
||||||
},
|
|
||||||
layer: (),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -164,12 +123,7 @@ where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.debug_struct("TileDef")
|
loop {}
|
||||||
.field("light", &self.light)
|
|
||||||
.field("graphic_name", &self.graphic_name)
|
|
||||||
.field("tex_rect", &self.tex_rect)
|
|
||||||
.field("layer", &self.layer)
|
|
||||||
.finish()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,13 +132,7 @@ where
|
||||||
Layer::SpecificDef: Default + Debug + Inspect,
|
Layer::SpecificDef: Default + Debug + Inspect,
|
||||||
{
|
{
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
loop {}
|
||||||
light: Default::default(),
|
|
||||||
graphic_name: Default::default(),
|
|
||||||
tex_rect: Default::default(),
|
|
||||||
layer: Layer::SpecificDef::default(),
|
|
||||||
//ADD blend_graphic: String::new(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -215,14 +163,7 @@ pub struct TileDb {
|
||||||
|
|
||||||
impl Default for TileDb {
|
impl Default for TileDb {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
loop {}
|
||||||
unknown_bg: Bg::unknown_def(),
|
|
||||||
unknown_mid: Mid::unknown_def(),
|
|
||||||
unknown_fg: Fg::unknown_def(),
|
|
||||||
bg: vec![],
|
|
||||||
mid: vec![],
|
|
||||||
fg: vec![],
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -230,9 +171,7 @@ impl Index<BgTileId> for TileDb {
|
||||||
type Output = TileDef<Bg>;
|
type Output = TileDef<Bg>;
|
||||||
|
|
||||||
fn index(&self, index: BgTileId) -> &Self::Output {
|
fn index(&self, index: BgTileId) -> &Self::Output {
|
||||||
self.bg
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_bg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -240,9 +179,7 @@ impl Index<MidTileId> for TileDb {
|
||||||
type Output = TileDef<Mid>;
|
type Output = TileDef<Mid>;
|
||||||
|
|
||||||
fn index(&self, index: MidTileId) -> &Self::Output {
|
fn index(&self, index: MidTileId) -> &Self::Output {
|
||||||
self.mid
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_mid)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -250,9 +187,7 @@ impl Index<FgTileId> for TileDb {
|
||||||
type Output = TileDef<Fg>;
|
type Output = TileDef<Fg>;
|
||||||
|
|
||||||
fn index(&self, index: FgTileId) -> &Self::Output {
|
fn index(&self, index: FgTileId) -> &Self::Output {
|
||||||
self.fg
|
loop {}
|
||||||
.get(index.0 as usize - 1)
|
|
||||||
.unwrap_or(&self.unknown_fg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -260,37 +195,14 @@ const PATH: &str = "tiles.dat";
|
||||||
|
|
||||||
impl TileDb {
|
impl TileDb {
|
||||||
pub fn load_or_default() -> Self {
|
pub fn load_or_default() -> Self {
|
||||||
match std::fs::read(PATH) {
|
loop {}
|
||||||
Ok(data) => match rmp_serde::from_slice(&data) {
|
|
||||||
Ok(db) => db,
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to load tile database: {e}\nCreating default.");
|
|
||||||
Default::default()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to load tile database: {e}\nCreating default.");
|
|
||||||
Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
pub fn try_save(&self) {
|
pub fn try_save(&self) {
|
||||||
match rmp_serde::to_vec(self) {
|
loop {}
|
||||||
Ok(vec) => match std::fs::write(PATH, vec) {
|
|
||||||
Ok(()) => {}
|
|
||||||
Err(e) => log::warn!("Failed to save tile db: {e}"),
|
|
||||||
},
|
|
||||||
Err(e) => log::warn!("Failed to save tile db: {e}"),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn update_rects(&mut self, rects: &RectMap) {
|
pub(crate) fn update_rects(&mut self, rects: &RectMap) {
|
||||||
update_rect_def(&mut self.unknown_bg, rects);
|
loop {}
|
||||||
update_rect_def(&mut self.unknown_mid, rects);
|
|
||||||
update_rect_def(&mut self.unknown_fg, rects);
|
|
||||||
update_rect_db(&mut self.bg, rects);
|
|
||||||
update_rect_db(&mut self.mid, rects);
|
|
||||||
update_rect_db(&mut self.fg, rects);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,9 +210,7 @@ fn update_rect_db<Layer: TileLayer>(db: &mut Vec<TileDef<Layer>>, rects: &RectMa
|
||||||
where
|
where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
for def in db {
|
loop {}
|
||||||
update_rect_def(def, rects);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn update_rect_def<Layer: TileLayer>(
|
fn update_rect_def<Layer: TileLayer>(
|
||||||
|
|
@ -309,14 +219,5 @@ fn update_rect_def<Layer: TileLayer>(
|
||||||
) where
|
) where
|
||||||
Layer::SpecificDef: Debug + Inspect,
|
Layer::SpecificDef: Debug + Inspect,
|
||||||
{
|
{
|
||||||
if !def.graphic_name.is_empty() {
|
loop {}
|
||||||
if let Some(rect) = rects.get(def.graphic_name.as_str()) {
|
|
||||||
def.tex_rect = *rect;
|
|
||||||
log::info!("Updated rect for {}: {:?}", def.graphic_name.as_str(), rect);
|
|
||||||
} else {
|
|
||||||
log::error!("Missing texture for {:?}", def.graphic_name.as_str());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log::warn!("Empty graphic name!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue