OMGeeky/logisim
1
0
Fork 0
mirror of https://github.com/OMGeeky/logisim.git synced 2025-12-26 16:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

split code into submodules

Browse Source
This commit is contained in:
OMGeeky
2025-04-18 16:47:15 +02:00
parent bfeba1bcd3
commit 60eb2011ff
2 changed files with 38 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/logic_sim/block_label.rs Normal file
View File

@@ -0,0 +1,34 @@
use super::*;
pub struct BlockLabelPlugin;
impl Plugin for BlockLabelPlugin {
fn build(&self, app: &mut App) {
app.add_systems(Update, scale_labels);
}
}
#[derive(Bundle, Debug)]
pub struct BlockLabelBundle {
text: Text2d,
font: TextFont,
text_layout: TextLayout,
text_bounds: TextBounds,
transform: Transform,
marker: CanvasText,
}
impl BlockLabelBundle {
pub fn new(name: impl Into<String>, size: IVec2, font: TextFont) -> Self {
Self {
text: Text2d(name.into()),
font,
text_layout: TextLayout::new(JustifyText::Justified, LineBreak::WordOrCharacter),
text_bounds: TextBounds::from(size.as_vec2() * (1.0 / LABEL_SCALING_FACTOR)),
transform: Transform::from_translation(Vec3::Z),
marker: CanvasText,
}
}
}
fn scale_labels(mut labels: Query<&mut Transform, With<CanvasText>>, canvas: Res<Canvas>) {
labels.par_iter_mut().for_each(|mut transform| {
transform.scale = Vec3::splat(canvas.zoom) * LABEL_SCALING_FACTOR;
});
}

99
src/logic_sim/mod.rs
View File

@@ -1,10 +1,12 @@
use crate::camera::Canvas;
use crate::logic_sim::block_label::{BlockLabelBundle, BlockLabelPlugin};
use bevy::color::palettes::basic::{GREEN, RED, WHITE};
use bevy::prelude::*;
use bevy::text::TextBounds;
use bevy_common_assets::json::JsonAssetPlugin;
use serde::Deserialize;
use std::ops::BitOr;
pub mod block_label;
const LABEL_SCALING_FACTOR: f32 = 0.2;
@@ -51,28 +53,6 @@ pub struct BlockBundle {
global_transform: GlobalTransform,
block_visuals: BlockVisuals,
}
#[derive(Bundle, Debug)]
pub struct BlockLabelBundle {
text: Text2d,
font: TextFont,
text_layout: TextLayout,
text_bounds: TextBounds,
transform: Transform,
marker: CanvasText,
}
impl BlockLabelBundle {
fn new(name: impl Into<String>, size: IVec2, font: TextFont) -> Self {
Self {
text: Text2d(name.into()),
font,
text_layout: TextLayout::new(JustifyText::Justified, LineBreak::WordOrCharacter),
text_bounds: TextBounds::from(size.as_vec2() * (1.0 / LABEL_SCALING_FACTOR)),
transform: Transform::from_translation(Vec3::Z),
marker: CanvasText,
}
}
}
#[derive(Component, Debug)]
pub struct CanvasText;
@@ -172,7 +152,7 @@ impl ConnectionValues {
| ConnectionValues::HalfByte(_, _, _, _)
| ConnectionValues::Byte(_)
| ConnectionValues::X16(_) => unreachable!(),
ConnectionValues::X32(b) => b as u32,
ConnectionValues::X32(b) => b,
ConnectionValues::X64(b) => b as u32,
ConnectionValues::X128(b) => b as u32,
ConnectionValues::X256(b, _) => b as u32,
@@ -370,6 +350,7 @@ impl Plugin for LogicSimPlugin {
//hi
// .insert_resource(get_sample_block())
.add_plugins(JsonAssetPlugin::<BlockDefinition>::new(&["blockdef.json"]))
.add_plugins(BlockLabelPlugin)
.add_systems(Startup, setup)
.init_asset::<BlockDefinition>()
.init_state::<AppState>()
@@ -382,82 +363,16 @@ impl Plugin for LogicSimPlugin {
(
(update_connection_positions, draw_connections).chain(),
render_blocks,
scale_labels,
draw_wires,
update_connection_states,
),
);
}
}
fn get_sample_block() -> BlockDefinition {
BlockDefinition {
id: 1,
pos: Vec2::new(0.0, 0.0),
size: IVec2::new(50, 80),
name: "AND".to_string(),
color: Color::from(RED),
inner_blocks: vec![],
wires: vec![WireDefinition {
connections: vec![
ConnectionDefinitionRef {
parent_block: 1,
id: 1,
},
ConnectionDefinitionRef {
parent_block: 1,
id: 2,
},
ConnectionDefinitionRef {
parent_block: 1,
id: 3,
},
ConnectionDefinitionRef {
parent_block: 1,
id: 4,
},
ConnectionDefinitionRef {
parent_block: 1,
id: 6,
},
],
}],
inputs: vec![
ConnectionDefinition {
id: 1,
value: ConnectionValues::HalfByte(false, true, false, true),
},
ConnectionDefinition {
id: 2,
value: ConnectionValues::HalfByte(true, false, false, true),
},
],
outputs: vec![
ConnectionDefinition {
id: 3,
value: ConnectionValues::HalfByte(false, false, true, false),
},
ConnectionDefinition {
id: 4,
value: ConnectionValues::HalfByte(false, false, true, false),
},
ConnectionDefinition {
id: 5,
value: ConnectionValues::Byte(0b0101_1010),
},
ConnectionDefinition {
id: 6,
value: ConnectionValues::HalfByte(false, true, false, false),
},
],
}
}
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
let block_def =
BlockDefinitionHandle(asset_server.load("logisim/blocks/sample1.blockdef.json"));
commands.insert_resource(block_def);
// let block = get_sample_block();
// spawn_block_definition(commands, asset_server, block);
}
fn spawn_block_definition_from_asset(
@@ -688,12 +603,6 @@ fn draw_wires(
}
}
fn scale_labels(mut labels: Query<&mut Transform, With<CanvasText>>, canvas: Res<Canvas>) {
labels.par_iter_mut().for_each(|mut transform| {
transform.scale = Vec3::splat(canvas.zoom) * LABEL_SCALING_FACTOR;
});
}
fn update_connection_states(
wires: Query<&Wire>,
mut connections: Query<(