AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 10:35:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'use classic gui' option not being shown (Thanks venom983), fix view matrix having issues when spectating someone who is looking straight up or down in classicube. (Thanks 123DontMessWitMe)

Browse Source
This commit is contained in:
UnknownShadow200 2016-01-13 22:16:45 +11:00
parent 56cb2b49a8
commit 6a2514af4e
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClassicalSharp/2D/Screens/Menu/NostalgiaScreen.cs
View File

@ -27,7 +27,7 @@ namespace ClassicalSharp {
Options.Set( OptionsKey.UseClassicGui, v == "yes" );
} ),
Make( -140, -50, "Classic player list", OnWidgetClick,
Make( -140, 0, "Classic player list", OnWidgetClick,
g => g.UseClassicTabList ? "yes" : "no",
(g, v) => { g.UseClassicTabList = v == "yes";
Options.Set( OptionsKey.UseClassicTabList, v == "yes" );

6
ClassicalSharp/Model/BlockModel.cs
View File

@ -79,11 +79,11 @@ namespace ClassicalSharp.Model {
atlas = game.TerrainAtlas1D;
if( game.BlockInfo.IsSprite[block] ) {
SpriteXQuad( TileSide.Right, true );
SpriteXQuad( TileSide.Right, false );
SpriteZQuad( TileSide.Back, false );
SpriteXQuad( TileSide.Right, false );
SpriteZQuad( TileSide.Back, true );
SpriteXQuad( TileSide.Right, true );
} else {
YQuad( 0, TileSide.Bottom, FastColour.ShadeYBottom );
XQuad( maxBB.X - 0.5f, TileSide.Right, true, FastColour.ShadeX );
@ -174,7 +174,7 @@ namespace ClassicalSharp.Model {
cache.vertices[index++] = new VertexPos3fTex2fCol4b( p2, 0, p2, rec.U1, rec.V2, col );
}
void SpriteXQuad( int side, bool firstPart ) { // dis is broken
void SpriteXQuad( int side, bool firstPart ) {
int texId = game.BlockInfo.GetTextureLoc( block, side ), texIndex = 0;
TextureRec rec = atlas.GetTexRec( texId, 1, out texIndex );
FlushIfNotSame( texIndex );

26
ClassicalSharp/Utils/Camera.cs
View File

@ -32,6 +32,14 @@ namespace ClassicalSharp {
/// <summary> Calculates the picked block based on the camera's current position. </summary>
public virtual void GetPickedBlock( PickedPos pos ) {
}
protected float AdjustPitch( float value ) {
if( value >= 90.00f && value <= 90.25f ) return 90.25f * Utils.Deg2Rad;
if( value >= 89.75f && value <= 90.00f ) return 89.75f * Utils.Deg2Rad;
if( value >= 270.00f && value <= 270.25f ) return 270.25f * Utils.Deg2Rad;
if( value >= 269.75f && value <= 270.00f ) return 269.75f * Utils.Deg2Rad;
return value * Utils.Deg2Rad;
}
}
public abstract class PerspectiveCamera : Camera {
@ -54,7 +62,8 @@ namespace ClassicalSharp {
}
public override void GetPickedBlock( PickedPos pos ) {
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
Vector3 eyePos = player.EyePosition;
float reach = game.LocalPlayer.ReachDistance;
Picking.CalculatePickedBlock( game, eyePos, dir, reach, pos );
@ -142,7 +151,8 @@ namespace ClassicalSharp {
Vector3 eyePos = player.EyePosition;
eyePos.Y += bobYOffset;
Vector3 dir = -Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 dir = -Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
Picking.ClipCameraPos( game, eyePos, dir, distance, game.CameraClipPos );
Vector3 cameraPos = game.CameraClipPos.IntersectPoint;
return Matrix4.LookAt( cameraPos, eyePos, Vector3.UnitY ) * tiltMatrix;
@ -153,7 +163,8 @@ namespace ClassicalSharp {
}
public override Vector3 GetCameraPos( Vector3 eyePos ) {
Vector3 dir = -Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 dir = -Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
Picking.ClipCameraPos( game, eyePos, dir, distance, game.CameraClipPos );
return game.CameraClipPos.IntersectPoint;
}
@ -176,7 +187,8 @@ namespace ClassicalSharp {
Vector3 eyePos = player.EyePosition;
eyePos.Y += bobYOffset;
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
Picking.ClipCameraPos( game, eyePos, dir, distance, game.CameraClipPos );
Vector3 cameraPos = game.CameraClipPos.IntersectPoint;
return Matrix4.LookAt( cameraPos, eyePos, Vector3.UnitY ) * tiltMatrix;
@ -187,7 +199,8 @@ namespace ClassicalSharp {
}
public override Vector3 GetCameraPos( Vector3 eyePos ) {
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 dir = Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
Picking.ClipCameraPos( game, eyePos, dir, distance, game.CameraClipPos );
return game.CameraClipPos.IntersectPoint;
}
@ -202,7 +215,8 @@ namespace ClassicalSharp {
CalcViewBobbing( delta );
Vector3 eyePos = player.EyePosition;
eyePos.Y += bobYOffset;
Vector3 cameraDir = Utils.GetDirVector( player.HeadYawRadians, player.PitchRadians );
Vector3 cameraDir = Utils.GetDirVector( player.HeadYawRadians,
AdjustPitch( player.PitchDegrees ) );
return Matrix4.LookAt( eyePos, eyePos + cameraDir, Vector3.UnitY ) * tiltMatrix;
}