gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-20 07:27:19 -05:00
Code Issues Releases Wiki Activity

fixed lint errors in d2render (#695)

Browse Source
This commit is contained in:
lord 2020-08-05 19:04:36 -07:00 committed by GitHub
parent 8b2b991b12
commit 4507b1e1c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
d2core/d2render/ebiten/ebiten_renderer.go
View File

@ -12,8 +12,14 @@ import (
)
const (
screenWidth = 800
screenHeight = 600
screenWidth = 800
screenHeight = 600
defaultSaturation = 1.0
defaultBrightness = 1.0
defaultSkewX = 0.0
defaultSkewY = 0.0
defaultScaleX = 1.0
defaultScaleY = 1.0
)
// Renderer is an implementation of a renderer
@ -87,12 +93,12 @@ func (r *Renderer) CreateSurface(surface d2interface.Surface) (d2interface.Surfa
surfaceState{
filter: ebiten.FilterNearest,
effect: d2enum.DrawEffectNone,
saturation: 1.0,
brightness: 1.0,
skewX: 0.0,
skewY: 0.0,
scaleX: 0.0,
scaleY: 0.0,
saturation: defaultSaturation,
brightness: defaultBrightness,
skewX: defaultSkewX,
skewY: defaultSkewY,
scaleX: defaultScaleX,
scaleY: defaultScaleY,
},
)

21
d2core/d2render/ebiten/ebiten_surface.go
View File

@ -17,6 +17,9 @@ import (
const (
maxAlpha = 0xff
cacheLimit = 512
Transparency25 = 0.25
Transparency50 = 0.50
Transparency75 = 0.75
)
type colorMCacheKey uint32
@ -37,12 +40,12 @@ type ebitenSurface struct {
func createEbitenSurface(img *ebiten.Image, currentState ...surfaceState) *ebitenSurface {
state := surfaceState{
effect: d2enum.DrawEffectNone,
saturation: 1.0,
brightness: 1.0,
skewX: 0.0,
skewY: 0.0,
scaleX: 1.0,
scaleY: 1.0,
saturation: defaultSaturation,
brightness: defaultBrightness,
skewX: defaultSkewX,
skewY: defaultSkewY,
scaleX: defaultScaleX,
scaleY: defaultScaleY,
}
if len(currentState) > 0 {
state = currentState[0]
@ -151,11 +154,11 @@ func (s *ebitenSurface) Render(sfc d2interface.Surface) error {
// Are these correct? who even knows
switch s.stateCurrent.effect {
case d2enum.DrawEffectPctTransparency25:
opts.ColorM.Translate(0, 0, 0, -0.25)
opts.ColorM.Translate(0, 0, 0, -Transparency25)
case d2enum.DrawEffectPctTransparency50:
opts.ColorM.Translate(0, 0, 0, -0.50)
opts.ColorM.Translate(0, 0, 0, -Transparency50)
case d2enum.DrawEffectPctTransparency75:
opts.ColorM.Translate(0, 0, 0, -0.75)
opts.ColorM.Translate(0, 0, 0, -Transparency75)
case d2enum.DrawEffectModulate:
opts.CompositeMode = ebiten.CompositeModeLighter
// TODO: idk what to do when ebiten doesn't exactly match, pick closest?