diff options
| -rw-r--r-- | serialize.go | 257 | ||||
| -rw-r--r-- | tocltcmds.go | 5 |
2 files changed, 257 insertions, 5 deletions
diff --git a/serialize.go b/serialize.go index 2d01874..798969c 100644 --- a/serialize.go +++ b/serialize.go @@ -16562,6 +16562,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).BgColor w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16583,6 +16586,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type))) > math.MaxUint16 { chk(ErrTooLong) } @@ -16605,6 +16611,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type)))) write16(w, uint16(x)) } @@ -16627,6 +16636,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type))[:]) chk(err) } @@ -16649,6 +16661,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Clouds if x { write8(w, 1) @@ -16675,6 +16690,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).SunFogTint w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16697,6 +16715,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).MoonFogTint w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16718,6 +16739,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).FogTintType))) > math.MaxUint16 { chk(ErrTooLong) } @@ -16740,6 +16764,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).FogTintType)))) write16(w, uint16(x)) } @@ -16762,6 +16789,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).FogTintType))[:]) chk(err) } @@ -16783,6 +16813,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type == "skybox" { if len(((*(*(struct { BgColor color.NRGBA @@ -16802,6 +16835,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures)) > math.MaxUint16 { chk(ErrTooLong) } @@ -16824,6 +16860,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures))) write16(w, uint16(x)) } @@ -16845,6 +16884,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures { if err := pcall(func() { (((*(*(struct { @@ -16865,6 +16907,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures)[local204]).serialize(w) }); err != nil { if err == io.EOF { @@ -16892,6 +16937,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type == "regular" { { x := (*(*(struct { @@ -16912,6 +16960,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DaySky w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16934,6 +16985,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DayHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16956,6 +17010,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DawnSky w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -16978,6 +17035,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DawnHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -17000,6 +17060,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).NightSky w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -17022,6 +17085,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).NightHorizon w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -17044,6 +17110,9 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Indoor w.Write([]byte{x.A, x.R, x.G, x.B}) } @@ -17067,9 +17136,62 @@ func (obj *ToCltSkyParams) serialize(w io.Writer) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).BodyOrbitTilt write32(w, math.Float32bits(x)) } + { + x := (*(*(struct { + BgColor color.NRGBA + Type string + Clouds bool + SunFogTint color.NRGBA + MoonFogTint color.NRGBA + FogTintType string + + //mt:if %s.Type == "skybox" + Textures []Texture + + //mt:if %s.Type == "regular" + DaySky, DayHorizon, + DawnSky, DawnHorizon, + NightSky, NightHorizon, + Indoor color.NRGBA + + BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 + }))(obj)).FogDistance + write16(w, uint16(x)) + } + { + x := (*(*(struct { + BgColor color.NRGBA + Type string + Clouds bool + SunFogTint color.NRGBA + MoonFogTint color.NRGBA + FogTintType string + + //mt:if %s.Type == "skybox" + Textures []Texture + + //mt:if %s.Type == "regular" + DaySky, DayHorizon, + DawnSky, DawnHorizon, + NightSky, NightHorizon, + Indoor color.NRGBA + + BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 + }))(obj)).FogStart + write32(w, math.Float32bits(x)) + } } func (obj *ToCltSkyParams) deserialize(r io.Reader) { @@ -17092,6 +17214,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).BgColor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17124,6 +17249,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type) = string(local205) { p := &(*(*(struct { @@ -17144,6 +17272,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Clouds switch n := read8(r); n { case 0: @@ -17173,6 +17304,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).SunFogTint *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17195,6 +17329,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).MoonFogTint *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17227,6 +17364,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).FogTintType) = string(local207) if (*(*(struct { BgColor color.NRGBA @@ -17246,6 +17386,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type == "skybox" { var local209 uint16 { @@ -17270,6 +17413,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures) = make([]Texture, local209) for local210 := range (*(*(struct { BgColor color.NRGBA @@ -17289,6 +17435,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures { if err := pcall(func() { (((*(*(struct { @@ -17309,6 +17458,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Textures)[local210]).deserialize(r) }); err != nil { if err == io.EOF { @@ -17336,6 +17488,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Type == "regular" { { p := &(*(*(struct { @@ -17356,6 +17511,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DaySky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17378,6 +17536,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DayHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17400,6 +17561,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DawnSky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17422,6 +17586,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).DawnHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17444,6 +17611,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).NightSky *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17466,6 +17636,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).NightHorizon *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17488,6 +17661,9 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).Indoor *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)} } @@ -17511,9 +17687,62 @@ func (obj *ToCltSkyParams) deserialize(r io.Reader) { Indoor color.NRGBA BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 }))(obj)).BodyOrbitTilt *p = math.Float32frombits(read32(r)) } + { + p := &(*(*(struct { + BgColor color.NRGBA + Type string + Clouds bool + SunFogTint color.NRGBA + MoonFogTint color.NRGBA + FogTintType string + + //mt:if %s.Type == "skybox" + Textures []Texture + + //mt:if %s.Type == "regular" + DaySky, DayHorizon, + DawnSky, DawnHorizon, + NightSky, NightHorizon, + Indoor color.NRGBA + + BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 + }))(obj)).FogDistance + *p = int16(read16(r)) + } + { + p := &(*(*(struct { + BgColor color.NRGBA + Type string + Clouds bool + SunFogTint color.NRGBA + MoonFogTint color.NRGBA + FogTintType string + + //mt:if %s.Type == "skybox" + Textures []Texture + + //mt:if %s.Type == "regular" + DaySky, DayHorizon, + DawnSky, DawnHorizon, + NightSky, NightHorizon, + Indoor color.NRGBA + + BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 + }))(obj)).FogStart + *p = math.Float32frombits(read32(r)) + } } func (obj *ToCltOverrideDayNightRatio) serialize(w io.Writer) { @@ -17680,7 +17909,7 @@ func (obj *ToCltLocalPlayerAnim) deserialize(r io.Reader) { func (obj *ToCltEyeOffset) serialize(w io.Writer) { if err := pcall(func() { ((*(*(struct { - First, Third Vec + First, Third, ThirdFront Vec }))(obj)).First).serialize(w) }); err != nil { if err == io.EOF { @@ -17690,7 +17919,7 @@ func (obj *ToCltEyeOffset) serialize(w io.Writer) { } if err := pcall(func() { ((*(*(struct { - First, Third Vec + First, Third, ThirdFront Vec }))(obj)).Third).serialize(w) }); err != nil { if err == io.EOF { @@ -17698,12 +17927,22 @@ func (obj *ToCltEyeOffset) serialize(w io.Writer) { } chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.Vec", err)) } + if err := pcall(func() { + ((*(*(struct { + First, Third, ThirdFront Vec + }))(obj)).ThirdFront).serialize(w) + }); err != nil { + if err == io.EOF { + chk(io.EOF) + } + chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.Vec", err)) + } } func (obj *ToCltEyeOffset) deserialize(r io.Reader) { if err := pcall(func() { ((*(*(struct { - First, Third Vec + First, Third, ThirdFront Vec }))(obj)).First).deserialize(r) }); err != nil { if err == io.EOF { @@ -17713,7 +17952,7 @@ func (obj *ToCltEyeOffset) deserialize(r io.Reader) { } if err := pcall(func() { ((*(*(struct { - First, Third Vec + First, Third, ThirdFront Vec }))(obj)).Third).deserialize(r) }); err != nil { if err == io.EOF { @@ -17721,6 +17960,16 @@ func (obj *ToCltEyeOffset) deserialize(r io.Reader) { } chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.Vec", err)) } + if err := pcall(func() { + ((*(*(struct { + First, Third, ThirdFront Vec + }))(obj)).ThirdFront).deserialize(r) + }); err != nil { + if err == io.EOF { + chk(io.EOF) + } + chk(fmt.Errorf("%s: %w", "github.com/HimbeerserverDE/mt.Vec", err)) + } } func (obj *ToCltDelParticleSpawner) serialize(w io.Writer) { diff --git a/tocltcmds.go b/tocltcmds.go index 9e64979..fde2510 100644 --- a/tocltcmds.go +++ b/tocltcmds.go @@ -666,6 +666,9 @@ type ToCltSkyParams struct { //mt:end BodyOrbitTilt float32 + + FogDistance int16 + FogStart float32 } // ToCltOverrideDayNightRatio overrides the client's day-night ratio @@ -683,7 +686,7 @@ type ToCltLocalPlayerAnim struct { // ToCltEyeOffset tells the client where to position the camera // relative to the player. type ToCltEyeOffset struct { - First, Third Vec + First, Third, ThirdFront Vec } // ToCltDelParticleSpawner tells the client to delete a particle spawner. |