luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implemented (limited) darkening of theme colors and fixed rendering of the 3D box

Browse source
This commit is contained in:
Vojtěch Fošnár 2023-01-09 22:50:17 +01:00
parent a972b5b0ee
commit 84e8c25e37
No known key found for this signature in database
GPG key ID: 657727E71C40859A
2 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
d2renderers/d2svg/d2svg.go
View file

@ -618,6 +618,7 @@ func render3dRect(targetShape d2target.Shape) string {
)
border := svg_style.NewThemableElement("path")
border.D = strings.Join(borderSegments, " ")
border.Fill = color.None
_, borderStroke := svg_style.ShapeTheme(targetShape)
border.Stroke = borderStroke
borderStyle := svg_style.ShapeStyle(targetShape)
@ -646,6 +647,7 @@ func render3dRect(targetShape d2target.Shape) string {
mainShape.Mask = fmt.Sprintf("url(#%s)", maskID)
mainShapeFill, _ := svg_style.ShapeTheme(targetShape)
mainShape.Fill = mainShapeFill
mainShape.Stroke = color.None
mainShape.Style = svg_style.ShapeStyle(targetShape)
mainShapeRendered := mainShape.Render()
@ -663,18 +665,17 @@ func render3dRect(targetShape d2target.Shape) string {
fmt.Sprintf("%d,%d", v.X+targetShape.Pos.X, v.Y+targetShape.Pos.Y),
)
}
// TODO make darker color part of the theme?
darkerColor := targetShape.Fill
// darkerColor, err := color.Darken(targetShape.Fill)
// if err != nil {
// darkerColor = targetShape.Fill
// }
// TODO make darker color part of the theme? or just keep this bypass
darkerColor, err := color.Darken(targetShape.Fill)
if err != nil {
darkerColor = targetShape.Fill
}
sideShape := svg_style.NewThemableElement("polygon")
sideShape.Fill = darkerColor
sideShape.Points = strings.Join(sidePoints, " ")
sideShape.Mask = fmt.Sprintf("url(#%s)", maskID)
sideShape.Style = svg_style.ShapeStyle(targetShape)
renderedSides := mainShape.Render()
renderedSides := sideShape.Render()
return borderMask + mainShapeRendered + renderedSides + renderedBorder
}

25
lib/color/color.go
View file

@ -1,11 +1,36 @@
package color
import (
"regexp"
"github.com/lucasb-eyer/go-colorful"
"github.com/mazznoer/csscolorparser"
)
var themeRegex = regexp.MustCompile("^B[1-6]$")
func Darken(colorString string) (string, error) {
if themeRegex.MatchString(colorString) {
switch colorString[1] {
case '1':
return B1, nil
case '2':
return B1, nil
case '3':
return B2, nil
case '4':
return B3, nil
case '5':
return B4, nil
case '6':
return B5, nil
}
}
return DarkenCSS(colorString)
}
func DarkenCSS(colorString string) (string, error) {
c, err := csscolorparser.Parse(colorString)
if err != nil {
return "", err