Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 514 rgb() support #254

Merged
merged 22 commits into from
Mar 19, 2021
Merged

Add 514 rgb() support #254

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6bef088
we can now have 5 args with rgb(r,g,b,a,space)
ZeWaka Mar 12, 2021
a6fb458
every day we stray further from the light
ZeWaka Mar 15, 2021
9ef144e
note on the proper format
ZeWaka Mar 15, 2021
0d70dc6
rgb() kwarg validation
ZeWaka Mar 15, 2021
6b7bd06
move position of y arg to clarify it is lumin.
ZeWaka Mar 15, 2021
207ecb1
unnecessary cloning
ZeWaka Mar 15, 2021
c4ead63
use Range instead of dumb custom tuple impl
ZeWaka Mar 15, 2021
ee83390
now checks if the rgb() value is within the range
ZeWaka Mar 15, 2021
4c2008c
some fmt-ing
ZeWaka Mar 15, 2021
d0dbdd2
color conversion, space detection, lots of shit
ZeWaka Mar 16, 2021
0accb0d
Should be all finished, tests all done
ZeWaka Mar 16, 2021
3994041
working alpha for kwarg
ZeWaka Mar 16, 2021
18d13a7
...and now positional alpha support
ZeWaka Mar 16, 2021
f19e6d7
Update src/dreammaker/tests/constants_tests.rs
ZeWaka Mar 16, 2021
e7b793e
Update src/dreammaker/constants.rs
ZeWaka Mar 16, 2021
70cc95e
Move rgb() body to its own function
SpaceManiac Mar 19, 2021
081453a
Replace write! with format!
SpaceManiac Mar 19, 2021
827fdf7
Use an enum for the color space
SpaceManiac Mar 19, 2021
5f1c9bb
Use enumerate() for arg_pos
SpaceManiac Mar 19, 2021
f185feb
Use .get() rather than .len() and [3]
SpaceManiac Mar 19, 2021
cdf0a06
Destructure in for loop and skip unnecessary clone
SpaceManiac Mar 19, 2021
b6af6a1
Rearrange initialization
SpaceManiac Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/dreammaker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ serde_derive = "1.0.103"
toml = "0.5.5"
guard = "0.5.0"
phf = { version = "0.8.0", features = ["macros"] }
color_space = "0.5.3"

[dependencies.linked-hash-map]
git = "https://github.com/SpaceManiac/linked-hash-map"
Expand Down
2 changes: 1 addition & 1 deletion src/dreammaker/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ pub fn register_builtins(tree: &mut ObjectTree) {
proc/REGEX_QUOTE_REPLACEMENT(text);
proc/replacetext(Haystack,Needle,Replacement,Start=1,End=0);
proc/replacetextEx(Haystack,Needle,Replacement,Start=1,End=0);
proc/rgb(R,G,B,A=null,space); // special form? - [r,g,b|x,y,z],(a),(space)
proc/rgb(R,G,B,A=null,space,red,blue,green,alpha,h,hue,s,saturation,c,chroma,v,value,l,y,luminance); // [r,g,b|h,s,[v|l|y]],(a),(space)
proc/rgb2num(color, space);
proc/roll(ndice=1,sides); // +1 form
proc/round(A,B=null);
Expand Down
200 changes: 190 additions & 10 deletions src/dreammaker/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ use std::path::Path;

use linked_hash_map::LinkedHashMap;
use ordered_float::OrderedFloat;
use color_space::{Hsl, Hsv, Lch, Rgb};

use super::{DMError, Location, HasLocation, Context};
use super::objtree::*;
use super::ast::*;
use super::objtree::*;
use super::preprocessor::DefineMap;
use super::{Context, DMError, HasLocation, Location, Severity};

/// An absolute typepath and optional variables.
///
Expand Down Expand Up @@ -478,7 +479,7 @@ fn constant_ident_lookup(
.cloned()
{
Some(decl) => decl,
None => return Ok(ConstLookup::Continue(None)), // definitely doesn't exist
None => return Ok(ConstLookup::Continue(None)), // definitely doesn't exist
};

let type_ = &mut tree[ty];
Expand Down Expand Up @@ -744,19 +745,198 @@ impl<'a> ConstantFolder<'a> {
"arccos" => self.trig_op(args, f32::acos)?,
"rgb" => {
use std::fmt::Write;
if args.len() != 3 && args.len() != 4 {
return Err(self.error(format!("malformed rgb() call, must have 3 or 4 arguments and instead has {}", args.len())));
if args.len() != 3 && args.len() != 4 && args.len() != 5 {
ZeWaka marked this conversation as resolved.
Show resolved Hide resolved
return Err(self.error(format!("malformed rgb() call, must have 3, 4, or 5 arguments and instead has {}", args.len())));
}
let mut result = String::with_capacity(7);
result.push('#');
for each in args {
if let Some(i) = self.expr(each, None)?.to_int() {
let clamped = std::cmp::max(::std::cmp::min(i, 255), 0);
let _ = write!(result, "{:02x}", clamped);

let mut space = -1; // -1 to indicate not set
let arguments = self.arguments(args)?;

#[derive(Default)]
struct ColorArgs {
r: bool,
g: bool,
b: bool,
h: bool,
s: bool,
v: bool,
l: bool,
c: bool,
y: bool,
a: Option<i32>,
}

let mut color_args = ColorArgs {..Default::default()};

for each in &arguments {
let value = &each.0;
let potential_kwarg_value = &each.1;

// Check for kwargs if we're in the right form
if let Some(kwarg_value) = potential_kwarg_value {
if let Some(kwarg) = value.as_str() {
match kwarg {
"r" | "red" => color_args.r = true,
"g" | "green" => color_args.g = true,
"b" | "blue" => color_args.b = true,
"h" | "hue" => color_args.h = true,
"s" | "saturation" => color_args.s = true,
"v" | "value" => color_args.v = true,
"l" | "luminance" => color_args.l = true,
"c" | "chroma" => color_args.c = true,
"y" => color_args.y = true,
"a" | "alpha" => color_args.a = kwarg_value.to_int(),
"space" => match kwarg_value.to_int() { // Do we have an actual colorspace specified? Set the values.
Some(0) => space = 0,
Some(1) => space = 1,
Some(2) => space = 2,
Some(3) => space = 3,
_ => {
return Err(self.error(format!("malformed rgb() call, bad color space: {}", kwarg_value)))
}
}
_ => {
return Err(self.error(format!("malformed rgb() call, bad kwarg passed: {}", kwarg)))
}
}
} else {
return Err(self.error(format!("malformed rgb() call, kwarg is not string: {}", value)));
}
}
}

// Only set space if it wasn't set manually by the space arg
if space == -1 {
space = 0; // Default
if color_args.r || color_args.g || color_args.b {
// TODO: Add hint here for useless r/g/b kwarg
}
if color_args.h {
if color_args.c && color_args.y {
space = 3;
}
else if color_args.s {
if color_args.v {
space = 1;
}
else if color_args.l {
space = 2;
}
else {
return Err(self.error("malformed rgb() call, could not determine space: only h & s specified"));
}
}
else {
return Err(self.error("malformed rgb() call, could not determine space: only h specified"));
}
}
}

let mut value_vec: Vec<f64> = vec![];

let mut arg_pos = 0;

for each in &*arguments {
let value = &each.0;
let potential_kwarg_value = &each.1;
let mut to_check = &value.clone();

// Determines the range based on predetermined colorspace
let mut range = match arg_pos {
0 => match space {
0 => 0..=255, //r
1 => 0..=360, //h
2 => 0..=360, //h
3 => 0..=360, //h
_ => return Err(self.error("malformed rgb() call, illegal color space")),
},
1 => match space {
0 => 0..=255, //g
1 => 0..=100, //s
2 => 0..=100, //s
3 => 0..=100, //c
_ => return Err(self.error("malformed rgb() call, illegal color space")),
},
2 => match space {
0 => 0..=255, //b
1 => 0..=100, //v
2 => 0..=100, //l
3 => 0..=100, //y
_ => return Err(self.error("malformed rgb() call, illegal color space")),
},
_ => 0..=255,
};

// If we have a secondary value, it's a kwarg, we need to get the actual value. If this fails, it's normal.
if let Some(kwarg_value) = potential_kwarg_value {
if let Some(kwarg) = value.as_str() {
to_check = kwarg_value; // Set the value to actually check to be our associated vaue

range = match kwarg {
"r" | "red" | "g" | "green" | "b" | "blue" => 0..=255,
"h" | "hue" => 0..=360,
"s" | "saturation" => 0..=100,
"v" | "value" => 0..=100,
"c" | "chroma" => 0..=100,
"l" | "y" | "luminance" => 0..=100,
"a" | "alpha" => 0..=255,
"space" => continue, // Don't range-check the value of the space
_ => {
return Err(self.error(format!("malformed rgb() call, bad kwarg passed: {}", kwarg)))
}
};
} else {
return Err(self.error(format!("malformed rgb() call, kwarg is not string: {}", value)));
}
}

if let Some(i) = to_check.to_int() {
if !range.contains(&i) {
return Err(self.error(format!("malformed rgb() call, {} is not within the valid range ({}..{})", i, range.start(), range.end()))
.set_severity(Severity::Warning)
.with_location(self.location)
);
}
let clamped= std::cmp::max(::std::cmp::min(i, *range.end()), *range.start());
ZeWaka marked this conversation as resolved.
Show resolved Hide resolved
value_vec.push(clamped.into());
} else {
return Err(self.error("malformed rgb() call, argument wasn't an int"));
return Err(self.error("malformed rgb() call, value wasn't an int"));
}

arg_pos += 1;
}

assert!(value_vec.len() >= 3); // Make sure we got 3+ values

// Convert our color given a space to a rgb hexcode
let color: Rgb = match space {
0 => Rgb::new(value_vec[0], value_vec[1], value_vec[2]),
1 => Hsv::new(value_vec[0], value_vec[1] * 0.01, value_vec[2] * 0.01).into(),
2 => Hsl::new(value_vec[0], value_vec[1] * 0.01, value_vec[2] * 0.01).into(),
3 => Lch::new(value_vec[2], value_vec[1], value_vec[0]).into(),
_ => {
return Err(self.error(format!("malformed rgb() call, bad color space: {}", space)))
}
};

let alpha;

// Extract the raw 4th alpha positional argument if it wasn't a kwarg
if color_args.a.is_none() && value_vec.len() > 3 {
alpha = Some(value_vec[3] as i32);
} else { // Handle the kwarg if it was there
alpha = color_args.a;
}

// APPARENTLY the author thinks fractional rgb is a thing, hence the rounding
if alpha.is_some() {
let _ = write!(result, "{:02x}{:02x}{:02x}{:02x}", color.r.round() as u8, color.g.round() as u8, color.b.round() as u8, alpha.unwrap());
} else {
let _ = write!(result, "{:02x}{:02x}{:02x}", color.r.round() as u8, color.g.round() as u8, color.b.round() as u8);
}

Constant::String(result)
},
"defined" if self.defines.is_some() => {
Expand Down
Loading