gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-06-20 22:25:24 +00:00
Code Issues Releases Wiki Activity

dt1 encoder: moved record encoders and decoders to appropriate files

Browse Source
This commit is contained in:
M. Sz 2021-02-05 14:07:51 +01:00
parent 9f56574066
commit 3dafb3ebcd
3 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
d2common/d2fileformats/d2ds1/ds1.go
View File

@ -452,12 +452,7 @@ func (ds1 *DS1) loadLayerStreams(br *d2datautils.StreamReader) error {
switch layerStreamType {
case d2enum.LayerStreamWall1, d2enum.LayerStreamWall2, d2enum.LayerStreamWall3, d2enum.LayerStreamWall4:
wallIndex := int(layerStreamType) - int(d2enum.LayerStreamWall1)
ds1.Tiles[y][x].Walls[wallIndex].Prop1 = byte(dw & 0x000000FF) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].Sequence = byte((dw & 0x00003F00) >> 8) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].Unknown1 = byte((dw & 0x000FC000) >> 14) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].Style = byte((dw & 0x03F00000) >> 20) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].Unknown2 = byte((dw & 0x7C000000) >> 26) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].hidden = byte((dw & 0x80000000) >> 31) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Walls[wallIndex].Decode(dw) //nolint:gomnd // Bitmask
case d2enum.LayerStreamOrientation1, d2enum.LayerStreamOrientation2,
d2enum.LayerStreamOrientation3, d2enum.LayerStreamOrientation4:
wallIndex := int(layerStreamType) - int(d2enum.LayerStreamOrientation1)
@ -473,19 +468,9 @@ func (ds1 *DS1) loadLayerStreams(br *d2datautils.StreamReader) error {
ds1.Tiles[y][x].Walls[wallIndex].Zero = byte((dw & 0xFFFFFF00) >> 8) //nolint:gomnd // Bitmask
case d2enum.LayerStreamFloor1, d2enum.LayerStreamFloor2:
floorIndex := int(layerStreamType) - int(d2enum.LayerStreamFloor1)
ds1.Tiles[y][x].Floors[floorIndex].Prop1 = byte(dw & 0x000000FF) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].Sequence = byte((dw & 0x00003F00) >> 8) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].Unknown1 = byte((dw & 0x000FC000) >> 14) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].Style = byte((dw & 0x03F00000) >> 20) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].Unknown2 = byte((dw & 0x7C000000) >> 26) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].hidden = byte((dw & 0x80000000) >> 31) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Floors[floorIndex].Decode(dw)
case d2enum.LayerStreamShadow:
ds1.Tiles[y][x].Shadows[0].Prop1 = byte(dw & 0x000000FF) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].Sequence = byte((dw & 0x00003F00) >> 8) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].Unknown1 = byte((dw & 0x000FC000) >> 14) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].Style = byte((dw & 0x03F00000) >> 20) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].Unknown2 = byte((dw & 0x7C000000) >> 26) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].hidden = byte((dw & 0x80000000) >> 31) //nolint:gomnd // Bitmask
ds1.Tiles[y][x].Shadows[0].Decode(dw)
case d2enum.LayerStreamSubstitute:
ds1.Tiles[y][x].Substitutions[0].Unknown = dw
}
@ -497,7 +482,7 @@ func (ds1 *DS1) loadLayerStreams(br *d2datautils.StreamReader) error {
}
// Marshal encodes ds1 back to byte slice
// nolint:funlen,gocognit // no need to change
// nolint:funlen,gocognit,gocyclo // no need to change
func (ds1 *DS1) Marshal() []byte {
// create stream writer
sw := d2datautils.CreateStreamWriter()
@ -549,12 +534,7 @@ func (ds1 *DS1) Marshal() []byte {
switch layerStreamType {
case d2enum.LayerStreamWall1, d2enum.LayerStreamWall2, d2enum.LayerStreamWall3, d2enum.LayerStreamWall4:
wallIndex := int(layerStreamType) - int(d2enum.LayerStreamWall1)
dw |= uint32(ds1.Tiles[y][x].Walls[wallIndex].Prop1) & 0xFF //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Walls[wallIndex].Sequence) & 0x3F) << 8 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Walls[wallIndex].Unknown1) & 0xFC) << 14 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Walls[wallIndex].Style) & 0x3F) << 20 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Walls[wallIndex].Unknown2) & 0x7C) << 26 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Walls[wallIndex].hidden) & 0x01) << 31 //nolint:gomnd // Bitmask
dw = ds1.Tiles[y][x].Walls[wallIndex].Encode()
case d2enum.LayerStreamOrientation1, d2enum.LayerStreamOrientation2,
d2enum.LayerStreamOrientation3, d2enum.LayerStreamOrientation4:
wallIndex := int(layerStreamType) - int(d2enum.LayerStreamOrientation1)
@ -563,19 +543,9 @@ func (ds1 *DS1) Marshal() []byte {
case d2enum.LayerStreamFloor1, d2enum.LayerStreamFloor2:
floorIndex := int(layerStreamType) - int(d2enum.LayerStreamFloor1)
dw |= uint32(ds1.Tiles[y][x].Floors[floorIndex].Prop1) & 0xFF //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Floors[floorIndex].Sequence) & 0x3F) << 8 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Floors[floorIndex].Unknown1) & 0xFC) << 14 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Floors[floorIndex].Style) & 0x3F) << 20 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Floors[floorIndex].Unknown2) & 0x7C) << 26 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Floors[floorIndex].hidden) & 0x01) << 31 //nolint:gomnd // Bitmask
dw = ds1.Tiles[y][x].Floors[floorIndex].Encode()
case d2enum.LayerStreamShadow:
dw |= uint32(ds1.Tiles[y][x].Shadows[0].Prop1) & 0xFF //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Shadows[0].Sequence) & 0x3F) << 8 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Shadows[0].Unknown1) & 0xFC) << 14 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Shadows[0].Style) & 0x3F) << 20 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Shadows[0].Unknown2) & 0x7C) << 26 //nolint:gomnd // Bitmask
dw |= (uint32(ds1.Tiles[y][x].Shadows[0].hidden) & 0x01) << 31 //nolint:gomnd // Bitmask
dw = ds1.Tiles[y][x].Shadows[0].Encode()
case d2enum.LayerStreamSubstitute:
dw = ds1.Tiles[y][x].Substitutions[0].Unknown
}

22
d2common/d2fileformats/d2ds1/floor_shadow_record.go
View File

@ -17,3 +17,25 @@ type FloorShadowRecord struct {
func (f *FloorShadowRecord) Hidden() bool {
return f.hidden > 0
}
// Decode decodes floor-shadow record
func (f *FloorShadowRecord) Decode(dw uint32) {
f.Prop1 = byte(dw & 0x000000FF) //nolint:gomnd // Bitmask
f.Sequence = byte((dw & 0x00003F00) >> 8) //nolint:gomnd // Bitmask
f.Unknown1 = byte((dw & 0x000FC000) >> 14) //nolint:gomnd // Bitmask
f.Style = byte((dw & 0x03F00000) >> 20) //nolint:gomnd // Bitmask
f.Unknown2 = byte((dw & 0x7C000000) >> 26) //nolint:gomnd // Bitmask
f.hidden = byte((dw & 0x80000000) >> 31) //nolint:gomnd // Bitmask
}
// Encode encodes floor-shadow record
func (f *FloorShadowRecord) Encode() (dw uint32) {
dw |= uint32(f.Prop1) & 0xFF //nolint:gomnd // Bitmask
dw |= (uint32(f.Sequence) & 0x3F) << 8 //nolint:gomnd // Bitmask
dw |= (uint32(f.Unknown1) & 0xFC) << 14 //nolint:gomnd // Bitmask
dw |= (uint32(f.Style) & 0x3F) << 20 //nolint:gomnd // Bitmask
dw |= (uint32(f.Unknown2) & 0x7C) << 26 //nolint:gomnd // Bitmask
dw |= (uint32(f.hidden) & 0x01) << 31 //nolint:gomnd // Bitmask
return dw
}

22
d2common/d2fileformats/d2ds1/wall_record.go
View File

@ -20,3 +20,25 @@ type WallRecord struct {
func (w *WallRecord) Hidden() bool {
return w.hidden > 0
}
// Encode encodes wall record
func (w *WallRecord) Encode() (dw uint32) {
dw |= uint32(w.Prop1) & 0xFF //nolint:gomnd // Bitmask
dw |= (uint32(w.Sequence) & 0x3F) << 8 //nolint:gomnd // Bitmask
dw |= (uint32(w.Unknown1) & 0xFC) << 14 //nolint:gomnd // Bitmask
dw |= (uint32(w.Style) & 0x3F) << 20 //nolint:gomnd // Bitmask
dw |= (uint32(w.Unknown2) & 0x7C) << 26 //nolint:gomnd // Bitmask
dw |= (uint32(w.hidden) & 0x01) << 31 //nolint:gomnd // Bitmask
return dw
}
// Decode decodes wall record
func (w *WallRecord) Decode(dw uint32) {
w.Prop1 = byte(dw & 0x000000FF) //nolint:gomnd // Bitmask
w.Sequence = byte((dw & 0x00003F00) >> 8) //nolint:gomnd // Bitmask
w.Unknown1 = byte((dw & 0x000FC000) >> 14) //nolint:gomnd // Bitmask
w.Style = byte((dw & 0x03F00000) >> 20) //nolint:gomnd // Bitmask
w.Unknown2 = byte((dw & 0x7C000000) >> 26) //nolint:gomnd // Bitmask
w.hidden = byte((dw & 0x80000000) >> 31) //nolint:gomnd // Bitmask
}