mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2025-02-09 18:17:07 -05:00
7e3aff557b
* improve AssetManager implementation Notable changes are: * removed the individual managers inside of d2asset, only one asset manager * AssetManager now has caches for the types of files it loads * created a type for TextDictionary (the txt file structs) * fixed a file path bug in d2loader Source * fixed a asset stream bug in d2loader Asset * d2loader.Loader now needs a d2config.Config on creation (for resolving locale files) * updated the mpq file in d2asset test data, added test case for "sub-directory" * added a Data method to d2asset.Asset. The data is cached on first full read. * renamed ArchiveDataStream to DataStream in d2interface * moved palette utility func out of d2asset and into d2util * bugfix for MacOS mpq loader issue * lint fixes, added data caching to filesystem asset * adding comment for mpq asset close * Decouple d2asset from d2render Notable changes in d2common: * d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct * un-exported dcc.decodeDirection, it is only used in d2dcc * removed font interface from d2interface, we only have one font implementation * added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need * added `BindRenderer` method to animation interface Notable changes in d2common/d2asset: * **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render * exported Animation * Animation implementation binds to the renderer to create surfaces only on the first time it is rendered * font, dcc, dc6 initialization logic moved out of asset_manager.go * for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods * the d2asset.Font struct now stores font table data for initialization purposes Notable changes in d2core/d2render: * Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time **These last changes should have been a separate PR, sorry.** Notable changes in d2core/d2ui: * ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments Notable Changes in d2game: Because of the change in d2ui, all instances of this code pattern... ```golang animation, err := screen.asset.LoadAnimation(imgPath, palettePath) sprite, err := screen.ui.NewSprite(animation) ``` ... becomes this ... ```golang sprite, err := screen.ui.NewSprite(imgPath, palettePath) ```
106 lines
2.3 KiB
Go
106 lines
2.3 KiB
Go
package d2player
|
|
|
|
import (
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2geom"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2resource"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2asset"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2ui"
|
|
)
|
|
|
|
type miniPanel struct {
|
|
asset *d2asset.AssetManager
|
|
container *d2ui.Sprite
|
|
button *d2ui.Sprite
|
|
isOpen bool
|
|
isSinglePlayer bool
|
|
rectangle d2geom.Rectangle
|
|
}
|
|
|
|
func newMiniPanel(asset *d2asset.AssetManager, uiManager *d2ui.UIManager, isSinglePlayer bool) *miniPanel {
|
|
miniPanelContainerPath := d2resource.Minipanel
|
|
if isSinglePlayer {
|
|
miniPanelContainerPath = d2resource.MinipanelSmall
|
|
}
|
|
|
|
containerSprite, _ := uiManager.NewSprite(miniPanelContainerPath, d2resource.PaletteSky)
|
|
|
|
buttonSprite, _ := uiManager.NewSprite(d2resource.MinipanelButton, d2resource.PaletteSky)
|
|
|
|
rectangle := d2geom.Rectangle{Left: 325, Top: 526, Width: 156, Height: 26}
|
|
|
|
if !isSinglePlayer {
|
|
rectangle.Width = 182
|
|
}
|
|
|
|
return &miniPanel{
|
|
asset: asset,
|
|
container: containerSprite,
|
|
button: buttonSprite,
|
|
isOpen: true,
|
|
isSinglePlayer: isSinglePlayer,
|
|
rectangle: rectangle,
|
|
}
|
|
}
|
|
|
|
func (m *miniPanel) IsOpen() bool {
|
|
return m.isOpen
|
|
}
|
|
|
|
func (m *miniPanel) Toggle() {
|
|
m.isOpen = !m.isOpen
|
|
}
|
|
|
|
func (m *miniPanel) Open() {
|
|
m.isOpen = true
|
|
}
|
|
|
|
func (m *miniPanel) Close() {
|
|
m.isOpen = false
|
|
}
|
|
|
|
func (m *miniPanel) Render(target d2interface.Surface) error {
|
|
if !m.isOpen {
|
|
return nil
|
|
}
|
|
|
|
if err := m.container.SetCurrentFrame(0); err != nil {
|
|
return err
|
|
}
|
|
|
|
width, height := target.GetSize()
|
|
|
|
m.container.SetPosition((width/2)-75, height-48)
|
|
|
|
if err := m.container.Render(target); err != nil {
|
|
return err
|
|
}
|
|
|
|
buttonWidth, _ := m.button.GetCurrentFrameSize()
|
|
buttonWidth++
|
|
|
|
for i, j := 0, 0; j < 16; i++ {
|
|
if m.isSinglePlayer && j == 6 { // skip Party Screen button if the game is single player
|
|
j += 2
|
|
}
|
|
|
|
if err := m.button.SetCurrentFrame(j); err != nil {
|
|
return err
|
|
}
|
|
|
|
m.button.SetPosition((width/2)-72+(buttonWidth*i), height-51)
|
|
|
|
if err := m.button.Render(target); err != nil {
|
|
return err
|
|
}
|
|
|
|
j += 2
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (m *miniPanel) isInRect(x, y int) bool {
|
|
return m.rectangle.IsInRect(x, y)
|
|
}
|