Set up screen via transitions from state to state
This commit is contained in:
parent
9c56e988b2
commit
7a7548c78f
File diff suppressed because it is too large
Load Diff
|
|
@ -6,10 +6,10 @@ edition = "2021"
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
cairo-rs = "0.20.1"
|
||||
cairo-rs = "0.18"
|
||||
cyberpunk = { path = "../cyberpunk" }
|
||||
gio = "0.20.4"
|
||||
glib = "0.20.4"
|
||||
gio = "0.18"
|
||||
glib = "0.18"
|
||||
gtk = { version = "0.7", package = "gtk4" }
|
||||
serde = { version = "1.0.210", features = ["derive"] }
|
||||
serde_yml = "0.0.12"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,11 @@
|
|||
- text: The distinguishing thing about magic is that it includes some kind of personal element. The person who is performing the magic is relevant to the magic. -- Ted Chang, Marie Brennan
|
||||
position: top
|
||||
transition_in: !Fade
|
||||
duration:
|
||||
secs: 5
|
||||
nanos: 0
|
||||
transition: !Fade
|
||||
- text: Any sufficiently advanced technology is indistinguishable from magic. -- Arthur C. Clark.
|
||||
position: middle
|
||||
transition_in: !Fade
|
||||
duration:
|
||||
secs: 5
|
||||
nanos: 0
|
||||
transition: !Fade
|
||||
|
||||
- text: Electricity is the closest we get to Magic in this world.
|
||||
position: middle
|
||||
transition_in: !Fade
|
||||
duration:
|
||||
secs: 5
|
||||
nanos: 0
|
||||
transition: !Fade
|
||||
|
||||
|
|
|
|||
|
|
@ -1,42 +1,47 @@
|
|||
use std::{fs::File, io::Read, path::Path, rc::Rc, time::Duration};
|
||||
use std::{cell::RefCell, fs::File, io::Read, ops::Index, path::Path, rc::Rc, time::Duration};
|
||||
|
||||
use cyberpunk::{AsymLine, AsymLineCutout, GlowPen, Pen, Text};
|
||||
use glib::Object;
|
||||
use gtk::{glib, prelude::*, subclass::prelude::*};
|
||||
use glib::{GString, Object};
|
||||
use gtk::{
|
||||
glib::{self, Propagation},
|
||||
prelude::*,
|
||||
subclass::prelude::*,
|
||||
EventControllerKey,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
const PURPLE: (f64, f64, f64) = (0.7, 0., 1.);
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
enum TextArea {
|
||||
enum Position {
|
||||
Top,
|
||||
Middle,
|
||||
Bottom,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct Fade {
|
||||
duration: Duration,
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
enum TransitionName {
|
||||
Fade,
|
||||
CrossFade,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
enum AnimationIn {
|
||||
struct Fade(Step);
|
||||
|
||||
enum Transition {
|
||||
Fade(Fade),
|
||||
CrossFade(Step, Step),
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
enum AnimationOut {
|
||||
Fade(Fade),
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct ScriptElement {
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
struct Step {
|
||||
text: String,
|
||||
position: TextArea,
|
||||
transition_in: AnimationIn,
|
||||
position: Position,
|
||||
transition: TransitionName,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct Script(Vec<ScriptElement>);
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
struct Script(Vec<Step>);
|
||||
|
||||
impl Script {
|
||||
fn from_file(path: &Path) -> Result<Script, serde_yml::Error> {
|
||||
|
|
@ -47,13 +52,106 @@ impl Script {
|
|||
Ok(Self(script))
|
||||
}
|
||||
|
||||
fn iter<'a>(&'a self) -> impl Iterator<Item = &'a ScriptElement> {
|
||||
fn iter<'a>(&'a self) -> impl Iterator<Item = &'a Step> {
|
||||
self.0.iter()
|
||||
}
|
||||
|
||||
fn len(&self) -> usize {
|
||||
self.0.len()
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Script {
|
||||
fn default() -> Self {
|
||||
Self(vec![])
|
||||
}
|
||||
}
|
||||
|
||||
impl Index<usize> for Script {
|
||||
type Output = Step;
|
||||
|
||||
fn index(&self, index: usize) -> &Self::Output {
|
||||
&self.0[index]
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct CyberScreenState {
|
||||
script: Script,
|
||||
idx: Option<usize>,
|
||||
top: Option<Step>,
|
||||
middle: Option<Step>,
|
||||
bottom: Option<Step>,
|
||||
}
|
||||
|
||||
impl Default for CyberScreenState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
script: Script(vec![]),
|
||||
idx: None,
|
||||
top: None,
|
||||
middle: None,
|
||||
bottom: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CyberScreenState {
|
||||
fn new(script: Script) -> CyberScreenState {
|
||||
let mut s = CyberScreenState::default();
|
||||
s.script = script;
|
||||
s
|
||||
}
|
||||
|
||||
fn next_page(&mut self) -> Transition {
|
||||
let idx = match self.idx {
|
||||
None => 0,
|
||||
Some(idx) => if idx < self.script.len() {
|
||||
idx + 1
|
||||
} else {
|
||||
idx
|
||||
}
|
||||
};
|
||||
self.idx = Some(idx);
|
||||
let step = self.script[idx].clone();
|
||||
|
||||
match step.position {
|
||||
Position::Top => {
|
||||
let transition = if let Some(old_step) = self.top.take() {
|
||||
Transition::CrossFade(old_step, step.clone())
|
||||
} else {
|
||||
Transition::Fade(Fade(step.clone()))
|
||||
};
|
||||
self.top = Some(step);
|
||||
transition
|
||||
}
|
||||
Position::Middle => {
|
||||
let transition = if let Some(old_step) = self.middle.take() {
|
||||
Transition::CrossFade(old_step, step.clone())
|
||||
} else {
|
||||
Transition::Fade(Fade(step.clone()))
|
||||
};
|
||||
self.middle = Some(step);
|
||||
transition
|
||||
}
|
||||
Position::Bottom => {
|
||||
let transition = if let Some(old_step) = self.bottom.take() {
|
||||
Transition::CrossFade(old_step, step.clone())
|
||||
} else {
|
||||
Transition::Fade(Fade(step.clone()))
|
||||
};
|
||||
self.bottom = Some(step);
|
||||
transition
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct CyberScreenPrivate {}
|
||||
pub struct CyberScreenPrivate {
|
||||
state: Rc<RefCell<CyberScreenState>>,
|
||||
transition_queue: Rc<RefCell<Vec<Transition>>>,
|
||||
}
|
||||
|
||||
#[glib::object_subclass]
|
||||
impl ObjectSubclass for CyberScreenPrivate {
|
||||
|
|
@ -66,74 +164,89 @@ impl ObjectImpl for CyberScreenPrivate {}
|
|||
impl WidgetImpl for CyberScreenPrivate {}
|
||||
impl DrawingAreaImpl for CyberScreenPrivate {}
|
||||
|
||||
impl CyberScreenPrivate {
|
||||
fn set_script(&self, script: Script) {
|
||||
*self.state.borrow_mut() = CyberScreenState::new(script);
|
||||
}
|
||||
|
||||
fn next_page(&self) {
|
||||
let transition = self.state.borrow_mut().next_page();
|
||||
self.transition_queue.borrow_mut().push(transition);
|
||||
}
|
||||
}
|
||||
|
||||
glib::wrapper! {
|
||||
pub struct CyberScreen(ObjectSubclass<CyberScreenPrivate>) @extends gtk::DrawingArea, gtk::Widget;
|
||||
}
|
||||
|
||||
impl CyberScreen {
|
||||
pub fn new() -> Self {
|
||||
pub fn new(script: Script) -> Self {
|
||||
let s: Self = Object::builder().build();
|
||||
s.imp().set_script(script);
|
||||
|
||||
s.set_draw_func({
|
||||
let s = s.clone();
|
||||
move |_, context, width, height| {
|
||||
let _ = context.set_source_rgb(0., 0., 0.);
|
||||
let _ = context.paint();
|
||||
|
||||
let pen = GlowPen::new(width, height, 2., 8., (0.7, 0., 1.));
|
||||
|
||||
AsymLine {
|
||||
orientation: gtk::Orientation::Horizontal,
|
||||
start_x: 50.,
|
||||
start_y: height as f64 / 2.,
|
||||
start_length: 75.,
|
||||
height: 50.,
|
||||
end_length: 75.,
|
||||
invert: false,
|
||||
/*
|
||||
for i in 0..6 {
|
||||
pen.move_to(0., height as f64 * i as f64 / 5.);
|
||||
pen.line_to(width as f64, height as f64 * i as f64 / 5.);
|
||||
}
|
||||
.draw(&pen);
|
||||
pen.stroke();
|
||||
*/
|
||||
|
||||
|
||||
AsymLineCutout {
|
||||
orientation: gtk::Orientation::Horizontal,
|
||||
start_x: 50.,
|
||||
start_y: height as f64 / 4. * 3.,
|
||||
start_length: 75.,
|
||||
cutout_length: 15.,
|
||||
end_length: 75.,
|
||||
height: 15.,
|
||||
invert: true,
|
||||
}.draw(&pen);
|
||||
pen.stroke();
|
||||
|
||||
let tracery = pen.finish();
|
||||
let _ = context.set_source(tracery);
|
||||
let _ = context.paint();
|
||||
|
||||
let text = Text::new("Test text".to_owned(), &context, 64.);
|
||||
let text_extents = text.extents();
|
||||
context.move_to(20., text_extents.height() + 40.);
|
||||
context.set_source_rgb(0.7, 0., 1.);
|
||||
text.draw();
|
||||
for transition in s.imp().transition_queue.borrow().iter() {
|
||||
if let Some(ref text) = s.imp().state.borrow().top {
|
||||
let text_display = Text::new(text.text.clone(), context, 32.);
|
||||
let y = height as f64 * 1. / 5. + text_display.extents().height();
|
||||
|
||||
context.move_to(20., y);
|
||||
let _ = context.set_source_rgb(PURPLE.0, PURPLE.1, PURPLE.2);
|
||||
text_display.draw();
|
||||
}
|
||||
|
||||
if let Some(ref text) = s.imp().state.borrow().middle {
|
||||
let text_display = Text::new(text.text.clone(), context, 32.);
|
||||
let y = height as f64 * 2. / 5. + text_display.extents().height();
|
||||
|
||||
context.move_to(20., y);
|
||||
let _ = context.set_source_rgb(PURPLE.0, PURPLE.1, PURPLE.2);
|
||||
text_display.draw();
|
||||
}
|
||||
|
||||
if let Some(ref text) = s.imp().state.borrow().bottom {
|
||||
let text_display = Text::new(text.text.clone(), context, 32.);
|
||||
let y = height as f64 * 3. / 5. + text_display.extents().height();
|
||||
|
||||
context.move_to(20., y);
|
||||
let _ = context.set_source_rgb(PURPLE.0, PURPLE.1, PURPLE.2);
|
||||
text_display.draw();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
s
|
||||
}
|
||||
|
||||
fn next_page(&self) {
|
||||
println!("next page");
|
||||
self.imp().next_page();
|
||||
self.queue_draw();
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
/*
|
||||
let script: Script = Script(vec![ScriptElement {
|
||||
text: "abcdefg".to_owned(),
|
||||
position: TextArea::Top,
|
||||
transition_in: AnimationIn::Fade(Fade {
|
||||
duration: Duration::from_secs(10),
|
||||
}),
|
||||
}]);
|
||||
|
||||
println!("{}", serde_yml::to_string(&script).unwrap());
|
||||
*/
|
||||
|
||||
let script = Script::from_file(Path::new("./script.yml")).unwrap();
|
||||
for element in script.iter() {
|
||||
println!("{:?}", element);
|
||||
|
|
@ -143,11 +256,22 @@ fn main() {
|
|||
.application_id("com.luminescent-dreams.cyberpunk-slideshow")
|
||||
.build();
|
||||
|
||||
app.connect_activate(|app| {
|
||||
let window = gtk::ApplicationWindow::new(app);
|
||||
window.present();
|
||||
app.connect_activate(move |app| {
|
||||
let screen = CyberScreen::new(script.clone());
|
||||
|
||||
let screen = CyberScreen::new();
|
||||
let events = EventControllerKey::new();
|
||||
|
||||
events.connect_key_released({
|
||||
let screen = screen.clone();
|
||||
move |_, key, _, _| {
|
||||
if key.name() == Some(GString::from("Right")) {
|
||||
screen.next_page();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
let window = gtk::ApplicationWindow::new(app);
|
||||
window.add_controller(events);
|
||||
|
||||
window.set_child(Some(&screen));
|
||||
window.set_width_request(800);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,7 @@
|
|||
use cairo::{
|
||||
Context, FontSlant, FontWeight, Format, ImageSurface, LineCap, LinearGradient, Pattern,
|
||||
Context, FontSlant, FontWeight, Format, ImageSurface, LineCap, Pattern,
|
||||
TextExtents,
|
||||
};
|
||||
use gtk::{prelude::*, subclass::prelude::*, EventControllerKey};
|
||||
use std::{
|
||||
cell::RefCell,
|
||||
rc::Rc,
|
||||
sync::{Arc, RwLock},
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
pub struct AsymLineCutout {
|
||||
pub orientation: gtk::Orientation,
|
||||
|
|
|
|||
Loading…
Reference in New Issue